Skip to content

Commit

Permalink
json style
Browse files Browse the repository at this point in the history
  • Loading branch information
nornagon committed Jun 5, 2024
1 parent 8b8107c commit c6217e5
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 121 deletions.
39 changes: 3 additions & 36 deletions data/json/monsters/mammal.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion data/json/monsters/zed_lieutenant.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
22 changes: 2 additions & 20 deletions data/mods/Aftershock/mobs/abstract_monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
},
{
Expand Down Expand Up @@ -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 }
},
{
Expand Down
9 changes: 8 additions & 1 deletion data/mods/Defense_Mode/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
14 changes: 1 addition & 13 deletions data/mods/DinoMod/monsters/dinosaur.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
13 changes: 1 addition & 12 deletions data/mods/DinoMod/monsters/juvenile.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 1 addition & 12 deletions data/mods/Magiclysm/monsters/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions data/mods/Magiclysm/monsters/ogre.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
{
Expand Down
5 changes: 1 addition & 4 deletions data/mods/MindOverMatter/monsters/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
]
5 changes: 1 addition & 4 deletions data/mods/Xedra_Evolved/monsters/elementals.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 2 additions & 14 deletions data/mods/Xedra_Evolved/monsters/inventor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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" ]
}
]

0 comments on commit c6217e5

Please sign in to comment.