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

v0.2.4: bombs now properly submit a ranking if they kill the player

Browse Source
This commit is contained in:
Evan Debenham 2015-02-23 11:49:58 -05:00
parent f3c27fbbd7
commit 09f91c321e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/shatteredpixel/shatteredpixeldungeon/items/Bomb.java
View File

@ -17,10 +17,12 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items; package com.shatteredpixel.shatteredpixeldungeon.items;
import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -135,6 +137,10 @@ public class Bomb extends Item {
if (dmg > 0) { if (dmg > 0) {
ch.damage( dmg, this ); ch.damage( dmg, this );
} }
if (ch == Dungeon.hero && !ch.isAlive())
//constant is used here in the rare instance a player is killed by a double bomb.
Dungeon.fail(Utils.format(ResultDescriptions.ITEM, "bomb"));
} }
//destroys items / triggers bombs caught in the blast. //destroys items / triggers bombs caught in the blast.