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

v0.7.3: improved the sprites and VFX for new thrown weapons

Browse Source
This commit is contained in:
Evan Debenham 2019-05-21 03:16:53 -04:00
parent 31b94f0ff5
commit 1cad02e2a4
3 changed files with 7 additions and 5 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: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java
View File

@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite;
import com.watabou.noosa.tweeners.AlphaTweener;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
import com.watabou.utils.Callback; import com.watabou.utils.Callback;
@ -49,14 +50,12 @@ public class HeavyBoomerang extends MissileWeapon {
protected void rangedHit(Char enemy, int cell) { protected void rangedHit(Char enemy, int cell) {
decrementDurability(); decrementDurability();
if (durability > 0){ if (durability > 0){
//TODO vfx
Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth); Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth);
} }
} }
@Override @Override
protected void rangedMiss(int cell) { protected void rangedMiss(int cell) {
//TODO vfx
parent = null; parent = null;
Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth); Buff.append(Dungeon.hero, CircleBack.class).setup(this, cell, Dungeon.hero.pos, Dungeon.depth);
} }
@ -84,8 +83,8 @@ public class HeavyBoomerang extends MissileWeapon {
left--; left--;
if (left <= 0){ if (left <= 0){
final Char returnTarget = Actor.findChar(returnPos); final Char returnTarget = Actor.findChar(returnPos);
((MissileSprite) Dungeon.hero.sprite.parent.recycle(MissileSprite.class)). MissileSprite visual = ((MissileSprite) Dungeon.hero.sprite.parent.recycle(MissileSprite.class));
reset( thrownPos, visual.reset( thrownPos,
returnPos, returnPos,
boomerang, boomerang,
new Callback() { new Callback() {
@ -109,6 +108,9 @@ public class HeavyBoomerang extends MissileWeapon {
} }
} }
}); });
visual.alpha(0f);
float duration = Dungeon.level.trueDistance(thrownPos, returnPos) / 20f;
Dungeon.hero.sprite.parent.add(new AlphaTweener(visual, 1f, duration));
detach(); detach();
} }
} }

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

@ -302,7 +302,7 @@ public class ItemSpriteSheet {
assignItemRect(TRIDENT, 16, 16); assignItemRect(TRIDENT, 16, 16);
assignItemRect(THROWING_HAMMER, 12, 12); assignItemRect(THROWING_HAMMER, 12, 12);
assignItemRect(FORCE_CUBE, 10, 13); assignItemRect(FORCE_CUBE, 11, 12);
} }
public static final int TIPPED_DARTS = xy(1, 11); //16 slots public static final int TIPPED_DARTS = xy(1, 11); //16 slots