AstroEngineDevs · Hackx2 · Feb 17, 2024 · May 10, 2023 · May 12, 2023 · May 14, 2023
diff --git a/Project.xml b/Project.xml
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': Psy Engine" file="PsyEngine" packageName="com.hackx2.psyengine" package="com.hackx2.psyengine" main="Main" version="0.2.8" company="Hackx2" />
+	<app title="Friday Night Funkin': Astro Engine" file="Astro Engine" packageName="com.hackx2.astroengine" package="com.hackx2.astroengine" main="game.Main" version="0.2.8" company="Hackx2" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -194,8 +194,8 @@
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
 
-	<icon path="art/icon16.png" size='16'/>
-	<icon path="art/icon32.png" size='32'/>
-	<icon path="art/icon64.png" size='64'/>
-	<icon path="art/iconOG.png" />
+	<icon path="art/icon/icon16.png" size='16'/>
+	<icon path="art/icon/icon32.png" size='32'/>
+	<icon path="art/icon/icon64.png" size='64'/>
+	<icon path="art/icon/iconOG.png" />
 </project>
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 <div align="center">
-    <img src="art/psyshit/512-modified.png" width="100" height="100"/>
+    <img src="art/astroshit/512-modified.png" width="250" height="250"/>
     <br>
-    <h1>Friday Night Funkin' • <code>Psy Engine</code> (<strong>Beta</strong>)</h1>
+    <h1>Friday Night Funkin' • <code>Astro Engine</code> (<strong>Beta</strong>)</h1>
     <br>    
-    <img src="https://img.shields.io/github/forks/Hackx2/FNF-PsyEngine?style=for-the-badge" />
-    <img src="https://img.shields.io/github/license/Hackx2/FNF-PsyEngine?style=for-the-badge" />
-    <img src="https://img.shields.io/github/actions/workflow/status/Hackx2/FNF-PsyEngine/main.yml?style=for-the-badge" /> 
+    <img src="https://img.shields.io/github/forks/Hackx2/FNF-AstroEngine?style=for-the-badge" />
+    <img src="https://img.shields.io/github/license/Hackx2/FNF-AstroEngine?style=for-the-badge" />
+    <img src="https://img.shields.io/github/actions/workflow/status/Hackx2/FNF-AstroEngine/main.yml?style=for-the-badge" /> 
     <br>
 <br>UPDATE HAXE TO 4.2.5 rn NOW BOIII<br><br>
 

diff --git a/Setup.md b/Setup.md
@@ -1,3 +1,3 @@
-go to ```source/psy/Core.hx``` and edit the ```coreGame``` var!
+go to ```source/backend/data/EngineData.hx``` and edit the ```coreGame``` var!
 
 yeah Yeah i'll update this later!!
