From c6217e52451cbb8158b18696340d86353e03e472 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Tue, 4 Jun 2024 16:52:32 -0700 Subject: [PATCH] json style --- data/json/monsters/mammal.json | 39 ++----------------- data/json/monsters/zed_lieutenant.json | 9 ++++- .../Aftershock/mobs/abstract_monsters.json | 22 +---------- data/mods/Defense_Mode/monsters.json | 9 ++++- data/mods/DinoMod/monsters/dinosaur.json | 14 +------ data/mods/DinoMod/monsters/juvenile.json | 13 +------ data/mods/Magiclysm/monsters/monsters.json | 13 +------ data/mods/Magiclysm/monsters/ogre.json | 5 +-- data/mods/MindOverMatter/monsters/nether.json | 5 +-- .../Xedra_Evolved/monsters/elementals.json | 5 +-- .../mods/Xedra_Evolved/monsters/inventor.json | 16 +------- 11 files changed, 29 insertions(+), 121 deletions(-) diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 009a473edd14b..5308227b72008 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -2178,18 +2178,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "ANIMAL", - "PATH_AVOID_DANGER", - "WARM", - "HIT_AND_RUN", - "KEENNOSE", - "CLIMBS", - "SMALL_HIDER" - ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE", "CLIMBS", "SMALL_HIDER" ] }, { "id": "mon_fox_red", @@ -2438,18 +2427,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "ANIMAL", - "PATH_AVOID_DANGER", - "WARM", - "HIT_AND_RUN", - "KEENNOSE", - "SWIMS", - "SMALL_HIDER" - ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE", "SWIMS", "SMALL_HIDER" ] }, { "id": "mon_moose", @@ -3465,18 +3443,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "reproduction": { "baby_monster": "mon_ferret_kit", "baby_count": 5, "baby_timer": 100 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "ANIMAL", - "PATH_AVOID_DANGER", - "SWIMS", - "WARM", - "CANPLAY", - "CAN_BE_CULLED", - "SMALL_HIDER" - ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "CANPLAY", "CAN_BE_CULLED", "SMALL_HIDER" ] }, { "id": "mon_ferret_kit", diff --git a/data/json/monsters/zed_lieutenant.json b/data/json/monsters/zed_lieutenant.json index e3e1761fb5080..877da7a5f8871 100644 --- a/data/json/monsters/zed_lieutenant.json +++ b/data/json/monsters/zed_lieutenant.json @@ -34,7 +34,14 @@ "melee_training_cap": 0, "//1": "Try to stay this far away from the player with your regular moves, very important", "tracking_distance": 10, - "path_settings": { "max_dist": 10, "allow_open_doors": true, "avoid_traps": true, "avoid_dangerous_fields": true, "avoid_sharp": true, "allow_climb_stairs": true }, + "path_settings": { + "max_dist": 10, + "allow_open_doors": true, + "avoid_traps": true, + "avoid_dangerous_fields": true, + "avoid_sharp": true, + "allow_climb_stairs": true + }, "//2": "TODO? Upgrade doesn't actually work because amalgamations do not have evolutions. Ideally this would upgrade them one step *and also remove their timed lifespan*. If this is added/resolved the spell cooldowns probably need to be nerfed.", "special_attacks": [ [ "UPGRADE", 20 ], diff --git a/data/mods/Aftershock/mobs/abstract_monsters.json b/data/mods/Aftershock/mobs/abstract_monsters.json index a55322d100833..0ace2f573513b 100644 --- a/data/mods/Aftershock/mobs/abstract_monsters.json +++ b/data/mods/Aftershock/mobs/abstract_monsters.json @@ -24,16 +24,7 @@ "path_settings": { "max_dist": 5 }, "death_drops": { "groups": [ [ "broken_robots", 1 ] ] }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ - "SEES", - "HEARS", - "BASHES", - "ELECTRONIC", - "NO_BREATHE", - "BIOLOGICALPROOF", - "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER" - ], + "flags": [ "SEES", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE", "BIOLOGICALPROOF", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "bash": 12, "cut": 12, "stab": 6, "acid": 12, "heat": 5 } }, { @@ -63,16 +54,7 @@ "path_settings": { "max_dist": 5 }, "death_drops": { "groups": [ [ "broken_robots", 1 ] ] }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ - "SEES", - "HEARS", - "BASHES", - "ELECTRONIC", - "NO_BREATHE", - "BIOLOGICALPROOF", - "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER" - ], + "flags": [ "SEES", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE", "BIOLOGICALPROOF", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "bash": 10, "cut": 10, "stab": 5, "acid": 10, "heat": 5 } }, { diff --git a/data/mods/Defense_Mode/monsters.json b/data/mods/Defense_Mode/monsters.json index 8358bcd18c86d..0846ed567f435 100644 --- a/data/mods/Defense_Mode/monsters.json +++ b/data/mods/Defense_Mode/monsters.json @@ -660,7 +660,14 @@ "melee_training_cap": 0, "//1": "Try to stay this far away from the player with your regular moves, very important", "tracking_distance": 6, - "path_settings": { "max_dist": 40, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "allow_climb_stairs": true, "avoid_dangerous_fields": true }, + "path_settings": { + "max_dist": 40, + "allow_open_doors": true, + "avoid_traps": true, + "avoid_sharp": true, + "allow_climb_stairs": true, + "avoid_dangerous_fields": true + }, "special_attacks": [ [ "UPGRADE", 0 ], [ "RESURRECT", 0 ], diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 62fe936d84e23..05956f07a99a4 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -169,19 +169,7 @@ "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 }, "grab_strength": 15, "special_attacks": [ { "id": "teeth_grab", "cooldown": 10 }, { "id": "teeth_rip", "cooldown": 10 }, [ "LUNGE", 5 ], [ "EAT_CARRION", 60 ] ], - "flags": [ - "SEES", - "SMELLS", - "HEARS", - "EATS", - "ANIMAL", - "PATH_AVOID_DANGER", - "BASHES", - "DESTROYS", - "WARM", - "SWIMS", - "PUSH_MON" - ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", "SWIMS", "PUSH_MON" ], "harvest": "dino_large_pred", "dissect": "dissect_dino_large_pred", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "SOUND" ], diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json index 6f08b954b034c..88106d326d9b1 100644 --- a/data/mods/DinoMod/monsters/juvenile.json +++ b/data/mods/DinoMod/monsters/juvenile.json @@ -345,18 +345,7 @@ "upgrades": { "age_grow": 14, "into": "mon_deinonychus" }, "petfood": { "food": [ "DINOFOOD_B" ] }, "dissect": "dissect_raptor_sample_single", - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "KEENNOSE", - "ANIMAL", - "PATH_AVOID_DANGER", - "WARM", - "CANPLAY", - "NO_BREED", - "CAN_BE_CULLED" - ] + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] }, { "id": "mon_utahraptor_juvenile", diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 247bb908e6eaf..c01da6ed34830 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -273,18 +273,7 @@ "death_drops": "wisp_death", "anger_triggers": [ "PLAYER_CLOSE" ], "death_function": { "message": "The %s disintegrates!", "corpse_type": "NO_CORPSE" }, - "flags": [ - "SEES", - "HEARS", - "FLIES", - "PATH_AVOID_DANGER", - "ELECTRIC", - "HARDTOSHOOT", - "NOGIB", - "NOHEAD", - "NO_BREATHE", - "SWARMS" - ] + "flags": [ "SEES", "HEARS", "FLIES", "PATH_AVOID_DANGER", "ELECTRIC", "HARDTOSHOOT", "NOGIB", "NOHEAD", "NO_BREATHE", "SWARMS" ] }, { "id": "mon_troll", diff --git a/data/mods/Magiclysm/monsters/ogre.json b/data/mods/Magiclysm/monsters/ogre.json index f275a6b6865ec..3bf920bcb7aaf 100644 --- a/data/mods/Magiclysm/monsters/ogre.json +++ b/data/mods/Magiclysm/monsters/ogre.json @@ -118,10 +118,7 @@ [ "EAT_FOOD", 120 ] ], "fear_triggers": [ "HURT" ], - "path_settings": { - "avoid_traps": true, - "avoid_dangerous_fields": true - }, + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true }, "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER" ] }, { diff --git a/data/mods/MindOverMatter/monsters/nether.json b/data/mods/MindOverMatter/monsters/nether.json index 9827288d132f7..b665b4173bdbc 100644 --- a/data/mods/MindOverMatter/monsters/nether.json +++ b/data/mods/MindOverMatter/monsters/nether.json @@ -49,9 +49,6 @@ "NOGIB", "TEEP_IMMUNE" ], - "path_settings": { - "avoid_traps": true, - "avoid_dangerous_fields": true - } + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } } ] diff --git a/data/mods/Xedra_Evolved/monsters/elementals.json b/data/mods/Xedra_Evolved/monsters/elementals.json index 1952e990fc5c3..4c84e7d12fb72 100644 --- a/data/mods/Xedra_Evolved/monsters/elementals.json +++ b/data/mods/Xedra_Evolved/monsters/elementals.json @@ -505,10 +505,7 @@ "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ], - "path_settings": { - "avoid_traps": true, - "avoid_dangerous_fields": true - } + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } }, { "type": "MONSTER", diff --git a/data/mods/Xedra_Evolved/monsters/inventor.json b/data/mods/Xedra_Evolved/monsters/inventor.json index c058406b6b489..af521ea638d38 100644 --- a/data/mods/Xedra_Evolved/monsters/inventor.json +++ b/data/mods/Xedra_Evolved/monsters/inventor.json @@ -55,10 +55,7 @@ "DROPS_AMMO", "STUN_IMMUNE" ], - "path_settings": { - "avoid_traps": true, - "avoid_dangerous_fields": true - } + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } }, { "id": "mon_shotgunbot", @@ -112,15 +109,6 @@ "revert_to_itype": "bot_meleebot", "path_settings": { "max_dist": 9, "avoid_dangerous_fields": true, "avoid_traps": true }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ - "SEES", - "HEARS", - "GOODHEARING", - "ELECTRONIC", - "COLDPROOF", - "NO_BREATHE", - "PATH_AVOID_DANGER", - "STUN_IMMUNE" - ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "STUN_IMMUNE" ] } ]