Skip to content

Commit 8bdef66

Browse files
SEM24SEM24
committed
Code refactor and new features.
1 parent e31a2fa commit 8bdef66

6 files changed

Lines changed: 173 additions & 79 deletions

File tree

‎config.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fullscreen=Off
2-
music_volume=1
2+
music_volume=0
33
se_volume=1

‎src/main/java/com/khomsi/game/entity/player/Player.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,13 @@ public void setDefaultValues() {
8888

8989
public void setDefaultPosition() {
9090
//player position of player
91-
gameManager.currentMap = 3;
92-
worldX = GameManager.TILE_SIZE * 25;
93-
worldY = GameManager.TILE_SIZE * 1;
91+
gameManager.currentMap = 0;
92+
worldX = GameManager.TILE_SIZE * 30;
93+
worldY = GameManager.TILE_SIZE * 21;
94+
//TODO remove later
95+
// gameManager.currentMap = 3;
96+
// worldX = GameManager.TILE_SIZE * 25;
97+
// worldY = GameManager.TILE_SIZE * 1;
9498
direction = "down";
9599
}
96100

@@ -288,31 +292,31 @@ public void update() {
288292
entityAttack();
289293
}
290294
//You can't guard while attacking
291-
else if (keyHandler.spacePressed) {
295+
else if (keyHandler.isSpacePressed) {
292296
guarding = true;
293297
guardCounter++;
294298

295299
}
296300
//to avoid moving the character without pressing buttons
297-
else if (keyHandler.upPressed || keyHandler.downPressed ||
298-
keyHandler.leftPressed || keyHandler.rightPressed || keyHandler.enterPressed) {
301+
else if (keyHandler.isUpPressed || keyHandler.isDownPressed ||
302+
keyHandler.isLeftPressed || keyHandler.isRightPressed || keyHandler.isEnterPressed) {
299303

300304
//use else if to avoid diagonal movement, if it's not needed, use just if
301-
if (keyHandler.upPressed) {
305+
if (keyHandler.isUpPressed) {
302306
direction = "up";
303-
} else if (keyHandler.downPressed) {
307+
} else if (keyHandler.isDownPressed) {
304308
direction = "down";
305-
} else if (keyHandler.leftPressed) {
309+
} else if (keyHandler.isLeftPressed) {
306310
direction = "left";
307-
} else if (keyHandler.rightPressed) {
311+
} else if (keyHandler.isRightPressed) {
308312
direction = "right";
309313
}
310314

311315
turnOnCollision();
312316
//Check Event
313317
gameManager.eventHandler.checkEvent();
314318
//Change the direction of player
315-
if (!collisionOn && !keyHandler.enterPressed) {
319+
if (!collisionOn && !keyHandler.isEnterPressed) {
316320
switch (direction) {
317321
case "up" -> worldY -= speed;
318322
case "down" -> worldY += speed;
@@ -322,13 +326,13 @@ else if (keyHandler.upPressed || keyHandler.downPressed ||
322326
spriteMovement();
323327
}
324328
//To prevent sword swing when interact with events by enter press
325-
if (keyHandler.enterPressed && !attackCanceled) {
329+
if (keyHandler.isEnterPressed && !attackCanceled) {
326330
gameManager.playSE(10);
327331
attacking = true;
328332
spriteCounter = 0;
329333
}
330334
attackCanceled = false;
331-
gameManager.keyHandler.enterPressed = false;
335+
gameManager.keyHandler.isEnterPressed = false;
332336
guarding = false;
333337
guardCounter = 0;
334338
//Change the player's walk/attack sprites
@@ -348,7 +352,7 @@ else if (keyHandler.upPressed || keyHandler.downPressed ||
348352

349353
//Shoot projectTiles, if the previous tile is still on the screen,
350354
//you can't shoot next one
351-
if (keyHandler.shootKeyPressed && !projectTile.alive
355+
if (keyHandler.isShootKeyPressed && !projectTile.alive
352356
&& shootAvailableCounter == 30 && projectTile.haveResource(this)) {
353357
//Set default coord, direction, alive state and entity
354358
projectTile.set(worldX, worldY, direction, true, this);
@@ -495,7 +499,7 @@ private void interactMob(int mobIndex) {
495499
private void interactNpc(int npcIndex) {
496500
//if index not 999 - player touches the npc
497501
if (npcIndex != playerIndex) {
498-
if (gameManager.keyHandler.enterPressed) {
502+
if (gameManager.keyHandler.isEnterPressed) {
499503
attackCanceled = true;
500504
gameManager.npcList[gameManager.currentMap][npcIndex].speak();
501505
}
@@ -571,7 +575,7 @@ private void takeObject(int index) {
571575
}
572576
//Obstacle
573577
else if (gameManager.object[gameManager.currentMap][index].type == TYPE_OBSTACLE) {
574-
if (keyHandler.enterPressed) {
578+
if (keyHandler.isEnterPressed) {
575579
attackCanceled = true;
576580
gameManager.object[gameManager.currentMap][index].interact();
577581
}

‎src/main/java/com/khomsi/game/main/logic/EventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public boolean interact(int map, int col, int row, String direction) {
146146
}
147147

148148
private void speak(Entity entity) {
149-
if (gameManager.keyHandler.enterPressed) {
149+
if (gameManager.keyHandler.isEnterPressed) {
150150
gameManager.gameState = GameManager.DIALOGUE_STATE;
151151
gameManager.player.attackCanceled = true;
152152
entity.speak();
@@ -174,7 +174,7 @@ private void damagePit(int gameState) {
174174
}
175175

176176
private void healingPool(int gameState) {
177-
if (gameManager.keyHandler.enterPressed) {
177+
if (gameManager.keyHandler.isEnterPressed) {
178178
gameManager.gameState = gameState;
179179
gameManager.player.attackCanceled = true;
180180
if (gameManager.player.coin > 0) {

‎src/main/java/com/khomsi/game/main/tools/CutScenes.java‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
//package com.khomsi.game.main.tools;
2+
//
3+
//import com.khomsi.game.entity.mobs.MobDungeonBoss;
4+
//import com.khomsi.game.entity.player.PlayerDummy;
5+
//import com.khomsi.game.main.GameManager;
6+
//import com.khomsi.game.main.logic.CutSceneManager;
7+
//import com.khomsi.game.objects.outside.DungeonDoorClosedObject;
8+
//
9+
//import java.util.Objects;
10+
//
11+
//public class CutScenes {
12+
// GameManager gameManager;
13+
//
14+
// public CutScenes(GameManager gameManager) {
15+
// this.gameManager = gameManager;
16+
// }
17+
//
18+
// public void sceneDungeonBoss(int scenePhase, int sceneNumber, int NA) {
19+
// switch (scenePhase) {
20+
// case 0 -> {
21+
// gameManager.bossBattleOn = true;
22+
// //Close the door
23+
// for (int i = 0; i < gameManager.object[1].length; i++) {
24+
// if (gameManager.object[gameManager.currentMap][i] == null) {
25+
// gameManager.object[gameManager.currentMap][i] = new DungeonDoorClosedObject(gameManager);
26+
// //TODO change the location of door and the map of dungeon 2
27+
// gameManager.object[gameManager.currentMap][i].worldX = GameManager.TILE_SIZE * 25;
28+
// gameManager.object[gameManager.currentMap][i].worldY = GameManager.TILE_SIZE * 8;
29+
// gameManager.object[gameManager.currentMap][i].markered = true;
30+
// gameManager.playSE(5);
31+
// break;
32+
// }
33+
// }
34+
// //Search the vacant slot for dummy
35+
// for (int i = 0; i < gameManager.npcList[1].length; i++) {
36+
// if (gameManager.npcList[gameManager.currentMap][i] == null) {
37+
// gameManager.npcList[gameManager.currentMap][i] = new PlayerDummy(gameManager);
38+
// gameManager.npcList[gameManager.currentMap][i].worldX = gameManager.player.worldX;
39+
// gameManager.npcList[gameManager.currentMap][i].worldY = gameManager.player.worldY;
40+
// gameManager.npcList[gameManager.currentMap][i].direction = gameManager.player.direction;
41+
// break;
42+
// }
43+
// }
44+
// gameManager.player.drawing = false;
45+
// scenePhase++;
46+
// }
47+
// //Move the camera to boss
48+
// case 1 -> {
49+
// gameManager.player.worldY += 2;
50+
// if (gameManager.player.worldY > GameManager.TILE_SIZE * 28) {
51+
// scenePhase++;
52+
// }
53+
// }
54+
// case 2 -> {
55+
// for (int i = 0; i < gameManager.mobs[1].length; i++) {
56+
// if (gameManager.mobs[gameManager.currentMap][i] != null
57+
// && Objects.equals(gameManager.mobs[gameManager.currentMap][i].name, MobDungeonBoss.MOB_NAME)) {
58+
// gameManager.mobs[gameManager.currentMap][i].bossSleep = false;
59+
// gameManager.ui.npc = gameManager.mobs[gameManager.currentMap][i];
60+
// scenePhase++;
61+
// break;
62+
// }
63+
// }
64+
// }
65+
// //Boss speaks
66+
// case 3 -> gameManager.ui.showDialog();
67+
// //Return camera to player
68+
// case 4 -> {
69+
// for (int i = 0; i < gameManager.npcList[1].length; i++) {
70+
// if (gameManager.npcList[gameManager.currentMap][i] != null
71+
// && Objects.equals(gameManager.npcList[gameManager.currentMap][i].name, PlayerDummy.NPC_NAME)) {
72+
// //Restore player's position
73+
// gameManager.player.worldX = gameManager.npcList[gameManager.currentMap][i].worldX;
74+
// gameManager.player.worldY = gameManager.npcList[gameManager.currentMap][i].worldY;
75+
// //Delete dummy
76+
// gameManager.npcList[gameManager.currentMap][i] = null;
77+
// break;
78+
// }
79+
// }
80+
// //Draw the player again
81+
// gameManager.player.drawing = true;
82+
// //Restore counters
83+
// scenePhase = 0;
84+
// sceneNumber = NA;
85+
// gameManager.gameState = GameManager.PLAY_STATE;
86+
// //Change music
87+
// gameManager.stopMusic();
88+
// gameManager.playMusic(22);
89+
// }
90+
// }
91+
// }
92+
//}

0 commit comments

Comments
 (0)