skibbdi

AstroEngineDevs · Aug 26, 2024 · 577e985 · 577e985
1 parent 1a17a1d
commit 577e985
Show file tree

Hide file tree

Showing 131 changed files with 817 additions and 2,756 deletions.
diff --git a/Project.xml b/Project.xml
@@ -98,11 +98,6 @@
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 	<set name="BUILD_DIR" value="export/32bit" if="32bits" />
 
-	<library name="videos" preload="true" />
-	<library name="songs" preload="true" />
-	<library name="shared" preload="true" />
-	<library name="week_assets"   preload="true" />
-
 	<assets path="assets/videos" library="videos" if="VIDEOS_ALLOWED"/>
 	<assets path="assets/songs" library="songs" exclude="*.ogg" if="web"/>
 	<assets path="assets/songs" library="songs" exclude="*.mp3" unless="web"/>
@@ -133,12 +128,9 @@
 
 	<!-- Lime -->
 	<haxelib name="lime" />
-	<!-- OpenFL -->
-	<haxelib name="openfl" />
 	<!-- HaxeFlixel -->
 	<haxelib name="flixel"/>
 	<haxelib name="flixel-addons"/>
-	<haxelib name="flixel-ui" />
 	<haxelib name="tjson" />
 	<!-- Faxe -->
 	<haxelib name="faxe" if='switch'/>

diff --git a/assets/BASE_GAME/shared/data/2hot/2hot-easy.json b/assets/BASE_GAME/shared/data/2hot/2hot-easy.json
@@ -1357,7 +1357,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 182,
 		"needsVoices": true,
 		"song": "2Hot",

diff --git a/assets/BASE_GAME/shared/data/2hot/2hot-hard.json b/assets/BASE_GAME/shared/data/2hot/2hot-hard.json
@@ -1586,7 +1586,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 182,
 		"needsVoices": true,
 		"song": "2Hot",

diff --git a/assets/BASE_GAME/shared/data/2hot/2hot.json b/assets/BASE_GAME/shared/data/2hot/2hot.json
@@ -1449,7 +1449,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 182,
 		"needsVoices": true,
 		"song": "2Hot",

diff --git a/assets/BASE_GAME/shared/data/blammed/blammed-easy.json b/assets/BASE_GAME/shared/data/blammed/blammed-easy.json
@@ -1461,6 +1461,6 @@
 		"needsVoices": true,
 		"bpm": 165,
 		"speed": 1.2,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/blammed/blammed-hard.json b/assets/BASE_GAME/shared/data/blammed/blammed-hard.json
@@ -2436,6 +2436,6 @@
 		"needsVoices": true,
 		"bpm": 165,
 		"speed": 2.3,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/blammed/blammed.json b/assets/BASE_GAME/shared/data/blammed/blammed.json
@@ -1781,6 +1781,6 @@
 		"needsVoices": true,
 		"bpm": 165,
 		"speed": 1.5,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/blammed/events.json b/assets/BASE_GAME/shared/data/blammed/events.json
@@ -959,6 +959,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/blazin/blazin-easy.json b/assets/BASE_GAME/shared/data/blazin/blazin-easy.json
@@ -958,7 +958,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 180,
 		"needsVoices": false,
 		"song": "Blazin'",

diff --git a/assets/BASE_GAME/shared/data/blazin/blazin-hard.json b/assets/BASE_GAME/shared/data/blazin/blazin-hard.json
@@ -976,7 +976,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 180,
 		"needsVoices": false,
 		"song": "Blazin'",

diff --git a/assets/BASE_GAME/shared/data/blazin/blazin.json b/assets/BASE_GAME/shared/data/blazin/blazin.json
@@ -962,7 +962,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 180,
 		"needsVoices": false,
 		"song": "Blazin'",

diff --git a/assets/BASE_GAME/shared/data/bopeebo/bopeebo-easy.json b/assets/BASE_GAME/shared/data/bopeebo/bopeebo-easy.json
@@ -805,7 +805,7 @@
 		"song": "Bopeebo",
 		"needsVoices": true,
 		"validScore": true,
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1,
 		"bpm": 100
 	}

diff --git a/assets/BASE_GAME/shared/data/bopeebo/bopeebo-hard.json b/assets/BASE_GAME/shared/data/bopeebo/bopeebo-hard.json
@@ -822,6 +822,6 @@
 		"needsVoices": true,
 		"bpm": 100,
 		"speed": 1.3,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/bopeebo/bopeebo.json b/assets/BASE_GAME/shared/data/bopeebo/bopeebo.json
