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.

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

Fix ferals in hazardous waste sarcophagus #62515

Merged
merged 1 commit into from
Dec 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion data/json/mapgen/hazardous_waste_sarcophagus.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@
{ "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 24, "x2": 47, "y2": 47 }
],
"monster": { " ": { "monster": "mon_zombie", "chance": 10 } },
"monsters": { "~": { "monster": "GROUP_VANILLA", "chance": 20, "density": 0.1 } },
"//": "The government would not put live humans into a highly irradiated cavern with lots of maneating zombies. Right? Right?!",
"monsters": { "~": { "monster": "GROUP_VANILLA_NO_FERAL", "chance": 20, "density": 0.1 } },
"computers": {
"5": {
"name": "SRCF Security Terminal",
Expand Down
15 changes: 12 additions & 3 deletions data/json/monstergroups/zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
},
{
"type": "monstergroup",
"name": "GROUP_VANILLA",
"name": "GROUP_VANILLA_NO_FERAL",
"default": "mon_zombie",
"monsters": [
{ "monster": "mon_zombie", "weight": 264, "cost_multiplier": 0 },
Expand All @@ -187,11 +187,20 @@
{ "monster": "mon_zombie_rot", "weight": 60, "cost_multiplier": 0 },
{ "monster": "mon_zombie_dog", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_zombie_crawler", "weight": 30, "cost_multiplier": 0 },
{ "monster": "mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
]
},
{
"type": "monstergroup",
"name": "GROUP_VANILLA",
"default": "mon_zombie",
"//": "Normalized to 1000",
"monsters": [
{ "group": "GROUP_VANILLA_NO_FERAL", "weight": 891, "cost_multiplier": 0 },
{ "monster": "mon_feral_human_pipe", "weight": 40, "cost_multiplier": 0 },
{ "monster": "mon_feral_human_crowbar", "weight": 40, "cost_multiplier": 0 },
{ "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 0 },
{ "monster": "mon_feral_sapien_spear", "weight": 9, "cost_multiplier": 2 },
{ "monster": "mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
{ "monster": "mon_feral_sapien_spear", "weight": 9, "cost_multiplier": 2 }
]
},
{
Expand Down