Skip to content

Commit 61bf9ad

Browse files
authored
Fix UI/UX issues and Improve save/load system.
- Add all currency fields (metalScrap, titaniumCore, neurochip) to new save template - Redesign save dialog UI with wooden theme matching game aesthetic - Fix ESC key and pause button to properly open pause menu - Fix pause menu layering - save dialog now appears on top - Update win/lose conditions to use homebase health instead of player health - Fix entity cleanup timing to ensure score calculation works correctly - Merge latest changes from main branch
2 parents e433ee6 + 0cd2958 commit 61bf9ad

24 files changed

+436
-180
lines changed

source/core/assets/flat-earth/skin/flat-earth-ui.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@ com.badlogic.gdx.graphics.Color: {
3030
a: 1
3131
}
3232
color: {
33-
r: 0.3372549
34-
g: 0.8
35-
b: 0.44705883
33+
r: 1,
34+
g: 0.549,
35+
b: 0,
3636
a: 1
37-
}
37+
},
3838
gray: {
3939
r: 0.5
4040
g: 0.5
4141
b: 0.5
4242
a: 1
4343
}
4444
highlight: {
45-
r: 0.42156863
46-
g: 1
47-
b: 0.5552286
45+
r: 1,
46+
g: 0.7,
47+
b: 0.3,
4848
a: 1
4949
}
5050
pressed: {
51-
r: 0.2529412
52-
g: 0.6
53-
b: 0.33313715
51+
r: 0.8,
52+
g: 0.4,
53+
b: 0,
5454
a: 1
55-
}
55+
},
5656
selection: {
5757
r: 0.22745098
5858
g: 0.59607846

source/core/assets/images/book.png

1.47 MB
Loading
2.76 MB
Loading

source/core/assets/images/rank.png

1.23 MB
Loading
1.97 MB
Loading
1.3 MB
Loading
252 KB
Loading
594 KB
Loading

source/core/assets/saves/harry.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

source/core/src/main/com/csse3200/game/areas/ForestGameArea.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,12 @@ private void buildSpawnQueue() {
244244
public void onWaveDefeated() {
245245
logger.info("Wave {} defeated!", currentWaveIndex + 1);
246246

247+
// Safety check: if waves not initialized (e.g., loaded from save), don't process wave progression
248+
if (waves == null) {
249+
logger.warn("Waves not initialized - skipping wave progression");
250+
return;
251+
}
252+
247253
// Check if this was the final wave
248254
if (currentWaveIndex + 1 >= waves.size()) {
249255
// All waves complete - trigger victory!

0 commit comments

Comments
 (0)