From 1cb71c4bd5677b846ac6d512d04d1862658d16cd Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:49:22 +0100 Subject: [PATCH 01/11] first pass --- data/json/monsters/insect_spider.json | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 68945b673ce59..bd953742aa67f 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -127,24 +127,23 @@ { "id": "mon_worm", "type": "MONSTER", - "name": { "str": "giant worm" }, + "name": { "str": "giant earthworm" }, "description": "A huge, mutated creature that might once have been a nightcrawler. It possesses a large fanged mouth and a long slender body that comes up to your shoulder, with even more surely hiding underground.", "default_faction": "worm", "bodytype": "snake", "species": [ "WORM" ], "volume": "108500 ml", - "weight": "120 kg", - "hp": 50, - "speed": 80, + "weight": "122250 g", + "hp": 115, + "speed": 55, "material": [ "flesh" ], "symbol": "W", "color": "pink", - "aggression": 30, - "morale": 100, - "melee_skill": 4, - "melee_dice": 4, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "aggression": -60, + "morale": 5, + "melee_skill": 3, + "melee_dice": 2, + "melee_dice_sides": 3, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], "harvest": "mutant_meatslug", "dissect": "dissect_troglobite_sample_small", @@ -155,24 +154,22 @@ "effect": { "id": "death_halfworm", "hit_self": true }, "corpse_type": "NO_CORPSE" }, - "upgrades": { "half_life": 60, "into": "mon_graboid" }, + "upgrades": { "age_grow": 45, "into": "mon_graboid" }, "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER" ], - "armor": { "bash": 2 } + "armor": { "bash": 6 } }, { "id": "mon_worm_small", "type": "MONSTER", - "name": { "str": "large worm" }, + "name": { "str": "large earthworm" }, "description": "A disturbingly large mutated subterranean creature similar to a nightcrawler. It possesses a fanged mouth and a long slender body that comes up to your knees, with even more surely hiding underground.", - "copy-from": "mon_halfworm", - "looks_like": "mon_worm", - "volume": "62500 ml", - "weight": "81500 g", + "copy-from": "mon_worm", + "proportional": { "hp": 0.85, "speed": 0.85, "volume": 0.67, "weight": 0.67 }, "dissect": "dissect_troglobite_sample_single", - "upgrades": { "half_life": 42, "into": "mon_worm" }, + "upgrades": { "age_grow": 30, "into": "mon_worm" }, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], "delete": { - "reproduction": { "baby_egg": "egg_worm", "baby_count": 3, "baby_timer": 15 }, + "reproduction": { "baby_egg": "egg_worm", "baby_count": 1, "baby_timer": 30 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ] } }, From b85ca4a042a5549a51c16ba95a6ac02d707c0f05 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Thu, 15 Feb 2024 13:50:04 +0100 Subject: [PATCH 02/11] descriptions --- data/json/monsters/insect_spider.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index bd953742aa67f..e47e1ab8de315 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -128,7 +128,7 @@ "id": "mon_worm", "type": "MONSTER", "name": { "str": "giant earthworm" }, - "description": "A huge, mutated creature that might once have been a nightcrawler. It possesses a large fanged mouth and a long slender body that comes up to your shoulder, with even more surely hiding underground.", + "description": "A huge, mutated garden worm peeking out from the earth - pink, ringed, and most importantly docile. Despite its size and looks, it appears to be peaceful.", "default_faction": "worm", "bodytype": "snake", "species": [ "WORM" ], @@ -162,7 +162,7 @@ "id": "mon_worm_small", "type": "MONSTER", "name": { "str": "large earthworm" }, - "description": "A disturbingly large mutated subterranean creature similar to a nightcrawler. It possesses a fanged mouth and a long slender body that comes up to your knees, with even more surely hiding underground.", + "description": "A disturbingly large mutated wriggling earthworm with the moist earth still clinging to its slimy body. Despite its size it appears to be peaceful, a refreshing change for once.", "copy-from": "mon_worm", "proportional": { "hp": 0.85, "speed": 0.85, "volume": 0.67, "weight": 0.67 }, "dissect": "dissect_troglobite_sample_single", From 73acd64a76e5111850cb4a5d5b41adbe61083192 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:58:54 +0100 Subject: [PATCH 03/11] flags and foodies oh my --- data/json/monsters/insect_spider.json | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index e47e1ab8de315..1eb460881a2bf 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -80,6 +80,7 @@ "melee_dice": 3, "melee_dice_sides": 12, "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], + "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ], "bleed_rate": 60, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], "harvest": "mutant_meatslug", @@ -92,7 +93,7 @@ "corpse_type": "NO_CORPSE" }, "zombify_into": "mon_meat_cocoon_med", - "flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS", "ATTACK_LOWER" ], + "flags": [ "DIGS", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "EATS", "BASHES", "DESTROYS", "PUSH_VEH" ], "armor": { "bash": 12, "cut": 8, "bullet": 6, "electric": 2 } }, { @@ -105,23 +106,23 @@ "species": [ "WORM" ], "volume": "45 L", "weight": "60 kg", - "hp": 20, - "speed": 80, + "hp": 50, + "speed": 42, "material": [ "flesh" ], "symbol": "s", "color": "pink", - "aggression": 10, - "morale": 40, - "melee_skill": 4, + "aggression": -60, + "morale": -15, + "melee_skill": 3, "melee_dice": 2, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "melee_dice_sides": 3, + "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], "harvest": "mutant_meatslug", "dissect": "dissect_troglobite_sample_single", "upgrades": { "age_grow": 10, "into": "mon_worm" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER" ], + "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER", "PATH_AVOID_FIRE", "EATS" ], "armor": { "bash": 2 } }, { @@ -144,6 +145,7 @@ "melee_skill": 3, "melee_dice": 2, "melee_dice_sides": 3, + "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], "harvest": "mutant_meatslug", "dissect": "dissect_troglobite_sample_small", @@ -155,14 +157,14 @@ "corpse_type": "NO_CORPSE" }, "upgrades": { "age_grow": 45, "into": "mon_graboid" }, - "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER" ], + "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER", "PATH_AVOID_FIRE", "EATS" ], "armor": { "bash": 6 } }, { "id": "mon_worm_small", "type": "MONSTER", - "name": { "str": "large earthworm" }, - "description": "A disturbingly large mutated wriggling earthworm with the moist earth still clinging to its slimy body. Despite its size it appears to be peaceful, a refreshing change for once.", + "name": { "str": "oversized earthworm" }, + "description": "A disturbingly large wriggling earthworm with the moist earth still clinging to its slimy body. Despite its size it appears to be peaceful, a refreshing change for once.", "copy-from": "mon_worm", "proportional": { "hp": 0.85, "speed": 0.85, "volume": 0.67, "weight": 0.67 }, "dissect": "dissect_troglobite_sample_single", From 05e5332dc2c399bce139842dd22223f33c92732d Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 25 Feb 2024 12:16:04 +0100 Subject: [PATCH 04/11] graboid description Co-Authored-By: Paprika-H <78005870+Paprika-H@users.noreply.github.com> --- data/json/monsters/insect_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 1eb460881a2bf..5e074f7c8a9c0 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -63,7 +63,7 @@ "id": "mon_graboid", "type": "MONSTER", "name": { "str": "graboid" }, - "description": "A monstrous beast the size of a semi truck with a tripartite mouth that opens to reveal hundreds of writhing tongues with razor sharp edges. It keeps most of its enormous body hidden underground.", + "description": "This huge subterranean creature is a far cry from its earthworm ancestors. Despite only seeing its head, you can tell its grown to a mind-boggling size. While the image may be quite unsettling, it doesn't appear to pay you any mind.", "default_faction": "worm", "bodytype": "snake", "species": [ "WORM" ], From 09cbb2e34cbd2ee4d8d67b39371b1b821efe8b73 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 25 Feb 2024 12:23:15 +0100 Subject: [PATCH 05/11] graboid rebalancing --- data/json/monsters/insect_spider.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 5e074f7c8a9c0..e3f4d8dbb445f 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -67,19 +67,19 @@ "default_faction": "worm", "bodytype": "snake", "species": [ "WORM" ], - "volume": "875000 ml", - "weight": "200 kg", - "hp": 210, - "speed": 180, + "volume": "600 L", + "weight": "800 kg", + "hp": 600, + "speed": 95, "material": [ "flesh" ], "symbol": "W", - "color": "white", - "aggression": 40, - "morale": 120, + "color": "pink", + "aggression": -15, + "morale": 8, "melee_skill": 5, "melee_dice": 3, - "melee_dice_sides": 12, - "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], + "melee_dice_sides": 7, + "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ], "bleed_rate": 60, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], @@ -92,9 +92,9 @@ "effect": { "id": "death_halfworm", "hit_self": true }, "corpse_type": "NO_CORPSE" }, - "zombify_into": "mon_meat_cocoon_med", + "zombify_into": "mon_meat_cocoon_large", "flags": [ "DIGS", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "EATS", "BASHES", "DESTROYS", "PUSH_VEH" ], - "armor": { "bash": 12, "cut": 8, "bullet": 6, "electric": 2 } + "armor": { "bash": 16, "cut": 6, "bullet": 4, "electric": 2 } }, { "id": "mon_halfworm", From 57ec74b8f4a2b8dd62f7d609cd384e10c481d440 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Tue, 26 Mar 2024 20:49:18 +0100 Subject: [PATCH 06/11] I think that's fine? --- .../surface_visitors/NPC_old_guard_representative.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json index 8d68605b3c8c5..45805f474a2c1 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json @@ -285,10 +285,7 @@ "start": { "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, "update_mapgen": { - "place_monster": [ - { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12, "target": true }, - { "monster": "mon_graboid", "x": [ 9, 15 ], "y": [ 9, 15 ] } - ] + "place_monster": [ { "monster": "mon_spider_trapdoor_small", "x": 12, "y": 12, "target": true, "repeat": [ 3, 5 ] } ] } }, "origins": [ "ORIGIN_SECONDARY" ], From 01dbffe22b8c3427823c86abd8a8592760983b14 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 7 Apr 2024 19:53:39 +0200 Subject: [PATCH 07/11] worm splitting + faction edits --- data/json/monster_factions.json | 2 +- .../monster_deaths.json | 36 +++++++++- data/json/monsters/insect_spider.json | 66 +++++++++++-------- 3 files changed, 74 insertions(+), 30 deletions(-) diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index 5bbb82da8abf7..2456275c12159 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -294,7 +294,7 @@ { "type": "MONSTER_FACTION", "name": "worm", - "base_faction": "mutant" + "base_faction": "insect" }, { "type": "MONSTER_FACTION", diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 124e0ccc9c79f..84be0464a7635 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -155,17 +155,47 @@ "id": "death_halfworm", "type": "SPELL", "name": { "str": "Half Worm Death" }, - "description": "Spawns two half worms.", + "description": "Spawns one or two half worms.", "valid_targets": [ "ground", "self" ], - "min_damage": 2, + "min_damage": 1, "max_damage": 2, - "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX" ], + "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ], "shape": "blast", "effect": "summon", "effect_str": "mon_halfworm", "min_aoe": 2, "max_aoe": 2 }, + { + "id": "death_halfworm_small", + "type": "SPELL", + "name": { "str": "Small Half Worm Death" }, + "description": "Spawns one or two small half worms.", + "valid_targets": [ "ground", "self" ], + "min_damage": 1, + "max_damage": 2, + "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ], + "shape": "blast", + "effect": "summon", + "effect_str": "mon_halfworm_small", + "min_aoe": 2, + "max_aoe": 2 + }, + { + "id": "death_halfworm_graboid", + "type": "SPELL", + "name": { "str": "Graboid Half Worm Death" }, + "description": "Spawns one or two graboid half worms.", + "valid_targets": [ "ground", "self" ], + "min_damage": 1, + "max_damage": 2, + "flags": [ "SILENT", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE" ], + "shape": "blast", + "effect": "summon", + "effect_str": "mon_halfworm_graboid", + "min_aoe": 2, + "max_aoe": 2 + }, { "id": "death_blobsplit_large", "type": "SPELL", diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index e3f4d8dbb445f..09133a2387938 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -89,41 +89,40 @@ "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "death_function": { "message": "The %s splits in two!", - "effect": { "id": "death_halfworm", "hit_self": true }, + "effect": { "id": "death_halfworm_graboid", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "zombify_into": "mon_meat_cocoon_large", "flags": [ "DIGS", "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "EATS", "BASHES", "DESTROYS", "PUSH_VEH" ], "armor": { "bash": 16, "cut": 6, "bullet": 4, "electric": 2 } }, + { + "id": "mon_halfworm_graboid", + "type": "MONSTER", + "name": { "str": "graboid half worm" }, + "description": "A squiggling severed portion of a wounded graboid.", + "copy-from": "mon_graboid", + "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 }, + "morale": -5, + "dissect": "dissect_troglobite_sample_large", + "upgrades": { "age_grow": 10, "into": "mon_graboid" }, + "zombify_into": "mon_meat_cocoon_large", + "armor": { "bash": 12, "cut": 4, "bullet": 2 }, + "extend": { "flags": [ "NO_BREED" ] } + }, { "id": "mon_halfworm", "type": "MONSTER", - "name": { "str": "half worm" }, + "name": { "str": "giant half worm" }, "description": "A squiggling severed portion of a wounded giant worm.", - "default_faction": "worm", - "bodytype": "snake", - "species": [ "WORM" ], - "volume": "45 L", - "weight": "60 kg", - "hp": 50, - "speed": 42, - "material": [ "flesh" ], - "symbol": "s", - "color": "pink", - "aggression": -60, + "copy-from": "mon_worm", + "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 }, "morale": -15, - "melee_skill": 3, - "melee_dice": 2, - "melee_dice_sides": 3, - "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ], [ "EAT_CROP", 60 ] ], - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], - "harvest": "mutant_meatslug", "dissect": "dissect_troglobite_sample_single", "upgrades": { "age_grow": 10, "into": "mon_worm" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "DIGS", "HEARS", "GOODHEARING", "ATTACK_LOWER", "PATH_AVOID_FIRE", "EATS" ], - "armor": { "bash": 2 } + "armor": { "bash": 4 }, + "extend": { "flags": [ "NO_BREED" ] } }, { "id": "mon_worm", @@ -169,11 +168,26 @@ "proportional": { "hp": 0.85, "speed": 0.85, "volume": 0.67, "weight": 0.67 }, "dissect": "dissect_troglobite_sample_single", "upgrades": { "age_grow": 30, "into": "mon_worm" }, - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ], - "delete": { - "reproduction": { "baby_egg": "egg_worm", "baby_count": 1, "baby_timer": 30 }, - "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ] - } + "death_function": { + "message": "The %s splits in two!", + "effect": { "id": "death_halfworm_small", "hit_self": true }, + "corpse_type": "NO_CORPSE" + }, + "armor": { "bash": 4 }, + "extend": { "flags": [ "NO_BREED" ] } + }, + { + "id": "mon_halfworm_small", + "type": "MONSTER", + "name": { "str": "oversized half worm" }, + "description": "A squiggling severed portion of a wounded oversized worm.", + "copy-from": "mon_worm_small", + "proportional": { "hp": 0.4, "speed": 0.67, "volume": 0.475, "weight": 0.475 }, + "morale": -15, + "dissect": "dissect_troglobite_sample_single", + "upgrades": { "age_grow": 10, "into": "mon_worm_small" }, + "zombify_into": "mon_meat_cocoon_small", + "armor": { "bash": 3 } }, { "id": "mon_worm_larva", From 401751f9d1ef943c4d170b8a23a9febb4dcd4dae Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:40:16 +0200 Subject: [PATCH 08/11] please the spellchecker gods --- tools/spell_checker/dictionary.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 944accb566618..4f3d5a81eb7e0 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -2307,7 +2307,6 @@ GR gr graboid graboids -Gracie gracken grackens Grafton From e8fbeb8bd82790bee38268fac035a08416840c55 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:31:58 +0200 Subject: [PATCH 09/11] Revert "please the spellchecker gods" This reverts commit 33a3e2bd894937bd4b74103acc0466245edcee72. --- tools/spell_checker/dictionary.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 4f3d5a81eb7e0..944accb566618 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -2307,6 +2307,7 @@ GR gr graboid graboids +Gracie gracken grackens Grafton From 517147e578237f87fe51da2ba2c5cf1c23ae92ff Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:38:34 +0200 Subject: [PATCH 10/11] solve the evil --- data/json/monster_factions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index 2456275c12159..3df29ccfee912 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -291,11 +291,6 @@ "by_mood": [ "animal" ], "hate": [ "small_animal", "insect" ] }, - { - "type": "MONSTER_FACTION", - "name": "worm", - "base_faction": "insect" - }, { "type": "MONSTER_FACTION", "name": "slug", @@ -437,6 +432,11 @@ "neutral": [ "fish", "bot", "aquatic_predator" ], "by_mood": [ "insect" ] }, + { + "type": "MONSTER_FACTION", + "name": "worm", + "base_faction": "insect" + }, { "type": "MONSTER_FACTION", "name": "locust", From e18bbbd57f59a014769f291581530694de063e8f Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 12 Apr 2024 17:28:38 +0200 Subject: [PATCH 11/11] the Little Guy --- data/json/mapgen/bugs/graboid_field.json | 12 ++++++++++++ data/json/overmap/overmap_special/specials.json | 3 ++- .../overmap/overmap_terrain/overmap_terrain.json | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 data/json/mapgen/bugs/graboid_field.json diff --git a/data/json/mapgen/bugs/graboid_field.json b/data/json/mapgen/bugs/graboid_field.json new file mode 100644 index 0000000000000..7127617170a8e --- /dev/null +++ b/data/json/mapgen/bugs/graboid_field.json @@ -0,0 +1,12 @@ +[ + { + "om_terrain": "field_graboid", + "type": "mapgen", + "weight": 100, + "method": "json", + "object": { + "predecessor_mapgen": "field", + "place_monster": [ { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12 } ] + } + } +] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 4e44033a87b64..82d51e712df63 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -712,7 +712,8 @@ "id": "Cabin_Lapin", "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_lapin_north" }, - { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_lapin_north" } + { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_lapin_north" }, + { "point": [ 1, 1, 0 ], "overmap": "field_graboid" } ], "connections": [ { "point": [ 0, -1, 0 ], "terrain": "forest_trail", "connection": "forest_trail" } ], "locations": [ "forest" ], diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 33abd142c517f..296e8cbdefa81 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -1016,5 +1016,17 @@ "color": "yellow", "see_cost": 3, "flags": [ "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "field_graboid", + "looks_like": "field", + "name": "field", + "sym": ".", + "color": "brown", + "see_cost": 2, + "extras": "field", + "travel_cost_type": "field", + "flags": [ "NO_ROTATE" ] } ]