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

v0.6.1: fixed a couple of bugs leftover from ring mechanics changes

Browse Source
This commit is contained in:
Evan Debenham 2017-06-21 16:43:15 -04:00
parent 1d904966bf
commit 42a37ec1ac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
View File

@ -248,6 +248,11 @@ public class Ring extends KindofMisc {
if ((ticksToKnow = bundle.getInt( UNFAMILIRIARITY )) == 0) { if ((ticksToKnow = bundle.getInt( UNFAMILIRIARITY )) == 0) {
ticksToKnow = TICKS_TO_KNOW; ticksToKnow = TICKS_TO_KNOW;
} }
//pre-0.6.1 saves
if (level() < 0){
upgrade(-level());
}
} }
public static int getBonus(Char target, Class<?extends RingBuff> type){ public static int getBonus(Char target, Class<?extends RingBuff> type){

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
View File

@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@ -80,9 +79,6 @@ public class ScrollOfRemoveCurse extends InventoryScroll {
procced = true; procced = true;
} }
} }
if (item instanceof Ring && item.level() <= 0){
item.upgrade(1 - item.level());
}
if (item instanceof Bag){ if (item instanceof Bag){
for (Item bagItem : ((Bag)item).items){ for (Item bagItem : ((Bag)item).items){
if (bagItem != null && bagItem.cursed) { if (bagItem != null && bagItem.cursed) {