Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Feral Archaelogist #78840

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Remove Feral Archaelogist #78840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data/json/mapgen/mine/mine_entrance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
"failures": [ { "action": "alarm" } ]
}
},
"place_monster": [ { "monster": "mon_feral_human_archaeologist", "chance": 13, "repeat": [ 1, 2 ], "x": [ 4, 7 ], "y": [ 5, 8 ] } ],
"gaspumps": { "@": { "fuel": "gasoline", "amount": [ 100, 500 ] }, "$": { "fuel": "diesel", "amount": [ 100, 500 ] } },
"vehicles": { "Ø": { "vehicle": "tatra_truck", "chance": 50, "fuel": 40 } },
"nested": { "`": { "chunks": [ [ "mechanical_fluid", 10 ], [ "gasoline_diesel_motor_oil", 80 ], [ "null", 80 ] ] } },
Expand Down
16 changes: 0 additions & 16 deletions data/json/monsterdrops/feral_humans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,22 +826,6 @@
{ "item": "dog_tag", "prob": 20 }
]
},
{
"id": "feral_archaelogist_death_drops",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "group": "clothing_outdoor_set", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "socks_unisex", "prob": 100, "damage": [ 1, 4 ] },
{ "group": "archeology_tools", "prob": 30, "damage": [ 0, 2 ] },
{ "group": "scarfs_unisex", "prob": 10, "damage": [ 1, 4 ] },
{ "group": "clothing_work_gloves", "prob": 10, "damage": [ 1, 4 ] },
{ "group": "clothing_work_hat", "prob": 10, "damage": [ 1, 4 ] },
{ "group": "accesories_personal_unisex", "prob": 5, "damage": [ 1, 4 ] },
{ "item": "shovel", "prob": 100, "damage": [ 0, 2 ] },
{ "item": "bullwhip", "prob": 3, "damage": [ 0, 2 ] }
]
},
{
"id": "mon_feral_cop_death_drops",
"type": "item_group",
Expand Down
26 changes: 0 additions & 26 deletions data/json/monsters/feral_humans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,31 +569,5 @@
"speed": 85,
"description": "A maddened and crazed police officer infected by the fungus. Their body armor is overgrown with fungal matter. Though obviously in pain they don't seem any less keen to batter you to death with their baton.",
"extend": { "flags": [ "NO_FUNG_DMG" ], "species": [ "FUNGUS" ] }
},
{
"id": "mon_feral_human_archaeologist",
"type": "MONSTER",
"name": "feral archaeologist",
"description": "Judging by looks, this poor individual was probably an archaeologist in their former life. Rabid and bloodshot, they now seem intent to make you a part of their collection as they come at you with a shovel in hand.",
"copy-from": "mon_feral_human_pipe",
"special_attacks": [
{
"type": "gun",
"cooldown": 5,
"move_cost": 150,
"gun_type": "feral_human_thrown_rock",
"ammo_type": "rock",
"no_ammo_sound": "",
"fake_skills": [ [ "throw", 3 ] ],
"fake_str": 8,
"condition": { "not": { "u_has_effect": "maimed_arm" } },
"require_targeting_player": false,
"ranges": [ [ 2, 5, "DEFAULT" ] ],
"description": "The feral human throws a rock!"
},
{ "id": "feral_weapon_shovel" }
],
"looks_like": "mon_feral_human_tool",
"death_drops": "feral_archaelogist_death_drops"
}
]
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"required_event": "opens_spellbook",
"condition": {
"math": [
"(u_characters_nearby('radius': 30, 'attitude': 'any') + u_monsters_nearby('mon_feral_cop', 'mon_feral_human_pipe', 'mon_feral_human_crowbar', 'mon_feral_jackboot', 'mon_feral_marine_bayonet', 'mon_feral_soldier', 'mon_feral_prepper_knife', 'mon_feral_sailor_axe', 'mon_feral_maid_knife', 'mon_feral_maid_candlestick', 'mon_feral_officer', 'mon_feral_sailor_lug_wrench', 'mon_feral_sailor_mop', 'mon_feral_maid_broom', 'mon_feral_sailor_wrench', 'mon_feral_swimmer_kickboard', 'mon_feral_armored_battleaxe', 'mon_feral_sapien_spear', 'mon_feral_armored_mace', 'mon_feral_human_tool', 'mon_feral_militia', 'mon_feral_fancy_rapier_fake', 'mon_feral_fancy_rapier', 'mon_feral_human_archaeologist', 'mon_feral_human_axe', 'mon_feral_labsecurity_flashlight', 'mon_feral_labsecurity_9mm', 'mon_feral_survivalist', 'mon_feral_scientist_scalpel', 'mon_feral_zebra_agent', 'mon_renfield', 'mon_renfield_9mm', 'mon_renfield_shotgun', 'mon_renfield_flamethrower', 'radius': 30, 'attitude': 'both'))",
"(u_characters_nearby('radius': 30, 'attitude': 'any') + u_monsters_nearby('mon_feral_cop', 'mon_feral_human_pipe', 'mon_feral_human_crowbar', 'mon_feral_jackboot', 'mon_feral_marine_bayonet', 'mon_feral_soldier', 'mon_feral_prepper_knife', 'mon_feral_sailor_axe', 'mon_feral_maid_knife', 'mon_feral_maid_candlestick', 'mon_feral_officer', 'mon_feral_sailor_lug_wrench', 'mon_feral_sailor_mop', 'mon_feral_maid_broom', 'mon_feral_sailor_wrench', 'mon_feral_swimmer_kickboard', 'mon_feral_armored_battleaxe', 'mon_feral_sapien_spear', 'mon_feral_armored_mace', 'mon_feral_human_tool', 'mon_feral_militia', 'mon_feral_fancy_rapier_fake', 'mon_feral_fancy_rapier', 'mon_feral_human_axe', 'mon_feral_labsecurity_flashlight', 'mon_feral_labsecurity_9mm', 'mon_feral_survivalist', 'mon_feral_scientist_scalpel', 'mon_feral_zebra_agent', 'mon_renfield', 'mon_renfield_9mm', 'mon_renfield_shotgun', 'mon_renfield_flamethrower', 'radius': 30, 'attitude': 'both'))",
">=",
"10"
]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
"id": "EOC_VAMPIRE_SCENT_BLOOD_activated",
"condition": {
"math": [
"(u_characters_nearby('radius': 30, 'attitude': 'any') + u_monsters_nearby('mon_feral_cop', 'mon_feral_human_pipe', 'mon_feral_human_crowbar', 'mon_feral_jackboot', 'mon_feral_marine_bayonet', 'mon_feral_soldier', 'mon_feral_prepper_knife', 'mon_feral_sailor_axe', 'mon_feral_maid_knife', 'mon_feral_maid_candlestick', 'mon_feral_officer', 'mon_feral_sailor_lug_wrench', 'mon_feral_sailor_mop', 'mon_feral_maid_broom', 'mon_feral_sailor_wrench', 'mon_feral_swimmer_kickboard', 'mon_feral_armored_battleaxe', 'mon_feral_sapien_spear', 'mon_feral_armored_mace', 'mon_feral_human_tool', 'mon_feral_militia', 'mon_feral_fancy_rapier_fake', 'mon_feral_fancy_rapier', 'mon_feral_human_archaeologist', 'mon_feral_human_axe', 'mon_feral_labsecurity_flashlight', 'mon_feral_labsecurity_9mm', 'mon_feral_survivalist', 'mon_feral_scientist_scalpel', 'mon_feral_zebra_agent', 'mon_renfield', 'mon_renfield_9mm', 'mon_renfield_shotgun', 'mon_renfield_flamethrower', 'radius': 30, 'attitude': 'both'))",
"(u_characters_nearby('radius': 30, 'attitude': 'any') + u_monsters_nearby('mon_feral_cop', 'mon_feral_human_pipe', 'mon_feral_human_crowbar', 'mon_feral_jackboot', 'mon_feral_marine_bayonet', 'mon_feral_soldier', 'mon_feral_prepper_knife', 'mon_feral_sailor_axe', 'mon_feral_maid_knife', 'mon_feral_maid_candlestick', 'mon_feral_officer', 'mon_feral_sailor_lug_wrench', 'mon_feral_sailor_mop', 'mon_feral_maid_broom', 'mon_feral_sailor_wrench', 'mon_feral_swimmer_kickboard', 'mon_feral_armored_battleaxe', 'mon_feral_sapien_spear', 'mon_feral_armored_mace', 'mon_feral_human_tool', 'mon_feral_militia', 'mon_feral_fancy_rapier_fake', 'mon_feral_fancy_rapier', 'mon_feral_human_axe', 'mon_feral_labsecurity_flashlight', 'mon_feral_labsecurity_9mm', 'mon_feral_survivalist', 'mon_feral_scientist_scalpel', 'mon_feral_zebra_agent', 'mon_renfield', 'mon_renfield_9mm', 'mon_renfield_shotgun', 'mon_renfield_flamethrower', 'radius': 30, 'attitude': 'both'))",
">=",
"1"
]
Expand Down
Loading