Merge pull request #522 from AnderFan/ashtray

Поправил баг с неусвоением пищи у пеплоходцев
AdventureTimeSS14 · May 20, 2024 · 0c4c2af · 0c4c2af
2 parents 7d446f7 + 3b69d3c
commit 0c4c2af
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 229 deletions.
diff --git a/Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalker.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalker.yml
@@ -7,8 +7,18 @@
   components:
   - type: HumanoidAppearance
     species: Reptilian
+  - type: ThermalRegulator
+    metabolismHeat: 800
+    radiatedHeat: 100
+    implicitHeatRegulation: 500
+    sweatHeatRegulation: 2000
+    shiveringHeatRegulation: 2000
+  - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 70
   - type: Body
     prototype: Human
+  - type: Hunger
   - type: MovementSpeedModifier
     baseWalkSpeed : 3
     baseSprintSpeed : 5.5
@@ -17,11 +27,6 @@
       - names_reptilian_male
   - type: Loadout
     prototypes: [ ADTAshWalkerEquipment ]
-  - type: Hunger
-    starvationDamage:
-      types:
-        Cold: 0.05
-        Bloodloss: 0.05
   - type: Puller
     needsHands: false
   - type: Thirst
@@ -65,24 +70,13 @@
     damage:
       types:
         Slash: 5
-  - type: Temperature
-    heatDamageThreshold: 400
-    coldDamageThreshold: 260  #starting temperature damage treshold
-    currentTemperature: 310.15
-    specificHeat: 42
-    coldDamage:
-      types:
-        Cold : 0.1 #per second, scales with temperature & other constants
-    heatDamage:
-      types:
-        Heat : 1.5 #per second, scales with temperature & other constants
   - type: Wagging
   # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
-    - CintaTaj
+    - Draconic
     understands:
-    - CintaTaj
+    - Draconic
   - type: SizeAttributeWhitelist # Frontier
     tall: true
     tallscale: 1.12

diff --git a/Resources/Prototypes/ADT/Lavaland/NPCs/BaseHumLavalandMob.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/BaseHumLavalandMob.yml
@@ -2,133 +2,14 @@
 - type: entity
   save: false
   parent:
-  - BaseMob
-  - MobDamageable
-  - MobCombat
+  - MobBloodstream
+  - MobFlammable
+  - BaseMobSpecies
   id: BaseHumLavalandMob
   abstract: true
   components:
