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

Implement new zombie: Zapper zombie #35951

Merged
merged 9 commits into from
Dec 15, 2019
Merged

Implement new zombie: Zapper zombie #35951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86bbca4
Add static zombie
arijust Dec 8, 2019
2c805b9
Swap spawns for zombie_electric into zombie_static
arijust Dec 8, 2019
7243003
Enhance description.
arijust Dec 8, 2019
98eabf9
Tweak description and name.
arijust Dec 8, 2019
551c52c
Un-engrish description.
arijust Dec 8, 2019
1cdcd26
Remove CBMs from zapper zombie.
arijust Dec 9, 2019
8ca4758
Removed CBMs from entire zapper evo line.
arijust Dec 9, 2019
90520fa
Revert previous commit
arijust Dec 9, 2019
0874031
Tweak description
arijust Dec 10, 2019
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
30 changes: 15 additions & 15 deletions data/json/monstergroups/monstergroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,7 @@
{ "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 },
{ "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 },
{ "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 },
Expand Down Expand Up @@ -4259,7 +4259,7 @@
{ "monster": "mon_zombie_bio_op", "freq": 50, "cost_multiplier": 5 },
{ "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 5 },
{ "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 3 },
{ "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
{ "monster": "mon_zombie_static", "freq": 50, "cost_multiplier": 3 },
{ "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_chickenbot", "freq": 1, "cost_multiplier": 50 },
{ "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 },
Expand Down Expand Up @@ -4390,7 +4390,7 @@
{ "monster": "mon_zombie_dog", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_electric", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }
]
},
Expand All @@ -4412,7 +4412,7 @@
{ "monster": "mon_dog_zombie_cop", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_electric", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }
]
},
Expand Down Expand Up @@ -4443,7 +4443,7 @@
{ "monster": "mon_dog_zombie_cop", "freq": 15, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 40, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_electric", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 }
]
Expand All @@ -4466,7 +4466,7 @@
{ "monster": "mon_dog_zombie_cop", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_electric", "freq": 180, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 180, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }
]
},
Expand All @@ -4488,7 +4488,7 @@
{ "monster": "mon_dog_zombie_cop", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_dog_zombie_rot", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
{ "monster": "mon_zombie_electric", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 }
]
},
Expand Down Expand Up @@ -4517,7 +4517,7 @@
{ "monster": "mon_zombie_tough", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_rot", "freq": 6, "cost_multiplier": 5 },
{ "monster": "mon_zombie_crawler", "freq": 4, "cost_multiplier": 5 },
{ "monster": "mon_zombie_electric", "freq": 200, "cost_multiplier": 5 }
{ "monster": "mon_zombie_static", "freq": 200, "cost_multiplier": 5 }
]
},
{
Expand Down Expand Up @@ -4692,7 +4692,7 @@
"name": "GROUP_SMALL_STATION",
"default": "mon_zombie_technician",
"monsters": [
{ "monster": "mon_zombie_electric", "freq": 55, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_static", "freq": 55, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 5, "pack_size": [ 2, 4 ] },
{ "monster": "mon_zombie_tough", "freq": 25, "cost_multiplier": 0 }
]
Expand All @@ -4702,7 +4702,7 @@
"name": "GROUP_LARGE_STATION",
"default": "mon_zombie_technician",
"monsters": [
{ "monster": "mon_zombie_electric", "freq": 55, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_static", "freq": 55, "cost_multiplier": 4, "pack_size": [ 1, 2 ] },
{ "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 5, "pack_size": [ 2, 4 ] },
{ "monster": "mon_zombie_tough", "freq": 25, "cost_multiplier": 0 }
]
Expand Down Expand Up @@ -5071,7 +5071,7 @@
"default": "mon_zombie_prisoner",
"monsters": [
{ "monster": "mon_zombie_prisoner", "freq": 350, "cost_multiplier": 0 },
{ "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 0 }
{ "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 0 }
]
},
{
Expand Down Expand Up @@ -5151,7 +5151,7 @@
{ "monster": "mon_zombie_child", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 4 },
{ "monster": "mon_zombie_cop", "freq": 10, "cost_multiplier": 3 },
{ "monster": "mon_zombie_electric", "freq": 5, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 5, "cost_multiplier": 5 },
{ "monster": "mon_zombie_runner", "freq": 10, "cost_multiplier": 5, "pack_size": [ 1, 2 ] }
]
},
Expand All @@ -5165,7 +5165,7 @@
{ "monster": "mon_zombie", "freq": 20, "cost_multiplier": 1 },
{ "monster": "mon_zombie_tough", "freq": 50, "cost_multiplier": 1 },
{ "monster": "mon_skeleton", "freq": 30, "cost_multiplier": 1 },
{ "monster": "mon_zombie_electric", "freq": 15, "cost_multiplier": 1 },
{ "monster": "mon_zombie_static", "freq": 15, "cost_multiplier": 1 },
{ "monster": "mon_zombie_fat", "freq": 10, "cost_multiplier": 1 }
]
},
Expand All @@ -5190,7 +5190,7 @@
{ "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 },
{ "monster": "mon_zombie_fireman", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_swimmer", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 },
{ "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 },
Expand All @@ -5215,7 +5215,7 @@
{ "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 3 },
{ "monster": "mon_zombie_soldier", "freq": 10, "cost_multiplier": 2 },
{ "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 },
{ "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_static", "freq": 10, "cost_multiplier": 5 },
{ "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
{ "monster": "mon_zombie_technician", "freq": 1, "cost_multiplier": 12 },
{ "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
Expand Down
45 changes: 45 additions & 0 deletions data/json/monsters/monsters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3846,6 +3846,51 @@
"FILTHY"
]
},
{
"id": "mon_zombie_static",
"type": "MONSTER",
"name": "zapper zombie",
"description": "A very pale dead body with the worst case of static hair you have ever seen. Sometimes, you can see sparks of electricity around it.",
"default_faction": "zombie",
"bodytype": "human",
"species": [ "ZOMBIE", "HUMAN" ],
"volume": "62500 ml",
"weight": 81500,
"hp": 60,
"speed": 75,
"material": [ "flesh" ],
"symbol": "Z",
"color": "white",
"aggression": 100,
"morale": 100,
"melee_skill": 4,
"melee_dice": 1,
"melee_dice_sides": 2,
"melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
"melee_cut": 0,
"dodge": 2,
"luminance": 4,
"harvest": "zombie",
"special_when_hit": [ "ZAPBACK", 100 ],
"death_drops": "default_zombie_death_drops",
"death_function": [ "NORMAL" ],
"upgrades": { "half_life": 8, "into": "mon_zombie_electric" },
"flags": [
"SEES",
"HEARS",
"SMELLS",
"STUMBLES",
"WARM",
"BASHES",
"GROUP_BASH",
"POISON",
"ELECTRIC",
"NO_BREATHE",
"REVIVES",
"PUSH_MON",
"FILTHY"
]
},
{
"id": "mon_zombie_electric",
"type": "MONSTER",
Expand Down