@@ -845,7 +845,7 @@
 		"song": "Bopeebo",
 		"needsVoices": true,
 		"validScore": true,
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 100,
 		"speed": 1
 	}

diff --git a/assets/BASE_GAME/shared/data/bopeebo/events.json b/assets/BASE_GAME/shared/data/bopeebo/events.json
@@ -162,6 +162,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/cocoa/cocoa-easy.json b/assets/BASE_GAME/shared/data/cocoa/cocoa-easy.json
@@ -1483,7 +1483,7 @@
 		"song": "Cocoa",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.3,
 		"bpm": 100
 	}

diff --git a/assets/BASE_GAME/shared/data/cocoa/cocoa-hard.json b/assets/BASE_GAME/shared/data/cocoa/cocoa-hard.json
@@ -2542,7 +2542,7 @@
 		"song": "Cocoa",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.5,
 		"bpm": 100
 	}

diff --git a/assets/BASE_GAME/shared/data/cocoa/cocoa.json b/assets/BASE_GAME/shared/data/cocoa/cocoa.json
@@ -1863,7 +1863,7 @@
 		"song": "Cocoa",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.3,
 		"bpm": 100
 	}

diff --git a/assets/BASE_GAME/shared/data/cocoa/events.json b/assets/BASE_GAME/shared/data/cocoa/events.json
@@ -52,6 +52,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/dad-battle/dad-battle-easy.json b/assets/BASE_GAME/shared/data/dad-battle/dad-battle-easy.json
@@ -1491,6 +1491,6 @@
 		"needsVoices": true,
 		"bpm": 180,
 		"speed": 1.3,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/dad-battle/dad-battle-hard.json b/assets/BASE_GAME/shared/data/dad-battle/dad-battle-hard.json
@@ -2006,6 +2006,6 @@
 		"needsVoices": true,
 		"bpm": 180,
 		"speed": 2.3,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/dad-battle/dad-battle.json b/assets/BASE_GAME/shared/data/dad-battle/dad-battle.json
@@ -1766,6 +1766,6 @@
 		"needsVoices": true,
 		"bpm": 180,
 		"speed": 1.5,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/dad-battle/events.json b/assets/BASE_GAME/shared/data/dad-battle/events.json
@@ -232,6 +232,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/darnell/darnell-easy.json b/assets/BASE_GAME/shared/data/darnell/darnell-easy.json
@@ -1090,7 +1090,7 @@
 	"generatedBy": "Psych Engine v1.0b - Chart Editor V-Slice Importer",
 	"stage": "phillyStreets",
 	"bpm": 155,
-	"format": "psych_v1_convert",
+	"format": "astro_v0.3_convert",
 	"speed": 1.8,
 	"artist": "Kawai Sprite"
 }
diff --git a/assets/BASE_GAME/shared/data/darnell/darnell-hard.json b/assets/BASE_GAME/shared/data/darnell/darnell-hard.json
@@ -1234,7 +1234,7 @@
 	"generatedBy": "Psych Engine v1.0b - Chart Editor V-Slice Importer",
 	"stage": "phillyStreets",
 	"bpm": 155,
-	"format": "psych_v1_convert",
+	"format": "astro_v0.3_convert",
 	"speed": 2.4,
 	"artist": "Kawai Sprite"
 }
diff --git a/assets/BASE_GAME/shared/data/darnell/darnell.json b/assets/BASE_GAME/shared/data/darnell/darnell.json
@@ -1130,7 +1130,7 @@
 	"generatedBy": "Psych Engine v1.0b - Chart Editor V-Slice Importer",
 	"stage": "phillyStreets",
 	"bpm": 155,
-	"format": "psych_v1_convert",
+	"format": "astro_v0.3_convert",
 	"speed": 2,
 	"artist": "Kawai Sprite"
 }
diff --git a/assets/BASE_GAME/shared/data/eggnog/eggnog-easy.json b/assets/BASE_GAME/shared/data/eggnog/eggnog-easy.json
@@ -1934,7 +1934,7 @@
 		"song": "Eggnog",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.4,
 		"bpm": 150
 	}

