Merge pull request #76188 from Karol1223/copyfrom

Correct some ``copy-from`` weirdness caught in #76180

data/json/monsters/fungus.json

@@ -179,7 +179,7 @@
     "name": { "str": "fungaloid shambler" },
     "description": "A large white fungus, a bulging gray stalk supporting a bloom at the top.  Spores float from its gills and tendrils extend from the base.  Chunks of rock, metal, bone, and wood are held by tendrils as a kind of armor.",
     "copy-from": "mon_fungaloid",
-    "volume": "12 L",
+    "volume": "120 L",
     "weight": "160 kg",
     "hp": 150,
     "speed": 20,

data/json/monsters/zanimal_upgrade.json

@@ -81,7 +81,7 @@
     "hp": 34,
     "speed": 85,
     "color": "magenta",
-    "upgrades": { "half_life": 56, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
+    "upgrades": false,
     "extend": { "special_attacks": [ [ "PARROT_AT_DANGER", 2 ], [ "SHRIEK", 2 ] ] }
   },
   {

data/json/monsters/zed-classic.json

@@ -163,7 +163,6 @@
       }
     ],
     "death_drops": "mon_zombie_hazmat_death_drops",
-    "upgrades": false,
     "armor": { "bash": 5, "cut": 4, "bullet": 3, "electric": 5 },
     "extend": { "weakpoint_sets": [ "wps_humanoid_gasmask" ], "families": [ "prof_wp_syn_armored" ], "flags": [ "ACIDPROOF" ] },
     "delete": { "special_attacks": [ "bite_humanoid", "scratch_humanoid" ] }

data/json/monsters/zed-pupating.json

@@ -137,7 +137,7 @@
   {
     "id": "mon_zombie_pupa_shady",
     "type": "MONSTER",
-    "copy-from": "mon_zombie_pupa_decoy",
+    "copy-from": "mon_zombie_pupa_decoy_shady",
     "extend": {
       "special_attacks": [
         {

data/json/monsters/zed-winged.json

@@ -73,6 +73,7 @@
       { "type": "leap", "cooldown": 2, "max_range": 8 }
     ],
     "burn_into": "mon_zombie_scorched_lasher",
+    "upgrades": false,
     "armor": { "bash": 2, "cut": 2, "bullet": 2, "electric": 1 },
     "extend": { "families": [ "prof_wp_flying" ], "flags": [ "SMELLS" ] }
   },

data/json/monsters/zed_ferrous.json

@@ -75,6 +75,7 @@
     "grab_strength": 35,
     "attack_effs": [ { "id": "tetanus", "duration": 300, "chance": 20 } ],
     "burn_into": "mon_zombie_scorched_rust",
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 5, "stab": 5, "bullet": 5 },
     "extend": { "flags": [ "SMELLS" ], "special_attacks": [ { "id": "impale" } ] }
   },
@@ -107,6 +108,7 @@
     ],
     "attack_effs": [ { "id": "tetanus", "duration": 300, "chance": 10 } ],
     "burn_into": "mon_zombie_fiend_rust",
+    "upgrades": false,
     "armor": { "bash": 8, "cut": 8, "stab": 8, "bullet": 8 },
     "extend": { "flags": [ "SMELLS", "PUSH_VEH" ] },
     "delete": { "flags": [ "GRABS" ] }

data/json/monsters/zed_skeletal.json

@@ -75,6 +75,7 @@
     ],
     "special_when_hit": [ "ZAPBACK", 100 ],
     "fungalize_into": "mon_skeleton_fungus",
+    "upgrades": false,
     "armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 30 },
     "extend": {
       "weakpoint_sets": [ "wps_bone_armor" ],

data/json/monsters/zed_soldiers.json

@@ -117,7 +117,8 @@
     "diff": 20,
     "bleed_rate": 50,
     "harvest": "zombie_humanoid_acid",
-    "delete": { "upgrades": { "half_life": 42, "into_group": "GROUP_SOLDIER_UPGRADE" }, "categories": [ "CLASSIC" ] },
+    "delete": { "categories": [ "CLASSIC" ] },
+    "upgrades": false,
     "relative": { "hp": 40, "speed": -10, "melee_skill": 2, "armor": { "bash": 5 } },
     "extend": {
       "special_attacks": [

data/json/monsters/zed_tentacle.json

@@ -90,6 +90,7 @@
         "ignore_dest_danger": true,
         "message": "The zombie strider takes a long step!"
       }
-    ]
+    ],
+    "upgrades": false
   }
 ]