From f45ceda8ac786be498bd1e5b7fa36aaf0b4d54b1 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 5 Jul 2024 20:35:47 +0200 Subject: [PATCH] Restore mutant bug spawns + Normalize their evolution timers (#74904) * spiders * moth and butterfly and worm and magic oh god * oops wrong numbers * fly, mosquito, grasshopper, locut * slug, snail, mantis, strider * aphid and ladybug * stag beetle, crayfish, centipede --- data/json/mapgen/retirement_community.json | 2 +- data/json/mapgen/zoo.json | 8 +- .../monster_deaths.json | 12 +- data/json/monstergroups/bugs.json | 194 +++++++++++++++--- data/json/monstergroups/fish.json | 11 +- data/json/monstergroups/misc.json | 25 +-- data/json/monstergroups/mutant_upgrades.json | 14 +- data/json/monstergroups/wilderness.json | 62 +++--- data/json/monsters/fish.json | 5 +- data/json/monsters/insect_spider.json | 6 +- data/json/monsters/mollusk.json | 8 +- data/json/traps.json | 4 +- 12 files changed, 241 insertions(+), 110 deletions(-) diff --git a/data/json/mapgen/retirement_community.json b/data/json/mapgen/retirement_community.json index b1163025e9f70..fa576b93e5042 100644 --- a/data/json/mapgen/retirement_community.json +++ b/data/json/mapgen/retirement_community.json @@ -212,7 +212,7 @@ { "group": "GROUP_RETIREMENT_COMMUNITY", "x": [ 48, 56 ], "y": [ 9, 13 ], "repeat": [ 2, 3 ] }, { "group": "GROUP_RETIREMENT_COMMUNITY", "x": [ 73, 81 ], "y": [ 9, 13 ], "repeat": [ 2, 3 ] }, { "monster": "mon_large_cockroach", "x": [ 85, 91 ], "y": [ 10 ], "chance": 50, "repeat": [ 2, 5 ] }, - { "monster": "mon_spider_cellar_giant", "x": [ 26, 30 ], "y": [ 9, 17 ], "chance": 100, "repeat": [ 3, 4 ] }, + { "group": "GROUP_SPIDER_BASEMENT", "x": [ 26, 30 ], "y": [ 9, 17 ], "chance": 100, "repeat": [ 3, 4 ] }, { "monster": "mon_zombie_child", "x": [ 125 ], "y": [ 17 ], "chance": 100, "repeat": [ 1, 2 ] }, { "monster": "mon_zombie_child", "x": [ 125 ], "y": [ 11 ], "chance": 100, "repeat": [ 1, 2 ] }, { "monster": "mon_zombie_child", "x": [ 132 ], "y": [ 11 ], "chance": 100, "repeat": [ 1, 2 ] } diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json index d422d3f3e9120..b98510084f94d 100644 --- a/data/json/mapgen/zoo.json +++ b/data/json/mapgen/zoo.json @@ -505,10 +505,10 @@ "name": "GROUP_SPIDERS_ZOO", "type": "monstergroup", "monsters": [ - { "monster": "mon_spider_web_small", "weight": 10 }, - { "monster": "mon_spider_trapdoor_small", "weight": 10 }, - { "monster": "mon_spider_widow_small", "weight": 10 }, - { "monster": "mon_spider_wolf_small", "weight": 10 } + { "group": "GROUP_SPIDER" }, + { "group": "GROUP_SPIDER_TRAPDOOR" }, + { "group": "GROUP_SPIDER_WIDOW" }, + { "group": "GROUP_SPIDER_WOLF" } ] }, { diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 922811eea9e38..dfce5f5c30d0a 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -526,10 +526,18 @@ "valid_targets": [ "self", "ground" ], "min_damage": 3, "max_damage": 8, - "flags": [ "RANDOM_DAMAGE", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "SILENT", "NO_EXPLOSION_SFX" ], + "flags": [ + "RANDOM_DAMAGE", + "HOSTILE_SUMMON", + "PERMANENT", + "SPAWN_WITH_DEATH_DROPS", + "SILENT", + "NO_EXPLOSION_SFX", + "SPAWN_GROUP" + ], "shape": "blast", "effect": "summon", - "effect_str": "mon_spider_cellar_giant_s", + "effect_str": "GROUP_SPIDER_MOM_SUMMON", "min_aoe": 2, "max_aoe": 2 }, diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json index d8e550420716c..92b99d518860a 100644 --- a/data/json/monstergroups/bugs.json +++ b/data/json/monstergroups/bugs.json @@ -16,9 +16,8 @@ "is_animal": true, "monsters": [ { "monster": "mon_ant_soldier", "weight": 90, "cost_multiplier": 5 }, - { "monster": "mon_aphid", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 }, - { "monster": "mon_lady_bug", "weight": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 }, - { "monster": "mon_lady_bug_giant", "weight": 5, "cost_multiplier": 10, "starts": "15 days" }, + { "group": "GROUP_APHID", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 }, + { "group": "GROUP_LADY_BUG", "weight": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 10 }, { "monster": "mon_antlion_larva", "weight": 5, "cost_multiplier": 10 }, { "monster": "mon_antlion_giant", "weight": 3, "cost_multiplier": 10 }, { "monster": "mon_ant_small", "weight": 852, "cost_multiplier": 0 } @@ -41,9 +40,8 @@ "is_animal": true, "monsters": [ { "monster": "mon_ant_acid_soldier", "weight": 90, "cost_multiplier": 5 }, - { "monster": "mon_aphid", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 }, - { "monster": "mon_lady_bug", "weight": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 }, - { "monster": "mon_lady_bug_giant", "weight": 5, "cost_multiplier": 10, "starts": "15 days" }, + { "group": "GROUP_APHID", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 }, + { "group": "GROUP_LADY_BUG", "weight": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 10 }, { "monster": "mon_antlion_larva", "weight": 5, "cost_multiplier": 10 }, { "monster": "mon_antlion_giant", "weight": 3, "cost_multiplier": 10 }, { "monster": "mon_ant_acid_small", "weight": 852, "cost_multiplier": 0 } @@ -97,7 +95,11 @@ { "type": "monstergroup", "name": "GROUP_SPIDER", - "monsters": [ { "monster": "mon_spider_web_small", "cost_multiplier": 0 } ] + "monsters": [ + { "monster": "mon_spider_web_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_spider_web", "weight": 5, "starts": "30 days" }, + { "monster": "mon_spider_web_mega", "weight": 2, "starts": "72 days" } + ] }, { "type": "monstergroup", @@ -105,19 +107,13 @@ "default": "mon_spider_cellar_small", "//": "`monster` ignores group-level pack size, so numbers are set in mapgen", "monsters": [ - { "monster": "mon_spider_cellar_small", "weight": 300, "ends": "14 days" }, - { "monster": "mon_spider_cellar_giant", "weight": 220, "starts": "7 days", "ends": "28 days" }, - { "monster": "mon_spider_cellar_mom", "weight": 80, "starts": "7 days" }, - { "monster": "mon_spider_cellar_giant", "weight": 200, "starts": "28 days" }, - { "monster": "mon_spider_cellar_mega", "weight": 100, "cost_multiplier": 0, "starts": "28 days" } + { "monster": "mon_spider_cellar_small", "weight": 30, "ends": "45 days" }, + { "monster": "mon_spider_cellar_giant", "weight": 22, "starts": "30 days", "ends": "72 days" }, + { "monster": "mon_spider_cellar_mom", "weight": 8, "starts": "30 days" }, + { "monster": "mon_spider_cellar_giant", "weight": 20, "starts": "72 days" }, + { "monster": "mon_spider_cellar_mega", "weight": 10, "starts": "72 days" } ] }, - { - "type": "monstergroup", - "name": "GROUP_SPIDER_CELLAR", - "default": "mon_spider_cellar_giant", - "monsters": [ { "monster": "mon_spider_cellar_giant", "weight": 5 } ] - }, { "type": "monstergroup", "name": "GROUP_SPIDER_CELLAR_GIANT", @@ -127,6 +123,42 @@ { "monster": "mon_spider_cellar_mega", "weight": 3 } ] }, + { + "type": "monstergroup", + "name": "GROUP_SPIDER_TRAPDOOR", + "monsters": [ + { "monster": "mon_spider_trapdoor_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_spider_trapdoor_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_spider_trapdoor_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_SPIDER_WIDOW", + "monsters": [ + { "monster": "mon_spider_widow_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_spider_widow_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_spider_widow_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_SPIDER_WOLF", + "monsters": [ + { "monster": "mon_spider_wolf_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_spider_wolf_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_spider_wolf_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_SPIDER_JUMPING", + "monsters": [ + { "monster": "mon_spider_jumping_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_spider_jumping_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_spider_jumping_mega", "weight": 2, "starts": "72 days" } + ] + }, { "name": "GROUP_WASP_NEST", "type": "monstergroup", @@ -268,33 +300,135 @@ { "type": "monstergroup", "name": "GROUP_WORM", - "is_animal": true, "monsters": [ - { "monster": "mon_graboid", "weight": 30, "cost_multiplier": 20, "starts": "13 days" }, - { "monster": "mon_halfworm", "weight": 0, "cost_multiplier": 0 }, - { "monster": "mon_worm_small", "weight": 970, "cost_multiplier": 0 } + { "monster": "mon_worm_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_worm", "weight": 5, "starts": "30 days" }, + { "monster": "mon_graboid", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_FLY", + "monsters": [ + { "monster": "mon_fly_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_fly", "weight": 5, "starts": "30 days" }, + { "monster": "mon_fly_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_MOSQUITO", + "monsters": [ + { "monster": "mon_mosquito_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_mosquito_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_mosquito_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_GRASSHOPPER", + "monsters": [ + { "monster": "mon_grasshopper_small", "ends": "45 days" }, + { "monster": "mon_grasshopper_giant", "starts": "30 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_LOCUST", + "monsters": [ + { "monster": "mon_locust_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_locust", "weight": 5, "starts": "30 days" }, + { "monster": "mon_locust_mega", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_WATER_STRIDER", + "monsters": [ { "monster": "mon_strider_small", "ends": "45 days" }, { "monster": "mon_strider_giant", "starts": "30 days" } ] + }, + { + "type": "monstergroup", + "name": "GROUP_PRAYING_MANTIS", + "monsters": [ + { "monster": "mon_mantis_small", "weight": 5, "ends": "63 days" }, + { "monster": "mon_mantis_giant", "weight": 5, "starts": "42 days" }, + { "monster": "mon_mantis_mega", "weight": 5, "starts": "84 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_APHID", + "monsters": [ { "monster": "mon_aphid_small", "ends": "45 days" }, { "monster": "mon_aphid", "starts": "30 days" } ] + }, + { + "type": "monstergroup", + "name": "GROUP_LADY_BUG", + "monsters": [ { "monster": "mon_lady_bug", "ends": "63 days" }, { "monster": "mon_lady_bug_giant", "starts": "42 days" } ] + }, + { + "type": "monstergroup", + "name": "GROUP_CENTIPEDE", + "monsters": [ + { "monster": "mon_centipede_small", "weight": 30, "ends": "45 days" }, + { "monster": "mon_centipede_giant", "weight": 22, "starts": "30 days", "ends": "72 days" }, + { "monster": "mon_centipede_mom", "weight": 8, "starts": "30 days" }, + { "monster": "mon_centipede_giant", "weight": 20, "starts": "72 days" }, + { "monster": "mon_centipede_mega", "weight": 10, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_STAG_BEETLE", + "monsters": [ + { "monster": "mon_stag_beetle_small", "weight": 5, "ends": "90 days" }, + { "monster": "mon_stag_beetle_giant", "weight": 5, "starts": "60 days" }, + { "monster": "mon_stag_beetle_mega", "weight": 2, "starts": "120 days" } ] }, { "type": "monstergroup", "name": "GROUP_BUTTERFLY", - "default": "mon_butterfly", - "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ] + "monsters": [ + { "monster": "mon_butterfly", "weight": 5, "ends": "45 days" }, + { "monster": "mon_butterfly_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_butterfly_titan", "weight": 2, "starts": "72 days" } + ] }, { "type": "monstergroup", - "name": "GROUP_BUTTERFLY_GIANT", - "default": "mon_butterfly_giant", + "name": "GROUP_MOTH", "monsters": [ - { "monster": "mon_butterfly_giant", "weight": 45 }, - { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 }, - { "monster": "mon_moth_giant", "weight": 45 }, - { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 } + { "monster": "mon_moth", "weight": 5, "ends": "45 days" }, + { "monster": "mon_moth_giant", "weight": 5, "starts": "30 days" }, + { "monster": "mon_moth_titan", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_SNAIL", + "monsters": [ + { "monster": "mon_snail_forest", "weight": 5, "ends": "45 days" }, + { "monster": "mon_snail_small", "weight": 5, "starts": "30 days" }, + { "monster": "mon_snail_giant", "weight": 2, "starts": "72 days" } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_SLUG", + "monsters": [ + { "monster": "mon_slug_forest", "weight": 5, "ends": "45 days" }, + { "monster": "mon_slug_small", "weight": 5, "starts": "30 days" }, + { "monster": "mon_slug_giant", "weight": 2, "starts": "72 days" } ] }, { "type": "monstergroup", "name": "GROUP_CENTIPEDE_MOM_SUMMON", "monsters": [ { "monster": "mon_centipede_small", "weight": 67 }, { "monster": "mon_centipede_larva", "weight": 33 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_SPIDER_MOM_SUMMON", + "monsters": [ { "monster": "mon_spider_cellar_small", "weight": 67 }, { "monster": "mon_spider_cellar_giant_s", "weight": 33 } ] } ] diff --git a/data/json/monstergroups/fish.json b/data/json/monstergroups/fish.json index c73483ef78061..255af00aebc0f 100644 --- a/data/json/monstergroups/fish.json +++ b/data/json/monstergroups/fish.json @@ -268,7 +268,7 @@ "conditions": [ "SPRING", "SUMMER" ], "pack_size": [ 1, 3 ] }, - { "monster": "mon_strider_small", "weight": 35, "cost_multiplier": 3, "pack_size": [ 3, 6 ] } + { "group": "GROUP_WATER_STRIDER", "weight": 35, "cost_multiplier": 3, "pack_size": [ 3, 6 ] } ] }, { @@ -318,5 +318,14 @@ { "monster": "mon_razorclaw", "weight": 667, "cost_multiplier": 0 }, { "monster": "mon_razorclaw", "weight": 333, "cost_multiplier": 0, "pack_size": [ 1, 2 ] } ] + }, + { + "type": "monstergroup", + "name": "GROUP_CRAYFISH", + "monsters": [ + { "monster": "mon_crayfish_small", "weight": 5, "ends": "45 days" }, + { "monster": "mon_giant_crayfish", "weight": 5, "starts": "30 days" }, + { "monster": "mon_crayfish_mega", "weight": 2, "starts": "72 days" } + ] } ] diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 269929daa1953..27c4ad22d5c97 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -100,17 +100,8 @@ "monsters": [ { "group": "GROUP_NETHER_UNVIABLE", "weight": 300, "cost_multiplier": 0 }, { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] }, - { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" }, - { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" }, - { "monster": "mon_spider_cellar_small", "weight": 300, "pack_size": [ 1, 3 ], "ends": "14 days" }, - { "group": "GROUP_SPIDER_CELLAR", "weight": 300, "pack_size": [ 2, 5 ], "starts": "14 days", "ends": "28 days" }, - { - "group": "GROUP_SPIDER_CELLAR_GIANT", - "weight": 300, - "cost_multiplier": 0, - "pack_size": [ 2, 4 ], - "starts": "28 days" - }, + { "group": "GROUP_SLUG", "weight": 180 }, + { "group": "GROUP_SPIDER_BASEMENT", "weight": 300, "pack_size": [ 2, 5 ] }, { "monster": "mon_mutant_experimental", "weight": 50, @@ -311,7 +302,7 @@ "name": "DUMP_ANIMALS", "monsters": [ { "monster": "mon_null", "weight": 378 }, - { "monster": "mon_fly", "weight": 100 }, + { "group": "GROUP_FLY", "weight": 100 }, { "monster": "mon_crow", "weight": 75 }, { "monster": "mon_raven", "weight": 75 }, { @@ -328,7 +319,7 @@ { "monster": "mon_raccoon", "weight": 15 }, { "monster": "mon_rattlesnake", "weight": 10 }, { "monster": "mon_rattlesnake_giant", "weight": 5, "cost_multiplier": 2 }, - { "monster": "mon_worm", "weight": 20 }, + { "group": "GROUP_WORM", "weight": 20 }, { "monster": "mon_wasp_small", "weight": 10 } ] }, @@ -345,7 +336,7 @@ "pack_size": [ 6, 12 ], "conditions": [ "DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN" ] }, - { "monster": "mon_spider_widow_giant", "weight": 30, "pack_size": [ 2, 4 ] }, + { "group": "GROUP_SPIDER_WIDOW", "weight": 30, "pack_size": [ 2, 4 ] }, { "monster": "mon_giant_cockroach", "weight": 50, "pack_size": [ 1, 3 ] }, { "monster": "mon_black_rat", "weight": 30, "pack_size": [ 4, 8 ] }, { "monster": "mon_wasp_small", "weight": 50, "pack_size": [ 2, 4 ] }, @@ -363,7 +354,7 @@ { "monster": "mon_null", "weight": 370, "cost_multiplier": 0 }, { "monster": "mon_zombie_crawler", "weight": 75, "cost_multiplier": 0 }, { "monster": "mon_raccoon", "weight": 100, "cost_multiplier": 0 }, - { "monster": "mon_fly", "weight": 100 }, + { "group": "GROUP_FLY", "weight": 100 }, { "monster": "mon_blob_sewer", "weight": 100 }, { "monster": "mon_sewer_rat", "weight": 100, "cost_multiplier": 0, "pack_size": [ 3, 12 ] }, { "group": "GROUP_ROACH", "weight": 75 }, @@ -483,10 +474,10 @@ { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 }, { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, { "monster": "mon_stag_beetle_larva", "weight": 40, "cost_multiplier": 5 }, - { "monster": "mon_centipede_giant", "weight": 200 }, + { "group": "GROUP_CENTIPEDE", "weight": 200 }, { "monster": "mon_sewer_snake", "weight": 100, "cost_multiplier": 0 }, { "monster": "mon_sewer_rat", "weight": 50, "cost_multiplier": 0, "pack_size": [ 3, 12 ] }, - { "monster": "mon_slug_small", "weight": 50, "ends": "180 hours" }, + { "group": "GROUP_SLUG", "weight": 50 }, { "monster": "mon_sludge_crawler", "weight": 25 }, { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" }, { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }, diff --git a/data/json/monstergroups/mutant_upgrades.json b/data/json/monstergroups/mutant_upgrades.json index be3a6c346340d..e87391decff5f 100644 --- a/data/json/monstergroups/mutant_upgrades.json +++ b/data/json/monstergroups/mutant_upgrades.json @@ -10,25 +10,25 @@ { "name": "GROUP_CENTIPEDE_ADULT", "type": "monstergroup", - "monsters": [ { "monster": "mon_centipede_giant", "weight": 900 }, { "monster": "mon_centipede_mom", "weight": 100 } ] + "monsters": [ { "monster": "mon_centipede_giant", "weight": 9 }, { "monster": "mon_centipede_mom", "weight": 1 } ] }, { "name": "GROUP_CENTIPEDE_GIANT", "type": "monstergroup", "default": "mon_centipede_mom", "monsters": [ - { "monster": "mon_centipede_mom", "weight": 450 }, - { "monster": "mon_centipede_giant", "weight": 500 }, - { "monster": "mon_centipede_mega", "weight": 50 } + { "monster": "mon_centipede_mom", "weight": 45 }, + { "monster": "mon_centipede_giant", "weight": 50 }, + { "monster": "mon_centipede_mega", "weight": 5 } ] }, { "name": "GROUP_CENTIPEDE_MOM", "type": "monstergroup", "monsters": [ - { "monster": "mon_centipede_giant", "weight": 650 }, - { "monster": "mon_centipede_mom", "weight": 250 }, - { "monster": "mon_centipede_mega", "weight": 100 } + { "monster": "mon_centipede_giant", "weight": 65 }, + { "monster": "mon_centipede_mom", "weight": 25 }, + { "monster": "mon_centipede_mega", "weight": 10 } ] }, { diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 7399cc71ec360..5f301f1df0ccc 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -222,8 +222,8 @@ "default": "mon_null", "is_animal": true, "monsters": [ - { "monster": "mon_fly_small", "weight": 2, "cost_multiplier": 0 }, - { "monster": "mon_aphid", "weight": 3, "pack_size": [ 1, 5 ], "cost_multiplier": 0 } + { "group": "GROUP_FLY", "weight": 2, "cost_multiplier": 0 }, + { "group": "GROUP_APHID", "weight": 3, "pack_size": [ 1, 5 ], "cost_multiplier": 0 } ] }, { @@ -232,21 +232,21 @@ "default": "mon_null", "is_animal": true, "monsters": [ - { "monster": "mon_fly_small", "weight": 2, "cost_multiplier": 0 }, - { "monster": "mon_spider_jumping_small", "weight": 1, "cost_multiplier": 0 }, - { "monster": "mon_spider_wolf_small", "weight": 1, "cost_multiplier": 0 }, - { "monster": "mon_mantis_small", "weight": 2, "cost_multiplier": 10 }, - { "monster": "mon_lady_bug", "weight": 5, "cost_multiplier": 10 }, - { "monster": "mon_aphid", "weight": 3, "pack_size": [ 1, 5 ], "cost_multiplier": 0 }, - { "monster": "mon_locust_small", "weight": 3, "pack_size": [ 3, 9 ], "cost_multiplier": 0 }, - { "monster": "mon_grasshopper_small", "weight": 3, "pack_size": [ 1, 3 ], "cost_multiplier": 0 }, + { "group": "GROUP_FLY", "weight": 2, "cost_multiplier": 0 }, + { "group": "GROUP_SPIDER_JUMPING", "weight": 1, "cost_multiplier": 0 }, + { "group": "GROUP_SPIDER_WOLF", "weight": 1, "cost_multiplier": 0 }, + { "group": "GROUP_PRAYING_MANTIS", "weight": 2, "cost_multiplier": 10 }, + { "group": "GROUP_LADY_BUG", "weight": 5, "cost_multiplier": 10 }, + { "group": "GROUP_APHID", "weight": 3, "pack_size": [ 1, 5 ], "cost_multiplier": 0 }, + { "group": "GROUP_LOCUST", "weight": 3, "pack_size": [ 3, 9 ], "cost_multiplier": 0 }, + { "group": "GROUP_GRASSHOPPER", "weight": 3, "pack_size": [ 1, 3 ], "cost_multiplier": 0 }, { "monster": "mon_antlion_giant", "weight": 1, "cost_multiplier": 10 }, - { "monster": "mon_stag_beetle_small", "weight": 2, "cost_multiplier": 10 }, + { "group": "GROUP_STAG_BEETLE", "weight": 2, "cost_multiplier": 10 }, { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 3 }, - { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 3 }, - { "monster": "mon_moth", "weight": 2, "cost_multiplier": 3 }, + { "group": "GROUP_BUTTERFLY", "weight": 2, "cost_multiplier": 3 }, + { "group": "GROUP_MOTH", "weight": 2, "cost_multiplier": 3 }, { "monster": "mon_cicada", "weight": 1, "cost_multiplier": 3 }, - { "monster": "mon_worm_small", "weight": 1, "cost_multiplier": 0 } + { "group": "GROUP_WORM", "weight": 1, "cost_multiplier": 0 } ] }, { @@ -356,7 +356,7 @@ "starts": "7 days", "pack_size": [ 1, 3 ] }, - { "monster": "mon_strider_small", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, + { "group": "GROUP_WATER_STRIDER", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, @@ -454,18 +454,8 @@ "ends": "90 days", "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, - { - "monster": "mon_slug_forest", - "weight": 15, - "cost_multiplier": 2, - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_snail_forest", - "weight": 15, - "cost_multiplier": 2, - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, + { "group": "GROUP_SLUG", "weight": 15, "cost_multiplier": 2, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, + { "group": "GROUP_SNAIL", "weight": 15, "cost_multiplier": 2, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, { "group": "GROUP_TADPOLES_SWAMP", "weight": 100, "pack_size": [ 3, 6 ] }, { "group": "GROUP_FROGS_SWAMP", "weight": 100, "pack_size": [ 1, 3 ] }, { "group": "GROUP_MUTAFROGS_SWAMP", "weight": 75, "starts": "7 days" } @@ -478,11 +468,11 @@ "is_animal": true, "monsters": [ { "monster": "mon_firefly", "weight": 30, "pack_size": [ 1, 4 ] }, - { "monster": "mon_mosquito_small", "weight": 50, "pack_size": [ 1, 6 ] }, + { "group": "GROUP_MOSQUITO", "weight": 50, "pack_size": [ 1, 6 ] }, { "monster": "mon_dragonfly_giant", "weight": 35, "cost_multiplier": 2, "pack_size": [ 1, 3 ] }, - { "monster": "mon_centipede_small", "weight": 40, "cost_multiplier": 2 }, + { "group": "GROUP_CENTIPEDE", "weight": 40, "cost_multiplier": 2 }, { "monster": "mon_dermatik", "weight": 40, "cost_multiplier": 2 }, - { "monster": "mon_crayfish_small", "weight": 10 } + { "group": "GROUP_CRAYFISH", "weight": 10 } ] }, { @@ -507,11 +497,11 @@ { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_skunk", "weight": 2, "cost_multiplier": 0 }, - { "monster": "mon_mantis_small", "weight": 5, "cost_multiplier": 10 }, - { "monster": "mon_lady_bug", "weight": 8, "cost_multiplier": 10 }, - { "monster": "mon_aphid", "weight": 20, "cost_multiplier": 0 }, - { "monster": "mon_locust_small", "weight": 15, "pack_size": [ 3, 9 ], "cost_multiplier": 0 }, - { "monster": "mon_grasshopper_small", "weight": 30, "cost_multiplier": 0 }, + { "group": "GROUP_PRAYING_MANTIS", "weight": 5, "cost_multiplier": 10 }, + { "group": "GROUP_LADY_BUG", "weight": 8, "cost_multiplier": 10 }, + { "group": "GROUP_APHID", "weight": 20, "cost_multiplier": 0 }, + { "group": "GROUP_LOCUST", "weight": 15, "pack_size": [ 3, 9 ], "cost_multiplier": 0 }, + { "group": "GROUP_GRASSHOPPER", "weight": 30, "cost_multiplier": 0 }, { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 }, { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 }, { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 } @@ -590,7 +580,7 @@ "is_animal": true, "monsters": [ { "group": "GROUP_POND_FISH_2", "weight": 200, "cost_multiplier": 0 }, - { "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] }, + { "group": "GROUP_WATER_STRIDER", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] }, { "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 }, { "group": "GROUP_TADPOLES_ALL", "weight": 75, "cost_multiplier": 0, "pack_size": [ 3, 6 ] } ] diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index 643cfd9a83ada..62bb976634442 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -968,7 +968,6 @@ "reproduction": { "baby_monster": "mon_fry_crayfish", "baby_count": 3, "baby_timer": 17 }, "baby_flags": [ "AUTUMN" ], "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], - "upgrades": { "half_life": 42, "into": "mon_crayfish_small" }, "flags": [ "FISHABLE", "SEES", "SMELLS", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE", "ARTHROPOD_BLOOD" ] }, { @@ -1017,7 +1016,7 @@ "volume": "30 L", "weight": "40 kg", "dissect": "dissect_crustacean_small", - "upgrades": { "half_life": 28, "into": "mon_giant_crayfish" }, + "upgrades": { "age_grow": 30, "into": "mon_giant_crayfish" }, "extend": { "flags": [ "NO_BREED" ] } }, { @@ -1052,7 +1051,7 @@ "baby_flags": [ "AUTUMN" ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], - "upgrades": { "half_life": 42, "into": "mon_crayfish_mega" }, + "upgrades": { "age_grow": 42, "into": "mon_crayfish_mega" }, "zombify_into": "mon_meat_cocoon_small", "flags": [ "SMELLS", "HEARS", "SEES", "SWIMS", "GRABS", "ARTHROPOD_BLOOD" ], "armor": { "cut": 8, "bullet": 6 } diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 3dada4db49db3..23be34e83b9d8 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -1075,7 +1075,7 @@ "vision_night": 8, "dissect": "dissect_spider_sample_single", "zombify_into": "mon_meat_cocoon_tiny", - "upgrades": { "age_grow": 14, "into_group": "GROUP_SPIDER_CELLAR" }, + "upgrades": { "age_grow": 14, "into": "mon_spider_cellar_giant" }, "delete": { "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK", "HOSTILE_SEEN" ], "flags": [ "GRABS" ], @@ -2995,7 +2995,7 @@ "volume": "750 ml", "weight": "1 kg", "stomach_size": 30, - "upgrades": { "age_grow": 35, "into": "mon_grasshopper_giant" }, + "upgrades": { "age_grow": 30, "into": "mon_grasshopper_giant" }, "extend": { "flags": [ "SMALL_HIDER", "NO_BREED" ] } }, { @@ -3351,7 +3351,7 @@ "weight": "4 kg", "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], "extend": { "flags": [ "NO_BREED" ] }, - "upgrades": { "age_grow": 40, "into": "mon_strider_giant" } + "upgrades": { "age_grow": 30, "into": "mon_strider_giant" } }, { "id": "mon_strider_giant", diff --git a/data/json/monsters/mollusk.json b/data/json/monsters/mollusk.json index 083fcb2a6f25e..8c410d2f3d162 100644 --- a/data/json/monsters/mollusk.json +++ b/data/json/monsters/mollusk.json @@ -52,7 +52,7 @@ "dissect": "dissect_gastropod_sample_single", "stomach_size": 100, "special_attacks": [ [ "BROWSE", 130 ], [ "EAT_CROP", 130 ] ], - "upgrades": { "age_grow": 14, "into": "mon_snail_small" }, + "upgrades": { "age_grow": 30, "into": "mon_snail_small" }, "fear_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "EATS" ] }, @@ -70,7 +70,7 @@ "proportional": { "hp": 0.4, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, "extend": { "flags": [ "NO_BREED" ] }, "zombify_into": "mon_meat_cocoon_small", - "upgrades": { "age_grow": 14, "into": "mon_snail_giant" } + "upgrades": { "age_grow": 42, "into": "mon_snail_giant" } }, { "id": "mon_snail_larva", @@ -151,7 +151,7 @@ "special_attacks": [ [ "BROWSE", 130 ], [ "EAT_CROP", 130 ] ], "harvest": "mutant_mollusk", "dissect": "dissect_gastropod_sample_single", - "upgrades": { "half_life": 14, "into": "mon_slug_small" }, + "upgrades": { "age_grow": 30, "into": "mon_slug_small" }, "fear_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "EATS" ] }, @@ -169,7 +169,7 @@ "proportional": { "hp": 0.4, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, "extend": { "flags": [ "NO_BREED" ] }, "zombify_into": "mon_meat_cocoon_small", - "upgrades": { "age_grow": 14, "into": "mon_slug_giant" } + "upgrades": { "age_grow": 42, "into": "mon_slug_giant" } }, { "id": "mon_slug_larva", diff --git a/data/json/traps.json b/data/json/traps.json index 9a6465a0fd440..f155112659ea2 100644 --- a/data/json/traps.json +++ b/data/json/traps.json @@ -761,10 +761,10 @@ "name": "Summon Trapdoor Spider", "description": "This spell summons hostile trapdoor spiders from the earth.", "effect": "summon", - "effect_str": "mon_spider_trapdoor_small", + "effect_str": "GROUP_SPIDER_TRAPDOOR", "shape": "blast", "valid_targets": [ "ground" ], - "flags": [ "PERMANENT", "HOSTILE_SUMMON", "NO_EXPLOSION_SFX" ], + "flags": [ "PERMANENT", "HOSTILE_SUMMON", "NO_EXPLOSION_SFX", "SPAWN_GROUP" ], "max_level": 15, "min_aoe": 2, "max_aoe": 2,