I forgot stuff...

This commit is contained in:
Raphi
2025-09-03 14:30:39 +02:00
parent cf7dd4d0f4
commit e53172d18f
4 changed files with 22 additions and 2 deletions

View File

@@ -15,7 +15,7 @@ import com.gpl.rpg.AndorsTrail.util.Size;
public class Actor {
public int iconID;
public final Size tileSize;
public final boolean allowHorizontalSpriteFlip;
public boolean allowHorizontalSpriteFlip;
public final Coord position = new Coord();
public final CoordRect rectPosition;
public final boolean isPlayer;

View File

@@ -37,6 +37,7 @@ public final class MonsterType {
public final Size tileSize;
public final int iconID;
public final boolean allowHorizontalSpriteFlip;
public final int maxAP;
public final int maxHP;
public final int moveCost;
@@ -64,6 +65,7 @@ public final class MonsterType {
, AggressionType aggressionType
, Size tileSize
, int iconID
, boolean allowHorizontalSpriteFlip
, int maxAP
, int maxHP
, int moveCost
@@ -90,6 +92,7 @@ public final class MonsterType {
this.aggressionType = aggressionType;
this.tileSize = tileSize;
this.iconID = iconID;
this.allowHorizontalSpriteFlip = allowHorizontalSpriteFlip;
this.maxAP = maxAP;
this.maxHP = maxHP;
this.moveCost = moveCost;

View File

@@ -105,6 +105,7 @@ public final class JsonFieldNames {
public static final class Monster {
public static final String monsterTypeID = "id";
public static final String iconID = "iconID";
public static String allowHorizontalSpriteFlip = "allowHorizontalSpriteFlip";
public static final String name = "name";
public static final String spawnGroup = "spawnGroup";
public static final String monsterClass = "monsterClass";

View File

@@ -503,16 +503,32 @@ public final class MainView extends SurfaceView
if (!area.contains(p)) return;
_drawFromMapPosition(canvas, area, p.x, p.y, tile);
}
private void drawFromMapPosition(Canvas canvas, final CoordRect area, final Coord p, final int tile, final boolean allowHorizontalSpriteFlip) {
if (!area.contains(p)) return;
_drawFromMapPosition(canvas, area, p.x, p.y, tile, allowHorizontalSpriteFlip);
}
private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile) {
if (!area.intersects(p)) return;
_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile);
}
private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile, final boolean allowHorizontalSpriteFlip) {
if (!area.intersects(p)) return;
_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile, allowHorizontalSpriteFlip);
}
private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile) {
x -= mapViewArea.topLeft.x;
y -= mapViewArea.topLeft.y;
// if ( (x >= 0 && x < mapViewArea.size.width)
// && (y >= 0 && y < mapViewArea.size.height)) {
tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint, m.allowHorizontalSpriteFlip);
tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint);
// }
}
private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile, final boolean allowHorizontalSpriteFlip) {
x -= mapViewArea.topLeft.x;
y -= mapViewArea.topLeft.y;
// if ( (x >= 0 && x < mapViewArea.size.width)
// && (y >= 0 && y < mapViewArea.size.height)) {
tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint, allowHorizontalSpriteFlip);
// }
}