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

Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon

Browse Source 
Changes in v0.2.1c

Conflicts:
	src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java

Additionally:
   Improved challenge characteristics (now armor challenge removes the reward menu button, rather than giving cloth armor)
This commit is contained in:
Evan Debenham
2014-10-21 09:52:56 -04:00
parent cc0a3ad412 b4d4e6a4d6
commit 1592ceb6d8
5 changed files with 55 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java
+5 -3
View File
@@ -23,13 +23,12 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.utils.Random;
public class Ooze extends Buff {
private static final String TXT_HERO_KILLED = "%s killed you...";
public int damage = 1;
@Override
public int icon() {
return BuffIndicator.OOZE;
@@ -43,7 +42,10 @@ public class Ooze extends Buff {
@Override
public boolean act() {
if (target.isAlive()) {
target.damage( damage, this );
if (Dungeon.depth > 4)
target.damage( Dungeon.depth/5, this );
else if (Random.Int(2) == 0)
target.damage( 1, this );
if (!target.isAlive() && target == Dungeon.hero) {
Dungeon.fail( Utils.format( ResultDescriptions.OOZE, Dungeon.depth ) );
GLog.n( TXT_HERO_KILLED, toString() );