konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.2: fixed bugs relating to corruption and awarding exp/kills

Browse Source
This commit is contained in:
Evan Debenham
2017-10-24 19:55:56 -04:00
parent 4af0cb4e93
commit a71488f6f5
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+1 -1
View File
@@ -549,7 +549,6 @@ public abstract class Mob extends Char {
Statistics.enemiesSlain++; Statistics.enemiesSlain++;
Badges.validateMonstersSlain(); Badges.validateMonstersSlain();
Statistics.qualifiedForNoKilling = false; Statistics.qualifiedForNoKilling = false;
}
int exp = Dungeon.hero.lvl <= maxLvl ? EXP : 0; int exp = Dungeon.hero.lvl <= maxLvl ? EXP : 0;
if (exp > 0) { if (exp > 0) {
@@ -558,6 +557,7 @@ public abstract class Mob extends Char {
} }
} }
} }
}
@Override @Override
public void die( Object cause ) { public void die( Object cause ) {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java
+6 -1
View File
@@ -22,7 +22,9 @@
package com.shatteredpixel.shatteredpixeldungeon.items.wands; package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok;
@@ -209,10 +211,13 @@ public class WandOfCorruption extends Wand {
buff.detach(); buff.detach();
} }
Buff.affect(enemy, Corruption.class); Buff.affect(enemy, Corruption.class);
Statistics.enemiesSlain++;
Badges.validateMonstersSlain();
Statistics.qualifiedForNoKilling = false;
if (enemy.EXP > 0 && curUser.lvl <= enemy.maxLvl) { if (enemy.EXP > 0 && curUser.lvl <= enemy.maxLvl) {
curUser.sprite.showStatus(CharSprite.POSITIVE, Messages.get(enemy, "exp", enemy.EXP)); curUser.sprite.showStatus(CharSprite.POSITIVE, Messages.get(enemy, "exp", enemy.EXP));
curUser.earnExp(enemy.EXP); curUser.earnExp(enemy.EXP);
enemy.EXP = 0;
} }
//TODO perhaps enemies should also drop loot here //TODO perhaps enemies should also drop loot here
} else { } else {