From 7abb24f723d7c81bcbca4f8aaa8c137ec57d5f08 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 13 Sep 2014 17:34:50 -0400 Subject: [PATCH] V0.2.0: Changed artifacts to use upgrade() instead of level++ --- .../shatteredpixeldungeon/items/artifacts/CapeOfThorns.java | 2 +- .../shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java | 2 +- .../shatteredpixeldungeon/items/artifacts/CloakOfShadows.java | 2 +- .../shatteredpixeldungeon/items/artifacts/HornOfPlenty.java | 2 +- .../items/artifacts/MasterThievesArmband.java | 2 +- .../shatteredpixeldungeon/items/artifacts/SandalsOfNature.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java index b929b39e4..88fb82ca8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java @@ -92,7 +92,7 @@ public class CapeOfThorns extends Artifact { if (exp >= (level+1)*10 && level < levelCap){ exp -= (level+1)*10; - level++; + upgrade(); GLog.p("Your Cape grows stronger!"); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index 7f0588a9b..302cc0a26 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -113,7 +113,7 @@ public class ChaliceOfBlood extends Artifact { Dungeon.fail(Utils.format(ResultDescriptions.ITEM, name, Dungeon.depth)); GLog.n("The Chalice sucks your life essence dry..."); } else { - level++; + upgrade(); if (level >= 5) image = ItemSpriteSheet.ARTIFACT_CHALICE3; else if (level >= 3) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index dbead6cd6..76c393fb1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -207,7 +207,7 @@ public class CloakOfShadows extends Artifact { //max level is 15 (20 charges) if (exp >= (level+1)*50 && level < levelCap) { - level++; + upgrade(); chargeCap++; exp -= level*50; GLog.p("Your Cloak Grows Stronger!"); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 6d5b116f5..9a70c1a8b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -172,7 +172,7 @@ public class HornOfPlenty extends Artifact { hero.busy(); hero.spend( TIME_TO_EAT ); - curItem.level += ((Food)item).hornValue; + curItem.upgrade(((Food)item).hornValue); if (curItem.level >= 30){ curItem.level = 30; GLog.p("your horn has consumed all the food it can!"); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java index 156363bf3..61dbebc6a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java @@ -67,7 +67,7 @@ public class MasterThievesArmband extends Artifact { } while(exp >= 500 && level < levelCap) { exp -= 500; - level++; + upgrade(); } return true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index daef8457c..ef46ca47f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -126,7 +126,7 @@ public class SandalsOfNature extends Artifact { seeds.add(item.name()); if (seeds.size() >= 5+level){ seeds.clear(); - //upgrade logic + upgrade(); } } }