Merge branch 'main' into Team-3-maps-main

UQcsse3200 · Sep 13, 2023 · 0cbdb91 · 0cbdb91
2 parents 25814da + 0287ce3
commit 0cbdb91
Show file tree

Hide file tree

Showing 53 changed files with 4,241 additions and 1,355 deletions.
diff --git a/source/core/assets/badlogic.jpg b/source/core/assets/badlogic.jpg
diff --git a/source/core/assets/flat-earth/skin/flat-earth-ui.json b/source/core/assets/flat-earth/skin/flat-earth-ui.json
@@ -327,7 +327,7 @@
 	com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
 		default: {
 			font: font
-			fontColor: black
+			fontColor: white
 		}
 		button: {
 			font: button

diff --git a/source/core/assets/images/ice_bg.png b/source/core/assets/images/ice_bg.png
diff --git a/source/core/assets/images/desert_bg.png → source/core/assets/images/ingamebg.png b/source/core/assets/images/desert_bg.png → source/core/assets/images/ingamebg.png
diff --git a/source/core/assets/images/lava_bg.png b/source/core/assets/images/lava_bg.png
diff --git a/source/core/assets/images/mobs/boss2.atlas b/source/core/assets/images/mobs/boss2.atlas
@@ -0,0 +1,348 @@
+boss2.png
+size: 980, 651
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Idle
+  rotate: false
+  xy: 0, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 140, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 280, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 280, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 420, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 560, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 700, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 840, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 0, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Idle
+  rotate: false
+  xy: 140, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 280, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 420, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 560, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 700, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 840, 93
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 0, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 140, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 280, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Walk
+  rotate: false
+  xy: 420, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 560, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 700, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 840, 186
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 0, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 140, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 280, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 420, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 560, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 700, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A1
+  rotate: false
+  xy: 840, 279
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 0, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 140, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 280, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 420, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 560, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Hurt
+  rotate: false
+  xy: 700, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 840, 372
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 0, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 140, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 280, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 420, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 560, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+boss_death
+  rotate: false
+  xy: 700, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Charging
+  rotate: false
+  xy: 840, 465
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Charging
+  rotate: false
+  xy: 0, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Charging
+  rotate: false
+  xy: 140, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Charging
+  rotate: false
+  xy: 280, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+Charging
+  rotate: false
+  xy: 420, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A2
+  rotate: false
+  xy: 560, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+A2
+  rotate: false
+  xy: 700, 558
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/mobs/boss2.png b/source/core/assets/images/mobs/boss2.png
diff --git a/source/core/assets/images/projectiles/attack_projectile.atlas b/source/core/assets/images/projectiles/attack_projectile.atlas
@@ -0,0 +1,33 @@
+attack_projectile.png
+size: 420, 93
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+P
+  rotate: false
+  xy: 0, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+P
+  rotate: false
+  xy: 140, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+p
+  rotate: false
+  xy: 280, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 280, 0
+  size: 140, 93
+  orig: 140, 93
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/attack_projectile.png b/source/core/assets/images/projectiles/attack_projectile.png