-  - type: Sprite
-    layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-    - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    - shader: StencilClear
-      sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
-      # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
-      # sprite refactor when
-      state: l_leg
-    - shader: StencilMask
-      map: ["enum.HumanoidVisualLayers.StencilMask"]
-      sprite: Mobs/Customization/masking_helpers.rsi
-      state: unisex_full
-      visible: false
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-    - map: ["jumpsuit"]
-    #- map: [ "underwearb" ] #Sirena
-    #- map: [ "underweart" ] #Sirena
-    #- map: ["enum.HumanoidVisualLayers.LFoot"]
-    #- map: ["enum.HumanoidVisualLayers.RFoot"]
-    #- map: [ "socks" ] #Sirena
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
-    - map: [ "gloves" ]
-    - map: [ "shoes" ]
-    - map: [ "ears" ]
-    - map: [ "outerClothing" ]
-    - map: [ "eyes" ]
-    - map: [ "belt" ]
-    - map: [ "id" ]
-    - map: [ "neck" ]
-    - map: [ "back" ]
-    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-    - map: [ "enum.HumanoidVisualLayers.Hair" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
-    - map: [ "mask" ]
-    - map: [ "head" ]
-    - map: [ "pocket1" ]
-    - map: [ "pocket2" ]
-    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
-      color: "#ffffff"
-      sprite: Objects/Misc/handcuffs.rsi
-      state: body-overlay-2
-      visible: false
-    - map: [ "clownedon" ] # Dynamically generated
-      sprite: "Effects/creampie.rsi"
-      state: "creampie_human"
-      visible: false
-  - type: DamageVisuals
-    thresholds: [ 20, 40, 100 ]
-    targetLayers:
-    - "enum.HumanoidVisualLayers.Chest"
-    - "enum.HumanoidVisualLayers.Head"
-    - "enum.HumanoidVisualLayers.LArm"
-    - "enum.HumanoidVisualLayers.LLeg"
-    - "enum.HumanoidVisualLayers.RArm"
-    - "enum.HumanoidVisualLayers.RLeg"
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#FF0000"
-      Burn:
-        sprite: Mobs/Effects/burn_damage.rsi
-  - type: GenericVisualizer
-    visuals:
-      enum.CreamPiedVisuals.Creamed:
-        clownedon: # Not 'creampied' bc I can already see Skyrat complaining about conflicts.
-          True: {visible: true}
-          False: {visible: false}
-  - type: StatusIcon
-    bounds: -0.5,-0.5,0.5,0.5
-  - type: RotationVisuals
-    defaultRotation: 90
-    horizontalRotation: 90
-  - type: HumanoidAppearance
-    species: Human
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      60: 0.7
-      80: 0.5
-  - type: Fixtures
-    fixtures: # TODO: This needs a second fixture just for mob collisions.
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 185
-        restitution: 0.0
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: FloorOcclusion
-  - type: RangedDamageSound
-    soundGroups:
-      Brute:
-        collection:
-          MeatBulletImpact
-    soundTypes:
-      Heat:
-        collection:
-          MeatLaserImpact
-  - type: Reactive
-    groups:
-      Flammable: [ Touch ]
-      Extinguish: [ Touch ]
-      Acidic: [Touch, Ingestion]
-    reactions:
-    - reagents: [Water, SpaceCleaner]
-      methods: [Touch]
-      effects:
-      - !type:WashCreamPieReaction
+  - type: Flashable
+  # Organs
   - type: StatusEffects
     allowed:
     - PainKiller
@@ -138,98 +19,43 @@
     - Stutter
     - SeeingRainbows
     - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
     - Drunk
     - SlurredSpeech
     - RatvarianLanguage
     - PressureImmunity
     - Muted
-    - ForcedSleep
-    - TemporaryBlindness
     - Pacified
     - StaminaModifier
-  - type: Reflect
-    enabled: false
-    reflectProb: 0
-  - type: Identity
-  - type: IdExaminable
-  - type: Hands
-  - type: Internals
-  - type: Inventory
-  - type: InventorySlots
-  - type: FloatingVisuals
-  - type: Climbing
-  - type: Cuffable
-  - type: Ensnareable
-    sprite: Objects/Misc/ensnare.rsi
-    state: icon
-  - type: AnimationPlayer
-  - type: Buckle
-  - type: CombatMode
-    canDisarm: true
-  - type: MeleeWeapon
-    soundHit:
-      collection: Punch
-    angle: 30
-    animation: WeaponArcFist
-    attackRate: 1
-    damage:
+  - type: Blindable
+  # Other
+  - type: Body
+    prototype: Human
+    requiredLegs: 0
+  - type: Temperature
+    heatDamageThreshold: 325
+    currentTemperature: 310.15
+    specificHeat: 42
+    coldDamage:
+      types:
+        Cold: 0.2 #per second, scales with temperature & other constants
+    heatDamage:
       types:
-        Blunt: 5
-  - type: SleepEmitSound
-  - type: SSDIndicator
-  - type: StandingState
-  - type: Fingerprint
-  - type: Dna
-  - type: MindContainer
-    showExamineInfo: true
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
-  - type: CanHostGuardian
-  - type: NpcFactionMember
-    factions:
-    - SimpleNeutral
-  - type: CreamPied
-  - type: Stripping
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      - key: enum.VoiceMaskUIKey.Key
-        type: VoiceMaskBoundUserInterface
-      - key: enum.HumanoidMarkingModifierKey.Key
-        type: HumanoidMarkingModifierBoundUserInterface
-      - key: enum.StrippingUiKey.Key
-        type: StrippableBoundUserInterface
-      - key: enum.StoreUiKey.Key
-        type: StoreBoundUserInterface
-  - type: Puller
-  - type: Speech
-    speechSounds: Alto
-  - type: DamageForceSay
-  - type: Vocal
-    sounds:
-      Male: MaleHuman
-      Female: FemaleHuman
-      Unsexed: MaleHuman
-  - type: Emoting
-  - type: EmoteAnimation
-  - type: EmotePanel
-  - type: BodyEmotes
-    soundsId: GeneralBodyEmotes
-  - type: Grammar
-    attributes:
-      proper: true
-  - type: MobPrice
-    price: 1500 # Kidnapping a living person and selling them for cred is a good move.
-    deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
-  - type: Tag
-    tags:
-    - FootstepSound
-    - DoorBumpOpener
-  - type: SizeAttributeWhitelist # Frontier
-    tall: true
-    tallscale: 1.1
-    short: true
-    shortscale: 0.9
+        Heat: 1.5 #per second, scales with temperature & other constants
+  - type: ThermalRegulator
+    metabolismHeat: 800
+    radiatedHeat: 100
+    implicitHeatRegulation: 500
+    sweatHeatRegulation: 2000
+    shiveringHeatRegulation: 2000
+    normalBodyTemperature: 310.15
+    thermalRegulationTemperatureThreshold: 25
+  - type: Perishable
+  - type: Butcherable
+    butcheringType: Spike # TODO human.
+    spawned:
+      - id: FoodMeat
+        amount: 5
+  - type: FireVisuals
+    alternateState: Standing