Merge pull request #39 from Hackx2/experimental

0.2.1

.github/workflows/main.yml

@@ -7,9 +7,9 @@ name: Build
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ main ]
+    branches: [ main, experimental ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, experimental ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

Project.xml

@@ -74,24 +74,43 @@
 	<section if="PRELOAD_ALL">
 		<library name="songs"         preload="true" />
 		<library name="shared"        preload="true" />
-		<library name="weekAssets"   preload="true" />
-
+		<library name="week2"         preload="true" />
+		<library name="week3"         preload="true" />
+		<library name="week4"         preload="true" />
+		<library name="week5"         preload="true" />
+		<library name="week6"         preload="true" />
+		<library name="week7"         preload="true" />
 	</section>
 
 	<section if="NO_PRELOAD_ALL">
 		<library name="songs"         preload="false" />
 		<library name="shared"        preload="false" />
-		<library name="weekAssets"   preload="true" />
+		<library name="week2"         preload="false" />
+		<library name="week3"         preload="false" />
+		<library name="week4"         preload="false" />
+		<library name="week5"         preload="false" />
+		<library name="week6"         preload="false" />
+		<library name="week7"         preload="false" />
 	</section>
 
 	<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"/>
 	<assets path="assets/shared"        library="shared"        exclude="*.ogg" if="web"/>
 	<assets path="assets/shared"        library="shared"        exclude="*.mp3" unless="web"/>
-	<assets path="assets/weekAssets"   library="weekAssets"   rename="assets" exclude="*.ogg" if="web"/>
-	<assets path="assets/weekAssets"   library="weekAssets"   rename="assets" exclude="*.mp3" unless="web"/>
-
+	<assets path="assets/week2"         library="week2"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week2"         library="week2"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week3"         library="week3"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week3"         library="week3"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week4"         library="week4"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week4"         library="week4"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week5"         library="week5"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week5"         library="week5"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week6"         library="week6"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week6"         library="week6"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week7"         library="week7"         exclude="*.ogg" if="web"/>
+	<assets path="assets/week7"         library="week7"         exclude="*.mp3" unless="web"/>
+
 	<section if="MODS_ALLOWED">
 		<assets path='mods' embed='false'/>
 	</section>

assets/preload/stages/limo.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week4",
+	"directory": "week4",
 	"defaultZoom": 0.9,
 	"isPixelStage": false,
 

assets/preload/stages/mall.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week5",
+	"directory": "week5",
 	"defaultZoom": 0.8,
 	"isPixelStage": false,
 

assets/preload/stages/mallEvil.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week5",
+	"directory": "week5",
 	"defaultZoom": 1.05,
 	"isPixelStage": false,
 

assets/preload/stages/philly.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week3",
+	"directory": "week3",
 	"defaultZoom": 1.05,
 	"isPixelStage": false,
 

assets/preload/stages/school.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week6",
+	"directory": "week6",
 	"defaultZoom": 1.05,
 	"isPixelStage": true,
 

assets/preload/stages/schoolEvil.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week6",
+	"directory": "week6",
 	"defaultZoom": 1.05,
 	"isPixelStage": true,
 

assets/preload/stages/spooky.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week2",
+	"directory": "week2",
 	"defaultZoom": 1.05,
 	"isPixelStage": false,
 

assets/preload/stages/tank.json

@@ -1,5 +1,5 @@
 {
-	"directory": "weekAssets/week7",
+	"directory": "week7",
 	"defaultZoom": 0.9,
 	"isPixelStage": false,
 

gitVersion.txt

@@ -1 +1 @@
-0.2
+0.2.1

hmm.json

@@ -8,7 +8,7 @@
     {
       "name": "openfl",
       "type": "haxelib",
-      "version": "9.3.2"
+      "version": null
     },
     {
       "name": "flixel",
@@ -79,7 +79,7 @@
       "type": "git",
       "dir": null,
       "ref": "master",
-      "url": "https://github.com/Hackx2/linc_luajit"
+      "url": "https://github.com/superpowers04/linc_luajit"
     }
   ]
 }

