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

V0.2.0: Corrected artifacts triggering the levelled item badge.

Browse Source
This commit is contained in:
Evan Debenham 2014-09-15 01:34:34 -04:00
parent eb42461b03
commit 06dbf11823
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
View File

@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Acidic; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Acidic;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Albino; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Albino;
@ -394,12 +395,13 @@ public class Badges {
// 1) When an item is obtained (Item.collect) // 1) When an item is obtained (Item.collect)
// 2) When an item is upgraded (ScrollOfUpgrade, ScrollOfWeaponUpgrade, ShortSword, WandOfMagicMissile) // 2) When an item is upgraded (ScrollOfUpgrade, ScrollOfWeaponUpgrade, ShortSword, WandOfMagicMissile)
// 3) When an item is identified // 3) When an item is identified
if (!item.levelKnown) {
// Note that artifacts should never trigger this badge as they are alternatively upgraded
if (!item.levelKnown || item instanceof Artifact) {
return; return;
} }
Badge badge = null; Badge badge = null;
if (!local.contains( Badge.ITEM_LEVEL_1 ) && item.level >= 3) { if (!local.contains( Badge.ITEM_LEVEL_1 ) && item.level >= 3) {
badge = Badge.ITEM_LEVEL_1; badge = Badge.ITEM_LEVEL_1;
local.add( badge ); local.add( badge );