Add all story quests (WIP)

Switch to JSON5 for area and quests Add ability to hide quest steps Fix Pro Gamer's highscore Change area sprite properties: "qw", "qh" to "q", "h" Add area trigger property option: "icon": true
alesan99 · Apr 6, 2024 · f493bac · f493bac
1 parent 9f06a34
commit f493bac
Show file tree

Hide file tree

Showing 35 changed files with 366 additions and 271 deletions.
diff --git a/server/sync.js b/server/sync.js
@@ -9,7 +9,7 @@ var minigameList = {
 		data: {},
 		host: false,
 		// Should be stored by the server
-		highscores: [[100, "Pro Gamer"],[0,"---"],[0,"---"]]
+		highscores: [[99, "Pro Gamer"],[0,"---"],[0,"---"]]
 	}
 };
 

diff --git a/website/assets/areas/alleyway.json → website/assets/areas/alleyway.json5 b/website/assets/areas/alleyway.json → website/assets/areas/alleyway.json5
diff --git a/website/assets/areas/arcade.json → website/assets/areas/arcade.json5 b/website/assets/areas/arcade.json → website/assets/areas/arcade.json5
@@ -133,8 +133,8 @@
 			"framesy": 1,
 			"ox": 0,
 			"oy": 0,
-			"qw": 265,
-			"qh": 72,
+			"w": 265,
+			"h": 72,
 
 			"x": 244,
 			"y": 244,
@@ -185,21 +185,20 @@
 			"icon": {"frame": 1, "x": 15, "y": -10},
 
 			"action": "quest",
-			"quest": "easteregghunt",
+			"quest": "egg_hunt",
 			"questSlot": 3,
 			"questSlotAdd": 1,
 
 			"condition": {
-				"quest": "easteregghunt",
+				"quest": "egg_hunt",
 				"questSlot": 3,
 				"questSlotValue": 0
 			},
 
 			"sprite": {
 				"image": "egg.png",
-				"qw": 30,
-				"qh": 40,
-
+				"w": 30,
+				"h": 40,
 				"worldy": 157
 			}
 		}

diff --git a/website/assets/areas/beefcakescoop.json → website/assets/areas/beefcakescoop.json5 b/website/assets/areas/beefcakescoop.json → website/assets/areas/beefcakescoop.json5
diff --git a/website/assets/areas/chictoriassecret.json → website/assets/areas/chictoriassecret.json5 b/website/assets/areas/chictoriassecret.json → website/assets/areas/chictoriassecret.json5
@@ -149,21 +149,20 @@
 			"icon": {"frame": 1, "x": 15, "y": -10},
 
 			"action": "quest",
-			"quest": "easteregghunt",
+			"quest": "egg_hunt",
 			"questSlot": 4,
 			"questSlotAdd": 1,
 
 			"condition": {
-				"quest": "easteregghunt",
+				"quest": "egg_hunt",
 				"questSlot": 4,
 				"questSlotValue": 0
 			},
 
 			"sprite": {
 				"image": "egg.png",
-				"qw": 30,
-				"qh": 40,
-
+				"w": 30,
+				"h": 40,
 				"worldy": 195
 			}
 		}

diff --git a/website/assets/areas/coop.json → website/assets/areas/coop.json5 b/website/assets/areas/coop.json → website/assets/areas/coop.json5
diff --git a/website/assets/areas/hub.json b/website/assets/areas/hub.json
diff --git a/website/assets/areas/hub.json5 b/website/assets/areas/hub.json5
@@ -1,4 +1,7 @@
 {
+	"name": "Town Square",
+	"mapLocation": [261, 196],
+
 	// Wall Collision
 	"walls": [
 		// Buildings in the back
@@ -84,8 +87,8 @@
 			"framesy": 1,
 			"ox": 201,
 			"oy": 0,
-			"qw": 226,
-			"qh": 215,
+			"w": 226,
+			"h": 215,
 
 			"x": 798,
 			"y": 145,
@@ -100,8 +103,8 @@
 				"frames": [0, 1],
 				"delay": 0.8
 			},
-			"qw": 280,
-			"qh": 450,
+			"w": 280,
+			"h": 450,
 
 			"x": 0,
 			"y": 0,
@@ -111,57 +114,29 @@
 
 	"triggers": {
 		"egg1": {
-			"x": 793,
-			"y": 298,
+			"x": 76,
+			"y": 479,
 			"shape": [0, 0, 40, 0, 40, 40, 0, 40],
 			"clickable": true,
-			"icon": { "frame": 1, "x": 15, "y": -10 },
+			"icon": true,
 
 			"action": "quest",
-			"quest": "easteregghunt",
+			"quest": "egg_hunt",
 			"questSlot": 0,
 			"questSlotAdd": 1,
 
 			"condition": {
-				"quest": "easteregghunt",
+				"quest": "egg_hunt",
 				"questSlot": 0,
 				"questSlotValue": 0
 			},
 
 			"sprite": {
 				"image": "egg.png",
-				"qw": 30,
-				"qh": 40,
-
+				"w": 30,
+				"h": 40,
 				"worldy": 318
 			}
 		},
-
-		"egg2": {
-			"x": 76,
-			"y": 479,
-			"shape": [0, 0, 40, 0, 40, 40, 0, 40],
-			"clickable": true,
-			"icon": { "frame": 1, "x": 15, "y": -10 },
-
-			"action": "quest",
-			"quest": "easteregghunt",
-			"questSlot": 1,
-			"questSlotAdd": 1,
-
-			"condition": {
-				"quest": "easteregghunt",
-				"questSlot": 1,
-				"questSlotValue": 0
-			},
-
-			"sprite": {
-				"image": "egg.png",
-				"qw": 30,
-				"qh": 40,
-
-				"worldy": 499
-			}
-		}
 	}
 }
diff --git a/...te/assets/areas/icosahedralhoneycomb.json → ...e/assets/areas/icosahedralhoneycomb.json5 b/...te/assets/areas/icosahedralhoneycomb.json → ...e/assets/areas/icosahedralhoneycomb.json5
diff --git a/website/assets/areas/neighborhood.json → website/assets/areas/neighborhood.json5 b/website/assets/areas/neighborhood.json → website/assets/areas/neighborhood.json5