konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.0: added placeholder sprites for new & reworked wands. All names are WIP.

Browse Source
This commit is contained in:
Evan Debenham
2015-03-27 02:54:31 -04:00
parent 99f853c190
commit 773481ceb4
11 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
-3
View File
@@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMagic.Magic;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Bundle;
@@ -75,8 +74,6 @@ public abstract class Wand extends KindOfWeapon {
{
defaultAction = AC_ZAP;
image = ItemSpriteSheet.WAND_MAGIC_MISSILE;
}
public Wand() {
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java
+3
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.Camera;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
@@ -42,6 +43,8 @@ public class WandOfAvalanche extends Wand {
{
name = "Wand of Avalanche";
image = ItemSpriteSheet.WAND_AVALANCHE;
collisionProperties = Ballistica.STOP_TERRAIN;
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
+3
View File
@@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.utils.Callback;
import com.watabou.utils.Random;
@@ -37,6 +38,8 @@ public class WandOfDisintegration extends Wand {
{
name = "Wand of Disintegration";
image = ItemSpriteSheet.WAND_DISINTEGRATION;
collisionProperties = Ballistica.STOP_TERRAIN;
}
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java
+2
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -41,6 +42,7 @@ public class WandOfFirebolt extends Wand {
{
name = "Wand of Firebolt";
image = ItemSpriteSheet.WAND_FIREBOLT;
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java
+2
View File
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.Camera;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
@@ -40,6 +41,7 @@ public class WandOfLightning extends Wand {
{
name = "Wand of Lightning";
image = ItemSpriteSheet.WAND_LIGHTNING;
}
private ArrayList<Char> affected = new ArrayList<Char>();
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java
+2
View File
@@ -18,6 +18,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -32,6 +33,7 @@ public class WandOfPoison extends Wand {
{
name = "Wand of Poison";
image = ItemSpriteSheet.WAND_ACID;
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java
+2
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -34,6 +35,7 @@ public class WandOfRegrowth extends Wand {
{
name = "Wand of Regrowth";
image = ItemSpriteSheet.WAND_REGROWTH;
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java
+2
View File
@@ -18,6 +18,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -32,6 +33,7 @@ public class WandOfSlowness extends Wand {
{
name = "Wand of Slowness";
image = ItemSpriteSheet.WAND_FROST;
}
@Override
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java
+3
View File
@@ -17,6 +17,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -37,6 +38,8 @@ public class WandOfTelekinesis extends Wand {
{
name = "Wand of Telekinesis";
image = ItemSpriteSheet.WAND_FORCE;
collisionProperties = Ballistica.STOP_TERRAIN;
}