Skip to content

Commit

Permalink
Finalize leech pod monster family
Browse files Browse the repository at this point in the history
  • Loading branch information
John-Candlebury committed Dec 20, 2019
1 parent adb9e66 commit df0f9ba
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
19 changes: 14 additions & 5 deletions data/json/monsters/power_leech.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"weight": "40 kg",
"hp": 100,
"speed": 100,
"diff": 30,
"material": [ "flesh" ],
"symbol": "K",
"color": "light_cyan",
Expand All @@ -26,7 +27,8 @@
"gun_type": "emp_frond",
"fake_skills": [ [ "gun", 3 ], [ "pistol", 3 ] ],
"ranges": [ [ 0, 12, "DEFAULT" ] ],
"description": "Lightning arcs towards you!"
"targeting_sound": "a faint buzz",
"description": "Lightning arcs from the leech blossom!"
},
[ "LEECH_SPAWNER", 25 ],
[ "MON_LEECH_EVOLUTION", 40 ],
Expand All @@ -48,6 +50,7 @@
"weight": "40 kg",
"hp": 40,
"speed": 100,
"diff": 20,
"material": [ "flesh" ],
"symbol": "y",
"color": "light_blue",
Expand All @@ -64,7 +67,8 @@
"gun_type": "emp_frond",
"fake_skills": [ [ "gun", 2 ], [ "pistol", 2 ] ],
"ranges": [ [ 0, 12, "DEFAULT" ] ],
"description": "Lightning arcs towards you!"
"targeting_sound": "a faint buzz",
"description": "Lightning arcs from the leech stalk!"
},
[ "MON_LEECH_EVOLUTION", 30 ]
],
Expand All @@ -84,6 +88,7 @@
"weight": "60 kg",
"hp": 40,
"speed": 100,
"diff": 20,
"material": [ "flesh" ],
"symbol": "g",
"color": "white",
Expand All @@ -97,7 +102,8 @@
"cooldown": 15,
"gun_type": "emp_frond",
"ranges": [ [ 0, 1, "DEFAULT" ] ],
"description": "Lightning arcs towards you!"
"targeting_sound": "a faint buzz",
"description": "Lightning arcs from the pod cluster!"
},
[ "LEECH_SPAWNER", 35 ]
],
Expand All @@ -116,6 +122,7 @@
"weight": "6 kg",
"hp": 40,
"speed": 120,
"diff": 20,
"material": [ "flesh" ],
"symbol": "m",
"color": "blue",
Expand All @@ -137,7 +144,8 @@
"gun_type": "emp_frond",
"fake_skills": [ [ "gun", 1 ], [ "pistol", 1 ] ],
"ranges": [ [ 0, 2, "DEFAULT" ] ],
"description": "Lightning arcs towards you!"
"targeting_sound": "a faint buzz",
"description": "Sparks fly from the root runner!"
},
[ "EVOLVE_KILL_STRIKE", 3 ]
],
Expand Down Expand Up @@ -178,7 +186,8 @@
"gun_type": "emp_frond",
"fake_skills": [ [ "gun", 1 ], [ "pistol", 1 ] ],
"ranges": [ [ 0, 2, "DEFAULT" ] ],
"description": "Lightning arcs towards you!"
"targeting_sound": "a faint buzz",
"description": "Lightning arcs from the root pod!"
},
[ "EVOLVE_KILL_STRIKE", 6 ]
],
Expand Down
23 changes: 7 additions & 16 deletions src/monattack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4814,13 +4814,13 @@ bool mattack::leech_spawner( monster *z )
add_msg( m_warning,
_( "An egg pod ruptures and a %s crawls out from the remains!" ), new_mon->name() );
}
}
}
if( one_in( 25 ) ) {
z->poly( mon_leech_stalk );
if( u_see ) {
add_msg( m_warning,
_( "Resplendent fronds emerge from the still intact pods!" ) );
if( one_in( 25 ) ) {
z->poly( mon_leech_stalk );
if( u_see ) {
add_msg( m_warning,
_( "Resplendent fronds emerge from the still intact pods!" ) );
}
}
}
}
return true;
Expand All @@ -4846,15 +4846,6 @@ bool mattack::mon_leech_evolution( monster *z )
_( "The %s blooms into flowers!" ), z->name() );
}
}
} else {
if( !queens.empty() ) {
if( u_see ) {
add_msg( m_warning,
_( "The %s flowers whiter and fall!" ), z->name() );
}
z->poly( mon_leech_stalk );
g->m.spawn_item( z->pos(), "leech_flower", 5, 0, calendar::turn );
}
}
return true;
}
Expand Down

0 comments on commit df0f9ba

Please sign in to comment.