Zombies on style (#531)

* zombie styl * random * randomrandom * random3 * random4 * random5 * Random6 * random7 * mega zombie nerf * Update zombie.yml --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-11-07 22:20:03 +02:00
parent ab7296ff4a
commit 12a838ac8e
6 changed files with 186 additions and 20 deletions
--- a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml
@@ -19,9 +19,9 @@
 - type: damageModifierSet
  id: CP14Zombie
  coefficients:
-    Blunt: 0.7
-    Slash: 0.9
-    Piercing: 0.6
+    Blunt: 0.8
+    Slash: 1.0
+    Piercing: 0.8
    Heat: 1.5
    Cold: 0.4
    Poison: 0
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
@@ -2,8 +2,9 @@

 - type: entity
  name: walking dead spawner
-  id: CP14SpawnMobUndeadZombie
+  id: CP14SpawnMobUndeadZombieRandom
  parent: MarkerBase
+  suffix: Random
  categories: [ ForkFiltered ]
  components:
  - type: Sprite
@@ -12,9 +13,25 @@
      state: green
    - sprite: _CP14/Mobs/Species/Zombie/parts.rsi
      state: full
-  - type: ConditionalSpawner
-    prototypes:
-    - CP14MobUndeadZombie
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - !type:GroupSelector
+        weight: 60
+        children:
+        - id: CP14MobUndeadZombieGearEasy1
+        - id: CP14MobUndeadZombieGearEasy2
+        - id: CP14MobUndeadZombieGearEasy3
+      - !type:GroupSelector
+        weight: 30
+        children:
+        - id: CP14MobUndeadZombieGearMedium1
+        - id: CP14MobUndeadZombieGearMedium2
+      - !type:GroupSelector
+        weight: 10
+        children:
+        - id: CP14MobUndeadZombieGearHard1
+        - id: CP14MobUndeadZombieGearHard2

 # Animal

--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/undead.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/undead.yml
@@ -16,3 +16,66 @@
  - type: NpcFactionMember
    factions:
    - CP14Undead
+
+- type: entity
+  id: CP14MobUndeadZombieGearEasy1
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Easy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadEasy1 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearEasy2
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Easy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadEasy2 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearEasy3
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Easy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadEasy3 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearMedium1
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Medium
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadMedium1 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearMedium2
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Medium
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadMedium2 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearHard1
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadHard1 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearHard2
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadHard2 ]
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
@@ -9,6 +9,38 @@
  components:
  - type: HumanoidAppearance
    species: CP14Zombie
+  - 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" ]
+    - map: [ "shirt" ]
+    - map: [ "pants" ]
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+    - map: [ "gloves" ]
+    - map: [ "shoes" ]
+    - map: [ "ears" ]
+    - map: [ "cloak" ]
+    - map: [ "eyes" ]
+    - map: [ "belt1" ]
+    - map: [ "belt2" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
  - type: Icon
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
    state: full
@@ -23,15 +55,17 @@
  - type: MobState
    allowedStates:
    - Alive
+    - Critical
    - Dead
  - type: MobThresholds
    thresholds:
      0: Alive
-      140: Dead
+      40: Critical
+      120: Dead
  - type: SlowOnDamage
    speedModifierThresholds:
-      80: 0.8
-      110: 0.4
+      10: 0.8
+      30: 0.4
  - type: StatusEffects
    allowed:
    - KnockedDown
@@ -39,7 +73,6 @@
    - Electrocution
    - Stutter
    - TemporaryBlindness
-    - Pacified
  - type: RotationVisuals
    defaultRotation: 90
    horizontalRotation: 90
@@ -60,11 +93,11 @@
  - type: PassiveDamage
    allowedStates:
    - Alive
-    damageCap: 130
+    - Critical
    damage:
      groups:
-        Brute: -0.3
-        Burn: -0.3
+        Brute: -2
+        Burn: -2
  - type: MeleeWeapon
    altDisarm: false
    angle: 0
@@ -74,9 +107,8 @@
    damage:
      types:
        Slash: 4
-        Structural: 2
+        Structural: 4
  - type: Pullable
-  - type: GhostTakeoverAvailable
  - type: SpamEmitSound
    minInterval: 10
    maxInterval: 30
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
@@ -283,12 +283,13 @@
 - type: cp14DemiplaneModifier
  id: EnemyZombie
  difficulty: 0.4
+  generationWeight: 20
  layers:
    - !type:OreDunGen
-      entity: CP14SpawnMobUndeadZombie
-      count: 3
-      minGroupSize: 1
-      maxGroupSize: 3
+      entity: CP14SpawnMobUndeadZombieRandom
+      count: 4
+      minGroupSize: 3
+      maxGroupSize: 4

 - type: cp14DemiplaneModifier
  id: EnemyDyno
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/undead_startinggear.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/undead_startinggear.yml
@@ -0,0 +1,53 @@
+- type: startingGear
+  id: CP14MobUndeadEasy1
+  equipment:
+    shirt: CP14ClothingShirtCottonBlack
+    pants: CP14ClothingPantsTrouserDarkBlue
+
+- type: startingGear
+  id: CP14MobUndeadEasy2
+  equipment:
+    pants: CP14ClothingPantsLoincloth
+
+- type: startingGear
+  id: CP14MobUndeadEasy3
+  equipment:
+    pants: CP14ClothingPantsTrouserDarkBlue
+    shoes: CP14ClothingShoesSandals
+    mask: CP14ClothingMaskSinner
+
+- type: startingGear
+  id: CP14MobUndeadMedium1
+  equipment:
+    cloak: CP14ClothingCloakCuirass
+    shirt: CP14ClothingShirtCottonRed
+    pants: CP14ClothingPantsTrouserWhite
+
+- type: startingGear
+  id: CP14MobUndeadMedium2
+  equipment:
+    cloak: CP14ClothingCloakCuirass
+    shirt: CP14ClothingShirtCottonRed
+    pants: CP14ClothingPantsTrouserWhite
+    head: CP14ClothingHeadBeretRed
+
+- type: startingGear
+  id: CP14MobUndeadHard1
+  equipment:
+    cloak: CP14ClothingCloakInfantryCuirass
+    shirt: CP14ClothingShirtMercenary
+    pants: CP14ClothingPantsMercenaryTrousers
+    shoes: CP14ClothingShoesBlack
+    back: CP14BaseTwoHandedSword
+    head: CP14ClothingHeadBeretMercenary
+
+- type: startingGear
+  id: CP14MobUndeadHard2
+  equipment:
+    cloak: CP14ClothingCloakCuirassLoincloth
+    shirt: CP14ClothingShirtMercenary
+    pants: CP14ClothingPantsMercenaryTrousers
+    shoes: CP14ClothingShoesBlack
+    back: CP14BaseShield
+    head: CP14ClothingHeadCapellina
+    mask: CP14ClothingMaskSteelMask