diff --git a/assets/items.png b/assets/items.png index 0e22d385c..58629bf58 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java deleted file mode 100644 index 76b14e7ea..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.quest; - -import com.shatteredpixel.shatteredpixeldungeon.items.Item; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - -public class DriedRose extends Item { - - { - name = "dried rose"; - image = ItemSpriteSheet.ROSE; - - unique = true; - } - - @Override - public boolean isUpgradable() { - return false; - } - - @Override - public boolean isIdentified() { - return true; - } - - @Override - public String info() { - return - "The rose has dried long ago, but it has kept all its petals somehow."; - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java index 4075b76cb..8fc12a0c1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java @@ -20,6 +20,8 @@ package com.shatteredpixel.shatteredpixeldungeon.items.quest; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +//this one's still hanging around to support quests from old saves +//TODO: remove this when saves from v0.2.1 are no longer supported public class RatSkull extends Item { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index a0110719a..1277b7fa7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -135,7 +135,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_ARMBAND = ROW8+1; public static final int ARTIFACT_CAPE = ROW8+2; public static final int ARTIFACT_TALISMAN = ROW8+3; - + public static final int ARTIFACT_ROSE = ROW8+4; //Row Nine: Artifacts with Dynamic Images public static final int ARTIFACT_HORN1 = ROW9+0; @@ -199,12 +199,11 @@ public class ItemSpriteSheet { public static final int PASTY = ROW13+6; //Row Fourteen: Quest Items - public static final int ROSE = ROW14+0; - public static final int SKULL = ROW14+1; - public static final int DUST = ROW14+2; - public static final int PICKAXE = ROW14+3; - public static final int ORE = ROW14+4; - public static final int TOKEN = ROW14+5; + public static final int SKULL = ROW14+0; + public static final int DUST = ROW14+1; + public static final int PICKAXE = ROW14+2; + public static final int ORE = ROW14+3; + public static final int TOKEN = ROW14+4; //Row Fifteen: Containers/Bags public static final int VIAL = ROW15+0; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java index a4973c343..53a176ab9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java @@ -25,13 +25,10 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; import com.shatteredpixel.shatteredpixeldungeon.items.Item; -import com.shatteredpixel.shatteredpixeldungeon.items.quest.DriedRose; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; -import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class WndSadGhost extends Window {