diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index c6f2fd0f61c86..611f9717db74d 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -33,7 +33,7 @@ "SEES", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "FLIES", @@ -85,7 +85,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CANPLAY", "SWARMS", @@ -239,7 +239,7 @@ "reproduction": { "baby_egg": "egg_duck", "baby_count": 3, "baby_timer": 5 }, "baby_flags": [ "SPRING" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] }, { "id": "mon_goose_canadian", @@ -292,7 +292,7 @@ "reproduction": { "baby_egg": "egg_turkey", "baby_count": 3, "baby_timer": 12 }, "baby_flags": [ "SPRING", "SUMMER" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SMALL_HIDER" ] }, { "id": "mon_pheasant", @@ -344,7 +344,7 @@ "SEES", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "SWARMS", @@ -500,7 +500,7 @@ "special_attacks": [ [ "SHRIEK", 10 ], [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, "upgrades": { "half_life": 21, "into_group": "GROUP_CROW_MUTANT" }, - "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "WARM", "FLIES", "EATS", "SMALL_HIDER" ] }, { "id": "mon_crow_mutant", @@ -539,7 +539,7 @@ [ "EAT_FOOD", 120 ] ], "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM", "EATS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "STUMBLES", "WARM", "EATS" ] }, { "id": "mon_pigeon", @@ -592,7 +592,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CAN_BE_CULLED", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CAN_BE_CULLED", "SMALL_HIDER" ] }, { "id": "mon_goose_golden", @@ -651,7 +651,7 @@ "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 5, "baby_timer": 14 }, "baby_flags": [ "SPRING" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SMALL_HIDER" ] }, { "id": "mon_woodpecker", @@ -682,7 +682,7 @@ "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 14 }, "baby_flags": [ "SPRING" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SMALL_HIDER" ] }, { "id": "mon_hummingbird_chick", @@ -728,7 +728,7 @@ "reproduction": { "baby_egg": "egg_coot", "baby_count": 3, "baby_timer": 5 }, "baby_flags": [ "SPRING" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] }, { "id": "mon_cormorant", diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json index 3459d3126448d..aa908c3d81024 100644 --- a/data/json/monsters/civilians.json +++ b/data/json/monsters/civilians.json @@ -35,7 +35,7 @@ "dodge": 1, "death_drops": "default_zombie_death_drops", "zombify_into": "mon_zombie", - "flags": [ "SEES", "HEARS", "WARM", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "CONVERSATION", "GUILT_HUMAN" ] + "flags": [ "SEES", "HEARS", "WARM", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "CONVERSATION", "GUILT_HUMAN" ] }, { "id": "mon_civilian_stationary", diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json index a64792c3f4e17..ef1586bb3232f 100644 --- a/data/json/monsters/cyborgs.json +++ b/data/json/monsters/cyborgs.json @@ -83,7 +83,7 @@ "WARM", "STUMBLES", "HUMAN", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ], "armor": { "bash": 10, "cut": 6, "bullet": 5 } @@ -127,7 +127,7 @@ "HAS_MIND", "NOHEAD", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "HIT_AND_RUN" ], @@ -194,7 +194,7 @@ "HAS_MIND", "NOHEAD", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "HIT_AND_RUN" ], @@ -293,7 +293,7 @@ "NO_BREATHE", "REVIVES", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "FILTHY" ], "armor": { "bash": 12, "cut": 28, "bullet": 8 } diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json index 8e5ae9688263b..691c6cf012814 100644 --- a/data/json/monsters/defense_bot.json +++ b/data/json/monsters/defense_bot.json @@ -48,7 +48,7 @@ "ELECTRONIC", "COLDPROOF", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "DROPS_AMMO", "STUN_IMMUNE" @@ -104,7 +104,7 @@ "ELECTRONIC", "COLDPROOF", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "DROPS_AMMO", "STUN_IMMUNE" @@ -150,7 +150,7 @@ "message": "Loud rock music blares as the %s explodes!", "corpse_type": "NO_CORPSE" }, - "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "STUN_IMMUNE" ], + "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE" ], "armor": { "bash": 14, "cut": 14, "bullet": 11 } }, { @@ -202,7 +202,7 @@ "message": "Loud rock music blares as the %s explodes!", "corpse_type": "NO_CORPSE" }, - "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "STUN_IMMUNE" ], + "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE" ], "armor": { "bash": 14, "cut": 14, "bullet": 11 } }, { @@ -230,7 +230,7 @@ "special_attacks": [ [ "TAZER", 5 ] ], "death_drops": { "groups": [ [ "robots", 4 ], [ "skitterbot", 1 ] ] }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ "SEES", "HEARS", "GOODHEARING", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER_1", "STUN_IMMUNE" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 12, "cut": 12, "bullet": 10, "electric": 5 } }, { @@ -272,7 +272,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "STUN_IMMUNE" ], @@ -312,7 +312,7 @@ "GOODHEARING", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE" ], @@ -355,7 +355,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "DROPS_AMMO", "STUN_IMMUNE" @@ -399,7 +399,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "DROPS_AMMO", "STUN_IMMUNE" diff --git a/data/json/monsters/drones.json b/data/json/monsters/drones.json index cad227c616a30..0be5ae11918bf 100644 --- a/data/json/monsters/drones.json +++ b/data/json/monsters/drones.json @@ -158,7 +158,7 @@ "BIOLOGICALPROOF", "NO_BREATHE", "INTERIOR_AMMO", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "HIT_AND_RUN", "STUN_IMMUNE" diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index e66af0d242ce5..72442a1e875e7 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -63,7 +63,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "WIELDED_WEAPON", "EATS" diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json index 642d876318d23..9fe849dd557bf 100644 --- a/data/json/monsters/fish.json +++ b/data/json/monsters/fish.json @@ -37,7 +37,7 @@ "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "FIRE" ], "zombify_into": "mon_meat_cocoon_med", - "flags": [ "SMELLS", "HEARS", "SEES", "SWIMS", "GRABS", "ARTHROPOD_BLOOD", "QUEEN", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SMELLS", "HEARS", "SEES", "SWIMS", "GRABS", "ARTHROPOD_BLOOD", "QUEEN", "PATH_AVOID_DANGER", "EATS" ], "armor": { "bash": 20, "cut": 30, "bullet": 24 } }, { @@ -1136,7 +1136,7 @@ "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], "fear_triggers": [ "FIRE" ], "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SMELLS", "HEARS", "SEES", "SWIMS", "GRABS", "ARTHROPOD_BLOOD", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SMELLS", "HEARS", "SEES", "SWIMS", "GRABS", "ARTHROPOD_BLOOD", "PATH_AVOID_DANGER", "EATS" ], "armor": { "bash": 10, "cut": 18, "bullet": 14 } }, { diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 754142320a908..96f78d576d8c2 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -701,7 +701,7 @@ "harvest": "arachnid_centipede_mega", "dissect": "dissect_insect_sample_large", "zombify_into": "mon_meat_cocoon_large", - "flags": [ "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_1", "DESTROYS", "PUSH_MON", "PUSH_VEH" ], + "flags": [ "SEES", "SMELLS", "KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER", "DESTROYS", "PUSH_MON", "PUSH_VEH" ], "armor": { "bash": 25, "cut": 35, "stab": 15, "bullet": 45, "electric": 3 } }, { @@ -1131,7 +1131,7 @@ "fungalize_into": "mon_spider_fungus", "upgrades": { "age_grow": 14, "into_group": "GROUP_SPIDER_CELLAR_GIANT" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "SMELLS", "HEARS", "GRABS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "GRABS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_DANGER" ], "armor": { "bash": 1, "cut": 5, "acid": 3, "bullet": 2 } }, { @@ -1355,7 +1355,7 @@ "fungalize_into": "mon_spider_fungus", "upgrades": { "age_grow": 42, "into": "mon_spider_jumping_mega" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "CLIMBS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "CLIMBS", "PATH_AVOID_DANGER" ], "armor": { "cut": 3, "bullet": 2 } }, { @@ -2854,7 +2854,7 @@ "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], "fear_triggers": [ "FIRE" ], "zombify_into": "mon_meat_cocoon_med", - "flags": [ "SEES", "CAN_DIG", "BORES", "PUSH_VEH", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ], + "flags": [ "SEES", "CAN_DIG", "BORES", "PUSH_VEH", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SMELLS" ], "armor": { "bash": 15, "cut": 18, "bullet": 20, "electric": 2 } }, { @@ -3187,7 +3187,7 @@ "GOODHEARING", "BASHES", "DESTROYS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PUSH_MON", "PUSH_VEH", "PET_WONT_FOLLOW", @@ -3678,7 +3678,7 @@ "anger_triggers": [ "HURT" ], "fear_triggers": [ "FIRE", "HURT" ], "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ], + "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SMELLS" ], "armor": { "bash": 1, "cut": 3, "bullet": 2, "electric": 2 } }, { @@ -3707,7 +3707,7 @@ "fear_triggers": [ "FIRE", "HURT" ], "zombify_into": "mon_meat_cocoon_small", "special_attacks": [ [ "GRAZE", 100 ] ], - "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "EATS" ], + "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SMELLS", "EATS" ], "armor": { "bash": 15, "cut": 18, "bullet": 20, "electric": 2 } }, { diff --git a/data/json/monsters/kraken_spawn.json b/data/json/monsters/kraken_spawn.json index ddaf83944813f..1f2aabadac149 100644 --- a/data/json/monsters/kraken_spawn.json +++ b/data/json/monsters/kraken_spawn.json @@ -35,7 +35,7 @@ "reproduction": { "baby_monster": "mon_octupus_stalker_spawn", "baby_count": 1, "baby_timer": 700 }, "baby_flags": [ "SPRING" ], "zombify_into": "mon_meat_cocoon_med", - "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "PATH_AVOID_DANGER_1", "WATER_CAMOUFLAGE", "WARM", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "PATH_AVOID_DANGER", "WATER_CAMOUFLAGE", "WARM", "EATS" ], "armor": { "bash": 2, "cut": 8, "bullet": 12 } }, { diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index cf08dcefa29b4..5308227b72008 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -72,7 +72,7 @@ "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER_1", "SMALL_HIDER" ] + "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER", "SMALL_HIDER" ] }, { "id": "mon_bear_cub", @@ -135,7 +135,7 @@ "//": "220 days gestation period, the mother and cubs remain together for 16-17 months.", "baby_flags": [ "SPRING" ], "special_attacks": [ [ "EAT_FOOD", 20 ], { "type": "bite", "cooldown": 15, "infection_chance": 44 }, [ "BROWSE", 40 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "PUSH_MON", "CORNERED_FIGHTER", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "BASHES", "PUSH_MON", "CORNERED_FIGHTER", "EATS" ], "armor": { "bash": 2, "electric": 1 } }, { @@ -168,7 +168,7 @@ "fear_triggers": [ "SOUND" ], "zombify_into": "mon_zombeaver", "special_attacks": [ { "type": "bite", "cooldown": 15 } ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "WATER_CAMOUFLAGE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "WATER_CAMOUFLAGE" ] }, { "id": "mon_black_rat", @@ -204,7 +204,7 @@ "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "PLAYER_CLOSE" ], "special_attacks": [ [ "EAT_FOOD", 120 ], [ "BROWSE", 120 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "STUMBLES", "PATH_AVOID_DANGER_1", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "STUMBLES", "PATH_AVOID_DANGER", "EATS", "SMALL_HIDER" ] }, { "id": "mon_lab_rat", @@ -253,7 +253,7 @@ "WARM", "SWIMS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_BE_CULLED", "EATS", "SMALL_HIDER" @@ -292,7 +292,7 @@ "upgrades": { "age_grow": 38, "into": "mon_boar_wild" }, "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_FOOD", 40 ], [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] }, { "id": "mon_boar_wild", @@ -336,7 +336,7 @@ "SMELLS", "PET_MOUNTABLE", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CORNERED_FIGHTER", @@ -373,7 +373,7 @@ "harvest": "cat_medium_with_skull", "families": [ "prof_intro_biology", "prof_physiology" ], "dissect": "dissect_feline_sample_single", - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "SMALL_HIDER" ] }, { "id": "mon_cat_kitten", @@ -442,7 +442,7 @@ "ANIMAL", "CANPLAY", "CLIMBS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "CORNERED_FIGHTER", @@ -687,7 +687,7 @@ "dissect": "dissect_mouse_sample_single", "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1", "SMALL_HIDER" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER", "SMALL_HIDER" ] }, { "id": "mon_cougar", @@ -723,7 +723,7 @@ "reproduction": { "baby_monster": "mon_cougar_kitten", "baby_count": 6, "baby_timer": 92 }, "//": "Cougars can breed all year, but mainly do so between January and August, they can have between 1 to 6 kittens at a time.", "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE" ], "armor": { "bash": 1 } }, { @@ -812,7 +812,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "CANPLAY", @@ -867,7 +867,7 @@ "SMELLS", "PET_MOUNTABLE", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "CANPLAY", @@ -910,7 +910,7 @@ "harvest": "mammal_fur_canis", "dissect": "dissect_lupine_sample_single", "families": [ "prof_intro_biology", "prof_physiology" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE", "EATS" ], "armor": { "bash": 1 } }, { @@ -944,7 +944,7 @@ "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "special_attacks": [ [ "EAT_FOOD", 40 ] ], "fear_triggers": [ "SOUND" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS" ], "armor": { "bash": 1 } }, { @@ -978,7 +978,7 @@ "path_settings": { "max_dist": 10 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "upgrades": { "age_grow": 330, "into": "mon_deer" }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_deer", @@ -1016,7 +1016,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 12 }, "baby_flags": [ "SPRING", "SUMMER" ], "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "EATS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "EATS" ] }, { "id": "mon_dog", @@ -1071,7 +1071,7 @@ "PET_MOUNTABLE", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -1137,7 +1137,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1187,7 +1187,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1227,7 +1227,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1278,7 +1278,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1321,7 +1321,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -1376,7 +1376,7 @@ "GROUP_MORALE", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -1416,7 +1416,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1468,7 +1468,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1542,7 +1542,7 @@ "GROUP_MORALE", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -1588,7 +1588,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1641,7 +1641,7 @@ "HARDTOSHOOT", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1684,7 +1684,7 @@ "PET_MOUNTABLE", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "STUMBLES", @@ -1738,7 +1738,7 @@ "HARDTOSHOOT", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "STUMBLES", @@ -1776,7 +1776,7 @@ "PET_MOUNTABLE", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1828,7 +1828,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1872,7 +1872,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1925,7 +1925,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -1969,7 +1969,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -2021,7 +2021,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -2062,7 +2062,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -2114,7 +2114,7 @@ "CAN_BE_CULLED", "HEARS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM", @@ -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_1", - "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", @@ -2221,7 +2210,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_1", "WARM", "HIT_AND_RUN", "KEENNOSE", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE", "SMALL_HIDER" ] }, { "id": "mon_groundhog", @@ -2251,7 +2240,7 @@ "stomach_size": 30, "special_attacks": [ [ "GRAZE", 100 ] ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "EATS", "SMALL_HIDER" ] }, { "id": "mon_hare", @@ -2314,7 +2303,7 @@ "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CAN_BE_CULLED", @@ -2367,7 +2356,7 @@ "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "MILKABLE", "EATS" @@ -2410,7 +2399,7 @@ "special_attacks": [ [ "GRAZE", 50 ] ], "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1", "EATS" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER", "EATS" ] }, { "id": "mon_mink", @@ -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_1", - "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", @@ -2488,7 +2466,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CORNERED_FIGHTER", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER", "EATS" ], "armor": { "bash": 4, "cut": 1, "bullet": 1, "electric": 1 } }, { @@ -2526,7 +2504,7 @@ "upgrades": { "age_grow": 180, "into": "mon_moose" }, "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "EATS" ], "armor": { "bash": 2 } }, { @@ -2565,7 +2543,7 @@ "dissect": "dissect_cattle_sample_large", "families": [ "prof_intro_biology", "prof_physiology" ], "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CORNERED_FIGHTER", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER", "EATS" ], "armor": { "bash": 14, "cut": 1, "bullet": 10, "electric": 1 } }, { @@ -2604,7 +2582,7 @@ "//": "Baby mutant moose need to grow quicker to be able to survive in the world after the cataclysm.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "EATS" ], "armor": { "bash": 2 } }, { @@ -2634,7 +2612,7 @@ "dissect": "dissect_rat_sample_single", "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1", "SMALL_HIDER" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER", "SMALL_HIDER" ] }, { "id": "mon_opossum", @@ -2665,7 +2643,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "fear_triggers": [ "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] }, { "id": "mon_skunk", @@ -2712,7 +2690,7 @@ "SMELLS", "ANIMAL", "CLIMBS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "GOODHEARING", @@ -2746,7 +2724,7 @@ "harvest": "mammal_small_fur", "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "WATER_CAMOUFLAGE", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "WATER_CAMOUFLAGE", "SMALL_HIDER" ] }, { "id": "mon_pig_piglet", @@ -2786,7 +2764,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "WARM", "KEENNOSE", @@ -2837,7 +2815,7 @@ "SMELLS", "PET_MOUNTABLE", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CAN_BE_CULLED", @@ -2877,7 +2855,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "WARM", "CAN_BE_CULLED", @@ -2967,7 +2945,7 @@ "upgrades": { "half_life": 30, "into": "mon_raccoon_mutant" }, "special_attacks": [ [ "EAT_FOOD", 60 ], [ "BROWSE", 50 ], [ "EAT_CARRION", 60 ] ], "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ] }, { "id": "mon_sewer_rat", @@ -3003,7 +2981,7 @@ "upgrades": { "half_life": 42, "into_group": "GROUP_RATKIN_EVOLVED" }, "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER", "STUMBLES", "EATS", "SMALL_HIDER" ] }, { "id": "mon_sheep_lamb", @@ -3038,7 +3016,7 @@ "upgrades": { "age_grow": 240, "into": "mon_sheep" }, "//": "Puberty reached in 6-9 months.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CAN_BE_CULLED", "EATS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CAN_BE_CULLED", "EATS" ] }, { "id": "mon_sheep", @@ -3082,7 +3060,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE", @@ -3127,7 +3105,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE", @@ -3164,7 +3142,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "special_attacks": [ [ "BROWSE", 120 ] ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "STUMBLES", "WARM", "EATS", "SMALL_HIDER" ] }, { "id": "mon_squirrel_red", @@ -3195,7 +3173,7 @@ "dissect": "dissect_mouse_sample_single", "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES", "WARM", "EATS", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "STUMBLES", "WARM", "EATS", "SMALL_HIDER" ] }, { "id": "mon_weasel", @@ -3222,7 +3200,7 @@ "harvest": "mammal_tiny", "families": [ "prof_intro_biology", "prof_physiology" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "SMALL_HIDER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "SMALL_HIDER" ] }, { "id": "mon_wolf", @@ -3257,7 +3235,7 @@ "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE", "PLAYER_NEAR_BABY" ], "zombify_into": "mon_zolf", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "CORNERED_FIGHTER" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CORNERED_FIGHTER" ], "armor": { "bash": 1 } }, { @@ -3323,7 +3301,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 12 }, "baby_flags": [ "WINTER", "AUTUMN" ], "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CORNERED_FIGHTER", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER", "EATS" ], "armor": { "electric": 1 } }, { @@ -3381,7 +3359,7 @@ "special_attacks": [ [ "EAT_CROP", 150 ], [ "GRAZE", 150 ] ], "//": "Puberty reached in 6-9 months, copied from lamb but it probably applies the same on llamas.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "EATS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "EATS" ] }, { "id": "mon_llama", @@ -3424,7 +3402,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE", @@ -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_1", - "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", @@ -3490,7 +3457,7 @@ "//": "Kits do not have their full fur yet and are really sensitive to cold temperature", "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], "dodge": 9, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CANPLAY", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "NO_BREED" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CANPLAY", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "NO_BREED" ], "upgrades": { "age_grow": 90, "into": "mon_ferret" }, "armor": { "cold": 0 } } diff --git a/data/json/monsters/mechsuits.json b/data/json/monsters/mechsuits.json index b5ad57c4ce130..8fb87dee625cc 100644 --- a/data/json/monsters/mechsuits.json +++ b/data/json/monsters/mechsuits.json @@ -40,7 +40,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 15, "cut": 25, "bullet": 20 } @@ -85,7 +85,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE" ], @@ -133,7 +133,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE" ], diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json index 2404c0eec4c70..538804f918f5a 100644 --- a/data/json/monsters/mi-go.json +++ b/data/json/monsters/mi-go.json @@ -43,7 +43,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -101,7 +101,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -153,7 +153,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -214,7 +214,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -275,7 +275,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -311,7 +311,7 @@ "WARM", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "SEES", @@ -376,7 +376,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS" ], diff --git a/data/json/monsters/monster_flags.json b/data/json/monsters/monster_flags.json index c514af83704e8..7f2374e55e501 100644 --- a/data/json/monsters/monster_flags.json +++ b/data/json/monsters/monster_flags.json @@ -405,15 +405,10 @@ "//": "This monster can't be revived by necros. It will still rise on its own." }, { - "id": "PATH_AVOID_DANGER_1", + "id": "PATH_AVOID_DANGER", "type": "monster_flag", "//": "This monster will path around some dangers instead of through them" }, - { - "id": "PATH_AVOID_DANGER_2", - "type": "monster_flag", - "//": "This monster will path around most dangers instead of through them" - }, { "id": "PATH_AVOID_FIRE", "type": "monster_flag", diff --git a/data/json/monsters/mutant.json b/data/json/monsters/mutant.json index b794950feac03..5b83b70dec590 100644 --- a/data/json/monsters/mutant.json +++ b/data/json/monsters/mutant.json @@ -145,7 +145,7 @@ "BASHES", "GROUP_BASH", "HIT_AND_RUN", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "EATS" ], "armor": { "bash": 10, "cut": 11, "stab": 8, "bullet": 5, "electric": 2 } diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json index 6c3f2c2c300d9..fb36b13ca134b 100644 --- a/data/json/monsters/mutant_mammal.json +++ b/data/json/monsters/mutant_mammal.json @@ -48,7 +48,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "BASHES", "PUSH_MON", @@ -88,7 +88,7 @@ "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ], "armor": { "cut": 4 } }, { @@ -121,7 +121,7 @@ "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "zombify_into": "mon_meat_cocoon_tiny", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ] }, { "id": "mon_coyote_mutant_shark", @@ -165,7 +165,7 @@ "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK" ], "fear_triggers": [ "SOUND" ], "zombify_into": "mon_meat_cocoon_tiny", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "GROUP_MORALE", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "GROUP_MORALE", "EATS" ], "armor": { "bash": 1 } }, { @@ -206,7 +206,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN", "KEENNOSE", @@ -258,7 +258,7 @@ ], "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "zombify_into": "mon_meat_cocoon_large", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS" ], "armor": { "bash": 8, "cut": 10, "electric": 1 } }, { @@ -297,7 +297,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 12 }, "baby_flags": [ "SPRING", "SUMMER" ], "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "EATS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "EATS" ] }, { "id": "mon_deer_mutant_spider_fawn", @@ -331,7 +331,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "upgrades": { "age_grow": 330, "into": "mon_deer_mutant_spider" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "STUMBLES" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "STUMBLES" ] }, { "id": "mon_dog_mutant_mongrel", @@ -386,7 +386,7 @@ "PET_MOUNTABLE", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -452,7 +452,7 @@ "PET_MOUNTABLE", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -550,7 +550,7 @@ "PET_MOUNTABLE", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", @@ -644,7 +644,7 @@ "HEARS", "HIT_AND_RUN", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "SMELLS", "SWARMS", diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 93826b17f1f60..191748f6e1cf4 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -30,7 +30,7 @@ "anger_triggers": [ "HURT", "FRIEND_DIED", "FRIEND_ATTACKED" ], "harvest": "mutant_bird_flightless", "dissect": "dissect_bird_sample_large", - "flags": [ "HEARS", "KEENNOSE", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS", "SUNDEATH" ], + "flags": [ "HEARS", "KEENNOSE", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "SWIMS", "SUNDEATH" ], "armor": { "bash": 6, "cut": 2, "bullet": 2 } }, { @@ -92,7 +92,7 @@ "families": [ "prof_wp_netherium_abomination" ], "weakpoint_sets": [ "wps_humanoid_body" ], "special_attacks": [ [ "SHRIEK", 10 ] ], - "flags": [ "SMELLS", "HEARS", "HAS_MIND", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1", "SUNDEATH", "NO_BREATHE", "HUMAN" ] + "flags": [ "SMELLS", "HEARS", "HAS_MIND", "WARM", "ANIMAL", "PATH_AVOID_DANGER", "SUNDEATH", "NO_BREATHE", "HUMAN" ] }, { "id": "mon_blood_sacrifice", @@ -282,7 +282,7 @@ "NO_BREATHE", "PRIORITIZE_TARGETS", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "HARDTOSHOOT" ] }, @@ -458,7 +458,7 @@ "feed": "If you're seeing this message it's a bug.", "pet": "If you're seeing this message it's a bug." }, - "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_flaming_eye", @@ -923,7 +923,7 @@ "CAMOUFLAGE", "FIREPROOF", "NIGHT_INVISIBILITY", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "HARDTOSHOOT", "HIT_AND_RUN" ], @@ -958,7 +958,7 @@ "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "special_attacks": [ { "type": "spell", "spell_data": { "id": "fear_paralyze" }, "monster_message": "", "cooldown": 20 } ], - "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "ANIMAL", "NO_BREATHE", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "ANIMAL", "NO_BREATHE", "PATH_AVOID_DANGER" ] }, { "id": "mon_gracke", @@ -987,7 +987,7 @@ "harvest": "demihuman", "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], - "flags": [ "SMELLS", "HEARS", "WARM", "HAS_MIND", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SMELLS", "HEARS", "WARM", "HAS_MIND", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "electric": 1 } }, { diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index 40ca41cf74162..04793571083ba 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -25,7 +25,7 @@ "families": [ "prof_intro_biology", "prof_physiology" ], "harvest": "mammal_tiny", "biosignature": { "biosig_item": "shed_snakeskin_little", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "VENOM", "HARDTOSHOOT", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "SWIMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "VENOM", "HARDTOSHOOT", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ] }, { "id": "mon_rattlesnake", @@ -66,7 +66,7 @@ "//babies": "On average, a female rattlesnake gives birth to at least eight babies, up to around fifteen. Most baby rattlesnakes are born in the early summer, but sometimes in late summer and early autumn.", "upgrades": { "half_life": 34, "into": "mon_rattlesnake_big" }, "biosignature": { "biosig_item": "shed_snakeskin", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER_1", "ANIMAL", "SWIMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ] }, { "id": "mon_rattlesnake_big", @@ -115,7 +115,7 @@ "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], "harvest": "mutant_tiny", "biosignature": { "biosig_item": "shed_snakeskin", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER_1", "ANIMAL", "SWIMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ] }, { "id": "mon_rattlesnake_giant", @@ -161,7 +161,7 @@ "upgrades": { "half_life": 80, "into": "mon_rattlesnake_mega" }, "biosignature": { "biosig_item": "shed_snakeskin_giant", "biosig_timer": 180 }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER_1", "ANIMAL", "SWIMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ], "armor": { "bash": 2, "cut": 4, "bullet": 3, "electric": 1 } }, { @@ -214,7 +214,7 @@ "//babies2": "Deathrattle is heavily mutated, so a short gestation period and all-year large clutch birth are plausible", "zombify_into": "mon_meat_cocoon_large", "biosignature": { "biosig_item": "shed_snakeskin_scales", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER", "ANIMAL", "PUSH_MON", "SWIMS" ], "armor": { "bash": 6, "cut": 8, "bullet": 6, "electric": 3, "acid": 6 } }, { diff --git a/data/json/monsters/robofac_robots.json b/data/json/monsters/robofac_robots.json index 4817731ae8afd..6c8f67e512120 100644 --- a/data/json/monsters/robofac_robots.json +++ b/data/json/monsters/robofac_robots.json @@ -60,7 +60,7 @@ "vision_day": 50, "path_settings": { "max_dist": 50, "avoid_traps": true }, "flags": [ - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "SEES", "FLIES", "ELECTRONIC", @@ -132,7 +132,7 @@ "COLDPROOF", "BIOLOGICALPROOF", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 12, "cut": 12, "bullet": 10, "electric": 5 } diff --git a/data/json/monsters/rodentkin.json b/data/json/monsters/rodentkin.json index e816ec818294f..979f14e579472 100644 --- a/data/json/monsters/rodentkin.json +++ b/data/json/monsters/rodentkin.json @@ -52,7 +52,7 @@ "WARM", "SWIMS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "EATS", "SMALL_HIDER" ] @@ -99,7 +99,7 @@ [ "EAT_CARRION", 120 ] ], "attack_effs": [ { "id": "rat_bite_fever", "duration": 400, "chance": 10 } ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1", "EATS", "SMALL_HIDER" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER", "EATS", "SMALL_HIDER" ], "families": [ "prof_intro_biology", "prof_physiology" ], "harvest": "mutant_mammal_small_fur", "dissect": "dissect_rat_sample_single" @@ -121,7 +121,7 @@ "special_attacks": [ [ "EAT_FOOD", 120 ], [ "EAT_CARRION", 120 ] ], "families": [ "prof_intro_biology", "prof_physiology", "prof_electromagnetics" ], "upgrades": { "half_life": 42, "into_group": "GROUP_RATKIN_EVOLVED" }, - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ELECTRIC", "ANIMAL", "PATH_AVOID_DANGER_1", "EATS", "SMALL_HIDER" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ELECTRIC", "ANIMAL", "PATH_AVOID_DANGER", "EATS", "SMALL_HIDER" ], "emit_fields": [ { "emit_id": "emit_shock_burst_rat", "delay": "5 s" } ] }, { @@ -162,7 +162,7 @@ ], "attack_effs": [ { "id": "rat_bite_fever", "duration": 400, "chance": 20 } ], "zombify_into": "mon_meat_cocoon_tiny", - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "PATH_AVOID_DANGER_1", "CAN_DIG", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "PATH_AVOID_DANGER", "CAN_DIG", "EATS" ], "dissect": "dissect_rat_sample_small", "armor": { "bash": 5, "cut": 6, "bullet": 2 } }, @@ -204,7 +204,7 @@ [ "EAT_CARRION", 120 ] ], "attack_effs": [ { "id": "rat_bite_fever", "duration": 400, "chance": 20 } ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "PATH_AVOID_DANGER_1", "CAN_DIG", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "PATH_AVOID_DANGER", "CAN_DIG", "EATS" ], "armor": { "bash": 5, "cut": 6, "bullet": 2 } }, { @@ -236,7 +236,7 @@ "special_when_hit": [ "ZAPBACK", 100 ], "special_attacks": [ { "id": "teke_push" }, [ "EAT_FOOD", 120 ], [ "EAT_CARRION", 120 ] ], "zombify_into": "mon_meat_cocoon_tiny", - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "RANGED_ATTACKER", "ELECTRIC", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "RANGED_ATTACKER", "ELECTRIC", "PATH_AVOID_DANGER", "EATS" ], "armor": { "bash": 15, "cut": 3, "bullet": 26 } }, { @@ -272,7 +272,7 @@ [ "EAT_CARRION", 120 ] ], "zombify_into": "mon_meat_cocoon_tiny", - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ELECTRIC", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ELECTRIC", "PATH_AVOID_DANGER", "EATS" ], "dissect": "dissect_rat_sample_small", "armor": { "bash": 10, "cut": 10, "bullet": 6 } } diff --git a/data/json/monsters/starers.json b/data/json/monsters/starers.json index e3e43e538d8e5..740800e97a553 100644 --- a/data/json/monsters/starers.json +++ b/data/json/monsters/starers.json @@ -37,7 +37,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "NO_FUNG_DMG", "WIELDED_WEAPON" diff --git a/data/json/monsters/utility_bot.json b/data/json/monsters/utility_bot.json index bcb9fdf71a9e4..a8ed8fa50d42b 100644 --- a/data/json/monsters/utility_bot.json +++ b/data/json/monsters/utility_bot.json @@ -33,7 +33,7 @@ "PACIFIST", "PAY_BOT", "PET_HARNESSABLE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 10, "cut": 10, "bullet": 8 } @@ -107,7 +107,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 10, "cut": 12, "bullet": 10 } @@ -144,7 +144,7 @@ "BIOLOGICALPROOF", "ELECTRONIC", "COLDPROOF", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "cut": 12, "bullet": 10 } diff --git a/data/json/monsters/yrax.json b/data/json/monsters/yrax.json index 3114f88a9905d..04f2495557e78 100644 --- a/data/json/monsters/yrax.json +++ b/data/json/monsters/yrax.json @@ -52,11 +52,12 @@ "NOHEAD", "NO_BREATHE", "KEEP_DISTANCE", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "HIT_AND_RUN", "ELECTRONIC" ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true }, "armor": { "bash": 42, "cut": 48, "acid": 12, "heat": 8, "bullet": 35 } }, { @@ -129,11 +130,12 @@ "GOODHEARING", "NOHEAD", "NO_BREATHE", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "FLIES", "PRIORITIZE_TARGETS", "ELECTRONIC" - ] + ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } }, { "id": "mon_golden_monolith", @@ -208,11 +210,12 @@ "GOODHEARING", "NOHEAD", "NO_BREATHE", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "HIT_AND_RUN", "ELECTRONIC" ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true }, "armor": { "bash": 1000, "cut": 1000, "acid": 100, "heat": 100, "bullet": 1000 } }, { @@ -242,7 +245,7 @@ "NOHEAD", "NO_BREATHE", "PACIFIST", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "ELECTRONIC", "CLIMBS", @@ -250,6 +253,7 @@ "ALWAYS_SEES_YOU", "FIREPROOF" ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true }, "special_attacks": [ { "type": "spell", diff --git a/data/json/monsters/zed_amalgamation.json b/data/json/monsters/zed_amalgamation.json index c72fba295a22a..7c259af98d1a0 100644 --- a/data/json/monsters/zed_amalgamation.json +++ b/data/json/monsters/zed_amalgamation.json @@ -111,8 +111,8 @@ "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_amalgamation" ], "harvest": "zombie_amalgamation", "//": "TODO: When effects/spells can mess with path settings + flags move smartness to the effect of dedicated coordinatiors", - "path_settings": { "avoid_sharp": true, "avoid_traps": true, "max_dist": 400 }, - "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_2", "REVIVES", "NO_BREATHE" ], + "path_settings": { "avoid_sharp": true, "avoid_traps": true, "avoid_dangerous_fields": true, "max_dist": 400 }, + "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER", "REVIVES", "NO_BREATHE" ], "armor": { "bash": 8, "cut": 4, "stab": 4, "acid": 5, "bullet": 12, "electric": 5 } }, { diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index b951bce77fc00..cbd173d2ee258 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -73,7 +73,7 @@ "REVIVES", "BILE_BLOOD", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "FILTHY" ], "armor": { "bash": 5, "cut": 5, "bullet": 4, "electric": 3 } diff --git a/data/json/monsters/zed_lieutenant.json b/data/json/monsters/zed_lieutenant.json index 2c746406f373f..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_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 ], @@ -94,7 +101,7 @@ "KEEP_DISTANCE", "PHOTOPHOBIC", "NOT_HALLUCINATION", - "PATH_AVOID_DANGER_2" + "PATH_AVOID_DANGER" ], "//3": "Explicitly resistant to bullets, meant to be lured into a close encounter(if you can see/engage it at all)", "armor": { "cut": 25, "stab": 25, "bash": 25, "bullet": 100 } diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 2c95d37c1ff32..0d74ddcd872b6 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -1135,7 +1135,7 @@ "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], "upgrades": false, "armor": { "bash": 2, "cut": 2, "bullet": 2, "electric": 3 }, - "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER_1" ] }, + "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER" ] }, "delete": { "flags": [ "STUMBLES" ] } }, { @@ -1162,7 +1162,7 @@ "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], "upgrades": false, "armor": { "electric": 2 }, - "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER_1" ] }, + "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER" ] }, "delete": { "flags": [ "STUMBLES" ] } }, { diff --git a/data/mods/Aftershock/mobs/PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/PrepPhyle_mobs.json index 31369c16fa434..55108ac45fe00 100644 --- a/data/mods/Aftershock/mobs/PrepPhyle_mobs.json +++ b/data/mods/Aftershock/mobs/PrepPhyle_mobs.json @@ -25,7 +25,7 @@ "dissect": "dissect_CBM_DOG", "reproduction": { "baby_monster": "afs_mon_cyber_mastiff_pup", "baby_count": 7, "baby_timer": 320 }, "//2": "1-7 puppies & 300-320 days per-litter for size medium canines", - "flags": [ "ANIMAL", "PET_MOUNTABLE", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ], + "flags": [ "ANIMAL", "PET_MOUNTABLE", "HEARS", "HIT_AND_RUN", "KEENNOSE", "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM" ], "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], "armor": { "bash": 8, "cut": 14, "bullet": 11 } }, @@ -66,6 +66,6 @@ "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", "pet": "The %s happily wags its tail while you pat its head." }, - "flags": [ "ANIMAL", "DOGFOOD", "CANPLAY", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SEES", "SMELLS", "WARM" ] + "flags": [ "ANIMAL", "DOGFOOD", "CANPLAY", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SEES", "SMELLS", "WARM" ] } ] diff --git a/data/mods/Aftershock/mobs/abstract_monsters.json b/data/mods/Aftershock/mobs/abstract_monsters.json index 42c365a209aa1..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_1" - ], + "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_1" - ], + "flags": [ "SEES", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE", "BIOLOGICALPROOF", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "bash": 10, "cut": 10, "stab": 5, "acid": 10, "heat": 5 } }, { @@ -128,7 +110,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "WIELDED_WEAPON" ], diff --git a/data/mods/Aftershock/mobs/aliens.json b/data/mods/Aftershock/mobs/aliens.json index 0fd9874c6b0fc..0a1d728fba5a7 100644 --- a/data/mods/Aftershock/mobs/aliens.json +++ b/data/mods/Aftershock/mobs/aliens.json @@ -23,7 +23,7 @@ "harvest": "alien_small_fur", "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "PET_WONT_FOLLOW", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "WARM" ] }, { "id": "afs_mon_garlander", @@ -143,7 +143,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "harvest": "alien_large_leather", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ], "armor": { "bash": 4, "cut": 1, "bullet": 1 } }, { @@ -175,7 +175,7 @@ "baby_flags": [ "AUTUMN" ], "harvest": "alien_large_leather", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "ATTACKMON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "ATTACKMON" ], "armor": { "bash": 4, "cut": 1, "bullet": 1 } }, { @@ -206,7 +206,7 @@ "harvest": "alien_small_fur", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1", "STUMBLES" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER", "STUMBLES" ] }, { "id": "afs_venandi", @@ -234,7 +234,7 @@ "harvest": "alien_mammal_fur", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE" ], "armor": { "bash": 1 } }, { @@ -260,7 +260,7 @@ "hp": 60, "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, { "type": "bite", "cooldown": 10 } ], "description": "A tall bird with two long, muscular legs, a long neck, and a long sharp beak.", - "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "GRABS", "KEENNOSE", "WARM", "HIT_AND_RUN" ], + "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "GRABS", "KEENNOSE", "WARM", "HIT_AND_RUN" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 }, "harvest": "bird_large", "anger_triggers": [ "PLAYER_WEAK", "HURT", "FRIEND_ATTACKED", "PLAYER_CLOSE" ], diff --git a/data/mods/Aftershock/mobs/mutants.json b/data/mods/Aftershock/mobs/mutants.json index 756c6019c1fc0..fb706491a36a9 100644 --- a/data/mods/Aftershock/mobs/mutants.json +++ b/data/mods/Aftershock/mobs/mutants.json @@ -29,7 +29,7 @@ "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "death_drops": "cryo_lab_drops", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "COLDPROOF" ] + "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "COLDPROOF" ] }, { "id": "mon_cryokinetic", diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index b451984a9ac98..89062cc2901ad 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -224,7 +224,7 @@ "NO_BREATHE", "PRIORITIZE_TARGETS", "GOODHEARING", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "HIT_AND_RUN" ], "armor": { "bash": 10, "cut": 20, "bullet": 16 } @@ -275,7 +275,7 @@ "vision_day": 50, "death_function": { "corpse_type": "BROKEN" }, "death_drops": { "groups": [ [ "broken_robots", 3 ] ] }, - "flags": [ "SEES", "HEARS", "ELECTRONIC", "BIOLOGICALPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "HEARS", "ELECTRONIC", "BIOLOGICALPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "bash": 8, "cut": 8, "acid": 6, "heat": 4 } }, { @@ -425,7 +425,7 @@ "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "death_function": { "corpse_type": "BROKEN" }, "death_drops": { "groups": [ [ "broken_robots", 3 ] ] }, - "flags": [ "SEES", "HEARS", "ELECTRONIC", "BIOLOGICALPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "HEARS", "ELECTRONIC", "BIOLOGICALPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER" ], "armor": { "bash": 6, "cut": 6, "acid": 6, "heat": 2 } }, { @@ -809,7 +809,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 12, "cut": 8, "bullet": 6 } @@ -848,7 +848,7 @@ "COLDPROOF", "NO_BREATHE", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], "armor": { "bash": 12, "cut": 8, "bullet": 6 } @@ -878,7 +878,7 @@ "vision_night": 100, "death_function": { "corpse_type": "BROKEN" }, "death_drops": { "groups": [ [ "robots", 20 ] ] }, - "path_settings": { "max_dist": 30, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 30, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "petfood": { "food": [ "STEED_registry" ], "feed": "The %s activates as you swipe the registry key. A nearly inaudible hum is the only indication the STEED is active." @@ -894,7 +894,7 @@ "BIOLOGICALPROOF", "NO_BREATHE", "PET_MOUNTABLE", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "PATH_AVOID_FALL", "PATH_AVOID_FIRE", "STUN_IMMUNE" diff --git a/data/mods/Aftershock/mobs/uplifted_monsters.json b/data/mods/Aftershock/mobs/uplifted_monsters.json index f6e6e7d066474..4a98ca1824bf6 100644 --- a/data/mods/Aftershock/mobs/uplifted_monsters.json +++ b/data/mods/Aftershock/mobs/uplifted_monsters.json @@ -54,7 +54,7 @@ "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "reproduction": { "baby_monster": "mon_uplifted_bear_cub", "baby_count": 1, "baby_timer": 700 }, "baby_flags": [ "SPRING" ], - "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "BASHES", "ATTACKMON" ], "armor": { "bash": 2 } }, { @@ -111,7 +111,7 @@ "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "special_attacks": [ [ "scratch", 20 ] ], "zombify_into": "mon_uplifted_ape_zed", - "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "ANIMAL", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "ANIMAL", "PATH_AVOID_DANGER" ] }, { "id": "mon_uplifted_octupus", @@ -168,7 +168,7 @@ "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ], "reproduction": { "baby_monster": "mon_uplifted_octopus_spawn", "baby_count": 1, "baby_timer": 700 }, "baby_flags": [ "SPRING" ], - "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "SWIMS", "PATH_AVOID_DANGER_1", "WARM", "ATTACKMON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "SWIMS", "PATH_AVOID_DANGER", "WARM", "ATTACKMON" ], "armor": { "bash": 2 } }, { diff --git a/data/mods/Aftershock/mobs/water_mobs.json b/data/mods/Aftershock/mobs/water_mobs.json index 2711c3164d1c7..2901b171a76c5 100644 --- a/data/mods/Aftershock/mobs/water_mobs.json +++ b/data/mods/Aftershock/mobs/water_mobs.json @@ -41,7 +41,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "SWIMS" @@ -91,7 +91,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "SWIMS" diff --git a/data/mods/CrazyCataclysm/crazy_monsters.json b/data/mods/CrazyCataclysm/crazy_monsters.json index 249b67f2c0a87..f9a76be0d8ce1 100644 --- a/data/mods/CrazyCataclysm/crazy_monsters.json +++ b/data/mods/CrazyCataclysm/crazy_monsters.json @@ -117,7 +117,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "BASHES", "ATTACKMON", @@ -242,7 +242,7 @@ "BASHES", "POISON", "NO_BREATHE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "FILTHY" ], @@ -292,7 +292,7 @@ ], "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ], + "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "PUSH_MON", "SWIMS" ], "armor": { "bash": 6, "cut": 8, "bullet": 6 } } ] diff --git a/data/mods/Defense_Mode/monsters.json b/data/mods/Defense_Mode/monsters.json index de693b010ef24..0846ed567f435 100644 --- a/data/mods/Defense_Mode/monsters.json +++ b/data/mods/Defense_Mode/monsters.json @@ -97,7 +97,7 @@ "fungalize_into": "mon_spider_fungus", "upgrades": { "age_grow": 14, "into_group": "GROUP_SPIDER_CELLAR_GIANT" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "SMELLS", "HEARS", "GRABS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "GRABS", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PATH_AVOID_DANGER" ], "armor": { "bash": 1, "cut": 5, "acid": 3, "bullet": 2 } }, { @@ -184,7 +184,7 @@ "fungalize_into": "mon_spider_fungus", "upgrades": { "half_life": 42, "into": "mon_spider_jumping_mega" }, "zombify_into": "mon_meat_cocoon_small", - "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "CLIMBS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "CLIMBS", "PATH_AVOID_DANGER" ], "armor": { "cut": 3, "bullet": 2 } }, { @@ -274,7 +274,7 @@ { "id": "scratch", "max_mul": 1.5 } ], "attack_effs": [ { "id": "rat_bite_fever", "duration": 400, "chance": 10 } ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER" ], "harvest": "mutant_mammal_small_fur", "dissect": "dissect_rat_sample_single" }, @@ -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 }, + "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 ], @@ -711,7 +718,7 @@ "FILTHY", "STUN_IMMUNE", "KEEP_DISTANCE", - "PATH_AVOID_DANGER_2" + "PATH_AVOID_DANGER" ], "//3": "Because it's Defense Mode, you can hurt it with bullets. Otherwise, It'd be too hard to fight.", "armor": { "cut": 25, "stab": 25, "bash": 25, "bullet": 25, "heat": 25, "cold": 25, "electric": 25, "acid": 25 } diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 4c4b1923273d3..05956f07a99a4 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -91,7 +91,7 @@ "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 2 }, "grab_strength": 15, "special_attacks": [ { "id": "teeth_grab", "cooldown": 10 }, { "id": "teeth_rip", "cooldown": 10 }, [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "WARM", "SWIMS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "SWIMS" ], "harvest": "dino_med_feather_pred", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], "fear_triggers": [ "FRIEND_DIED" ], @@ -130,7 +130,7 @@ "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 2 }, "grab_strength": 15, "special_attacks": [ { "id": "teeth_grab", "cooldown": 10 }, { "id": "teeth_rip", "cooldown": 10 }, [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM", "SWIMS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "WARM", "SWIMS" ], "harvest": "dino_large_pred", "dissect": "dissect_dino_large_pred", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE" ], @@ -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_1", - "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" ], @@ -221,7 +209,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_1", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], "harvest": "dino_large_pred", "dissect": "dissect_dino_large_pred", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "SOUND" ], @@ -260,7 +248,7 @@ "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 }, "grab_strength": 15, "special_attacks": [ { "id": "teeth_grab", "cooldown": 10 }, { "id": "teeth_rip", "cooldown": 10 }, [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "WARM" ], "harvest": "allosaurus", "dissect": "dissect_dino_large_pred", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "SOUND" ], @@ -434,7 +422,7 @@ "reproduction": { "baby_egg": "egg_albertosaurus", "baby_count": 3, "baby_timer": 24 }, "baby_flags": [ "SPRING", "SUMMER" ], "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 }, - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], "grab_strength": 15, "special_attacks": [ { "id": "teeth_puncture", "cooldown": 7 }, @@ -488,7 +476,7 @@ { "id": "bio_op_takedown", "cooldown": 30 }, [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], "harvest": "dino_large_feather_pred", "dissect": "dissect_tyrant_sample_large", "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "SOUND" ], @@ -587,7 +575,7 @@ "HEARS", "EATS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", @@ -637,7 +625,7 @@ "HEARS", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "SWIMS", "CANPLAY", @@ -691,7 +679,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "HIT_AND_RUN", @@ -770,7 +758,7 @@ "HEARS", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CLIMBS", "CANPLAY", @@ -823,7 +811,7 @@ "HEARS", "ANIMAL", "CORNERED_FIGHTER", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "WARM", @@ -877,7 +865,7 @@ "HEARS", "ANIMAL", "CORNERED_FIGHTER", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "PET_HARNESSABLE", "WARM", @@ -931,7 +919,7 @@ "HEARS", "ANIMAL", "CORNERED_FIGHTER", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -983,7 +971,7 @@ "HEARS", "ANIMAL", "CORNERED_FIGHTER", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -1063,7 +1051,7 @@ "HEARS", "EATS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "CLIMBS", @@ -1121,7 +1109,7 @@ "HEARS", "EATS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "CLIMBS", @@ -1173,7 +1161,7 @@ "reproduction": { "baby_egg": "egg_utahraptor", "baby_count": 3, "baby_timer": 18 }, "baby_flags": [ "SPRING", "SUMMER" ], "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 2 }, - "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER_1", "KEENNOSE", "WARM", "CLIMBS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "EATS", "ANIMAL", "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "CLIMBS" ], "harvest": "dino_med_feather_pred", "dissect": "dissect_raptor_sample_small", "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_WEAK", "PLAYER_CLOSE", "HURT", "STALK", "SOUND" ], @@ -1239,7 +1227,7 @@ "HEARS", "EATS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "CLIMBS", @@ -1290,7 +1278,7 @@ "EATS", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CLIMBS", "SMALL_HIDER", @@ -1338,7 +1326,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CLIMBS", "PET_MOUNTABLE", @@ -1392,7 +1380,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CLIMBS", "PET_MOUNTABLE", @@ -1448,7 +1436,7 @@ "HEARS", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CLIMBS", "CORNERED_FIGHTER", @@ -1530,7 +1518,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "BASHES", "DESTROYS", "WARM", @@ -1655,7 +1643,7 @@ "special_attacks": [ [ "EAT_CROP", 40 ], [ "BROWSE", 60 ], [ "GRAZE", 60 ] ], "description": "Small, four-legged dinosaur with five rows of protective plates running down its back.", "reproduction": { "baby_egg": "egg_scutellosaurus", "baby_count": 3, "baby_timer": 24 }, - "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "CANPLAY", "CAN_BE_CULLED", "CORNERED_FIGHTER", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "CANPLAY", "CAN_BE_CULLED", "CORNERED_FIGHTER", "EATS" ], "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED" ], "harvest": "mammal_small_leather", "dissect": "dissect_stego_sample_single", @@ -1706,7 +1694,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -1866,7 +1854,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -1919,7 +1907,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "BASHES", "PET_MOUNTABLE", "COMBAT_MOUNT", @@ -1957,7 +1945,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -1989,7 +1977,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -2036,7 +2024,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "CAN_BE_CULLED", @@ -2087,7 +2075,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "CAN_BE_CULLED", @@ -2139,7 +2127,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "CAN_BE_CULLED", @@ -2357,7 +2345,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CANPLAY", "PET_MOUNTABLE", "HIT_AND_RUN", @@ -2404,7 +2392,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "PET_WONT_FOLLOW", @@ -2442,7 +2430,7 @@ "description": "A small rhino-like dinosaur with a bony crest studded with small horns and a hooked beak.", "reproduction": { "baby_egg": "egg_aquilops", "baby_count": 20, "baby_timer": 40 }, "special_attacks": [ [ "EAT_CROP", 40 ], [ "BROWSE", 60 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "CANPLAY", "CAN_BE_CULLED", "SMALL_HIDER", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "CANPLAY", "CAN_BE_CULLED", "SMALL_HIDER", "EATS" ], "harvest": "mammal_tiny", "dissect": "dissect_horns_sample_single" }, @@ -2693,7 +2681,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "COMBAT_MOUNT", "BASHES", @@ -2739,7 +2727,7 @@ "baby_flags": [ "SPRING", "SUMMER" ], "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 99 }, "petfood": { "food": [ "DINOFOOD_C" ] }, - "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "CANPLAY", "CAN_BE_CULLED", "SMALL_HIDER", "EATS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "CANPLAY", "CAN_BE_CULLED", "SMALL_HIDER", "EATS" ], "harvest": "bird_small", "anger_triggers": [ "HURT", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED" ], @@ -2782,7 +2770,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CANPLAY", "CAN_DIG", "CAN_BE_CULLED", @@ -2832,7 +2820,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "HIT_AND_RUN", "SWIMS", @@ -2880,7 +2868,7 @@ "FLIES", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CANPLAY", "CAN_BE_CULLED", "CORNERED_FIGHTER", @@ -2938,7 +2926,7 @@ "FLIES", "HIT_AND_RUN", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CANPLAY", "PET_MOUNTABLE", "COMBAT_MOUNT", @@ -2986,7 +2974,7 @@ "SEES", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "GRABS", "BASHES", "DESTROYS", @@ -3034,7 +3022,7 @@ "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 }, "grab_strength": 10, "special_attacks": [ { "id": "bite_grab", "cooldown": 50 }, [ "LUNGE", 10 ], [ "EAT_CARRION", 60 ] ], - "flags": [ "SEES", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "GRABS", "BASHES", "WARM", "SWIMS", "AQUATIC", "PUSH_MON", "EATS" ], + "flags": [ "SEES", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "GRABS", "BASHES", "WARM", "SWIMS", "AQUATIC", "PUSH_MON", "EATS" ], "harvest": "dino_large_pred", "dissect": "dissect_plesiosaurus", "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "PLAYER_CLOSE" ], diff --git a/data/mods/DinoMod/monsters/hatchling.json b/data/mods/DinoMod/monsters/hatchling.json index 9bd046ce47fbe..29e5b5e8dace5 100644 --- a/data/mods/DinoMod/monsters/hatchling.json +++ b/data/mods/DinoMod/monsters/hatchling.json @@ -173,7 +173,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "STUMBLES", "NO_BREED", @@ -198,7 +198,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CANPLAY", "STUMBLES", @@ -234,7 +234,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CANPLAY", "STUMBLES", @@ -730,7 +730,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CANPLAY", "STUMBLES", diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json index 6ae737c96b712..88106d326d9b1 100644 --- a/data/mods/DinoMod/monsters/juvenile.json +++ b/data/mods/DinoMod/monsters/juvenile.json @@ -290,7 +290,7 @@ "upgrades": { "age_grow": 70, "into": "mon_gallimimus" }, "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 3 }, "petfood": { "food": [ "DINOFOOD_A", "DINOFOOD_B", "DINOFOOD_C" ] }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY", "CAN_BE_CULLED" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY", "CAN_BE_CULLED" ], "harvest": "bird_small" }, { @@ -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_1", - "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", @@ -453,7 +442,7 @@ "fear_triggers": [ "FRIEND_DIED" ], "upgrades": { "age_grow": 365, "into": "mon_amargasaurus" }, "petfood": { "food": [ "DINOFOOD_C" ] }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY", "GROUP_MORALE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY", "GROUP_MORALE" ] }, { "id": "mon_apatosaurus_juvenile", @@ -826,7 +815,7 @@ "SMELLS", "FLIES", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "CANPLAY", "NO_BREED", @@ -854,7 +843,7 @@ "hp": 100, "upgrades": { "age_grow": 365, "into": "mon_mosasaurus" }, "petfood": { "food": [ "DINOFOOD_B" ] }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CANPLAY", "NO_BREED", "SWIMS", "AQUATIC" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "CANPLAY", "NO_BREED", "SWIMS", "AQUATIC" ] }, { "id": "mon_plesiosaurus_juvenile", @@ -869,6 +858,6 @@ "hp": 80, "upgrades": { "age_grow": 365, "into": "mon_plesiosaurus" }, "petfood": { "food": [ "DINOFOOD_B" ] }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "CANPLAY", "NO_BREED", "SWIMS", "AQUATIC" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "CANPLAY", "NO_BREED", "SWIMS", "AQUATIC" ] } ] diff --git a/data/mods/DinoMod/monsters/mutant_dino.json b/data/mods/DinoMod/monsters/mutant_dino.json index cf8b44444f89b..8a444050c872e 100644 --- a/data/mods/DinoMod/monsters/mutant_dino.json +++ b/data/mods/DinoMod/monsters/mutant_dino.json @@ -24,7 +24,7 @@ "SMELLS", "HEARS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "PET_WONT_FOLLOW", "BASHES", diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json index 49b318a85e0a1..500846c8b5aa7 100644 --- a/data/mods/Magiclysm/monsters/dragon.json +++ b/data/mods/Magiclysm/monsters/dragon.json @@ -117,7 +117,7 @@ "SMELLS", "HAS_MIND", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "SWIMS", "ACIDPROOF", @@ -176,7 +176,7 @@ "dodge": 3, "//2": "Large means powerful, but it does not mean fast.", "speed": 100, - "delete": { "flags": [ "PATH_AVOID_DANGER_1" ] }, + "delete": { "flags": [ "PATH_AVOID_DANGER" ] }, "emit_fields": [ { "emit_id": "emit_dragon_adult_fright", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 10 }, diff --git a/data/mods/Magiclysm/monsters/feral_fantasy_species.json b/data/mods/Magiclysm/monsters/feral_fantasy_species.json index 798d77eee3753..23da55d9b81d3 100644 --- a/data/mods/Magiclysm/monsters/feral_fantasy_species.json +++ b/data/mods/Magiclysm/monsters/feral_fantasy_species.json @@ -203,7 +203,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_axe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GRABS", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GRABS", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER" ] }, { "id": "mon_feral_ravenfolk", @@ -275,7 +275,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_axe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER" ] }, { "id": "mon_feral_lizardfolk", @@ -337,6 +337,6 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_axe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "SWIMS", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "SWIMS", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER" ] } ] diff --git a/data/mods/Magiclysm/monsters/feral_wizards.json b/data/mods/Magiclysm/monsters/feral_wizards.json index 279a0e3c238d7..0712847472f53 100644 --- a/data/mods/Magiclysm/monsters/feral_wizards.json +++ b/data/mods/Magiclysm/monsters/feral_wizards.json @@ -45,7 +45,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER" ] }, { "id": "mon_feral_lab_magician", @@ -124,7 +124,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "EATS" ] + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "EATS" ] }, { "id": "mon_feral_radiation_mage", @@ -213,7 +213,7 @@ "NO_BREATHE", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "EATS" ] }, @@ -288,7 +288,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "EATS" ], "//": "armor values below taken from the Bark mutation and accounting for partial coverage.", "armor": { "bash": 15, "cut": 10, "stab": 7, "bullet": 10, "electric": 5 } }, @@ -374,7 +374,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "EATS" ], "//": "armor values below taken from the Bark mutation and accounting for partial coverage.", "armor": { "bash": 15, "cut": 10, "stab": 7, "bullet": 10, "electric": 5 } }, @@ -453,7 +453,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "EATS" ], "//": "armor values below taken from the stoneskin spell.", "armor": { "bash": 15, "cut": 15, "stab": 12, "bullet": 7, "acid": 2 } }, @@ -561,7 +561,7 @@ "zombify_into": "mon_zombie", "fungalize_into": "mon_feral_human_pipe_fungal_infected", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "EATS" ], + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "EATS" ], "//": "armor values below taken from the stoneskin spell.", "armor": { "bash": 15, "cut": 15, "stab": 12, "bullet": 7, "acid": 2 } } diff --git a/data/mods/Magiclysm/monsters/forgedwellers.json b/data/mods/Magiclysm/monsters/forgedwellers.json index fb50a5add6a8e..95c4cecdf1cc3 100644 --- a/data/mods/Magiclysm/monsters/forgedwellers.json +++ b/data/mods/Magiclysm/monsters/forgedwellers.json @@ -29,7 +29,7 @@ "special_attacks": [ { "type": "spell", "spell_data": { "id": "manatouched_seeker_bolts", "min_level": 5 }, "cooldown": 60 } ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "death_function": { "corpse_type": "BROKEN" }, - "flags": [ "SEES", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES" ], + "flags": [ "SEES", "NO_BREATHE", "PATH_AVOID_DANGER", "LOUDMOVES" ], "armor": { "bash": 32, "cut": 32, "heat": 30, "bullet": 26 } }, { @@ -101,7 +101,7 @@ "harvest": "demihuman_large_fur", "death_function": { "effect": { "id": "summon_vengeance", "hit_self": false } }, "special_attacks": [ { "type": "spell", "spell_data": { "id": "demon_breath_fire", "min_level": 7 }, "cooldown": 10 }, [ "scratch", 15 ] ], - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "BASHES", "ANIMAL", "PATH_AVOID_DANGER_1", "NO_BREATHE" ], + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "BASHES", "ANIMAL", "PATH_AVOID_DANGER", "NO_BREATHE" ], "armor": { "acid": 80, "heat": 50 } }, { @@ -173,9 +173,9 @@ "families": [ "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], - "path_settings": { "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": { "subtype": "collection", "groups": [ [ "forge_life", 40 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ] }, - "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "PATH_AVOID_DANGER_2" ], + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "PATH_AVOID_DANGER" ], "armor": { "bash": 23, "cut": 32, "heat": 35, "bullet": 26 } }, { diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json index 0b78503330392..3b8c8376293fb 100644 --- a/data/mods/Magiclysm/monsters/goblin.json +++ b/data/mods/Magiclysm/monsters/goblin.json @@ -58,7 +58,7 @@ ] }, "armor": { "bash": 12, "cut": 12, "bullet": 4 }, - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER_1", "GROUP_MORALE", "WIELDED_WEAPON" ] + "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER", "GROUP_MORALE", "WIELDED_WEAPON" ] }, { "type": "MONSTER", @@ -252,7 +252,7 @@ ], "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "zombify_into": "mon_zombie_dog_fungus", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS" ], "armor": { "bash": 8, "cut": 10, "electric": 1 } }, { @@ -346,7 +346,7 @@ "HAS_MIND", "WARM", "BASHES", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "QUIETMOVES", "SWARMS", "GROUP_MORALE", diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index 261d658b18356..7ecb2cfbfd4d0 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -30,7 +30,7 @@ "grab_strength": 50, "special_attacks": [ { "id": "bite_grab", "cooldown": 10 }, [ "scratch", 6 ] ], "anger_triggers": [ "PLAYER_NEAR_BABY" ], - "flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "KEENNOSE", "PATH_AVOID_DANGER_1", "WARM", "GRABS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "KEENNOSE", "PATH_AVOID_DANGER", "WARM", "GRABS" ], "zombify_into": "mon_yulecat_zombie", "armor": { "bash": 4, "cut": 1, "bullet": 4 } }, @@ -83,7 +83,7 @@ "families": [ "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, - "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "PATH_AVOID_DANGER_1", "WARM", "CORNERED_FIGHTER" ], + "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER" ], "armor": { "bash": 6, "cut": 2, "bullet": 3 } }, { @@ -112,6 +112,6 @@ "fear_triggers": [ "HURT", "FIRE" ], "tracking_distance": 8, "special_attacks": [ { "type": "spell", "spell_data": { "id": "prank", "min_level": 5 }, "cooldown": 80 }, [ "PULL_METAL_WEAPON", 25 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "FAE_CREATURE", "HAS_MIND", "PATH_AVOID_DANGER_1", "KEEP_DISTANCE", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "FAE_CREATURE", "HAS_MIND", "PATH_AVOID_DANGER", "KEEP_DISTANCE", "WARM" ] } ] diff --git a/data/mods/Magiclysm/monsters/lizardfolk.json b/data/mods/Magiclysm/monsters/lizardfolk.json index a95bef10e3db0..03ddc1ec13197 100644 --- a/data/mods/Magiclysm/monsters/lizardfolk.json +++ b/data/mods/Magiclysm/monsters/lizardfolk.json @@ -39,7 +39,7 @@ "SMELLS", "KEENNOSE", "HAS_MIND", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CLIMBS", "GROUP_MORALE", "SWIMS", @@ -173,7 +173,7 @@ "GRABS", "SMELLS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PUSH_MON", "SWIMS", "GROUP_MORALE", diff --git a/data/mods/Magiclysm/monsters/mi-go.json b/data/mods/Magiclysm/monsters/mi-go.json index bd410955d9371..6acd8b52ac1d5 100644 --- a/data/mods/Magiclysm/monsters/mi-go.json +++ b/data/mods/Magiclysm/monsters/mi-go.json @@ -72,7 +72,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -153,7 +153,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" diff --git a/data/mods/Magiclysm/monsters/mics.json b/data/mods/Magiclysm/monsters/mics.json index 472b6acf11142..81254c89475c4 100644 --- a/data/mods/Magiclysm/monsters/mics.json +++ b/data/mods/Magiclysm/monsters/mics.json @@ -115,6 +115,6 @@ "harvest": "exempt", "anger_triggers": [ ], "death_function": { "message": "The %s dissipates in a gust of wind!", "corpse_type": "NO_CORPSE" }, - "flags": [ "SEES", "HEARS", "FLIES", "PATH_AVOID_DANGER_1", "CAMOUFLAGE", "HARDTOSHOOT", "NOGIB", "NOHEAD", "NO_BREATHE" ] + "flags": [ "SEES", "HEARS", "FLIES", "PATH_AVOID_DANGER", "CAMOUFLAGE", "HARDTOSHOOT", "NOGIB", "NOHEAD", "NO_BREATHE" ] } ] diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 33a9aa84c95be..c01da6ed34830 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -30,7 +30,7 @@ "//grab": "Assuming they are grabbing you with their paws", "grab_strength": 50, "special_attacks": [ { "type": "bite", "cooldown": 10 }, { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid", "cooldown": 7 } ], - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "GRABS", "PATH_AVOID_DANGER_1", "WARM", "GRABS", "SWARMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "GRABS", "PATH_AVOID_DANGER", "WARM", "GRABS", "SWARMS" ], "zombify_into": "mon_owlbear_zombie", "armor": { "bash": 5, "cut": 2, "bullet": 2 } }, @@ -68,7 +68,7 @@ "monster_message": "The black pudding burns %3$s with acid!" } ], - "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "POISON", "NO_BREATHE", "ACIDPROOF", "PATH_AVOID_DANGER_1" ], + "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "POISON", "NO_BREATHE", "ACIDPROOF", "PATH_AVOID_DANGER" ], "armor": { "bash": 12, "stab": 14, "acid": 15 } }, { @@ -78,7 +78,7 @@ "symbol": "K", "color": "dark_gray", "type": "MONSTER", - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "HAS_MIND", "PATH_AVOID_DANGER_1", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "HAS_MIND", "PATH_AVOID_DANGER", "WARM" ], "harvest": "mutant_human", "material": [ "hflesh" ], "bodytype": "human", @@ -143,7 +143,7 @@ "upgrades": { "age_grow": 240, "into": "mon_nightmare_sheep" }, "//": "Puberty reached in 6-9 months.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_nightmare_sheep", @@ -180,7 +180,7 @@ "fear_triggers": [ "FRIEND_DIED" ], "special_attacks": [ [ "EAT_CROP", 120 ] ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ] }, { "id": "mon_owlbear_cub", @@ -241,7 +241,7 @@ }, { "id": "smash", "throw_strength": 50 } ], - "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "CAN_DIG", "HIT_AND_RUN", "HARDTOSHOOT" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "WARM", "CAN_DIG", "HIT_AND_RUN", "HARDTOSHOOT" ], "armor": { "bash": 32, "cut": 30, "bullet": 24 } }, { @@ -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_1", - "ELECTRIC", - "HARDTOSHOOT", - "NOGIB", - "NOHEAD", - "NO_BREATHE", - "SWARMS" - ] + "flags": [ "SEES", "HEARS", "FLIES", "PATH_AVOID_DANGER", "ELECTRIC", "HARDTOSHOOT", "NOGIB", "NOHEAD", "NO_BREATHE", "SWARMS" ] }, { "id": "mon_troll", @@ -346,7 +335,7 @@ "SMELLS", "KEENNOSE", "HAS_MIND", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "GRABS", @@ -514,7 +503,7 @@ "special_attacks": [ { "type": "spell", "spell_data": { "id": "cone_cold", "min_level": 4 }, "cooldown": 25 } ], "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "zombify_into": "mon_zolf", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "COLDPROOF" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "COLDPROOF" ], "armor": { "bash": 3, "cut": 3, "heat": 50 } }, { @@ -548,7 +537,7 @@ "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ], "zombify_into": "mon_were_zolf", - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE" ], "armor": { "bash": 48, "cut": 36, "bullet": 40 } }, { @@ -597,7 +586,7 @@ ], "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s melts away." }, "path_settings": { "avoid_traps": true, "avoid_sharp": true }, - "flags": [ "SEES", "WARM", "BASHES", "DESTROYS", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FIREY", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "WARM", "BASHES", "DESTROYS", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FIREY", "PATH_AVOID_DANGER" ], "armor": { "bash": 12, "cut": 12, "bullet": 25 } }, { @@ -904,7 +893,7 @@ ], "anger_triggers": [ "PLAYER_CLOSE" ], "fear_triggers": [ "BRIGHT_LIGHT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "HAS_MIND", "PATH_AVOID_DANGER_1", "PATH_AVOID_FIRE", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "HAS_MIND", "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM" ], "armor": { "bash": 15, "cut": 2, "heat": 10, "necrotic": 5, "poison": 100 } } ] diff --git a/data/mods/Magiclysm/monsters/nature_spirits.json b/data/mods/Magiclysm/monsters/nature_spirits.json index 5bd5104616965..4d1addd8f42a2 100644 --- a/data/mods/Magiclysm/monsters/nature_spirits.json +++ b/data/mods/Magiclysm/monsters/nature_spirits.json @@ -26,7 +26,7 @@ "vision_night": 5, "material": [ "veggy" ], "fear_triggers": [ "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "PATH_AVOID_DANGER_1", "HIT_AND_RUN", "PATH_AVOID_FIRE", "FLAMMABLE", "NOHEAD", "NO_BREATHE" ], + "flags": [ "SEES", "HEARS", "PATH_AVOID_DANGER", "HIT_AND_RUN", "PATH_AVOID_FIRE", "FLAMMABLE", "NOHEAD", "NO_BREATHE" ], "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s collapses into a pile of moss." }, "death_drops": "mossling_drops" }, @@ -64,7 +64,7 @@ "BASHES", "GROUP_BASH", "CAMOUFLAGE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "NO_BREATHE", "PATH_AVOID_FIRE", "FLAMMABLE" diff --git a/data/mods/Magiclysm/monsters/ogre.json b/data/mods/Magiclysm/monsters/ogre.json index f0e9bb584d59b..3bf920bcb7aaf 100644 --- a/data/mods/Magiclysm/monsters/ogre.json +++ b/data/mods/Magiclysm/monsters/ogre.json @@ -50,7 +50,7 @@ "vision_day": 45, "vision_night": 3, "path_settings": { "avoid_traps": true, "avoid_sharp": true }, - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER" ], "armor": { "bash": 5, "cut": 2, "stab": 2, "psionic": 20 } }, { @@ -118,7 +118,8 @@ [ "EAT_FOOD", 120 ] ], "fear_triggers": [ "HURT" ], - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER_2" ] + "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" ] }, { "id": "mon_ogre_twoheaded", @@ -141,9 +142,10 @@ "PUSH_MON", "PUSH_VEH", "FILTHY", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "STUN_IMMUNE" ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true }, "armor": { "bash": 5, "cut": 2, "stab": 2, "psionic": 50 } }, { @@ -178,7 +180,7 @@ [ "EAT_FOOD", 120 ] ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "FILTHY", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "FILTHY", "PATH_AVOID_DANGER" ], "armor": { "bash": 5, "cut": 8, "stab": 8, "poison": 35 } }, { @@ -211,6 +213,6 @@ { "id": "smash", "throw_strength": 70 }, [ "EAT_FOOD", 120 ] ], - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "EATS", "BASHES", "PUSH_MON", "PUSH_VEH", "FILTHY", "PATH_AVOID_DANGER" ] } ] diff --git a/data/mods/Magiclysm/monsters/orcs.json b/data/mods/Magiclysm/monsters/orcs.json index 4344bdec3c391..44c2d50ce8205 100644 --- a/data/mods/Magiclysm/monsters/orcs.json +++ b/data/mods/Magiclysm/monsters/orcs.json @@ -94,7 +94,7 @@ } ] }, - "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER_1", "SWARMS", "GROUP_MORALE", "WIELDED_WEAPON" ] + "flags": [ "SEES", "HEARS", "HAS_MIND", "WARM", "BASHES", "PATH_AVOID_DANGER", "SWARMS", "GROUP_MORALE", "WIELDED_WEAPON" ] }, { "type": "MONSTER", diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index 75ccd250b8ac6..23c705b48c7bd 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -91,7 +91,7 @@ "HEARS", "SMELLS", "KEENNOSE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "GRABS", "SWARMS", @@ -124,7 +124,7 @@ "vision_night": 19, "armor": { "bash": 3, "cut": 3, "bullet": 2 } }, - "delete": { "flags": [ "PATH_AVOID_DANGER_1" ] }, + "delete": { "flags": [ "PATH_AVOID_DANGER" ] }, "extend": { "special_attacks": [ [ "SMASH", 20 ] ] } }, { @@ -149,7 +149,7 @@ "regenerates": 15, "proportional": { "volume": 1.05, "weight": 1.07 }, "extend": { "species": [ "ZOMBIE" ], "flags": [ "BASHES", "POISON", "NO_BREATHE", "REVIVES" ] }, - "delete": { "flags": [ "PATH_AVOID_DANGER_1", "PATH_AVOID_FIRE" ] } + "delete": { "flags": [ "PATH_AVOID_DANGER", "PATH_AVOID_FIRE" ] } }, { "type": "MONSTER", @@ -204,7 +204,7 @@ "armor": { "bash": 2, "cut": 1, "bullet": -2 } }, "proportional": { "volume": 1.01, "weight": 0.95 }, - "extend": { "flags": [ "PATH_AVOID_DANGER_1" ], "special_attacks": [ { "type": "leap", "cooldown": 7, "max_range": 2 } ] } + "extend": { "flags": [ "PATH_AVOID_DANGER" ], "special_attacks": [ { "type": "leap", "cooldown": 7, "max_range": 2 } ] } }, { "id": "mon_feral_human_magician_fungal_corpse", diff --git a/data/mods/Megafauna/monsters/mf_domestic.json b/data/mods/Megafauna/monsters/mf_domestic.json index c0564e63b2a44..bd4ea44cb8552 100644 --- a/data/mods/Megafauna/monsters/mf_domestic.json +++ b/data/mods/Megafauna/monsters/mf_domestic.json @@ -37,7 +37,7 @@ "feed": "The %s seems to like you! It lets you pat its shaggy-haired head and seems friendly.", "pet": "The %s lets you pet its shaggy-haired head, mooing loudly in satisfaction." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 5, "cut": 7, "stab": 3 } }, { @@ -68,7 +68,7 @@ "upgrades": { "age_grow": 240, "into": "mon_shrubox" }, "//": "Puberty reached in 6-9 months.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" ] }, { "id": "mon_woodox", @@ -111,7 +111,7 @@ "feed": "The %s seems to like you! It lets you pat its shaggy-haired head and seems friendly.", "pet": "The %s lets you pet its shaggy-haired head, mooing loudly in satisfaction." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ], "armor": { "bash": 5, "cut": 7, "stab": 3 } }, { @@ -142,7 +142,7 @@ "upgrades": { "age_grow": 240, "into": "mon_woodox" }, "//": "Puberty reached in 6-9 months.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" ] }, { "id": "mon_soergoat", @@ -182,7 +182,7 @@ "feed": "The %s seems to tolerate you! It cocks its head and stares at you with its strange goat-eyes as you approach.", "pet": "The %s lets you scratch its big belly, letting of a sonorous bleat in satisfaction." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 3, "cut": 4, "stab": 2 } }, { @@ -212,7 +212,7 @@ "placate_triggers": [ "PLAYER_WEAK" ], "upgrades": { "age_grow": 240, "into": "mon_soergoat" }, "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" ] }, { "id": "mon_bison", @@ -248,7 +248,7 @@ "placate_triggers": [ "PLAYER_WEAK" ], "special_attacks": [ [ "EAT_CROP", 120 ] ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ], "armor": { "bash": 5, "cut": 7, "stab": 3 } }, { @@ -279,7 +279,7 @@ "upgrades": { "age_grow": 240, "into": "mon_bison" }, "//": "Puberty reached in 6-9 months.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" ] }, { "id": "mon_scotts_horse", @@ -315,7 +315,7 @@ "baby_flags": [ "AUTUMN" ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "mountable_weight_ratio": 0.35, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 3, "cut": 4, "stab": 3 } }, { @@ -349,7 +349,7 @@ "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" @@ -389,7 +389,7 @@ "baby_flags": [ "AUTUMN" ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "mountable_weight_ratio": 0.35, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 5, "cut": 7, "stab": 3 } }, { @@ -423,7 +423,7 @@ "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY" @@ -463,7 +463,7 @@ "reproduction": { "baby_monster": "mon_camelops_foal", "baby_count": 1, "baby_timer": 360 }, "baby_flags": [ "SUMMER" ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 6, "cut": 9, "stab": 4 } }, { @@ -491,7 +491,7 @@ "special_attacks": [ [ "EAT_CROP", 60 ] ], "upgrades": { "age_grow": 240, "into": "mon_camelops" }, "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "NO_BREED" ] }, { "id": "mon_peccary_flathead", @@ -527,7 +527,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "HURT", "FIRE" ], "special_attacks": [ [ "EAT_FOOD", 20 ] ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It squeals happily as you pet it." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "CANPLAY" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CANPLAY" ], "armor": { "bash": 2, "cut": 3, "stab": 2 } }, { @@ -555,7 +555,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "WARM", "KEENNOSE", @@ -584,7 +584,7 @@ "anger_triggers": [ "PLAYER_NEAR_BABY", "FRIEND_ATTACKED" ], "fear_triggers": [ "SOUND", "FIRE" ], "reproduction": { "baby_monster": "mon_longnose_piglet", "baby_count": 1, "baby_timer": 200 }, - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER_1", "PET_MOUNTABLE", "WARM", "CANPLAY" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER", "PET_MOUNTABLE", "WARM", "CANPLAY" ], "armor": { "bash": 4, "cut": 6, "stab": 4 } }, { @@ -593,6 +593,6 @@ "copy-from": "mon_flathead_piglet", "name": { "str": "long-nosed peccary piglet" }, "description": "A juvenile long-nosed peccary - a stocky, short-legged, pig-like animal. Its playful squeals delight your heart.", - "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "CANPLAY" ] + "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CANPLAY" ] } ] diff --git a/data/mods/Megafauna/monsters/mf_predators.json b/data/mods/Megafauna/monsters/mf_predators.json index 712cb308eaac7..dc9000a725546 100644 --- a/data/mods/Megafauna/monsters/mf_predators.json +++ b/data/mods/Megafauna/monsters/mf_predators.json @@ -47,7 +47,7 @@ "KEENNOSE", "GOODHEARING", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "WARM", "CANPLAY", @@ -74,7 +74,7 @@ "melee_damage": [ { "damage_type": "stab", "amount": 4.0 } ], "dodge": 2, "upgrades": { "age_grow": 270, "into": "mon_direwolf" }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "NO_BREED", "WARM", "CANPLAY", "KEENNOSE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "NO_BREED", "WARM", "CANPLAY", "KEENNOSE" ] }, { "id": "mon_sabcat", @@ -130,7 +130,7 @@ "KEENNOSE", "ANIMAL", "GRABS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "KEEP_DISTANCE", "WARM", @@ -168,7 +168,7 @@ "GOODHEARING", "KEENNOSE", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "KEEP_DISTANCE", "WARM", @@ -216,7 +216,7 @@ "GOODHEARING", "KEENNOSE", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "HIT_AND_RUN" @@ -251,7 +251,7 @@ "GOODHEARING", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "WARM", "HIT_AND_RUN", @@ -289,7 +289,7 @@ "petfood": { "food": [ "CATFOOD" ], "feed": "The %s seems to like you! It emits a satisfied purr as you pet it." }, "harvest": "mammal_small_fur", "dissect": "dissect_feline_sample_single", - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN" ] }, { "id": "mon_bobcat_cub", @@ -309,7 +309,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 1.0 } ], "dodge": 2, "upgrades": { "age_grow": 90, "into": "mon_bobcat" }, - "flags": [ "NO_BREED", "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] + "flags": [ "NO_BREED", "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN" ] }, { "type": "MONSTER", @@ -352,7 +352,7 @@ "HEARS", "GOODHEARING", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "KEENNOSE", "WARM", "HIT_AND_RUN", @@ -391,6 +391,6 @@ "melee_damage": [ { "damage_type": "cut", "amount": 4.0 } ], "dodge": 3, "upgrades": { "age_grow": 315, "into": "mon_titanis_walleri" }, - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "NO_BREED", "WARM", "KEENNOSE", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "NO_BREED", "WARM", "KEENNOSE", "CANPLAY" ] } ] diff --git a/data/mods/Megafauna/monsters/mf_wild.json b/data/mods/Megafauna/monsters/mf_wild.json index b0fcafb9433fa..f7ccf14948973 100644 --- a/data/mods/Megafauna/monsters/mf_wild.json +++ b/data/mods/Megafauna/monsters/mf_wild.json @@ -32,7 +32,7 @@ "fear_triggers": [ "SOUND", "FIRE" ], "reproduction": { "baby_monster": "mon_giant_beaver_cub", "baby_count": 4, "baby_timer": 360 }, "baby_flags": [ "AUTUMN" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ], "armor": { "bash": 5, "cut": 10, "stab": 5 } }, { @@ -53,7 +53,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 2.0 } ], "dodge": 2, "upgrades": { "age_grow": 160, "into": "mon_giant_beaver" }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "NO_BREED" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "NO_BREED" ] }, { "id": "mon_large_claw_sloth", @@ -94,7 +94,7 @@ "feed": "The %s seems to like you! It lets you pat its head, giving off a bassy hum.", "pet": "The %s turns on its back and lets you scratch its huge, moss-overgrown belly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "PET_MOUNTABLE", "CANPLAY" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "PET_MOUNTABLE", "CANPLAY" ], "armor": { "bash": 5, "cut": 15, "stab": 10 } }, { @@ -116,7 +116,7 @@ "melee_damage": [ { "damage_type": "bash", "amount": 4.0, "armor_penetration": 2 } ], "dodge": 1, "upgrades": { "age_grow": 720, "into": "mon_large_claw_sloth" }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM", "NO_BREED", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "NO_BREED", "CANPLAY" ] }, { "id": "mon_stagmoose", @@ -157,7 +157,7 @@ "feed": "The %s seems to tolerate you. It cautiously lets you pat its head and seems friendly for now.", "pet": "The %s bows down its massive antlered head to nuzzle your face." }, - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "MILKABLE", "WARM", "CANPLAY" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "MILKABLE", "WARM", "CANPLAY" ], "armor": { "bash": 5, "cut": 5, "stab": 5 } }, { @@ -184,7 +184,7 @@ "feed": "The %s seems to like you. It lets you pat its head and seems friendly for now.", "pet": "The %s nuzzles you, pressing its head against your petting hand." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "NO_BREED", "WARM", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "NO_BREED", "WARM", "CANPLAY" ] }, { "id": "mon_mammoth", @@ -253,7 +253,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PET_MOUNTABLE", "WARM", @@ -293,7 +293,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PET_WONT_FOLLOW", "WARM", @@ -368,7 +368,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_MOUNTABLE", "WARM", "BASHES", @@ -407,7 +407,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PET_WONT_FOLLOW", "WARM", "KEENNOSE", @@ -459,7 +459,7 @@ "damage_max_instance": [ { "damage_type": "bash", "amount": 40 } ] } ], - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "PUSH_MON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "BASHES", "PUSH_MON" ], "armor": { "bash": 10, "cut": 15, "stab": 5 } }, { @@ -483,7 +483,7 @@ "dodge": 2, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "upgrades": { "age_grow": 360, "into": "mon_shortface" }, - "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_auk", @@ -515,7 +515,7 @@ "reproduction": { "baby_egg": "egg_auk", "baby_count": 1, "baby_timer": 360 }, "baby_flags": [ "SUMMER" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "SWIMS" ] }, { "id": "mon_auk_chick", @@ -567,7 +567,7 @@ "damage_max_instance": [ { "damage_type": "bash", "amount": 50 } ] } ], - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PUSH_MON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PUSH_MON" ], "armor": { "bash": 10, "cut": 25, "stab": 20 } }, { @@ -592,7 +592,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "harvest": "mammal_large_leather", "upgrades": { "age_grow": 360, "into": "mon_glyptotherium" }, - "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ], + "flags": [ "NO_BREED", "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ], "armor": { "bash": 4, "cut": 10, "stab": 5 } }, { @@ -629,7 +629,7 @@ "baby_flags": [ "AUTUMN" ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "mountable_weight_ratio": 0.3, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "MILKABLE" ], "armor": { "bash": 5, "cut": 10, "stab": 5 } }, { @@ -656,6 +656,6 @@ "special_attacks": [ [ "EAT_CROP", 60 ] ], "upgrades": { "age_grow": 240, "into": "mon_american_zebra" }, "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM", "NO_BREED" ] } ] diff --git a/data/mods/MindOverMatter/monsters/animal_psychics.json b/data/mods/MindOverMatter/monsters/animal_psychics.json index 175dc2b525760..0e7f0144dfa79 100644 --- a/data/mods/MindOverMatter/monsters/animal_psychics.json +++ b/data/mods/MindOverMatter/monsters/animal_psychics.json @@ -90,7 +90,7 @@ } ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "HIT_AND_RUN" ] + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "WARM", "FLIES", "HIT_AND_RUN" ] }, { "id": "mon_hodag", @@ -162,7 +162,7 @@ "reproduction": { "baby_monster": "mon_cow_calf", "baby_count": 1, "baby_timer": 343 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "biosignature": { "biosig_item": "feces_cow", "biosig_timer": 1 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "EATS", "PATH_AVOID_DANGER_1", "WARM", "CORNERED_FIGHTER" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "EATS", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER" ], "armor": { "bash": 4, "cut": 3, "stab": 1, "bullet": 4, "electric": 1 } }, { @@ -207,7 +207,7 @@ "reproduction": { "baby_egg": "egg_cockatrice", "baby_count": 3, "baby_timer": 10 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "CORNERED_FIGHTER" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "CORNERED_FIGHTER" ] }, { "id": "mon_cockatrice_chick", @@ -273,7 +273,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", diff --git a/data/mods/MindOverMatter/monsters/civilian_psychics.json b/data/mods/MindOverMatter/monsters/civilian_psychics.json index b7e78c476e06a..dc04c97155c5a 100644 --- a/data/mods/MindOverMatter/monsters/civilian_psychics.json +++ b/data/mods/MindOverMatter/monsters/civilian_psychics.json @@ -67,7 +67,7 @@ "special_attacks": [ [ "PARROT_AT_DANGER", 2 ] ], "death_drops": "default_zombie_death_drops", "zombify_into": "mon_zombie", - "flags": [ "SEES", "HEARS", "WARM", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "CONVERSATION", "GUILT_HUMAN" ] + "flags": [ "SEES", "HEARS", "WARM", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER", "CONVERSATION", "GUILT_HUMAN" ] }, { "id": "mon_civilian_electrokinetic", diff --git a/data/mods/MindOverMatter/monsters/feral_lab_psychics.json b/data/mods/MindOverMatter/monsters/feral_lab_psychics.json index d556200b44a4e..7f9087cc395f5 100644 --- a/data/mods/MindOverMatter/monsters/feral_lab_psychics.json +++ b/data/mods/MindOverMatter/monsters/feral_lab_psychics.json @@ -27,7 +27,7 @@ "dodge": 2, "harvest": "human", "dissect": "dissect_human_sample_single", - "path_settings": { "max_dist": 30, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 30, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "vision_day": 50, "vision_night": 3, "death_drops": "feral_scientists_death_drops_psychic", @@ -122,8 +122,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "TEEP_IMMUNE" ] }, @@ -192,7 +191,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "STUN_IMMUNE" diff --git a/data/mods/MindOverMatter/monsters/feral_psychics.json b/data/mods/MindOverMatter/monsters/feral_psychics.json index f7c0586ccc2c5..4270b22abca65 100644 --- a/data/mods/MindOverMatter/monsters/feral_psychics.json +++ b/data/mods/MindOverMatter/monsters/feral_psychics.json @@ -53,7 +53,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS" ] @@ -123,7 +123,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "STUN_IMMUNE" @@ -204,7 +204,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "NO_BREATHE", @@ -240,7 +240,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 45, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_clair", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -255,8 +255,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "GOODHEARING", "HARDTOSHOOT" @@ -292,7 +291,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 50, "vision_night": 50, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_clair", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -324,8 +323,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "DROPS_AMMO", "WIELDED_WEAPON", @@ -364,7 +362,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 55, "vision_night": 55, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_clair", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -403,8 +401,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "DROPS_AMMO", "WIELDED_WEAPON", @@ -468,7 +465,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ] }, @@ -544,7 +541,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "ELECTRIC" ] @@ -630,7 +627,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "ELECTRIC_FIELD" ] @@ -697,7 +694,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ] }, @@ -781,7 +778,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "PHOTOKIN_MONSTER_IMMUNE" ] @@ -871,7 +868,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "PHOTOKIN_MONSTER_IMMUNE" ] @@ -949,7 +946,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "FIREPROOF" ] @@ -1040,7 +1037,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "FIREY" ] @@ -1136,7 +1133,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "FIREY" ] @@ -1246,7 +1243,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "PUSH_VEH", @@ -1369,7 +1366,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "FLIES", @@ -1408,7 +1405,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_teep", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -1444,8 +1441,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ] }, @@ -1477,7 +1473,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_teep", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -1522,8 +1518,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "TEEP_IMMUNE" ] @@ -1556,7 +1551,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_teep", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -1610,8 +1605,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "TEEP_IMMUNE" ] @@ -1644,7 +1638,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 50, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 50, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_porter", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -1676,8 +1670,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "CLIMBS", "HARDTOSHOOT", @@ -1712,7 +1705,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_porter", "zombify_into": "mon_zombie_survivor", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -1760,8 +1753,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "CLIMBS", "HARDTOSHOOT", @@ -1797,7 +1789,7 @@ "dissect": "dissect_human_sample_single", "vision_day": 45, "vision_night": 3, - "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "path_settings": { "max_dist": 45, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true, "avoid_dangerous_fields": true }, "death_drops": "feral_humans_death_drops_porter", "death_function": { "effect": { "id": "teleport_summon_monster", "hit_self": true }, @@ -1858,8 +1850,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "CLIMBS", "HARDTOSHOOT", @@ -1935,7 +1926,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "NO_FUNG_DMG" @@ -2038,7 +2029,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PATH_AVOID_FIRE", "PRIORITIZE_TARGETS", "NO_FUNG_DMG" diff --git a/data/mods/MindOverMatter/monsters/mi_go.json b/data/mods/MindOverMatter/monsters/mi_go.json index 19f693fddffcd..9ba5b41bc64fa 100644 --- a/data/mods/MindOverMatter/monsters/mi_go.json +++ b/data/mods/MindOverMatter/monsters/mi_go.json @@ -68,7 +68,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER", @@ -145,7 +145,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER" @@ -230,7 +230,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "CORNERED_FIGHTER", diff --git a/data/mods/MindOverMatter/monsters/nether.json b/data/mods/MindOverMatter/monsters/nether.json index 533950779ee9a..b665b4173bdbc 100644 --- a/data/mods/MindOverMatter/monsters/nether.json +++ b/data/mods/MindOverMatter/monsters/nether.json @@ -43,11 +43,12 @@ "NOHEAD", "NO_FUNG_DMG", "KEEP_DISTANCE", - "PATH_AVOID_DANGER_2", + "PATH_AVOID_DANGER", "ACIDPROOF", "HARDTOSHOOT", "NOGIB", "TEEP_IMMUNE" - ] + ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } } ] diff --git a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json index 8fa21995ba17e..a59fbef6a01c5 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_monsters.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_monsters.json @@ -17,7 +17,7 @@ "color": "magenta", "death_function": { "corpse_type": "BROKEN" }, "placate_triggers": [ "HURT" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN" ] }, { "id": "mon_marshmallow_kid", @@ -234,7 +234,7 @@ "anger_triggers": [ "HURT" ], "harvest": "gummy_bear", "reproduction": { "baby_egg": "candy3", "baby_count": 1, "baby_timer": 10 }, - "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "ATTACKMON", "NO_BREATHE" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "WARM", "BASHES", "ATTACKMON", "NO_BREATHE" ], "armor": { "bash": 2 } }, { @@ -282,7 +282,7 @@ "reproduction": { "baby_egg": "candy3gator", "baby_count": 1, "baby_timer": 10 }, "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS", "ATTACKMON" ], + "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "PUSH_MON", "SWIMS", "ATTACKMON" ], "armor": { "bash": 6, "cut": 8, "bullet": 6 } }, { @@ -383,7 +383,7 @@ "path_settings": { "max_dist": 10 }, "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_1" ], + "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER" ], "reproduction": { "baby_egg": "cookies", "baby_count": 10, "baby_timer": 5 } }, { @@ -404,7 +404,7 @@ "melee_dice_sides": 5, "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], "dodge": 2, - "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_1", "SWIMS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER", "SWIMS" ], "reproduction": { "baby_egg": "cookies_egg", "baby_count": 1, "baby_timer": 5 } }, { @@ -425,7 +425,7 @@ "melee_dice_sides": 5, "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], "dodge": 2, - "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_1", "SWIMS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER", "SWIMS" ], "upgrades": { "age_grow": 200, "into": "mon_cookie_hydra" } }, { diff --git a/data/mods/Mythos-Creatures/monsters/mythos.json b/data/mods/Mythos-Creatures/monsters/mythos.json index 6d96542c3a02e..6b7325b3ce36e 100644 --- a/data/mods/Mythos-Creatures/monsters/mythos.json +++ b/data/mods/Mythos-Creatures/monsters/mythos.json @@ -40,7 +40,7 @@ "POISON", "NO_BREATHE", "ARTHROPOD_BLOOD", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "SWIMS", @@ -77,7 +77,7 @@ "path_settings": { "max_dist": 10 }, "fear_triggers": [ "FIRE", "HURT" ], "anger_triggers": [ "PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED" ], - "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "SWIMS", "CLIMBS", "SWARMS", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "WARM", "SWIMS", "CLIMBS", "SWARMS", "PATH_AVOID_DANGER" ] }, { "id": "mon_shantak", @@ -114,7 +114,7 @@ "SMELLS", "PET_MOUNTABLE", "FLIES", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "NO_BREATHE", "LOUDMOVES", diff --git a/data/mods/No_Hope/monsters.json b/data/mods/No_Hope/monsters.json index c6646494b453e..25a7ffe8603c9 100644 --- a/data/mods/No_Hope/monsters.json +++ b/data/mods/No_Hope/monsters.json @@ -393,7 +393,7 @@ ], "death_drops": { }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "DROPS_AMMO" ], + "flags": [ "SEES", "HEARS", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "LOUDMOVES", "DROPS_AMMO" ], "armor": { "bash": 14, "cut": 14, "bullet": 11 } }, { @@ -428,7 +428,7 @@ "harvest": "mammal_large_leather", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, "special_attacks": [ [ "EAT_CROP", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "ATTACKMON" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "ATTACKMON" ], "armor": { "bash": 4, "cut": 1, "bullet": 1 } }, { @@ -602,7 +602,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "STUN_IMMUNE", "MECH_DEFENSIVE" ], @@ -648,7 +648,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE", "MECH_DEFENSIVE" @@ -697,7 +697,7 @@ "NO_BREATHE", "RIDEABLE_MECH", "PRIORITIZE_TARGETS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "LOUDMOVES", "STUN_IMMUNE", "MECH_DEFENSIVE" diff --git a/data/mods/TEST_DATA/monsters.json b/data/mods/TEST_DATA/monsters.json index 3ffe6ad8cac63..f7f9da4376688 100644 --- a/data/mods/TEST_DATA/monsters.json +++ b/data/mods/TEST_DATA/monsters.json @@ -11,7 +11,7 @@ "weight": "81500 g", "hp": 100, "speed": 50, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW" ], "upgrades": { "half_life": 0, "into_group": "test_upgrades_multi", "multiple_spawns": true, "spawn_range": 5 } }, { @@ -182,7 +182,7 @@ "weight": "81500 g", "hp": 100, "speed": 50, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW" ], "upgrades": { "half_life": 0, "into_group": "test_upgrades_multi_late", "multiple_spawns": true, "spawn_range": 5 } }, { @@ -218,7 +218,7 @@ "weight": "81500 g", "hp": 100, "speed": 50, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW" ], "upgrades": { "half_life": 0, "into_group": "test_upgrades_multi_null", diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json index 0d0f0272810f2..a8db6cf76d971 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_bird.json +++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json @@ -31,7 +31,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_guinea_fowl", @@ -65,7 +65,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_quail", @@ -98,7 +98,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS" ] }, { "id": "mon_guinea_fowl_chick", @@ -148,7 +148,7 @@ "reproduction": { "baby_egg": "egg_toucan", "baby_count": 5, "baby_timer": 14 }, "baby_flags": [ "SPRING" ], "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS" ] }, { "id": "mon_parrot", @@ -182,7 +182,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ] }, { "id": "mon_cockatoo", @@ -216,7 +216,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ] }, { "id": "mon_budgerigar", @@ -250,7 +250,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ] }, { "id": "mon_macaw", @@ -284,7 +284,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ] }, { "id": "mon_toucan_chick", @@ -358,7 +358,7 @@ "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FIRE", "HURT" ], "reproduction": { "baby_egg": "egg_tinamou", "baby_count": 6, "baby_timer": 10 }, "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_seriema", @@ -389,7 +389,7 @@ "fear_triggers": [ "PLAYER_CLOSE" ], "reproduction": { "baby_egg": "egg_seriema", "baby_count": 6, "baby_timer": 10 }, "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] }, { "id": "mon_chachalaca", @@ -488,7 +488,7 @@ "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FIRE", "HURT" ], "reproduction": { "baby_egg": "egg_flamingo", "baby_count": 1, "baby_timer": 10 }, "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS" ] }, { "id": "mon_flamingo_chick", diff --git a/data/mods/TropiCataclysm/monsters/tropical_fungus.json b/data/mods/TropiCataclysm/monsters/tropical_fungus.json index 55b3f998cc12b..98e9cd2431b58 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_fungus.json +++ b/data/mods/TropiCataclysm/monsters/tropical_fungus.json @@ -17,7 +17,7 @@ "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "special_attacks": [ [ "FUNGUS", 200 ], [ "SMASH", 15 ], [ "FUNGUS_BRISTLE", 20 ], [ "FUNGUS_BIG_BLOSSOM", 30 ] ], "extend": { "flags": [ "POISON", "NO_BREATHE" ] }, - "delete": { "flags": [ "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "GROUP_MORALE", "GOODHEARING", "SWARMS" ] }, + "delete": { "flags": [ "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "GROUP_MORALE", "GOODHEARING", "SWARMS" ] }, "armor": { "bash": 3, "cut": 1 } }, { diff --git a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json index df2752503c8cf..95c75980ae610 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json +++ b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json @@ -300,7 +300,7 @@ "upgrades": { "half_life": 20, "into": "mon_onicophore_giant" }, "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "CLIMBS" ], + "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SMELLS", "CLIMBS" ], "armor": { "bash": 2 } }, { @@ -335,7 +335,7 @@ ], "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "CLIMBS" ], + "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER", "SMELLS", "CLIMBS" ], "armor": { "bash": 6, "cut": 3 } } ] diff --git a/data/mods/TropiCataclysm/monsters/tropical_mammal.json b/data/mods/TropiCataclysm/monsters/tropical_mammal.json index c0fa42b1c26ba..d8877b91c8b1b 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_mammal.json +++ b/data/mods/TropiCataclysm/monsters/tropical_mammal.json @@ -34,7 +34,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "PUSH_MON", "DESTROYS", @@ -101,7 +101,7 @@ "vision_night": 20, "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "harvest": "mammal_small_fur", - "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN" ] }, { "id": "mon_tapir_calf", @@ -148,7 +148,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], "special_attacks": [ [ "EAT_FOOD", 20 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "SWIMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "SWIMS" ], "armor": { "bash": 2, "cut": 1 } }, { @@ -180,7 +180,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 2 }, "special_attacks": [ [ "EAT_CROP", 60 ] ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER_1", "WARM" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PET_MOUNTABLE", "PATH_AVOID_DANGER", "WARM" ], "armor": { "bash": 2 } }, { @@ -209,7 +209,7 @@ "harvest": "mammal_small_fur", "vision_night": 5, "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER", "WARM", "KEENNOSE" ] }, { "id": "mon_bushdog", @@ -238,7 +238,7 @@ "vision_night": 5, "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ], "placate_triggers": [ "PLAYER_WEAK" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "SWIMS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "SWIMS", "PATH_AVOID_DANGER", "WARM", "KEENNOSE" ] }, { "id": "mon_coypus", @@ -266,7 +266,7 @@ "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], "fear_triggers": [ "SOUND" ], "placate_triggers": [ "PLAYER_WEAK" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ] }, { "id": "mon_capybara_baby", @@ -306,7 +306,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "placate_triggers": [ "PLAYER_WEAK" ], "special_attacks": [ [ "EAT_FOOD", 40 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ] }, { "id": "mon_hippo", @@ -340,7 +340,7 @@ "dissect": "dissect_cattle_sample_large", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, "special_attacks": [ [ "EAT_CROP", 60 ] ], - "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "SWIMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "SWIMS" ], "armor": { "bash": 4, "cut": 1, "bullet": 1 } }, { @@ -383,7 +383,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_FOOD", 40 ] ], "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE" ] }, { "id": "mon_guinea_pig", @@ -412,7 +412,7 @@ "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "reproduction": { "baby_monster": "mon_guinea_pig", "baby_count": 3, "baby_timer": 55 }, "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "ANIMAL", "PATH_AVOID_DANGER" ] }, { "id": "mon_kangaroo_joey", @@ -455,6 +455,6 @@ "reproduction": { "baby_monster": "mon_kangaroo_wallaby", "baby_count": 1, "baby_timer": 275 }, "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "placate_triggers": [ "PLAYER_WEAK" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ] } ] diff --git a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json index eabf01ea1b07e..e5e7398d3519d 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json +++ b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json @@ -316,7 +316,7 @@ ], "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK", "HURT" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ], + "flags": [ "SEES", "HEARS", "GRABS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "PUSH_MON", "SWIMS" ], "armor": { "bash": 6, "cut": 8, "bullet": 6 } }, { @@ -362,7 +362,7 @@ ], "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK", "HURT" ], "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ], + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "PUSH_MON", "SWIMS" ], "armor": { "bash": 3, "cut": 4, "bullet": 3 } }, { @@ -724,7 +724,7 @@ } ], "anger_triggers": [ "PLAYER_CLOSE", "HURT" ], - "flags": [ "SEES", "HEARS", "GRABS", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "SWIMS" ], + "flags": [ "SEES", "HEARS", "GRABS", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ], "armor": { "bash": 5, "cut": 5, "bullet": 5 } }, { diff --git a/data/mods/TropiCataclysm/monsters/zed_plant.json b/data/mods/TropiCataclysm/monsters/zed_plant.json index bf3cce3e52f05..7bed7b8023786 100644 --- a/data/mods/TropiCataclysm/monsters/zed_plant.json +++ b/data/mods/TropiCataclysm/monsters/zed_plant.json @@ -138,7 +138,7 @@ "REVIVES", "BILE_BLOOD", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "FILTHY", "PARALYZEVENOM" ] diff --git a/data/mods/Xedra_Evolved/monsters/bloodsuckers.json b/data/mods/Xedra_Evolved/monsters/bloodsuckers.json index a60263ff5ab8c..f2b6231554ab9 100644 --- a/data/mods/Xedra_Evolved/monsters/bloodsuckers.json +++ b/data/mods/Xedra_Evolved/monsters/bloodsuckers.json @@ -136,7 +136,7 @@ "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WIELDED_WEAPON" ], "armor": { "bash": 4, "cut": 4, "stab": 4, "bullet": 4 } @@ -206,7 +206,7 @@ "CAN_OPEN_DOORS", "CLIMBS", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "WIELDED_WEAPON" ], @@ -271,7 +271,7 @@ "CAN_OPEN_DOORS", "CLIMBS", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "WIELDED_WEAPON" ], @@ -336,7 +336,7 @@ "CAN_OPEN_DOORS", "CLIMBS", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "WIELDED_WEAPON" ], @@ -383,7 +383,7 @@ "ELECTRONIC", "WARM", "HUMAN", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ], "armor": { "bash": 10, "cut": 16, "bullet": 25 } @@ -430,7 +430,7 @@ "ELECTRONIC", "WARM", "HUMAN", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ], "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], @@ -467,7 +467,7 @@ "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER" ] }, { "id": "mon_vampire_bat", @@ -500,7 +500,7 @@ "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER_1", "HIT_AND_RUN" ] + "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "PATH_AVOID_DANGER", "HIT_AND_RUN" ] }, { "id": "mon_bat_giant", @@ -534,6 +534,6 @@ "vision_night": 20, "special_attacks": [ { "type": "bite", "cooldown": 15 } ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "HIT_AND_RUN", "ANIMAL", "PATH_AVOID_DANGER_1" ] + "flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "HIT_AND_RUN", "ANIMAL", "PATH_AVOID_DANGER" ] } ] diff --git a/data/mods/Xedra_Evolved/monsters/changeling.json b/data/mods/Xedra_Evolved/monsters/changeling.json index 1db40fac38125..c9fd3995d65bc 100644 --- a/data/mods/Xedra_Evolved/monsters/changeling.json +++ b/data/mods/Xedra_Evolved/monsters/changeling.json @@ -57,7 +57,7 @@ "HUMAN", "FAE_CREATURE", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO" ], "armor": { @@ -198,7 +198,7 @@ "HUMAN", "FAE_CREATURE", "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO" ], "armor": { @@ -494,7 +494,7 @@ "FAE_CREATURE", "PET_WONT_FOLLOW", "PET_MOUNTABLE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "HIT_AND_RUN" ], @@ -544,7 +544,7 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 10 }, "special_attacks": [ [ "EAT_CROP", 100 ] ], "petfood": { "food": [ "UNICORNFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "FAE_CREATURE", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED" ], + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "FAE_CREATURE", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER", "WARM", "NO_BREED" ], "armor": { "bash": 2, "electric": 1, "xe_cold_iron_cut_damage": 0, "xe_cold_iron_bash_damage": 0, "xe_cold_iron_stab_damage": 0 } }, { diff --git a/data/mods/Xedra_Evolved/monsters/elementals.json b/data/mods/Xedra_Evolved/monsters/elementals.json index 79406743bdb06..4c84e7d12fb72 100644 --- a/data/mods/Xedra_Evolved/monsters/elementals.json +++ b/data/mods/Xedra_Evolved/monsters/elementals.json @@ -130,7 +130,7 @@ "HEARS", "WARM", "FAE_CREATURE", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "BIOLOGICALPROOF", "FIREPROOF", "NOHEAD", @@ -182,7 +182,7 @@ "ranges": [ [ 0, 5, "BURST" ] ] } ], - "flags": [ "SEES", "SMELLS", "HEARS", "FAE_CREATURE", "RANGED_ATTACKER", "PATH_AVOID_DANGER_1", "CLIMBS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "FAE_CREATURE", "RANGED_ATTACKER", "PATH_AVOID_DANGER", "CLIMBS" ], "harvest": "fae_furred", "dissect": "dissect_undine_single", "vision_day": 20, @@ -222,7 +222,7 @@ "weakpoint_sets": [ "wps_alien_biology" ], "families": [ "prof_alien_biology" ], "hp": 20, - "flags": [ "SEES", "SMELLS", "HEARS", "FAE_CREATURE", "HIT_AND_RUN", "RANGED_ATTACKER", "PATH_AVOID_DANGER_1", "HARDTOSHOOT" ], + "flags": [ "SEES", "SMELLS", "HEARS", "FAE_CREATURE", "HIT_AND_RUN", "RANGED_ATTACKER", "PATH_AVOID_DANGER", "HARDTOSHOOT" ], "harvest": "water_elemental", "dissect": "dissect_undine_single", "special_attacks": [ { "id": "ice_spray" } ], @@ -366,7 +366,7 @@ "dissect": "dissect_arvore_single", "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "anger_triggers": [ "SOUND", "PLAYER_CLOSE" ], - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "FAE_CREATURE", "PATH_AVOID_DANGER_1", "HIT_AND_RUN", "WARM" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "FAE_CREATURE", "PATH_AVOID_DANGER", "HIT_AND_RUN", "WARM" ] }, { "id": "mon_vineling", @@ -502,10 +502,10 @@ "PUSH_VEH", "KEENNOSE", "NO_FUNG_DMG", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" - ] + ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } }, { "type": "MONSTER", @@ -549,7 +549,7 @@ "monster_message": "%1$s spits!" } ], - "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "FAE_CREATURE", "RANGED_ATTACKER", "PATH_AVOID_DANGER_1", "CLIMBS" ], + "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "FAE_CREATURE", "RANGED_ATTACKER", "PATH_AVOID_DANGER", "CLIMBS" ], "harvest": "fae_furred", "dissect": "dissect_salamander_single", "vision_day": 20, @@ -589,7 +589,7 @@ "weakpoint_sets": [ "wps_alien_biology" ], "families": [ "prof_alien_biology" ], "hp": 20, - "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "FAE_CREATURE", "PATH_AVOID_DANGER_1", "HARDTOSHOOT" ], + "flags": [ "SEES", "SMELLS", "HEARS", "HIT_AND_RUN", "FAE_CREATURE", "PATH_AVOID_DANGER", "HARDTOSHOOT" ], "harvest": "fae_furred", "dissect": "dissect_salamander_single", "emit_fields": [ { "emit_id": "emit_smoke_plume", "delay": "1 s" } ] @@ -636,7 +636,7 @@ "message": "The %s bursts into flames!", "corpse_type": "NO_CORPSE" }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "FLIES", "WARM", "FIREY", "SWARMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "FLIES", "WARM", "FIREY", "SWARMS" ] }, { "id": "mon_elemental_saraph", @@ -692,7 +692,7 @@ "FIREY", "KEENNOSE", "CLIMBS", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "ANIMAL", "FLIES" ], @@ -734,7 +734,7 @@ "families": [ "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "special_attacks": [ { "id": "slam" } ], - "flags": [ "HEARS", "WARM", "ANIMAL", "FAE_CREATURE", "PATH_AVOID_DANGER_1", "NO_BREATHE" ] + "flags": [ "HEARS", "WARM", "ANIMAL", "FAE_CREATURE", "PATH_AVOID_DANGER", "NO_BREATHE" ] }, { "id": "mon_zoomorphic_figure_small", diff --git a/data/mods/Xedra_Evolved/monsters/exodii.json b/data/mods/Xedra_Evolved/monsters/exodii.json index 7474f7805dee2..d362fa18bb744 100644 --- a/data/mods/Xedra_Evolved/monsters/exodii.json +++ b/data/mods/Xedra_Evolved/monsters/exodii.json @@ -56,7 +56,7 @@ ], "death_drops": { "subtype": "collection", "groups": [ [ "robots", 80 ] ] }, "death_function": { "corpse_type": "BROKEN" }, - "flags": [ "SEES", "HEARS", "GOODHEARING", "HAS_MIND", "NOHEAD", "NO_BREATHE", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "HAS_MIND", "NOHEAD", "NO_BREATHE", "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ], "armor": { "bash": 65, "cut": 62, "acid": 12, "heat": 8, "bullet": 72 } } ] diff --git a/data/mods/Xedra_Evolved/monsters/ferals.json b/data/mods/Xedra_Evolved/monsters/ferals.json index 69e8a867bfa42..c7ed71d8f6b5a 100644 --- a/data/mods/Xedra_Evolved/monsters/ferals.json +++ b/data/mods/Xedra_Evolved/monsters/ferals.json @@ -59,7 +59,7 @@ "CAN_OPEN_DOORS", "CLIMBS", "PUSH_MON", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "DROPS_AMMO", "WIELDED_WEAPON" ], diff --git a/data/mods/Xedra_Evolved/monsters/inventor.json b/data/mods/Xedra_Evolved/monsters/inventor.json index ea27a185f2373..af521ea638d38 100644 --- a/data/mods/Xedra_Evolved/monsters/inventor.json +++ b/data/mods/Xedra_Evolved/monsters/inventor.json @@ -49,14 +49,13 @@ "ELECTRONIC", "COLDPROOF", "NO_BREATHE", - "PATH_AVOID_DANGER_2", - "PATH_AVOID_FIRE", - "PATH_AVOID_FALL", + "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS", "LOUDMOVES", "DROPS_AMMO", "STUN_IMMUNE" - ] + ], + "path_settings": { "avoid_traps": true, "avoid_dangerous_fields": true } }, { "id": "mon_shotgunbot", @@ -108,19 +107,8 @@ "armor": { "bash": 14, "cut": 14, "bullet": 11, "electric": 5 }, "vision_day": 50, "revert_to_itype": "bot_meleebot", - "path_settings": { "max_dist": 9 }, + "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_2", - "PATH_AVOID_FIRE", - "PATH_AVOID_FALL", - "STUN_IMMUNE" - ] + "flags": [ "SEES", "HEARS", "GOODHEARING", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "PATH_AVOID_DANGER", "STUN_IMMUNE" ] } ] diff --git a/data/mods/desert_region/desert_mammal.json b/data/mods/desert_region/desert_mammal.json index a01135d757fe1..638ea8007b82b 100644 --- a/data/mods/desert_region/desert_mammal.json +++ b/data/mods/desert_region/desert_mammal.json @@ -33,7 +33,7 @@ "HEARS", "SMELLS", "ANIMAL", - "PATH_AVOID_DANGER_1", + "PATH_AVOID_DANGER", "WARM", "PUSH_MON", "DESTROYS", diff --git a/data/mods/desert_region/desert_monsters.json b/data/mods/desert_region/desert_monsters.json index 5f2c8735afd0d..3861a78e4da0c 100644 --- a/data/mods/desert_region/desert_monsters.json +++ b/data/mods/desert_region/desert_monsters.json @@ -52,7 +52,7 @@ "death_function": { "effect": { "id": "death_fungus", "hit_self": true } }, "special_attacks": [ [ "FUNGUS", 200 ], [ "SMASH", 15 ], [ "FUNGUS_BRISTLE", 20 ], [ "FUNGUS_BIG_BLOSSOM", 30 ] ], "extend": { "flags": [ "POISON", "NO_BREATHE" ] }, - "delete": { "flags": [ "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "GROUP_MORALE", "GOODHEARING", "SWARMS" ] }, + "delete": { "flags": [ "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "GROUP_MORALE", "GOODHEARING", "SWARMS" ] }, "armor": { "bash": 3, "cut": 1 } }, { diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index 0c6cd9afcb1bb..d4a28714c326c 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -432,7 +432,7 @@ Character flags can be `trait_id`, `json_flag_id` or `flag_id`. Some of these a - ```WEB_WALKER``` Removes the movement speed demerit while walking through webs. - ```WINGS_1``` You can slow your fall, effectively reducing the height of it by 1 level. - ```WINGS_2``` You can slow your fall, effectively reducing the height of falls by 2 levels, and ignore pit-like traps. -- ```WING_ARMS``` Two instances of this flag enable you to glide and ignore pit traps if not above 50% carryweight or 4 lift strength. +- ```WING_ARMS``` Two instances of this flag enable you to glide and ignore pit traps if not above 50% carryweight or 4 lift strength. - ```WINGGLIDE``` You can glide using some part of your body and strenuous physical effort. - ```mycus``` acts as `THRESH_MYCUS`, makes all monsters with FUNGUS species friendly, fungicidal gas & antifungal pills cause worse effects. Mutate when eating mycus fruit, or when sleeping. @@ -1140,8 +1140,7 @@ Used to describe monster characteristics and set their properties and abilities. - ```PACIFIST``` Monster will never do melee attacks. Useful for having them use grab without attacking the player. - ```PARALYZEVENOM``` This monster can apply `paralyzepoison` effect for 10 minutes. - ```PARALYZE``` Attack may paralyze the player with venom. -- ```PATH_AVOID_DANGER_1``` This monster will path around some dangers instead of through them. -- ```PATH_AVOID_DANGER_2``` This monster will path around most dangers instead of through them. +- ```PATH_AVOID_DANGER``` This monster will path around some dangers instead of through them. - ```PATH_AVOID_FALL``` This monster will path around cliffs instead of off of them. - ```PATH_AVOID_FIRE``` This monster will path around heat-related dangers instead of through them. - ```PAY_BOT``` Creature can be turned into a pet for a limited time in exchange of e-money. @@ -1324,7 +1323,7 @@ See [Character](#character) - ```BLIND_HARD``` Possible to craft with little to no light, but difficult. - ```FULL_MAGAZINE``` Crafted or deconstructed items from this recipe will have fully-charged magazines. - ```NEED_FULL_MAGAZINE``` If this recipe requires magazines, it needs one that is full. -- ```NO_RESIZE``` This clothes you crafted spawn unfitted +- ```NO_RESIZE``` This clothes you crafted spawn unfitted - ```SECRET``` Not automatically learned at character creation time based on high skill levels. - ```AFFECTED_BY_PAIN``` 1 unit of pain decreases the speed of craft for 1%. Recommended to not use in vanilla recipes - ```NO_MANIP``` Manipulation score do not affect crafting this recipe diff --git a/src/monmove.cpp b/src/monmove.cpp index 52135afd9afa5..9d611a84234cc 100644 --- a/src/monmove.cpp +++ b/src/monmove.cpp @@ -182,32 +182,19 @@ bool monster::know_danger_at( const tripoint &p ) const // Various avoiding behaviors. - bool avoid_fire = has_flag( mon_flag_PATH_AVOID_FIRE ); - bool avoid_fall = has_flag( mon_flag_PATH_AVOID_FALL ); - bool avoid_simple = has_flag( mon_flag_PATH_AVOID_DANGER_1 ); - bool avoid_complex = has_flag( mon_flag_PATH_AVOID_DANGER_2 ); - bool avoid_sharp = get_pathfinding_settings().avoid_sharp; + bool avoid_simple = has_flag( mon_flag_PATH_AVOID_DANGER ); + + bool avoid_fire = avoid_simple || has_flag( mon_flag_PATH_AVOID_FIRE ); + bool avoid_fall = avoid_simple || has_flag( mon_flag_PATH_AVOID_FALL ); + bool avoid_sharp = avoid_simple || get_pathfinding_settings().avoid_sharp; + + bool avoid_dangerous_fields = get_pathfinding_settings().avoid_dangerous_fields; bool avoid_traps = get_pathfinding_settings().avoid_traps; - /* - * Because some avoidance behaviors are supersets of others, - * we can cascade through the implications. Complex implies simple, - * and simple implies fire and fall. - * unfortunately, fall does not necessarily imply fire, nor the converse. - */ - if( avoid_complex ) { - avoid_simple = true; - avoid_traps = true; - } - if( avoid_simple ) { - avoid_fire = true; - avoid_fall = true; - avoid_sharp = true; - } // technically this will shortcut in evaluation from fire or fall // before hitting simple or complex but this is more explicit if( avoid_fire || avoid_fall || avoid_simple || - avoid_complex || avoid_traps || avoid_sharp ) { + avoid_traps || avoid_dangerous_fields || avoid_sharp ) { const ter_id target = here.ter( p ); if( !here.has_vehicle_floor( p ) ) { // Don't enter lava if we have any concept of heat being bad @@ -249,11 +236,8 @@ bool monster::know_danger_at( const tripoint &p ) const const field &target_field = here.field_at( p ); // Higher awareness is needed for identifying these as threats. - if( avoid_complex ) { - // Don't enter any dangerous fields - if( is_dangerous_fields( target_field ) ) { - return false; - } + if( avoid_dangerous_fields && is_dangerous_fields( target_field ) ) { + return false; } // Without avoid_complex, only fire and electricity are checked for field avoidance. diff --git a/src/monster.cpp b/src/monster.cpp index 984e921ccdeb5..90012ab02be21 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -1337,8 +1337,7 @@ bool monster::has_intelligence() const { return has_flag( mon_flag_PATH_AVOID_FALL ) || has_flag( mon_flag_PATH_AVOID_FIRE ) || - has_flag( mon_flag_PATH_AVOID_DANGER_1 ) || - has_flag( mon_flag_PATH_AVOID_DANGER_2 ) || + has_flag( mon_flag_PATH_AVOID_DANGER ) || has_flag( mon_flag_PRIORITIZE_TARGETS ) || get_pathfinding_settings().avoid_sharp || get_pathfinding_settings().avoid_traps; @@ -3962,8 +3961,7 @@ std::unordered_set monster::get_path_avoid() const if( has_flag( mon_flag_PRIORITIZE_TARGETS ) ) { radius = 2; - } else if( has_flag( mon_flag_PATH_AVOID_DANGER_1 ) || - has_flag( mon_flag_PATH_AVOID_DANGER_2 ) ) { + } else if( has_flag( mon_flag_PATH_AVOID_DANGER ) ) { radius = 1; } else { return ret; diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index d858d9bbcde5c..e4768e779d701 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -1280,6 +1280,7 @@ void mtype::load( const JsonObject &jo, const std::string &src ) optional( jop, was_loaded, "avoid_traps", path_settings.avoid_traps, false ); optional( jop, was_loaded, "allow_climb_stairs", path_settings.allow_climb_stairs, true ); optional( jop, was_loaded, "avoid_sharp", path_settings.avoid_sharp, false ); + optional( jop, was_loaded, "avoid_dangerous_fields", path_settings.avoid_dangerous_fields, false ); } } diff --git a/src/mtype.cpp b/src/mtype.cpp index e366b54677d70..22ad03c8943ac 100644 --- a/src/mtype.cpp +++ b/src/mtype.cpp @@ -119,8 +119,7 @@ mon_flag_id mon_flag_ACIDPROOF, mon_flag_NO_NECRO, mon_flag_PACIFIST, mon_flag_PARALYZEVENOM, - mon_flag_PATH_AVOID_DANGER_1, - mon_flag_PATH_AVOID_DANGER_2, + mon_flag_PATH_AVOID_DANGER, mon_flag_PATH_AVOID_FALL, mon_flag_PATH_AVOID_FIRE, mon_flag_PAY_BOT, @@ -245,8 +244,7 @@ void set_mon_flag_ids() mon_flag_NO_NECRO = mon_flag_id( "NO_NECRO" ); mon_flag_PACIFIST = mon_flag_id( "PACIFIST" ); mon_flag_PARALYZEVENOM = mon_flag_id( "PARALYZEVENOM" ); - mon_flag_PATH_AVOID_DANGER_1 = mon_flag_id( "PATH_AVOID_DANGER_1" ); - mon_flag_PATH_AVOID_DANGER_2 = mon_flag_id( "PATH_AVOID_DANGER_2" ); + mon_flag_PATH_AVOID_DANGER = mon_flag_id( "PATH_AVOID_DANGER" ); mon_flag_PATH_AVOID_FALL = mon_flag_id( "PATH_AVOID_FALL" ); mon_flag_PATH_AVOID_FIRE = mon_flag_id( "PATH_AVOID_FIRE" ); mon_flag_PAY_BOT = mon_flag_id( "PAY_BOT" ); diff --git a/src/mtype.h b/src/mtype.h index 4d8a1b8de31df..c1139e0868999 100644 --- a/src/mtype.h +++ b/src/mtype.h @@ -159,8 +159,7 @@ extern mon_flag_id mon_flag_ACIDPROOF, mon_flag_NO_NECRO, mon_flag_PACIFIST, mon_flag_PARALYZEVENOM, - mon_flag_PATH_AVOID_DANGER_1, - mon_flag_PATH_AVOID_DANGER_2, + mon_flag_PATH_AVOID_DANGER, mon_flag_PATH_AVOID_FALL, mon_flag_PATH_AVOID_FIRE, mon_flag_PAY_BOT, diff --git a/src/pathfinding.cpp b/src/pathfinding.cpp index d262caedb0a7e..18e1760f6e21b 100644 --- a/src/pathfinding.cpp +++ b/src/pathfinding.cpp @@ -233,6 +233,7 @@ std::vector map::route( const tripoint &f, const tripoint &t, const bool trapavoid = settings.avoid_traps; const bool roughavoid = settings.avoid_rough_terrain; const bool sharpavoid = settings.avoid_sharp; + const bool fieldavoid = settings.avoid_dangerous_fields; const int pad = 16; // Should be much bigger - low value makes pathfinders dumb! tripoint min( std::min( f.x, t.x ) - pad, std::min( f.y, t.y ) - pad, std::min( f.z, t.z ) ); @@ -333,7 +334,7 @@ std::vector map::route( const tripoint &f, const tripoint &t, newg += cost; if( cost == 0 ) { - if( climb_cost > 0 && p_special & PF_CLIMBABLE ) { + if( climb_cost > 0 && ( p_special & PF_CLIMBABLE ) ) { // Climbing fences newg += climb_cost; } else if( doors && ( terrain.open || furniture.open ) && @@ -425,10 +426,14 @@ std::vector map::route( const tripoint &f, const tripoint &t, } } - if( sharpavoid && p_special & PF_SHARP ) { + if( sharpavoid && ( p_special & PF_SHARP ) ) { layer.closed[index] = true; // Avoid sharp things } + if( fieldavoid && ( p_special & PF_FIELD ) ) { + // We'll walk through even known-dangerous fields if we absolutely have to. + newg += 500; + } } pf.add_point( newg, newg + 2 * rl_dist( p, t ), cur, p ); diff --git a/src/pathfinding.h b/src/pathfinding.h index d2045f3ffd949..e62769ae1042d 100644 --- a/src/pathfinding.h +++ b/src/pathfinding.h @@ -65,6 +65,7 @@ struct pathfinding_settings { bool allow_climb_stairs = true; bool avoid_rough_terrain = false; bool avoid_sharp = false; + bool avoid_dangerous_fields = false; pathfinding_settings() = default; pathfinding_settings( const pathfinding_settings & ) = default;