source/backend/Rating.hx

@@ -17,7 +17,7 @@ class Rating
 		this.name = name;
 		this.image = name;
 		this.counter = name + 's';
-		this.hitWindow = Reflect.field(backend.utils.ClientPrefs, name + 'Window');
+		this.hitWindow = Reflect.field(backend.utils.ClientPrefs.data, name + 'Window');
 		if(hitWindow == null)
 		{
 			hitWindow = 0;

source/backend/client/Discord.hx

@@ -1,5 +1,6 @@
 package backend.client;
 
+import backend.data.EngineData;
 import backend.utils.ClientPrefs;
 import Sys.sleep;
 import lime.app.Application;

source/backend/data/EngineData.hx

@@ -12,7 +12,7 @@ using StringTools;
 
     //** Other Shit **/
 	public static var mainCoreShit = {
-		coreVersion: '0.2',
+		coreVersion: '0.2.1',
 		colorMenuImage: 0xff525252,
 		mainRepo: "https://github.com/Hackx2/FNF-AstroEngine",
 	}

source/backend/utils/ClientPrefs.hx

@@ -2,9 +2,7 @@ package backend.utils;
 
 import flixel.FlxG;
 import flixel.util.FlxSave;
-import backend.Conductor;
 import flixel.input.keyboard.FlxKey;
-import flixel.graphics.FlxGraphic;
 import backend.utils.Controls;
 
 

source/game/Main.hx

@@ -12,7 +12,7 @@ import openfl.events.Event;
 import openfl.display.StageScaleMode;
 import lime.app.Application;
 
-#if desktop
+#if DISCORD_ALLOWED
 import backend.client.Discord.DiscordClient;
 #end
 

source/import.hx

@@ -1,12 +1,24 @@
-#if !macro
-import flixel.FlxG;
-import game.*;
-import game.objects.*;
-import backend.system.*;
-import backend.data.*;
+#if !macro 
+
+//Discord API
+#if DISCORD_ALLOWED
+import backend.client.Discord;
+#end
+
+//Psych
+#if LUA_ALLOWED
+import llua.*;
+import llua.Lua;
+#end
 
-import backend.data.WeekData.WeekFile;
-import backend.data.WeekData.WeekData;
+#if sys
+import sys.*;
+import sys.io.*;
+#elseif js
+import js.html.*;
+#end
+
+import backend.data.WeekData.*;
 
 import game.objects.characters.*;
 import game.objects.characters.MenuCharacter;
@@ -23,11 +35,39 @@ import game.objects.FlxUIDropDownMenuCustom;
 
 import backend.utils.Paths;
 
-#if desktop
-import backend.client.Discord.DiscordClient;
-#end
-
 import backend.system.MusicBeatSubstate;
 import backend.system.MusicBeatState;
 
+import backend.utils.Paths;
+import backend.utils.Controls;
+import backend.CoolUtil;
+import backend.system.MusicBeatState;
+import backend.system.MusicBeatSubstate;
+import game.transitions.CustomFadeTransition;
+import backend.utils.ClientPrefs;
+import backend.Conductor;
+
+import game.objects.Alphabet;
+import game.objects.BGSprite;
+
+import game.states.PlayState;
+import game.states.LoadingState;
+
+
+//Flixel
+import flixel.sound.FlxSound;
+import flixel.FlxG;
+import flixel.FlxSprite;
+import flixel.FlxCamera;
+import flixel.math.FlxMath;
+import flixel.math.FlxPoint;
+import flixel.util.FlxColor;
+import flixel.util.FlxTimer;
+import flixel.text.FlxText;
+import flixel.tweens.FlxEase;
+import flixel.tweens.FlxTween;
+import flixel.group.FlxSpriteGroup;
+import flixel.group.FlxGroup.FlxTypedGroup;
+
+using StringTools;
 #end