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

v0.8.0: fixed various errors with resized enemy sprites

Browse Source
This commit is contained in:
Evan Debenham 2019-10-29 19:51:00 -04:00
parent c803537ecd
commit 1539d57f71
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPD-classes/src/main/java/com/watabou/noosa/Visual.java
View File

@ -138,12 +138,12 @@ public class Visual extends Gizmo {
} }
public PointF center() { public PointF center() {
return new PointF( x + width / 2, y + height / 2 ); return new PointF( x + width() / 2, y + height() / 2 );
} }
public PointF center( PointF p ) { public PointF center( PointF p ) {
x = p.x - width / 2; x = p.x - width() / 2;
y = p.y - height / 2; y = p.y - height() / 2;
return p; return p;
} }

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@ -166,8 +166,8 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
final int csize = DungeonTilemap.SIZE; final int csize = DungeonTilemap.SIZE;
return new PointF( return new PointF(
PixelScene.align(Camera.main, ((cell % Dungeon.level.width()) + 0.5f) * csize - width * 0.5f), PixelScene.align(Camera.main, ((cell % Dungeon.level.width()) + 0.5f) * csize - width() * 0.5f),
PixelScene.align(Camera.main, ((cell / Dungeon.level.width()) + 1.0f) * csize - height - csize * perspectiveRaise) PixelScene.align(Camera.main, ((cell / Dungeon.level.width()) + 1.0f) * csize - height() - csize * perspectiveRaise)
); );
} }
@ -586,8 +586,8 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
super.updateMatrix(); super.updateMatrix();
Matrix.copy(matrix, shadowMatrix); Matrix.copy(matrix, shadowMatrix);
Matrix.translate(shadowMatrix, Matrix.translate(shadowMatrix,
(width() * (1f - shadowWidth)) / 2f, (width * (1f - shadowWidth)) / 2f,
(height() * (1f - shadowHeight)) + shadowOffset); (height * (1f - shadowHeight)) + shadowOffset);
Matrix.scale(shadowMatrix, shadowWidth, shadowHeight); Matrix.scale(shadowMatrix, shadowWidth, shadowHeight);
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TargetHealthIndicator.java
View File

@ -42,7 +42,7 @@ public class TargetHealthIndicator extends HealthBar {
if (target != null && target.isAlive() && target.sprite.visible) { if (target != null && target.isAlive() && target.sprite.visible) {
CharSprite sprite = target.sprite; CharSprite sprite = target.sprite;
width = sprite.width; width = sprite.width();
x = sprite.x; x = sprite.x;
y = sprite.y - 3; y = sprite.y - 3;
level( target ); level( target );

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java
View File

@ -68,14 +68,14 @@ public class WndInfoMob extends WndTitledMessage {
protected void layout() { protected void layout() {
image.x = 0; image.x = 0;
image.y = Math.max( 0, name.height() + health.height() - image.height ); image.y = Math.max( 0, name.height() + health.height() - image.height() );
name.setPos(x + image.width + GAP, name.setPos(x + image.width + GAP,
image.height > name.height() ? y +(image.height() - name.height()) / 2 : y); image.height() > name.height() ? y +(image.height() - name.height()) / 2 : y);
float w = width - image.width - GAP; float w = width - image.width() - GAP;
health.setRect(image.width + GAP, name.bottom() + GAP, w, health.height()); health.setRect(image.width() + GAP, name.bottom() + GAP, w, health.height());
buffs.setPos( buffs.setPos(
name.right() + GAP-1, name.right() + GAP-1,