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

New monster: SWAT Zombie #37815

Merged
merged 16 commits into from
Apr 11, 2020
Merged

New monster: SWAT Zombie #37815

merged 16 commits into from
Apr 11, 2020

Conversation

Moumix3
Copy link
Contributor

@Moumix3 Moumix3 commented Feb 7, 2020

Summary

SUMMARY: Content "Adds new monster 'SWAT zombie'"

Purpose of change

There are multiple references to the SWAT law enforcement unit in-game (vehicles, professions, items, ...), but no SWAT zombie using a SWAT armor. I figured it could be a good addition to the normal pool of zombies.

Describe the solution

  • Created a new zombie with appropriate stats (strength between cop and soldier zombies)
  • Added appropriate monster drops
  • Added appropriate spawn points

Describe alternatives you've considered

Not adding the SWAT zombie

Testing

  1. Modified json files locally
  2. Started a new game with the changes
  3. Spawned a couple of SWAT zombies
  4. Fought spawned zombies with different type of gears and skills, and checked the loot tables worked properly

Additional context

N/A

Adding a SWAT zombie, which is between a cop zombie and a soldier zombie in terms of strength and resistances
Largely based on the zombie cop loot table.
Used existing swat_guns item group.
Group "swat_gear" already exist (hence the "_zombie" in the name), but has a mixture of all item slots (head, torso, boots, equipment), so couldn't be used here (or there would be a possibility to have duplicate of things that don't make sense, like two helmets, or two pairs of boots, etc...)
Added SWAT zombies everywhere cop zombies can spawn, with half the chance
Fixed special attacks, as it was causing an error ("attack type does not exist").
Also aligned grab cooldown with all other zombies.
@Moumix3
Copy link
Contributor Author

Moumix3 commented Feb 7, 2020

Generated loot for 8 SWAT Zombies:

image

image

Removed 3 extra spaces... :)
@Brian-Otten
Copy link
Contributor

Looks quite nice, added it to logical spawngroup, has the looks_like zombie cop tag so it looks okay before tileset makers update, stats make sense, and it has a nicely fitting loot pool, with the probabilities all looking fine to me.

Would make for some nice extra enemy variety and make the world feel alive, so would love to see these get merged.

Removing more extra spaces >_>
Removed newlines for <120 characters array
Changed 4 spaces to 2. No idea why I put 4 there. :)
Last one I hope :')
ymber
ymber previously requested changes Feb 7, 2020
Copy link
Member

@ymber ymber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The itemgroups here should be more standardized. See #36446 for an example.

data/json/monsterdrops/zombie_cop.json Show resolved Hide resolved
data/json/monsterdrops/zombie_cop.json Outdated Show resolved Hide resolved
data/json/monsters/zed-classic.json Show resolved Hide resolved
@ifreund ifreund added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly. labels Feb 7, 2020
As per comments from ymber, modernizing the item groups (for the SWAT zombie) to use distribution or collection. Didn't change the cop zombie item_groups as it's not part of this PR.

Also changed the torso item group to have less diverse type of items, and remove things that made less sense for SWAT than cops (dress shirt & jacket).
@Moumix3 Moumix3 requested a review from ymber February 7, 2020 23:46
As per suggested changes
@ymber ymber dismissed their stale review February 8, 2020 09:55

Changes made.

Moumix3 and others added 4 commits February 8, 2020 10:39
Only the old rules of typing requires this. The general rule now is only one space after punctuations, but I understand it's the format that has been used in the rest of the project, so np! :p

Co-Authored-By: Anton Burmistrov <[email protected]>
Co-Authored-By: matskuman5 <[email protected]>
@kevingranade kevingranade merged commit b3a8d58 into CleverRaven:master Apr 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants