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

Pruning some unused IDs #75926

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Pruning some unused IDs #75926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d9bb47
monsters
Karol1223 Aug 24, 2024
4357602
feral weapon
Karol1223 Aug 24, 2024
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
17 changes: 0 additions & 17 deletions data/json/monster_special_attacks/feral_weapon_attacks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,23 +414,6 @@
"no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
"no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
},
{
"type": "monster_attack",
"attack_type": "melee",
"id": "feral_weapon_feral_m9",
"cooldown": 1,
"move_cost": 90,
"accuracy": 4,
"//": "Feral melee skill + weapon's to hit, so 6-2=4",
"damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ],
"condition": { "test_eoc": "is_disarmed" },
"hit_dmg_u": "%1$s hits your %2$s with a gun!",
"hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a gun!",
"miss_msg_u": "%1$s tries to hit you, but you dodge!",
"miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
"no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
"no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
},
{
"type": "monster_attack",
"attack_type": "melee",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/DinoMod/monstergroups/lab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"type": "monstergroup",
"name": "GROUP_BIO_DINO_PRED",
"monsters": [
{ "monster": "mon_spinosaurus", "weight": 100, "cost_multiplier": 20, "starts": "3 days", "ends": "28 days" },
{ "monster": "mon_spinosaurus_bio_op", "weight": 100, "cost_multiplier": 20, "starts": "3 days", "ends": "28 days" },
{ "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "3 days" },
{ "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "7 days" },
{ "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "28 days" },
Expand Down
12 changes: 0 additions & 12 deletions data/mods/TropiCataclysm/monsters/tropical_zombies.json
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions data/mods/desert_region/desert_monsters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,5 @@
"extend": { "flags": [ "POISON", "NO_BREATHE" ] },
"delete": { "flags": [ "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "GROUP_MORALE", "GOODHEARING", "SWARMS" ] },
"armor": { "bash": 3, "cut": 1 }
},
{
"id": "mon_zandcrawler",
"type": "MONSTER",
"copy-from": "mon_beekeeper",
"name": { "str": "zandcrawler" },
"description": "A calloused and misshapen form that seems to have adapted to the harsh, dry environment.",
"speed": 90,
"death_drops": "mon_zombie_swimmer_death_drops",
"extend": { "flags": [ "CAN_DIG" ] }
}
]
Loading