Skip to content

Commit

Permalink
Add small sludge trail to pupating zombies (CleverRaven#50079)
Browse files Browse the repository at this point in the history
* added small MF_SMALLSLUDGETRAIL to pupating zombies

* Update src/monmove.cpp

Co-authored-by: anothersimulacrum <[email protected]>

Co-authored-by: I-am-Erk <[email protected]>
Co-authored-by: anothersimulacrum <[email protected]>
  • Loading branch information
3 people authored Jul 20, 2021
1 parent 42aef0c commit b69f4b0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
12 changes: 6 additions & 6 deletions data/json/monsters/zed-pupating.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"bleed_rate": 50,
"special_attacks": [ { "type": "bite", "cooldown": 3 } ],
"regenerates": 10,
"extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
"extend": { "flags": [ "SMALLSLUDGETRAIL", "SLUDGEPROOF" ] }
},
{
"id": "mon_zombie_crawler_pupa",
Expand Down Expand Up @@ -44,7 +44,7 @@
"bleed_rate": 50,
"special_attacks": [ { "type": "bite", "cooldown": 3 } ],
"regenerates": 10,
"extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
"extend": { "flags": [ "SMALLSLUDGETRAIL", "SLUDGEPROOF" ] }
},
{
"id": "mon_zombie_pupa",
Expand Down Expand Up @@ -73,7 +73,7 @@
"speed": 95,
"regenerates": 10,
"upgrades": { "half_life": 21, "into_group": "GROUP_BRUTE_PUPA" },
"extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
"extend": { "flags": [ "SMALLSLUDGETRAIL", "SLUDGEPROOF" ] }
},
{
"id": "mon_brute_pupa",
Expand Down Expand Up @@ -137,7 +137,7 @@
"REVIVES",
"PUSH_MON",
"PUSH_VEH",
"SLUDGETRAIL",
"SMALLSLUDGETRAIL",
"SLUDGEPROOF",
"FILTHY"
]
Expand Down Expand Up @@ -195,7 +195,7 @@
"REVIVES",
"PUSH_MON",
"PUSH_VEH",
"SLUDGETRAIL",
"SMALLSLUDGETRAIL",
"SLUDGEPROOF",
"FILTHY"
]
Expand All @@ -215,7 +215,7 @@
"bleed_rate": 0,
"vision_day": 8,
"vision_night": 15,
"extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF", "NIGHT_INVISIBILITY" ] }
"extend": { "flags": [ "SMALLSLUDGETRAIL", "SLUDGEPROOF", "NIGHT_INVISIBILITY" ] }
},
{
"id": "mon_zombie_pupa_shady",
Expand Down
1 change: 1 addition & 0 deletions doc/JSON_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,7 @@ Other monster flags.
- ```SHEARABLE``` This monster can be sheared for wool.
- ```SLUDGEPROOF``` Ignores the effect of sludge trails.
- ```SLUDGETRAIL``` Causes the monster to leave a sludge trap trail when moving.
- ```SMALLSLUDGETRAIL``` Causes the monster to occasionally leave a 1-tile sludge trail when moving.
- ```SMELLS``` It can smell you.
- ```STUMBLES``` Stumbles in its movement.
- ```SUNDEATH``` Dies in full sunlight.
Expand Down
6 changes: 6 additions & 0 deletions src/monmove.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,12 @@ bool monster::move_to( const tripoint &p, bool force, bool step_on_critter,
}
}

if( has_flag ( MF_SMALLSLUDGETRAIL ) ) {
if( one_in( 2 ) ) {
here.add_field( pos(), fd_sludge, 1 );
}
}

if( has_flag( MF_DRIPS_NAPALM ) ) {
if( one_in( 10 ) ) {
// if it has more napalm, drop some and reduce ammo in tank
Expand Down
1 change: 1 addition & 0 deletions src/monstergenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ std::string enum_to_string<m_flag>( m_flag data )
case MF_FIREPROOF: return "FIREPROOF";
case MF_SLUDGEPROOF: return "SLUDGEPROOF";
case MF_SLUDGETRAIL: return "SLUDGETRAIL";
case MF_SMALLSLUDGETRAIL: return "SMALLSLUDGETRAIL";
case MF_COLDPROOF: return "COLDPROOF";
case MF_FIREY: return "FIREY";
case MF_QUEEN: return "QUEEN";
Expand Down
1 change: 1 addition & 0 deletions src/mtype.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ enum m_flag : int {
MF_FIREPROOF, // Immune to fire
MF_SLUDGEPROOF, // Ignores the effect of sludge trails
MF_SLUDGETRAIL, // Causes monster to leave a sludge trap trail when moving
MF_SMALLSLUDGETRAIL, // Causes monster to leave a low intensity, 1 tile sludge pool approximately every other tile when moving
MF_COLDPROOF, // Immune to cold damage
MF_FIREY, // Burns stuff and is immune to fire
MF_QUEEN, // When it dies, local populations start to die off too
Expand Down

0 comments on commit b69f4b0

Please sign in to comment.