diff --git a/assets/BASE_GAME/shared/data/eggnog/eggnog-hard.json b/assets/BASE_GAME/shared/data/eggnog/eggnog-hard.json
@@ -2669,7 +2669,7 @@
 		"song": "Eggnog",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.9,
 		"bpm": 150
 	}

diff --git a/assets/BASE_GAME/shared/data/eggnog/eggnog.json b/assets/BASE_GAME/shared/data/eggnog/eggnog.json
@@ -2259,7 +2259,7 @@
 		"song": "Eggnog",
 		"needsVoices": true,
 		"stage": "mall",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.6,
 		"bpm": 150
 	}

diff --git a/assets/BASE_GAME/shared/data/eggnog/events.json b/assets/BASE_GAME/shared/data/eggnog/events.json
@@ -232,6 +232,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/fresh/events.json b/assets/BASE_GAME/shared/data/fresh/events.json
@@ -42,6 +42,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/fresh/fresh-easy.json b/assets/BASE_GAME/shared/data/fresh/fresh-easy.json
@@ -1250,6 +1250,6 @@
 		"needsVoices": true,
 		"bpm": 120,
 		"speed": 1,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/fresh/fresh-hard.json b/assets/BASE_GAME/shared/data/fresh/fresh-hard.json
@@ -1580,6 +1580,6 @@
 		"needsVoices": true,
 		"bpm": 120,
 		"speed": 1.8,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/fresh/fresh.json b/assets/BASE_GAME/shared/data/fresh/fresh.json
@@ -1450,6 +1450,6 @@
 		"needsVoices": true,
 		"bpm": 120,
 		"speed": 1.3,
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/guns/guns-easy.json b/assets/BASE_GAME/shared/data/guns/guns-easy.json
@@ -2996,7 +2996,7 @@
 		"song": "Guns",
 		"needsVoices": true,
 		"stage": "tank",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.4,
 		"bpm": 185
 	}

diff --git a/assets/BASE_GAME/shared/data/guns/guns-hard.json b/assets/BASE_GAME/shared/data/guns/guns-hard.json
@@ -5141,7 +5141,7 @@
 		"validScore": true,
 		"needsVoices": true,
 		"stage": "tank",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 2.5,
 		"bpm": 185
 	}

diff --git a/assets/BASE_GAME/shared/data/guns/guns.json b/assets/BASE_GAME/shared/data/guns/guns.json
@@ -4456,7 +4456,7 @@
 		"song": "Guns",
 		"needsVoices": true,
 		"stage": "tank",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 2,
 		"bpm": 185
 	}

diff --git a/assets/BASE_GAME/shared/data/high/events.json b/assets/BASE_GAME/shared/data/high/events.json
@@ -62,6 +62,6 @@
 				]
 			]
 		],
-		"format": "psych_v1_convert"
+		"format": "astro_v0.3_convert"
 	}
 }
diff --git a/assets/BASE_GAME/shared/data/high/high-easy.json b/assets/BASE_GAME/shared/data/high/high-easy.json
@@ -1854,7 +1854,7 @@
 		"song": "High",
 		"needsVoices": true,
 		"stage": "limo",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.3,
 		"bpm": 125
 	}

diff --git a/assets/BASE_GAME/shared/data/high/high-hard.json b/assets/BASE_GAME/shared/data/high/high-hard.json
@@ -2789,7 +2789,7 @@
 		"song": "High",
 		"needsVoices": true,
 		"stage": "limo",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 2,
 		"bpm": 125
 	}

diff --git a/assets/BASE_GAME/shared/data/high/high.json b/assets/BASE_GAME/shared/data/high/high.json
@@ -2229,7 +2229,7 @@
 		"song": "High",
 		"needsVoices": true,
 		"stage": "limo",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"speed": 1.8,
 		"bpm": 125
 	}

diff --git a/assets/BASE_GAME/shared/data/lit-up/lit-up-easy.json b/assets/BASE_GAME/shared/data/lit-up/lit-up-easy.json
@@ -1143,7 +1143,7 @@
 			}
 		],
 		"gfVersion": "nene",
-		"format": "psych_v1_convert",
+		"format": "astro_v0.3_convert",
 		"bpm": 176,
 		"needsVoices": true,
 		"song": "Lit Up",
-Original file line number
+Diff line change
@@ Expand Up / @@ -959,6 +959,6 @@ @@
     				]
     			]
     		],
-    		"format": "psych_v1_convert"
+    		"format": "astro_v0.3_convert"
     	}
     }