fixes

2024-04-27 14:48:55 +03:00
parent 6174713383
commit 1c38d46cd3
2 changed files with 59 additions and 306 deletions
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -28,8 +28,6 @@
      state: unisex_full
      visible: false
    - map: ["jumpsuit"]
-    - map: [ "pants" ]
-    - map: [ "shirt" ]
    - map: ["enum.HumanoidVisualLayers.LFoot"]
    - map: ["enum.HumanoidVisualLayers.RFoot"]
    - map: ["enum.HumanoidVisualLayers.LHand"]
@@ -42,7 +40,6 @@
    - map: [ "belt" ]
    - map: [ "id" ]
    - map: [ "neck" ]
-    - map: [ "cloak" ]
    - map: [ "back" ]
    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
    - map: [ "enum.HumanoidVisualLayers.Hair" ]
@@ -350,16 +347,12 @@
      state: body-overlay-2
      visible: false
    - map: [ "gloves" ]
-    - map: [ "ring1" ]
-    - map: [ "ring2" ]
    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "outerClothing" ]
    - map: [ "eyes" ]
-    - map: [ "belt1" ]
-    - map: [ "belt2" ]
+    - map: [ "belt" ]
    - map: [ "id" ]
-    - map: [ "keys" ]
    - map: [ "neck" ]
    - map: [ "back" ]
    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
@@ -380,4 +373,4 @@
  - type: UserInterface
    interfaces:
      enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
+        type: HumanoidMarkingModifierBoundUserInterface
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -1,8 +1,5 @@
 - type: entity
-  parent:
-    - BaseMob
-    - MobDamageable
-    - MobCombat
+  parent: BaseMobSpecies
  id: CP14BaseMobSpecies
  save: false
  abstract: true
@@ -62,323 +59,86 @@
          sprite: "Effects/creampie.rsi"
          state: "creampie_human"
          visible: false
-    - type: DamageVisuals
-      thresholds: [ 10, 20, 30, 50, 70, 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: CP14Human
-    - 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: StatusEffects
-      allowed:
-        - Stun
-        - KnockedDown
-        - SlowedDown
-        - Stutter
-        - SeeingRainbows
-        - Electrocution
-        - Drunk
-        - SlurredSpeech
-        - RatvarianLanguage
-        - PressureImmunity
-        - Muted
-        - ForcedSleep
-        - TemporaryBlindness
-        - Pacified
-        - StaminaModifier
-    - type: Reflect
-      enabled: false
-      reflectProb: 0
    - type: Body
      prototype: CP14Human
      requiredLegs: 2
-    - 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:
-        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:
-        - NanoTrasen
-    - 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
-    - type: Puller
-    - type: Speech
-      speechSounds: Alto
-    - type: DamageForceSay
-    - type: Vocal
-      sounds:
-        Male: MaleHuman
-        Female: FemaleHuman
-        Unsexed: MaleHuman
-    - type: Emoting
-    - 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:
-        - CanPilot
-        - FootstepSound
-        - DoorBumpOpener

 - type: entity
-  parent:
-    - MobBloodstream
-    - MobRespirator
-    - MobAtmosStandard
-    - MobFlammable
-    - CP14BaseMobSpecies
+  parent: BaseMobSpeciesOrganic
  id: CP14BaseMobSpeciesOrganic
  save: false
  abstract: true
-  components:
-    - type: Flashable
-    - type: Barotrauma
-      damage:
-        types:
-          Blunt: 0.50 #per second, scales with pressure and other constants.
-          Heat: 0.1
-    - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
-      allowedStates:
-        - Alive
-      damageCap: 20
-      damage:
-        types:
-          Heat: -0.07
-        groups:
-          Brute: -0.07
-    # Organs
-    - type: StatusEffects
-      allowed:
-        - Stun
-        - KnockedDown
-        - SlowedDown
-        - Stutter
-        - SeeingRainbows
-        - Electrocution
-        - ForcedSleep
-        - TemporaryBlindness
-        - Drunk
-        - SlurredSpeech
-        - RatvarianLanguage
-        - PressureImmunity
-        - Muted
-        - Pacified
-        - StaminaModifier
-    - type: Blindable
-    # Other
-    - type: Temperature
-      heatDamageThreshold: 325
-      coldDamageThreshold: 260
-      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: 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: Respirator
-      damage:
-        types:
-          Asphyxiation: 1.0
-      damageRecovery:
-        types:
-          Asphyxiation: -1.0
-    - type: FireVisuals
-      alternateState: Standing
+  #components:
+  #  - type: FireVisuals
+  #    alternateState: Standing #TO DO - custom visual

 - type: entity
  save: false
+  parent: BaseSpeciesDummy
  id: CP14BaseSpeciesDummy
  abstract: true
  components:
-  - type: Hands
  - type: Inventory
    templateId: CP14Human
-  - type: InventorySlots
-  - type: ContainerContainer
  - type: Icon
    sprite: _CP14/Mobs/Species/Human/parts.rsi
    state: full
  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
    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
-        state: l_leg
-      - shader: StencilMask
-        map: [ "enum.HumanoidVisualLayers.StencilMask" ]
-        sprite: Mobs/Customization/masking_helpers.rsi
-        state: unisex_full
-        visible: false
-      - map: [ "jumpsuit" ]
-      - map: [ "pants" ]
-      - map: [ "shirt" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-      - 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: [ "cloak" ]
-      - 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: Appearance
+    - 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
+      state: l_leg
+    - shader: StencilMask
+      map: ["enum.HumanoidVisualLayers.StencilMask"]
+      sprite: Mobs/Customization/masking_helpers.rsi
+      state: unisex_full
+      visible: false
+    - map: ["jumpsuit"]
+    - map: ["enum.HumanoidVisualLayers.LFoot"]
+    - map: ["enum.HumanoidVisualLayers.RFoot"]
+    - map: ["enum.HumanoidVisualLayers.LHand"]
+    - map: ["enum.HumanoidVisualLayers.RHand"]
+    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "gloves" ]
+    - map: [ "ring1" ]
+    - map: [ "ring2" ]
+    - map: [ "shoes" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
+    - map: [ "belt1" ]
+    - map: [ "belt2" ]
+    - map: [ "id" ]
+    - map: [ "keys" ]
+    - 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" ]
  - type: HumanoidAppearance
    species: CP14Human
  - type: Body
    prototype: CP14Human
-    requiredLegs: 2
-  - type: UserInterface
-    interfaces:
-      - key: enum.HumanoidMarkingModifierKey.Key # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
+    requiredLegs: 2