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

v0.2.4: made potions susceptible to cold, refactored a bit of buff logic.

Browse Source
This commit is contained in:
Evan Debenham
2015-02-10 02:09:57 -05:00
parent ae2ba8be0e
commit 72975a49cc
9 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java
+9 -9
View File
@@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.utils.Bundle;
import com.watabou.utils.Random;
@@ -75,25 +74,26 @@ public class Burning extends Buff implements Hero.Doom {
target.damage( Random.Int( 1, 5 ), this );
if (target instanceof Hero) {
Item item = ((Hero)target).belongings.randomUnequipped();
Hero hero = (Hero)target;
Item item = hero.belongings.randomUnequipped();
if (item instanceof Scroll) {
item = item.detach( ((Hero)target).belongings.backpack );
item = item.detach( hero.belongings.backpack );
GLog.w( TXT_BURNS_UP, item.toString() );
Heap.burnFX( target.pos );
Heap.burnFX( hero.pos );
} else if (item instanceof MysteryMeat) {
item = item.detach( ((Hero)target).belongings.backpack );
item = item.detach( hero.belongings.backpack );
ChargrilledMeat steak = new ChargrilledMeat();
if (!steak.collect( ((Hero)target).belongings.backpack )) {
Dungeon.level.drop( steak, target.pos ).sprite.drop();
if (!steak.collect( hero.belongings.backpack )) {
Dungeon.level.drop( steak, hero.pos ).sprite.drop();
}
GLog.w( TXT_BURNS_UP, item.toString() );
Heap.burnFX( target.pos );
Heap.burnFX( hero.pos );
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java
+23 -1
View File
@@ -20,14 +20,19 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Thief;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio;
import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class Frost extends FlavourBuff {
private static final String TXT_FREEZES = "%s freezes!";
private static final float DURATION = 5f;
@Override
@@ -36,18 +41,35 @@ public class Frost extends FlavourBuff {
target.paralysed = true;
Burning.detach( target, Burning.class );
if (target instanceof Hero) {
Hero hero = (Hero)target;
Item item = hero.belongings.randomUnequipped();
if (item instanceof MysteryMeat) {
if (item instanceof Potion) {
item = item.detach( hero.belongings.backpack );
GLog.w(TXT_FREEZES, item.toString());
((Potion) item).shatter(hero.pos);
} else if (item instanceof MysteryMeat) {
item = item.detach( hero.belongings.backpack );
FrozenCarpaccio carpaccio = new FrozenCarpaccio();
if (!carpaccio.collect( hero.belongings.backpack )) {
Dungeon.level.drop( carpaccio, target.pos ).sprite.drop();
}
GLog.w(TXT_FREEZES, item.toString());
}
} else if (target instanceof Thief && ((Thief)target).item instanceof Potion) {
((Potion) ((Thief)target).item).shatter( target.pos );
((Thief) target).item = null;
}
return true;
} else {
return false;