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

v0.7.0: updated runestone sprites

Browse Source
This commit is contained in:
Evan Debenham 2018-08-30 23:35:50 -04:00
parent f293d9217e
commit 39b72ad6ec
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/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

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java
View File

@ -37,7 +37,7 @@ import com.watabou.utils.PathFinder;
public class StoneOfAggression extends Runestone {
{
image = ItemSpriteSheet.STONE_KAUNAN;
image = ItemSpriteSheet.STONE_AGGRESSION;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java
View File

@ -39,7 +39,7 @@ public class StoneOfAugmentation extends InventoryStone {
{
mode = WndBag.Mode.ENCHANTABLE;
image = ItemSpriteSheet.STONE_YNGVI;
image = ItemSpriteSheet.STONE_AUGMENTATION;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java
View File

@ -37,7 +37,7 @@ import com.watabou.utils.PathFinder;
public class StoneOfAvoidance extends Runestone {
{
image = ItemSpriteSheet.STONE_LAGUZ;
image = ItemSpriteSheet.STONE_AVOIDANCE;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlast.java
View File

@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class StoneOfBlast extends Runestone {
{
image = ItemSpriteSheet.STONE_GYFU;
image = ItemSpriteSheet.STONE_BLAST;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlink.java
View File

@ -30,7 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class StoneOfBlink extends Runestone {
{
image = ItemSpriteSheet.STONE_SOWILO;
image = ItemSpriteSheet.STONE_BLINK;
}
private static Ballistica throwPath;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java
View File

@ -44,7 +44,7 @@ public class StoneOfClairvoyance extends Runestone {
private static final int DIST = 8;
{
image = ItemSpriteSheet.STONE_RAIDO;
image = ItemSpriteSheet.STONE_CLAIRVOYANCE;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java
View File

@ -36,7 +36,7 @@ import com.watabou.utils.PathFinder;
public class StoneOfDeepenedSleep extends Runestone {
{
image = ItemSpriteSheet.STONE_NAUDIZ;
image = ItemSpriteSheet.STONE_SLEEP;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDetectCurse.java
View File

@ -33,7 +33,7 @@ public class StoneOfDetectCurse extends InventoryStone {
{
mode = WndBag.Mode.CURSE_DETECTABLE;
image = ItemSpriteSheet.STONE_ODAL;
image = ItemSpriteSheet.STONE_CURSE;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java
View File

@ -35,7 +35,7 @@ public class StoneOfEnchantment extends InventoryStone {
{
mode = WndBag.Mode.ENCHANTABLE;
image = ItemSpriteSheet.STONE_TIWAZ;
image = ItemSpriteSheet.STONE_ENCHANT;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java
View File

@ -36,7 +36,7 @@ import com.watabou.utils.Random;
public class StoneOfFlock extends Runestone {
{
image = ItemSpriteSheet.STONE_BERKANAN;
image = ItemSpriteSheet.STONE_FLOCK;
}
@Override

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java
View File

@ -75,7 +75,7 @@ public class StoneOfIntuition extends InventoryStone {
{
mode = WndBag.Mode.UNIDED_POTION_OR_SCROLL;
image = ItemSpriteSheet.STONE_ISAZ;
image = ItemSpriteSheet.STONE_INTUITION;
}
@Override
@ -128,7 +128,7 @@ public class StoneOfIntuition extends InventoryStone {
public WndGuess(final Item item){
IconTitle titlebar = new IconTitle();
titlebar.icon( new ItemSprite(ItemSpriteSheet.STONE_ISAZ, null) );
titlebar.icon( new ItemSprite(ItemSpriteSheet.STONE_INTUITION, null) );
titlebar.label( Messages.get(StoneOfIntuition.class, "name") );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java
View File

@ -41,7 +41,7 @@ import java.util.ArrayList;
public class StoneOfShock extends Runestone {
{
image = ItemSpriteSheet.STONE_MANNAZ;
image = ItemSpriteSheet.STONE_SHOCK;
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
View File

@ -1552,7 +1552,7 @@ public class ChangesScene extends PixelScene {
"\n" +
"Dev commentary will be added here in the future."));
changes.addButton( new ChangeButton(new ItemSprite(ItemSpriteSheet.STONE_YNGVI, null), "Pixel Dungeon v1.7.2",
changes.addButton( new ChangeButton(new ItemSprite(ItemSpriteSheet.STONE_AUGMENTATION, null), "Pixel Dungeon v1.7.2",
"Implemented directly from v1.7.2:\n" +
"_-_ Synchronous Movement\n" +
"_-_ Challenges\n" +

26
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -443,19 +443,19 @@ public class ItemSpriteSheet {
assignItemRect(i, 15, 14);
}
private static final int STONES = xy(1, 21); //16 slots
public static final int STONE_KAUNAN = STONES+0;
public static final int STONE_SOWILO = STONES+1;
public static final int STONE_LAGUZ = STONES+2;
public static final int STONE_YNGVI = STONES+3;
public static final int STONE_GYFU = STONES+4;
public static final int STONE_RAIDO = STONES+5;
public static final int STONE_ISAZ = STONES+6;
public static final int STONE_MANNAZ = STONES+7;
public static final int STONE_NAUDIZ = STONES+8;
public static final int STONE_BERKANAN = STONES+9;
public static final int STONE_ODAL = STONES+10;
public static final int STONE_TIWAZ = STONES+11;
private static final int STONES = xy(1, 21); //16 slots
public static final int STONE_AGGRESSION = STONES+0;
public static final int STONE_AUGMENTATION = STONES+1;
public static final int STONE_AVOIDANCE = STONES+2;
public static final int STONE_BLAST = STONES+3;
public static final int STONE_BLINK = STONES+4;
public static final int STONE_CLAIRVOYANCE = STONES+5;
public static final int STONE_SLEEP = STONES+6;
public static final int STONE_CURSE = STONES+7;
public static final int STONE_ENCHANT = STONES+8;
public static final int STONE_FLOCK = STONES+9;
public static final int STONE_INTUITION = STONES+10;
public static final int STONE_SHOCK = STONES+11;
static {
for (int i = STONES; i < STONES+16; i++)
assignItemRect(i, 14, 12);