From 50f8ab22c2e418b5325a53f027b58775e376d6fd Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Tue, 25 Jun 2024 16:59:52 +0200 Subject: [PATCH] Correct some remnants of nonfunctional ``extend``/``delete`` syntax (#74768) * destroy * innawood solution * oops I was wrong * I hate all of this --- data/json/items/chemicals_and_resources.json | 1 - data/json/items/comestibles/veggy_dishes.json | 1 - data/json/monsters/fish.json | 7 +-- data/json/monsters/mammal.json | 2 +- .../Magiclysm/monsters/holiday_magiclysm.json | 2 +- .../mods/innawood/monsters/insect_spider.json | 52 +++---------------- 6 files changed, 10 insertions(+), 55 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 209fe6ae02d90..fdd162aaa686d 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -2116,7 +2116,6 @@ "description": "Blood mixed with acidic compounds, smells putrid, a means of refining this could net some useful chemicals.", "comestible_type": "INVALID", "charges": 1, - "delete": { "ammo_type": "components" }, "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ], "drop_action": { "type": "emit_actor", "emits": [ "emit_acid_drop" ], "scale_qty": true } }, diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index de997699f2222..438affd462795 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -1044,7 +1044,6 @@ } ], "flags": [ "EATEN_HOT" ], - "extend": { "vitamins": [ [ "iron", 3 ] ] }, "relative": { "calories": 200, "fun": 2 }, "price": 500, "price_postapoc": 50, diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index 9fe849dd557bf..643cfd9a83ada 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -1016,12 +1016,9 @@ "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, "volume": "30 L", "weight": "40 kg", - "delete": { - "reproduction": { "baby_monster": "mon_crayfish_giant_larva", "baby_count": 3, "baby_timer": 21 }, - "baby_flags": [ "AUTUMN" ] - }, "dissect": "dissect_crustacean_small", - "upgrades": { "half_life": 28, "into": "mon_giant_crayfish" } + "upgrades": { "half_life": 28, "into": "mon_giant_crayfish" }, + "extend": { "flags": [ "NO_BREED" ] } }, { "id": "mon_giant_crayfish", diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 0f441b869ab95..5ef5b77462bed 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -1187,7 +1187,7 @@ "melee_dice_sides": 1, "stomach_size": 115, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "delete": { "zombify_into": "mon_zombie_dog" }, + "zombify_into": "", "fear_triggers": [ "HURT" ], "reproduction": { "baby_monster": "mon_dog_beagle_pup", "baby_count": 4, "baby_timer": 270 }, "//": "1-4 puppies & 270 days per-litter for size tiny canines", diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index 7ecb2cfbfd4d0..3939f49f54241 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -54,7 +54,7 @@ "dissect": "dissect_feline_sample_small", "special_attacks": [ [ "EAT_FOOD", 71 ] ], "extend": { "flags": [ "NO_BREED" ], "fear_triggers": [ "PLAYER_CLOSE", "HURT" ] }, - "delete": { "anger_triggers": "PLAYER_NEAR_BABY" }, + "delete": { "anger_triggers": [ "PLAYER_NEAR_BABY" ] }, "upgrades": { "age_grow": 234, "into": "mon_yulecat" } }, { diff --git a/data/mods/innawood/monsters/insect_spider.json b/data/mods/innawood/monsters/insect_spider.json index ca7c03f4673ed..9ecf1f3fd001e 100644 --- a/data/mods/innawood/monsters/insect_spider.json +++ b/data/mods/innawood/monsters/insect_spider.json @@ -2,57 +2,17 @@ { "id": "mon_aphid_small", "type": "MONSTER", - "name": { "str": "aphid" }, - "description": "This huge aphid is as big as a hamster. It's not as thirsty as bigger ones, but a herd of these could eat your crops easily.", - "copy-from": "mon_aphid", - "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.5 }, - "volume": "96 ml", - "weight": "96 g", - "special_attacks": [ [ "EAT_FOOD", 400 ], [ "EAT_CROP", 600 ] ], + "copy-from": "mon_aphid_small", + "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "starting_ammo": { "fresh_honeydew": 1 }, - "delete": { - "reproduction": { "baby_monster": "mon_aphid", "baby_count": 1, "baby_timer": 20 }, - "baby_flags": [ "SPRING", "SUMMER" ] - }, - "biosignature": { "biosig_item": "honeydew", "biosig_timer": 7000 }, - "upgrades": { "age_grow": 8, "into": "mon_aphid" } + "extend": { "flags": [ "MILKABLE" ] } }, { "id": "mon_aphid", "type": "MONSTER", - "name": { "str": "giant aphid" }, - "description": "A green aphid about the size of a rabbit. It is constantly searching for plants to suck from.", - "default_faction": "ant", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "1600 ml", - "weight": "2080 g", - "hp": 20, - "speed": 120, - "attack_cost": 360, - "material": [ "iflesh" ], - "symbol": "a", - "color": "light_green", - "morale": 10, - "aggression": -90, - "melee_skill": 1, - "melee_dice": 1, - "melee_dice_sides": 2, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "dodge": 3, - "vision_day": 10, - "vision_night": 5, - "starting_ammo": { "fresh_honeydew": 2 }, - "harvest": "arachnid", - "dissect": "dissect_insect_sample_single", - "regen_morale": true, - "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "FIRE", "PLAYER_CLOSE" ], - "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ] ], - "reproduction": { "baby_monster": "mon_aphid_small", "baby_count": 1, "baby_timer": 20 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "honeydew", "biosig_timer": 600 }, + "copy-from": "mon_aphid", "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "SWARMS", "MILKABLE" ], - "armor": { "bash": 2, "cut": 5, "bullet": 3 } + "starting_ammo": { "fresh_honeydew": 2 }, + "extend": { "flags": [ "MILKABLE" ] } } ]