diff --git a/art/astroshit/512-modified.png b/art/astroshit/512-modified.png
diff --git a/art/astroshit/512.png b/art/astroshit/512.png
diff --git a/art/icon16.png → art/icons/icon16.png b/art/icon16.png → art/icons/icon16.png
diff --git a/art/icon32.png → art/icons/icon32.png b/art/icon32.png → art/icons/icon32.png
diff --git a/art/icon64.png → art/icons/icon64.png b/art/icon64.png → art/icons/icon64.png
diff --git a/art/iconOG.png → art/icons/iconOG.png b/art/iconOG.png → art/icons/iconOG.png
diff --git a/assets/preload/data/blammed/blammed-easy.json b/assets/preload/data/blammed/blammed-easy.json
@@ -2,7 +2,7 @@
   "song": {
     "song": "Blammed",
     "bpm": 165.0,
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "needsVoices": true,
     "player1": "bf",
     "player2": "pico",

diff --git a/assets/preload/data/blammed/blammed-hard.json b/assets/preload/data/blammed/blammed-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "pico",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 2.3,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/blammed/blammed.json b/assets/preload/data/blammed/blammed.json
@@ -4,7 +4,7 @@
     "bpm": 165.0,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "player2": "pico",
     "speed": 1.5,
     "notes": [

diff --git a/assets/preload/data/bopeebo/bopeebo-easy.json b/assets/preload/data/bopeebo/bopeebo-easy.json
@@ -1,7 +1,7 @@
 {
 	"song": {
 		"player1": "bf",
-		"songColor": "0xFF6807B2",
+		"songColor": "0x6807B2",
 		"notes": [
 			{
 				"sectionNotes": [

diff --git a/assets/preload/data/bopeebo/bopeebo-hard.json b/assets/preload/data/bopeebo/bopeebo-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "dad",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 1.3,
     "notes": [
       {

diff --git a/assets/preload/data/bopeebo/bopeebo.json b/assets/preload/data/bopeebo/bopeebo.json
@@ -1,7 +1,7 @@
 {
 	"song": {
 		"player1": "bf",
-		"songColor": "0xFF6807B2",
+		"songColor": "0x6807B2",
 		"player2": "dad",
 		"notes": [
 			{

diff --git a/assets/preload/data/cocoa/cocoa-easy.json b/assets/preload/data/cocoa/cocoa-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-christmas",
     "player2": "parents-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "speed": 1.3,
     "notes": [
       {

diff --git a/assets/preload/data/cocoa/cocoa-hard.json b/assets/preload/data/cocoa/cocoa-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-christmas",
     "player2": "parents-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "speed": 1.5,
     "notes": [
       {

diff --git a/assets/preload/data/cocoa/cocoa.json b/assets/preload/data/cocoa/cocoa.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-christmas",
     "player2": "parents-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "speed": 1.3,
     "notes": [
       {

diff --git a/assets/preload/data/dad-battle/dad-battle-easy.json b/assets/preload/data/dad-battle/dad-battle-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "dad",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 1.3,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/dad-battle/dad-battle-hard.json b/assets/preload/data/dad-battle/dad-battle-hard.json
@@ -3,7 +3,7 @@
     "song": "Dad Battle",
     "bpm": 180.0,
     "needsVoices": true,
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "player1": "bf",
     "player2": "dad",
     "speed": 2.3,

diff --git a/assets/preload/data/dad-battle/dad-battle.json b/assets/preload/data/dad-battle/dad-battle.json
@@ -4,7 +4,7 @@
     "bpm": 180.0,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "player2": "dad",
     "speed": 1.5,
     "notes": [

diff --git a/assets/preload/data/eggnog/eggnog-easy.json b/assets/preload/data/eggnog/eggnog-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-christmas",
     "player2": "parents-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "speed": 1.4,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/eggnog/eggnog-hard.json b/assets/preload/data/eggnog/eggnog-hard.json
@@ -4,7 +4,7 @@
     "bpm": 150.0,
     "needsVoices": true,
     "player1": "bf-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "player2": "parents-christmas",
     "speed": 1.9,
     "notes": [

diff --git a/assets/preload/data/eggnog/eggnog.json b/assets/preload/data/eggnog/eggnog.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-christmas",
     "player2": "parents-christmas",
-    "songColor": "0xFFB2075F",
+    "songColor": "0xB2075F",
     "speed": 1.6,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/fresh/fresh-easy.json b/assets/preload/data/fresh/fresh-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "dad",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 1.0,
     "notes": [
       {

diff --git a/assets/preload/data/fresh/fresh-hard.json b/assets/preload/data/fresh/fresh-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "dad",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 1.8,
     "notes": [
       {

diff --git a/assets/preload/data/fresh/fresh.json b/assets/preload/data/fresh/fresh.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "dad",
-    "songColor": "0xFF6807B2",
+    "songColor": "0x6807B2",
     "speed": 1.3,
     "notes": [
       {

diff --git a/assets/preload/data/guns/guns-easy.json b/assets/preload/data/guns/guns-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "tankman",
-    "songColor": "0xFFFF8020",
+    "songColor": "0xFF8020",
     "speed": 1.4,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/guns/guns-hard.json b/assets/preload/data/guns/guns-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "tankman",
-    "songColor": "0xFFFF8020",
+    "songColor": "0xFF8020",
     "speed": 2.5,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/guns/guns.json b/assets/preload/data/guns/guns.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "tankman",
-    "songColor": "0xFFFF8020",
+    "songColor": "0xFF8020",
     "speed": 2.0,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/high/high-easy.json b/assets/preload/data/high/high-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-car",
     "player2": "mom-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "speed": 1.3,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/high/high-hard.json b/assets/preload/data/high/high-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-car",
     "player2": "mom-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "speed": 2.0,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/high/high.json b/assets/preload/data/high/high.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-car",
     "player2": "mom-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "speed": 1.8,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/milf/milf-easy.json b/assets/preload/data/milf/milf-easy.json
@@ -4,7 +4,7 @@
     "bpm": 180.0,
     "needsVoices": true,
     "player1": "bf-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "player2": "mom-car",
     "speed": 1.4,
     "notes": [

diff --git a/assets/preload/data/milf/milf-hard.json b/assets/preload/data/milf/milf-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-car",
     "player2": "mom-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "speed": 2.6,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/milf/milf.json b/assets/preload/data/milf/milf.json
@@ -4,7 +4,7 @@
     "bpm": 180.0,
     "needsVoices": true,
     "player1": "bf-car",
-    "songColor": "0xFFFF4DC9",
+    "songColor": "0xFF4DC9",
     "player2": "mom-car",
     "speed": 1.7,
     "notes": [

diff --git a/assets/preload/data/monster/monster-easy.json b/assets/preload/data/monster/monster-easy.json
@@ -3,7 +3,7 @@
     "song": "Monster",
     "bpm": 95,
     "needsVoices": true,
-    "songColor": "0xFFFF0000",
+    "songColor": "0xFF0000",
     "player1": "bf",
     "player2": "monster",
     "speed": 1.3,

diff --git a/assets/preload/data/monster/monster-hard.json b/assets/preload/data/monster/monster-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "monster",
-    "songColor": "0xFFFF0000",
+    "songColor": "0xFF0000",
     "speed": 1.6,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/monster/monster.json b/assets/preload/data/monster/monster.json
@@ -4,7 +4,7 @@
     "bpm": 95,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFFFF0000",
+    "songColor": "0xFF0000",
     "player2": "monster",
     "speed": 1.3,
     "notes": [

diff --git a/assets/preload/data/philly-nice/philly-nice-easy.json b/assets/preload/data/philly-nice/philly-nice-easy.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "pico",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "speed": 1.0,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/philly-nice/philly-nice-hard.json b/assets/preload/data/philly-nice/philly-nice-hard.json
@@ -4,7 +4,7 @@
     "bpm": 175.0,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "player2": "pico",
     "speed": 2.0,
     "notes": [

diff --git a/assets/preload/data/philly-nice/philly-nice.json b/assets/preload/data/philly-nice/philly-nice.json
@@ -4,7 +4,7 @@
     "bpm": 175.0,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "player2": "pico",
     "speed": 1.3,
     "notes": [

diff --git a/assets/preload/data/pico/pico-easy.json b/assets/preload/data/pico/pico-easy.json
@@ -4,7 +4,7 @@
     "bpm": 150.0,
     "needsVoices": true,
     "player1": "bf",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "player2": "pico",
     "speed": 1.2,
     "notes": [

diff --git a/assets/preload/data/pico/pico-hard.json b/assets/preload/data/pico/pico-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "pico",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "speed": 1.6,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/pico/pico.json b/assets/preload/data/pico/pico.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf",
     "player2": "pico",
-    "songColor": "0xFF00C100",
+    "songColor": "0x00C100",
     "speed": 1.4,
     "notes": [
       { "lengthInSteps": 16, "mustHitSection": true, "sectionNotes": [] },

diff --git a/assets/preload/data/roses/roses-easy.json b/assets/preload/data/roses/roses-easy.json
@@ -4,7 +4,7 @@
     "bpm": 120.0,
     "needsVoices": true,
     "player1": "bf-pixel",
-    "songColor": "0xFFFF63CE",
+    "songColor": "0xFF63CE",
     "player2": "senpai-angry",
     "speed": 1.2,
     "notes": [

diff --git a/assets/preload/data/roses/roses-hard.json b/assets/preload/data/roses/roses-hard.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-pixel",
     "player2": "senpai-angry",
-    "songColor": "0xFFFF63CE",
+    "songColor": "0xFF63CE",
     "speed": 1.5,
     "notes": [
       {

diff --git a/assets/preload/data/roses/roses.json b/assets/preload/data/roses/roses.json
@@ -5,7 +5,7 @@
     "needsVoices": true,
     "player1": "bf-pixel",
     "player2": "senpai-angry",
-    "songColor": "0xFFFF63CE",
+    "songColor": "0xFF63CE",
     "speed": 1.3,
     "notes": [
       {