Zombie Rework & Polymorph Expansion (#8413)

Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Resources/Prototypes/Diseases/noninfectious.yml

@@ -18,7 +18,6 @@
       reagent: Phalanximine
       min: 15
 
-
 - type: disease
   id: StageIIIALungCancer
   name: Stage IIIA Lung Cancer
@@ -42,27 +41,3 @@
 
 
 ### Once radiation is refactored I want it to have a small chance of giving you regular cancer
-
-- type: disease
-  id: ZombieInfection
-  name: Zombie Infection #This is the incubation period of the zombie disease.
-  infectious: false
-  cureResist: 0.2
-  effects:
-    - !type:DiseaseHealthChange
-      probability: 0.01
-      damage:
-        types:
-          Blunt: 2 #this is low but it goes for like 5 minutes so it's fine
-    - !type:DiseaseSnough
-      probability: 0.05
-      snoughMessage: disease-cough
-      snoughSound:
-        collection: Coughs
-    - !type:DiseaseProgression
-      probability: 0.33
-      comp: DiseaseZombie
-  cures:
-    - !type:DiseaseReagentCure
-      reagent: Romerol
-      min: 10

Resources/Prototypes/Diseases/zombie.yml

@@ -0,0 +1,26 @@
+- type: disease
+  id: ActiveZombieVirus
+  name: Zombie Virus
+  infectious: false
+  cureResist: 0.2
+  effects:
+    - !type:DiseaseHealthChange
+      probability: 0.075
+      damage:
+        types:
+          Blunt: 4
+    - !type:DiseaseAdjustReagent
+      probability: 0.05
+      reagent: Toxin
+      amount: 1
+    - !type:DiseaseSnough
+      probability: 0.01
+      snoughMessage: disease-cough
+      snoughSound:
+        collection: Coughs
+    - !type:DiseaseAddComponent
+      comp: ZombifyOnDeath
+  cures:
+    - !type:DiseaseReagentCure
+      reagent: Romerol
+      min: 5

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -728,7 +728,6 @@
     damage:
       types:
         Blunt: 0.1
-  - type: HumanoidAppearance # no this doesnt make sense but its needed for vocal
   - type: Vocal
     # mice are gender neutral who cares
     maleScream: /Audio/Animals/mouse_squeak.ogg

Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml

@@ -40,8 +40,8 @@
   parent: HandheldHealthAnalyzer
   id: HandheldHealthAnalyzerZombie
   name: Zombie Infector
-  suffix: DEBUG
+  suffix: Active
   components:
   - type: HealthAnalyzer
     fake: true
-    disease: ZombieInfection
+    disease: ActiveZombieVirus

Resources/Prototypes/Entities/Objects/Weapons/Melee/zombieclaw.yml

@@ -1,22 +0,0 @@
-# Special entity used to fill zombie's hands when they turn undead
-- type: entity
-  id: ZombieClaw
-  name: Zombie Claw
-  noSpawn: true
-  components:
-    - type: Sprite
-      sprite: Objects/Weapons/Melee/zombie_claw.rsi
-      state: icon
-    - type: Item
-    - type: Sharp
-    - type: ZombieTransfer
-    - type: Unremoveable
-    - type: MeleeWeapon
-      damage:
-        types:
-          Slash: 13
-          Piercing: 7
-      range: 1
-      arcwidth: 0
-      arc: claw
-

Resources/Prototypes/Polymorphs/polymorph.yml

@@ -8,30 +8,38 @@
   id: Chicken
   entity: MobChicken
   forced: true
-  dropInventory: true
+  inventory: Drop
 
 - type: polymorph
   id: Monkey
   entity: MobMonkey
   forced: true
-  dropInventory: true
+  inventory: Drop
   revertOnCrit: true
   revertOnDeath: true
 
+# this is a test for transferring some visual appearance stuff
+- type: polymorph
+  id: TestHumanMorph
+  entity: MobHuman
+  transferName: true
+  transferHumanoidAppearance: true
+  inventory: Transfer
+
 - type: polymorph
   id: AdminMonkeySmite
   entity: MobMonkey
   forced: true
-  dropInventory: true
+  inventory: Drop
 
 - type: polymorph
   id: AdminBreadSmite
   entity: FoodBreadPlain
   forced: true
-  dropInventory: true
+  inventory: Drop
 
 - type: polymorph
   id: AdminInstrumentSmite
   entity: SuperSynthesizerInstrument
   forced: true
-  dropInventory: true
+  inventory: Drop

Resources/Prototypes/Reagents/toxins.yml

@@ -309,4 +309,4 @@
               Cellular: 1
         - !type:ChemCauseDisease
           causeChance: 1
-          disease: ZombieInfection
+          disease: ActiveZombieVirus

Resources/Textures/Objects/Weapons/Melee/zombie_claw.rsi/meta.json

@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Illustrated by EmoGarbage",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}