From 77d7d9f3dfd3e8ff779f9f73c57bf446a4c3b621 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 10 Dec 2014 17:29:33 -0500 Subject: [PATCH] v0.2.3: artifact tweaks --- .../items/artifacts/AlchemistsToolkit.java | 3 +-- .../items/artifacts/TimekeepersHourglass.java | 10 ++++++---- .../items/artifacts/UnstableSpellbook.java | 13 ++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java index 291399815..ec7da178b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java @@ -21,7 +21,7 @@ import java.util.Collections; * Created by debenhame on 24/11/2014. */ public class AlchemistsToolkit extends Artifact { - //TODO: core functionality finished, but really rough. Look to improve code quality and add general polish. TEST. + //TODO: sprite { name = "Alchemists Toolkit"; @@ -34,7 +34,6 @@ public class AlchemistsToolkit extends Artifact { public static final String AC_BREW = "BREW"; //arrays used in containing potion collections for mix logic. - //strings are used so that different potions of the same class are considered equal public final ArrayList combination = new ArrayList(); public ArrayList curGuess = new ArrayList(); public ArrayList bstGuess = new ArrayList(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index ea1328cf5..e4828f32f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -22,7 +22,7 @@ import java.util.ArrayList; * Created by debenhame on 01/12/2014. */ public class TimekeepersHourglass extends Artifact { - //TODO: string, effect implementation. + //TODO: display logic, sprites. private static final String TXT_HGLASS = "Timekeeper's Hourglass"; private static final String TXT_STASIS = "Put myself in stasis"; @@ -65,12 +65,14 @@ public class TimekeepersHourglass extends Artifact { @Override protected void onSelect(int index) { if (index == 0){ - GLog.i("WIP"); + GLog.i("Everything seems to fly around you."); + GameScene.flash( 0xFFFFFF ); + Sample.INSTANCE.play( Assets.SND_TELEPORT ); activeBuff = new timeStasis(); activeBuff.attachTo(Dungeon.hero); } else if (index == 1){ - GLog.i("everything around you slows to a halt."); + GLog.i("everything around you suddenly freezes."); GameScene.flash( 0xFFFFFF ); Sample.INSTANCE.play( Assets.SND_TELEPORT ); @@ -160,7 +162,7 @@ public class TimekeepersHourglass extends Artifact { } public class timeStasis extends ArtifactBuff { - //todo: add visuals, test + //todo: add visuals @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index d3ab86d0d..3f679e8fa 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -27,7 +27,6 @@ import java.util.Collections; * Created by debenhame on 26/11/2014. */ public class UnstableSpellbook extends Artifact { - //TODO: add display logic { name = "Unstable Spellbook"; @@ -135,7 +134,7 @@ public class UnstableSpellbook extends Artifact { desc += "It seems to contains a list of spells, but the order and position of them in the index is " + "constantly shifting. if you read from this book, there's no telling what spell you might cast."; - if (isEquipped (Dungeon.hero)){ + if (isEquipped (Dungeon.hero)) { desc += "\n\n"; if (!cursed) desc += "The book fits firmly at your side, sending you the occasional zip of static energy."; @@ -144,18 +143,18 @@ public class UnstableSpellbook extends Artifact { desc += "\n\n"; - //all simple names for scrolls begin with ScrollOf, so picking a specific substring index works well here. + } + if (level < levelCap) if (scrolls.size() > 1) desc += "The book's index points to some pages which are blank. " + - "Those pages are listed as: " + scrolls.get(0).substring(8) + " and " - + scrolls.get(1).substring(8) + ". Perhaps adding to the book will increase its power"; + "Those pages are listed as: " + scrolls.get(0) + " and " + + scrolls.get(1) + ". Perhaps adding to the book will increase its power"; else desc += "The book's index has one remaining blank page. " + - "That page is listed as " + scrolls.get(0).substring(8) + "."; + "That page is listed as " + scrolls.get(0) + "."; else desc += "The book's index is full, it doesn't look like you can add anything more to it."; - } return desc; }