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

v0.2.3e: refactored quick slot button, should now support multiple instances of itself tied to different quickslots, needs testing

Browse Source
This commit is contained in:
Evan Debenham
2015-01-20 17:26:53 -05:00
parent 18580f7f0b
commit 2b44154ac1
16 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
+3 -3
View File
@@ -4,7 +4,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Random;
@@ -60,7 +60,7 @@ public class CapeOfThorns extends Artifact {
BuffIndicator.refreshHero();
GLog.w("Your Cape becomes inert again.");
}
QuickSlot.refresh();
QuickSlotButton.refresh();
}
spend(TICK);
return true;
@@ -92,7 +92,7 @@ public class CapeOfThorns extends Artifact {
}
}
QuickSlot.refresh();
QuickSlotButton.refresh();
return damage;
}
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
+4 -4
View File
@@ -8,7 +8,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.tweeners.AlphaTweener;
@@ -185,7 +185,7 @@ public class CloakOfShadows extends Artifact {
if (cooldown > 0)
cooldown --;
QuickSlot.refresh();
QuickSlotButton.refresh();
spend( TICK );
@@ -227,7 +227,7 @@ public class CloakOfShadows extends Artifact {
GLog.p("Your Cloak Grows Stronger!");
}
QuickSlot.refresh();
QuickSlotButton.refresh();
spend( TICK );
@@ -247,7 +247,7 @@ public class CloakOfShadows extends Artifact {
cooldown = 10 - (level / 3);
QuickSlot.refresh();
QuickSlotButton.refresh();
super.detach();
}
}
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+2 -2
View File
@@ -19,7 +19,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.GhostSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest;
import com.watabou.noosa.audio.Sample;
@@ -211,7 +211,7 @@ public class DriedRose extends Artifact {
}
QuickSlot.refresh();
QuickSlotButton.refresh();
spend( TICK );
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
+5 -5
View File
@@ -10,7 +10,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
import com.watabou.noosa.audio.Sample;
@@ -202,7 +202,7 @@ public class TimekeepersHourglass extends Artifact {
} else if (cursed && Random.Int(10) == 0)
((Hero) target).spend( TICK );
QuickSlot.refresh();
QuickSlotButton.refresh();
spend( TICK );
@@ -226,7 +226,7 @@ public class TimekeepersHourglass extends Artifact {
target.invisible++;
QuickSlot.refresh();
QuickSlotButton.refresh();
Dungeon.observe();
@@ -262,7 +262,7 @@ public class TimekeepersHourglass extends Artifact {
charge --;
}
QuickSlot.refresh();
QuickSlotButton.refresh();
if (charge <= 0){
detach();
@@ -301,7 +301,7 @@ public class TimekeepersHourglass extends Artifact {
GameScene.freezeEmitters = false;
charge = 0;
QuickSlot.refresh();
QuickSlotButton.refresh();
super.detach();
activeBuff = null;
}
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java
+2 -2
View File
@@ -13,7 +13,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMappi
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
import com.watabou.noosa.audio.Sample;
@@ -197,7 +197,7 @@ public class UnstableSpellbook extends Artifact {
}
}
QuickSlot.refresh();
QuickSlotButton.refresh();
spend( TICK );