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

V0.2.1 : Removed now unused quest items (rat skull gets to stick around a few versions to help old saves)

Browse Source
This commit is contained in:
Evan Debenham 2014-10-13 15:07:54 -04:00
parent bada599913
commit 0b8b28d37a
5 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

47
src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DriedRose.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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.";
}
}

2
src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java
View File

@ -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 {
{

13
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -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;

3
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java
View File

@ -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 {