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

v0.4.0: Refactored item status handler, now independent of sprite sheet

Browse Source
This commit is contained in:
Evan Debenham
2016-05-13 15:26:05 -04:00
parent c6233b274c
commit 07ec295889
4 changed files with 123 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
+20 -17
View File
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Bundle;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
public abstract class Scroll extends Item {
@@ -57,21 +58,23 @@ public abstract class Scroll extends Item {
ScrollOfPsionicBlast.class,
ScrollOfMirrorImage.class
};
private static final String[] runes =
{"KAUNAN", "SOWILO", "LAGUZ", "YNGVI", "GYFU", "RAIDO", "ISAZ", "MANNAZ", "NAUDIZ", "BERKANAN", "ODAL", "TIWAZ"};
private static final Integer[] images = {
ItemSpriteSheet.SCROLL_KAUNAN,
ItemSpriteSheet.SCROLL_SOWILO,
ItemSpriteSheet.SCROLL_LAGUZ,
ItemSpriteSheet.SCROLL_YNGVI,
ItemSpriteSheet.SCROLL_GYFU,
ItemSpriteSheet.SCROLL_RAIDO,
ItemSpriteSheet.SCROLL_ISAZ,
ItemSpriteSheet.SCROLL_MANNAZ,
ItemSpriteSheet.SCROLL_NAUDIZ,
ItemSpriteSheet.SCROLL_BERKANAN,
ItemSpriteSheet.SCROLL_ODAL,
ItemSpriteSheet.SCROLL_TIWAZ};
private static final HashMap<String, Integer> runes = new HashMap<String, Integer>() {
{
put("KAUNAN",ItemSpriteSheet.SCROLL_KAUNAN);
put("SOWILO",ItemSpriteSheet.SCROLL_SOWILO);
put("LAGUZ",ItemSpriteSheet.SCROLL_LAGUZ);
put("YNGVI",ItemSpriteSheet.SCROLL_YNGVI);
put("GYFU",ItemSpriteSheet.SCROLL_GYFU);
put("RAIDO",ItemSpriteSheet.SCROLL_RAIDO);
put("ISAZ",ItemSpriteSheet.SCROLL_ISAZ);
put("MANNAZ",ItemSpriteSheet.SCROLL_MANNAZ);
put("NAUDIZ",ItemSpriteSheet.SCROLL_NAUDIZ);
put("BERKANAN",ItemSpriteSheet.SCROLL_BERKANAN);
put("ODAL",ItemSpriteSheet.SCROLL_ODAL);
put("TIWAZ",ItemSpriteSheet.SCROLL_TIWAZ);
}
};
private static ItemStatusHandler<Scroll> handler;
@@ -86,7 +89,7 @@ public abstract class Scroll extends Item {
@SuppressWarnings("unchecked")
public static void initLabels() {
handler = new ItemStatusHandler<>( (Class<? extends Scroll>[])scrolls, runes, images );
handler = new ItemStatusHandler<>( (Class<? extends Scroll>[])scrolls, runes );
}
public static void save( Bundle bundle ) {
@@ -95,7 +98,7 @@ public abstract class Scroll extends Item {
@SuppressWarnings("unchecked")
public static void restore( Bundle bundle ) {
handler = new ItemStatusHandler<>( (Class<? extends Scroll>[])scrolls, runes, images, bundle );
handler = new ItemStatusHandler<>( (Class<? extends Scroll>[])scrolls, runes, bundle );
}
public Scroll() {