diff --git a/assets/items.png b/assets/items.png index 75d0887af..5dec4a0ce 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index 7131e6fa2..120150fb8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -50,6 +50,11 @@ public class ShatteredPixelDungeon extends Game { com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion.class, "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfWeaponUpgrade" ); + // 0.2.4d + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon.class, + "com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon" ); + } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 03509b815..3b2d82cf0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -32,7 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; -import com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java index fafe3ed1a..694741846 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java @@ -18,7 +18,7 @@ public class MerchantsBeacon extends Item { { name = "merchant's beacon"; - image = ItemSpriteSheet.BEACON; //TODO: make sprite + image = ItemSpriteSheet.BEACON; stackable = true; @@ -56,15 +56,14 @@ public class MerchantsBeacon extends Item { @Override public int price() { - return 10 * quantity; + return 5 * quantity; } @Override - //todo add description public String info() { - return "This odd piece of dwarvern technology allows you to communicate from great distances." + + return "This odd piece of dwarven technology allows you to communicate from great distances." + "\n\nAfter being activated, this beacon will let you sell items to Pixel Mart from anywhere in the dungeon." + - "\n\nOnce activated, the magic within the beacon will only last for one session though, so use it wisely."; + "\n\nHowever, the magic within the beacon will only last for one session, so use it wisely."; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java similarity index 95% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index de810e7ab..80e946e11 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -15,7 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see */ -package com.shatteredpixel.shatteredpixeldungeon.items; +package com.shatteredpixel.shatteredpixeldungeon.items.artifacts; +//If it weren't super obvious, this is going to become an artifact soon. import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -23,8 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; -import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose; -import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; @@ -65,7 +65,7 @@ public class LloydsBeacon extends Item { { name = "lloyd's beacon"; - image = ItemSpriteSheet.BEACON; + image = ItemSpriteSheet.ARTIFACT_BEACON; unique = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 84861980f..e5b4389c8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -147,6 +147,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_HOURGLASS = ROW8+4; public static final int ARTIFACT_TOOLKIT = ROW8+5; public static final int ARTIFACT_SPELLBOOK = ROW8+6; + public static final int ARTIFACT_BEACON = ROW8+7; //Row Nine: Artifacts with Dynamic Images public static final int ARTIFACT_HORN1 = ROW9+0;