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

v0.5.0: corrected alignment for wand effects

Browse Source
This commit is contained in:
Evan Debenham 2017-01-22 15:19:14 -05:00
parent 14c4875082
commit 5c37f71869
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/MagicMissile.java
View File

@ -65,8 +65,8 @@ public class MagicMissile extends Emitter {
public void reset( int type, int from, int to, Callback callback ) { public void reset( int type, int from, int to, Callback callback ) {
reset( type, reset( type,
DungeonTilemap.tileCenterToWorld( from ), DungeonTilemap.raisedTileCenterToWorld( from ),
DungeonTilemap.tileCenterToWorld( to ), DungeonTilemap.raisedTileCenterToWorld( to ),
callback ); callback );
} }
@ -80,7 +80,7 @@ public class MagicMissile extends Emitter {
public void reset( int type, Visual from, int to, Callback callback ) { public void reset( int type, Visual from, int to, Callback callback ) {
reset( type, reset( type,
from.center(), from.center(),
DungeonTilemap.tileCenterToWorld( to ), DungeonTilemap.raisedTileCenterToWorld( to ),
callback); callback);
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java
View File

@ -119,7 +119,7 @@ public class WandOfDisintegration extends DamageWand {
protected void fx( Ballistica beam, Callback callback ) { protected void fx( Ballistica beam, Callback callback ) {
int cell = beam.path.get(Math.min(beam.dist, distance())); int cell = beam.path.get(Math.min(beam.dist, distance()));
curUser.sprite.parent.add(new Beam.DeathRay(curUser.sprite.center(), DungeonTilemap.tileCenterToWorld( cell ))); curUser.sprite.parent.add(new Beam.DeathRay(curUser.sprite.center(), DungeonTilemap.raisedTileCenterToWorld( cell )));
callback.call(); callback.call();
} }

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java
View File

@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
@ -130,7 +131,7 @@ public class WandOfLightning extends DamageWand {
arcs.add( new Lightning.Arc(curUser.sprite.center(), ch.sprite.center())); arcs.add( new Lightning.Arc(curUser.sprite.center(), ch.sprite.center()));
arc(ch); arc(ch);
} else { } else {
arcs.add( new Lightning.Arc(curUser.sprite.center(), bolt.collisionPos)); arcs.add( new Lightning.Arc(curUser.sprite.center(), DungeonTilemap.raisedTileCenterToWorld(bolt.collisionPos)));
CellEmitter.center( cell ).burst( SparkParticle.FACTORY, 3 ); CellEmitter.center( cell ).burst( SparkParticle.FACTORY, 3 );
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java
View File

@ -130,7 +130,7 @@ public class WandOfPrismaticLight extends DamageWand {
@Override @Override
protected void fx( Ballistica beam, Callback callback ) { protected void fx( Ballistica beam, Callback callback ) {
curUser.sprite.parent.add( curUser.sprite.parent.add(
new Beam.LightRay(curUser.sprite.center(), DungeonTilemap.tileCenterToWorld(beam.collisionPos))); new Beam.LightRay(curUser.sprite.center(), DungeonTilemap.raisedTileCenterToWorld(beam.collisionPos)));
callback.call(); callback.call();
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java
View File

@ -201,7 +201,7 @@ public class WandOfTransfusion extends Wand {
@Override @Override
protected void fx(Ballistica beam, Callback callback) { protected void fx(Ballistica beam, Callback callback) {
curUser.sprite.parent.add( curUser.sprite.parent.add(
new Beam.HealthRay(curUser.sprite.center(), DungeonTilemap.tileCenterToWorld(beam.collisionPos))); new Beam.HealthRay(curUser.sprite.center(), DungeonTilemap.raisedTileCenterToWorld(beam.collisionPos)));
callback.call(); callback.call();
} }

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

@ -108,7 +108,7 @@ public class EyeSprite extends MobSprite {
if (Actor.findChar(zapPos) != null){ if (Actor.findChar(zapPos) != null){
parent.add(new Beam.DeathRay(center(), Actor.findChar(zapPos).sprite.center())); parent.add(new Beam.DeathRay(center(), Actor.findChar(zapPos).sprite.center()));
} else { } else {
parent.add(new Beam.DeathRay(center(), DungeonTilemap.tileCenterToWorld(zapPos))); parent.add(new Beam.DeathRay(center(), DungeonTilemap.raisedTileCenterToWorld(zapPos)));
} }
} }
((Eye)ch).deathGaze(); ((Eye)ch).deathGaze();

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTilemap.java
View File

@ -135,6 +135,12 @@ public abstract class DungeonTilemap extends Tilemap {
(pos % Dungeon.level.width() + 0.5f) * SIZE, (pos % Dungeon.level.width() + 0.5f) * SIZE,
(pos / Dungeon.level.width() + 0.5f) * SIZE ); (pos / Dungeon.level.width() + 0.5f) * SIZE );
} }
public static PointF raisedTileCenterToWorld( int pos ) {
return new PointF(
(pos % Dungeon.level.width() + 0.5f) * SIZE,
(pos / Dungeon.level.width() + 0.1f) * SIZE );
}
@Override @Override
public boolean overlapsScreenPoint( int x, int y ) { public boolean overlapsScreenPoint( int x, int y ) {