LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.2: more bugfixes / adjustments:

Browse Source 
- blessed ankhs now cleanse more debuffs, not just paralysis
- added a safety check to warlock zapping incase enemy is null
- added a safety check to vampiric incase attacker is dead
This commit is contained in:
Evan Debenham 2019-03-12 21:52:27 -04:00
parent 11ae926341
commit 616de2db3d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -80,6 +80,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.Key;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfExperience;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfMight;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy;
@ -469,7 +470,7 @@ public class Hero extends Char {
if (belongings.weapon != null) {
return belongings.weapon.speedFactor( this );
} else {
//Normally putting furor speed on unarmed attacks would be unnecessary
//But there's going to be that one guy who gets a furor+force ring combo
@ -960,7 +961,7 @@ public class Hero extends Char {
KindOfWeapon wep = belongings.weapon;
if (wep != null) damage = wep.proc( this, enemy, damage );
switch (subClass) {
case SNIPER:
if (wep instanceof MissileWeapon && !(wep instanceof SpiritBow.SpiritArrow)) {
@ -1377,6 +1378,7 @@ public class Hero extends Char {
this.HP = HT/4;
//ensures that you'll get to act first in almost any case, to prevent reviving and then instantly dieing again.
PotionOfHealing.cure(this);
Buff.detach(this, Paralysis.class);
spend(-cooldown());

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java
View File

@ -96,6 +96,8 @@ public class Warlock extends Mob implements Callback {
}
private void zap() {
if (enemy == null) return;
spend( TIME_TO_ZAP );
if (hit( this, enemy, true )) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Vampiric.java
View File

@ -41,7 +41,7 @@ public class Vampiric extends Weapon.Enchantment {
int healAmt = Math.round(healPercent * damage);
healAmt = Math.min( healAmt, attacker.HT - attacker.HP );
if (healAmt > 0) {
if (healAmt > 0 && attacker.isAlive()) {
attacker.HP += healAmt;
attacker.sprite.emitter().start( Speck.factory( Speck.HEALING ), 0.4f, 1 );