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

v0.2.3: refactored levelling on some artifacts

Browse Source
This commit is contained in:
Evan Debenham 2014-11-19 10:56:26 -05:00
parent c4b2c9ab4b
commit f59fc8c304
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
View File

@ -5,6 +5,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
@ -110,13 +111,17 @@ public class ChaliceOfBlood extends Artifact {
GLog.n("The Chalice sucks your life essence dry..."); GLog.n("The Chalice sucks your life essence dry...");
} else { } else {
upgrade(); upgrade();
if (level >= 7)
image = ItemSpriteSheet.ARTIFACT_CHALICE3;
else if (level >= 3)
image = ItemSpriteSheet.ARTIFACT_CHALICE2;
} }
} }
@Override
public Item upgrade() {
if (level >= 6)
image = ItemSpriteSheet.ARTIFACT_CHALICE3;
else if (level >= 2)
image = ItemSpriteSheet.ARTIFACT_CHALICE2;
return super.upgrade();
}
@Override @Override
protected ArtifactBuff passiveBuff() { protected ArtifactBuff passiveBuff() {

8
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
View File

@ -5,6 +5,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
@ -113,6 +114,12 @@ public class CloakOfShadows extends Artifact {
return new cloakStealth(); return new cloakStealth();
} }
@Override
public Item upgrade() {
chargeCap++;
return super.upgrade();
}
@Override @Override
public String desc() { public String desc() {
String desc = "This light silken cloak shimmers in and out of your vision as it sways in the air. When worn, " + String desc = "This light silken cloak shimmers in and out of your vision as it sways in the air. When worn, " +
@ -223,7 +230,6 @@ public class CloakOfShadows extends Artifact {
if (exp >= (level+1)*50 && level < levelCap) { if (exp >= (level+1)*50 && level < levelCap) {
upgrade(); upgrade();
chargeCap++;
exp -= level*50; exp -= level*50;
GLog.p("Your Cloak Grows Stronger!"); GLog.p("Your Cloak Grows Stronger!");
} }

26
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
View File

@ -140,6 +140,20 @@ public class SandalsOfNature extends Artifact {
return desc; return desc;
} }
@Override
public Item upgrade() {
if (level < 0)
image = ItemSpriteSheet.ARTIFACT_SANDALS;
else if (level == 0)
image = ItemSpriteSheet.ARTIFACT_SHOES;
else if (level == 1)
image = ItemSpriteSheet.ARTIFACT_BOOTS;
else if (level >= 2)
image = ItemSpriteSheet.ARTIFACT_GREAVES;
name = NAMES[level+1];
return super.upgrade();
}
private static final String SEEDS = "seeds"; private static final String SEEDS = "seeds";
private static final String NAME = "name"; private static final String NAME = "name";
@ -184,17 +198,9 @@ public class SandalsOfNature extends Artifact {
seeds.clear(); seeds.clear();
upgrade(); upgrade();
if (level >= 1 && level <= 3) { if (level >= 1 && level <= 3) {
GLog.p("Your " + name + " surge in size, they are now " + NAMES[level] + "!"); GLog.p("Your " + NAMES[level-1] + " surge in size, they are now " + NAMES[level] + "!");
name = NAMES[level];
} }
if (level <= 0)
image = ItemSpriteSheet.ARTIFACT_SANDALS;
else if (level == 1)
image = ItemSpriteSheet.ARTIFACT_SHOES;
else if (level == 2)
image = ItemSpriteSheet.ARTIFACT_BOOTS;
else if (level >= 3)
image = ItemSpriteSheet.ARTIFACT_GREAVES;
} else { } else {
GLog.i("Your " + name + " absorb the seed, they seem healthier."); GLog.i("Your " + name + " absorb the seed, they seem healthier.");
} }