LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging 1.7.5 source: items/rings changes

Browse Source
This commit is contained in:
Evan Debenham 2015-02-04 00:41:40 -05:00
parent 6387b697a9
commit c1b262a614
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
View File

@ -35,6 +35,8 @@ import com.watabou.utils.Random;
public class Ring extends KindofMisc {
private static final int TICKS_TO_KNOW = 200;
private static final float TIME_TO_EQUIP = 1f;
private static final String TXT_IDENTIFY =
@ -75,7 +77,7 @@ public class Ring extends KindofMisc {
private String gem;
private int ticksToKnow = 200;
private int ticksToKnow = TICKS_TO_KNOW;
@SuppressWarnings("unchecked")
public static void initGems() {
@ -283,7 +285,23 @@ public class Ring extends KindofMisc {
protected RingBuff buff() {
return null;
}
private static final String UNFAMILIRIARITY = "unfamiliarity";
@Override
public void storeInBundle( Bundle bundle ) {
super.storeInBundle( bundle );
bundle.put( UNFAMILIRIARITY, ticksToKnow );
}
@Override
public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle( bundle );
if ((ticksToKnow = bundle.getInt( UNFAMILIRIARITY )) == 0) {
ticksToKnow = TICKS_TO_KNOW;
}
}
public class RingBuff extends Buff {
private static final String TXT_KNOWN = "This is a %s";