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

v0.3.0: changed food to work with new recharging mechanic. Also removed charging from lightning trap.

Browse Source
This commit is contained in:
Evan Debenham
2015-03-30 15:55:34 -04:00
committed by Evan Debenham
parent 348f16c19b
commit 75f1181d27
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
+3 -1
View File
@@ -4,6 +4,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@@ -81,7 +82,8 @@ public class HornOfPlenty extends Artifact {
} }
break; break;
case MAGE: case MAGE:
hero.belongings.charge(false); //1 charge
Buff.affect( hero, ScrollOfRecharging.Recharging.class, 4f );
ScrollOfRecharging.charge(hero); ScrollOfRecharging.charge(hero);
break; break;
case ROGUE: case ROGUE:
src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
+2 -1
View File
@@ -152,7 +152,8 @@ public class Blandfruit extends Food {
} }
break; break;
case MAGE: case MAGE:
hero.belongings.charge( false ); //1 charge
Buff.affect(hero, ScrollOfRecharging.Recharging.class, 4f);
ScrollOfRecharging.charge(hero); ScrollOfRecharging.charge(hero);
break; break;
case ROGUE: case ROGUE:
src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java
+3 -1
View File
@@ -20,6 +20,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.food;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@@ -75,7 +76,8 @@ public class Food extends Item {
} }
break; break;
case MAGE: case MAGE:
hero.belongings.charge( false ); //1 charge
Buff.affect( hero, ScrollOfRecharging.Recharging.class, 4f );
ScrollOfRecharging.charge( hero ); ScrollOfRecharging.charge( hero );
break; break;
case ROGUE: case ROGUE:
src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/LightningTrap.java
-3
View File
@@ -21,7 +21,6 @@ import com.watabou.noosa.Camera;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle;
@@ -47,8 +46,6 @@ public class LightningTrap {
if (!ch.isAlive()) { if (!ch.isAlive()) {
Dungeon.fail( Utils.format( ResultDescriptions.TRAP, name ) ); Dungeon.fail( Utils.format( ResultDescriptions.TRAP, name ) );
GLog.n( "You were killed by a discharge of a lightning trap..." ); GLog.n( "You were killed by a discharge of a lightning trap..." );
} else {
((Hero)ch).belongings.charge( false );
} }
} }