MiauRizius/JGame2D
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

re-arranged some variables

Browse Source
This commit is contained in:
Maurice
2025-11-29 23:40:47 +01:00
parent 8a228685b1
commit c55bf8d043
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/de/miaurizius/jgame2d/core/GamePanel.java
View File

@@ -17,10 +17,8 @@ public class GamePanel extends JPanel implements Runnable {
// SCREEN SETTINGS // SCREEN SETTINGS
final int originalTileSize = 16; //16x16 tile final int originalTileSize = 16; //16x16 tile
final int scale = 3; final int scale = 3;
public final int tileSize = originalTileSize * scale; //48x48 tile
// 4:3 ratio
public final int maxScreenCol = 16; public final int maxScreenCol = 16;
public final int tileSize = originalTileSize * scale; //48x48 tile
public final int maxScreenRow = 12; public final int maxScreenRow = 12;
public final int screenWidth = tileSize * maxScreenCol; // 768 pixels public final int screenWidth = tileSize * maxScreenCol; // 768 pixels
public final int screenHeight = tileSize * maxScreenRow; // 576 pixels public final int screenHeight = tileSize * maxScreenRow; // 576 pixels
@@ -36,12 +34,12 @@ public class GamePanel extends JPanel implements Runnable {
// SYSTEM // SYSTEM
public TileManager tileM = new TileManager(this); public TileManager tileM = new TileManager(this);
public KeyHandler keyH = new KeyHandler(this); public KeyHandler keyH = new KeyHandler(this);
Sound se = new Sound();
Sound music = new Sound();
public CollisionHandler collisionH = new CollisionHandler(this); public CollisionHandler collisionH = new CollisionHandler(this);
public AssetSetter assetSetter = new AssetSetter(this); public AssetSetter assetSetter = new AssetSetter(this);
public UI ui = new UI(this); public UI ui = new UI(this);
public EventHandler eventH = new EventHandler(this); public EventHandler eventH = new EventHandler(this);
Sound se = new Sound();
Sound music = new Sound();
Thread gameThread; Thread gameThread;
// ENTITY AND OBJECT // ENTITY AND OBJECT

2
src/de/miaurizius/jgame2d/core/UI.java
View File

@@ -14,7 +14,7 @@ public class UI {
Font arial_40, arial_80B; //TODO: Custom font loader: https://www.youtube.com/watch?v=g-wrebFVP3E Font arial_40, arial_80B; //TODO: Custom font loader: https://www.youtube.com/watch?v=g-wrebFVP3E
BufferedImage heart_full, heart_half, heart_blank; BufferedImage heart_full, heart_half, heart_blank;
public String currentDialogue; public String currentDialogue;
public int commandNum = 0; public int commandNum;
public UI(GamePanel panel) { public UI(GamePanel panel) {
this.panel = panel; this.panel = panel;

19
src/de/miaurizius/jgame2d/entity/Entity.java
View File

@@ -22,22 +22,25 @@ public class Entity {
public Rectangle solidArea = new Rectangle(0, 0, 48, 48); public Rectangle solidArea = new Rectangle(0, 0, 48, 48);
public Rectangle attackArea = new Rectangle(0, 0, 0, 0); public Rectangle attackArea = new Rectangle(0, 0, 0, 0);
public int solidAreaDefaultX, solidAreaDefaultY; public int solidAreaDefaultX, solidAreaDefaultY;
public boolean collision = false; public boolean collision;
String[] dialogue = new String[20]; String[] dialogue = new String[20];
// STATE // STATE
public int worldX, worldY; public int worldX, worldY;
public Direction direction = Direction.DOWN; public Direction direction = Direction.DOWN;
public int spriteNum = 1; public int spriteNum = 1;
int dialogueIndex = 0; int dialogueIndex;
public boolean collisionOn = false; public boolean collisionOn;
public boolean invincible = false; public boolean invincible;
boolean attacking = false; //TODO: https://youtu.be/HL39xRzPpm4?t=551 boolean attacking;
boolean alive = true;
boolean dying;
// COUNTER // COUNTER
public int spriteCounter = 0; public int spriteCounter;
public int actionLock = 0; public int actionLock;
public int invincibleCount = 0; public int invincibleCount;
int dyingCount;
// ATTRIBUTES // ATTRIBUTES
public EntityType type; public EntityType type;