Skip to content

Commit

Permalink
Merge pull request #379 from UQcsse3200/Minigame
Browse files Browse the repository at this point in the history
Maze generation and integration with fish npc
  • Loading branch information
EllaBerglas committed Sep 20, 2024
2 parents 19054d0 + c4210dd commit 217556f
Show file tree
Hide file tree
Showing 30 changed files with 1,349 additions and 70 deletions.
Empty file removed saves/quests.json
Empty file.
2 changes: 2 additions & 0 deletions source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ project(":core") {
api "org.slf4j:slf4j-api:$slf4jVersion"
api "org.slf4j:slf4j-jdk14:$slf4jVersion"

api "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"

// Unit Testing
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5Version"
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:$junit5Version'
Expand Down
11 changes: 9 additions & 2 deletions source/core/assets/configs/NPCs.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
},
"snake": {
"baseHint": [
["HHIISSSSSSS, I am the mighty Snake of the Jungle!","You look very tasty and I am very hungry","Go play a game and collect me some apples...","/msOr I will eat you whole!"]
["HHIISSSSSSS, I am the mighty Snake of the Jungle!",
"You look very tasty and I am very hungry",
"Go play a game and collect me some apples...",
"/msOr I will eat you whole!"]
],
"spritePath": "images/snake.atlas",
"animationSpeed": 0.2,
Expand All @@ -68,7 +71,11 @@

"fish": {
"baseHint": [
["Welcome to Animal Kingdom!","I am Finny the Fish."]
["Help me please!",
"A strong current just scattered all my eggs and now I am lost",
"It is getting dark now, they are in great danger!",
"I must get them back and find my way home!",
"/muHelp me collect all the fish eggs an get back home before it is too late"]
],
"spritePath": "images/Fish.atlas",
"animationSpeed": 0.2,
Expand Down
Binary file added source/core/assets/images/minigames/spawn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/minigames/wall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/minigames/water.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions source/core/assets/minigameMaze/MazeOne.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
1000100001
1000100001
1000100001
1000100001
1000100001
1000100001
1000100001
1000100001
1000100001
1111111111
10 changes: 10 additions & 0 deletions source/core/assets/minigameMaze/TestMaze.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
1001010101
1010101010
0101010100
1110000100
1010101001
1010101010
1010101000
0011101010
0101010100
0101010001
41 changes: 41 additions & 0 deletions source/core/assets/minigameMaze/expanded_maze.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
0001111111111111111111111111111111111111111111111111111111111
0000000000001000000000000001000000000001000000001000000000001
1001001001111001111001111001001001111111001111001111001111001
1001001000000000001000001001001000001000001000000000001000001
1001111001111111001111111111001111111111001001111001111001111
1000001001001000001001000000000001001000001001001000001000001
1111111001001111001001001111111001001111111001001111001111001
1000000001000000001001001001000001001000001000001001001000001
1001111001001001111001111001001111001001111111111001111111001
1001000001001000001000001001000001001001000000001000001000001
1001111111001001111111001001001001001001001001111111001111001
1000000001001000001001001000001000000000001000000001000001001
1111001111111111001001001001111001001111111111111001111001001
1000001000001001000001000001000001001001000000000000000001001
1001111001111001111111001111001111111001111111111001111111001
1001000000000001000000001000000000000000000001000000000000001
1001001111111111111001001001111111111111111111111001001111111
1000001000001000000001001000001001001001001001001001001001001
1001111001001111001111111111111001001001001001001111001001001
1001000001001000000001000000000001001000001000000001001000001
1001111111001001001111001111001111001111001111111001001001111
1000000000000001000000001001000001001000000001001000000001001
1111111111001111111111001001001111001111001111001001111111001
1000000000000000001000000001000001000000001000000001000000001
1001111001001111001001111001111111111001111111111001001111111
1001000001001000001000001000000001000001000001001001001001001
1001111001001111111111111111111111001001001001001001001001001
1001001001000000000000001000001000001001001000000001000000001
1001001111111111001111111111001001111111111001111001111001111
1001000001000001000000001000001001000001000000001000000000001
1001001001111001001111001001001001111001001111001111001111001
1000001000001000000001001001000000000001001001001001001001001
1001111001001111111111001001001111111111111001001001001001001
1001000001000000001000000001000000000000001000000001000001001
1001111111001111111111001111111111111001111001111111001111001
1000001001001000001001000000000001001001000001001000000001001
1001111001001001111001001111111001001001111001001111001111111
1001001001000000001000000000001001001000001001000001000000001
1001001001001001111111111111001111001001001001001111111001111
1000001000001001000000000000001000000001001000000001000000000
1111111111111111111111111111111111111111111111111111111111000
31 changes: 31 additions & 0 deletions source/core/assets/minigameMaze/maze2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
1111111111111111111111111111111
1000000010000010000010000000001
1011101010111010101110111011101
1X10001010101010100000100010101
1110111010101010111111101110101
10001X1010001000100000001010001
1011101011101111101111111010111
101000101X001000001X001000001X1
1010111011111011111110101111101
1010000010000010000010101000001
1011101110111110111010101110101
1000100000100000100010000010101
1010111011101111101111111010111
1010001010001010001000001010001
1011101010111010101011101011101
1010001010100010101010101010001
1010111110101010111010101010111
1010000000101010001000101010001
1011111111101011101110101011101
1000001000001010000010101000101
1111101010111010111110101110101
1X10001010100010000000101010001
1010111110101111111111101011101
1010100010101000100000101010001
1010101010101010101110101010111
101000101010001X100010001000101
1011111010111111101011111011101
10000010001000001010100X1000101
1011111110111110111010111110101
1000000000000010000010000000001
1111111111111111111111111111111
Expand Down
37 changes: 37 additions & 0 deletions source/core/assets/minigameMaze/maze5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
1111111111111111111111111111111111111
1X0010000000000000000000000X100000001
1000100000000000000000000000100000001
1000100000000000000000000000100000001
1000100011111111100011111111100010001
100000001000000X100000000000000010001
1000000010000000100000000000000010001
1000000010000000100000000000000010001
1000111110001111111110001111111110001
1000000000001000000010000000100000001
1000000000001000000010000000100000001
100000000000100000001000000X100000001
1000111111111000100011111111100011111
1000100000001000100010000000100000001
1000100000001000100010000000100000001
1X00100000001000100010000000100000001
1111100010001000100010001000111110001
1000000010000000100000001000000000001
1000000010000000100000001000000000001
1000000010000000100000001000000000001
1000100011111111111111111111111111111
1000100010000000100000000000000000001
1000100010000000100000000000000000001
1000100010000000100000000000000000001
1000100010001000100011111111111110001
1000100010001000100010000000000010001
1000100010001000100010000000000010001
1000100X10001000100010000000000010001
1000111110001000100010001111111110001
1000000000001000000010001000000000001
1000000000001000000010001000000000001
1000000000001000000010001000000000001
1000111111111111111110001000111110001
1000000000000000000010000000100000001
1000000000000000000010000000100000001
1000000000000000000X100000001X0000001
1111111111111111111111111111111111111
Expand Down
Loading

0 comments on commit 217556f

Please sign in to comment.