imma just leave this here cuz errands

The-Powder-Team · Feb 4, 2024 · 0b6d004 · 0b6d004
1 parent d67c4d0
commit 0b6d004
Show file tree

Hide file tree

Showing 40 changed files with 842 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,9 @@ art/build_x32-officialrelease.bat
 art/build_x64-officialrelease.bat
 art/test_x64-debug-officialrelease.bat
 
+### MacOS-Specific
+*.DS_Store
+
 ### VS Code
 export/*
 .vscode/*

diff --git a/BUILDING.md b/BUILDING.md
@@ -11,7 +11,7 @@
 - (Windows-only) Microsoft Visual Studio Community
 - (Unix-Only) `g++` compiler
 - (Linux-only) VLC
-- Haxe (4.2.5 or greater)
+- Haxe (4.2.5+)
 
 ---
 
@@ -108,9 +108,9 @@ which will create the files inside of `FNF-PsychEngine/export/<platform>/bin`
 No, that is normal, when you compile flixel games for the first time, it usually takes around 5 to 10 minutes,
 it really depends on how powerful your hardware is
 
-### "I had an error saying that 'hxCodec' could not be found!"
+~~### "I had an error saying that 'hxCodec' could not be found!"~~
 
-Refer to Issue ShadowMario/FNF-PsychEngine#12770.
+~~Refer to Issue ShadowMario/FNF-PsychEngine#12770.~~
 
 ### "I had an error relating to g++ on Linux!"
 

diff --git a/Project.xml b/Project.xml
@@ -73,7 +73,7 @@
 	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
 
 	<section if="MODS_ALLOWED">
-		<assets path='example_mods' rename='mods' embed='false'/>
+		<assets path='example_mods' rename='mods' embed='false' type='template'/>
 	</section>
 	<assets path='art/readme.txt' rename='do NOT readme.txt' />
 
@@ -87,7 +87,8 @@
 	<!--Psych stuff needed-->
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
 	<haxelib name="SScript" if="HSCRIPT_ALLOWED"/>
-	<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>
+	<!--<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>-->
+	<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
 	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
 	<haxelib name="flxanimate"/>
 
@@ -97,7 +98,7 @@
 
 	<!-- Enables a terminal log prompt on debug builds -->
 	<haxelib name="hxcpp-debug-server" if="debug"/>
-	<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
+	<!--<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />-->
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
@@ -108,7 +109,7 @@
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
 
 	<!-- Show debug traces for hxCodec -->
-	<haxedef name="HXC_DEBUG_TRACE" if="debug" />
+	<!--<haxedef name="HXC_DEBUG_TRACE" if="debug" />-->
 
 	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
 	<haxedef name="FLX_NO_DEBUG" unless="debug" />
@@ -120,14 +121,26 @@
 	<haxedef name="HXCPP_CHECK_POINTER" if="CRASH_HANDLER" />
 	<haxedef name="HXCPP_STACK_LINE" if="CRASH_HANDLER" />
 	<haxedef name="HXCPP_STACK_TRACE" if="CRASH_HANDLER" />
+
+	<haxedef name="HXCPP_GC_BIG_BLOCKS" if="cpp " /> <!-- mmmm memory -->
 
 	<!--Disable deprecated warnings-->
 	<haxedef name='no-deprecation-warnings' />
 
 	<!--Macro fixes-->
+	<haxeflag name="-dce" value="no" if="HSCRIPT_ALLOWED" />
 	<haxeflag name="--macro" value="allowPackage('flash')" />
 	<haxeflag name="--macro" value="include('my.pack')" />
 
+	<!--hxVLC Defines-->
+	<section if="VIDEOS_ALLOWED">
+		<!--The level of verbosity that is being used for logging-->
+		<haxedef name="HXVLC_VERBOSE" value="2" if="debug" />
+
+		<!--Enable libVLC logging on hxVLC-->
+		<haxedef name="HXVLC_LOGGING" if="debug" />
+	</section>
+
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ same goes for *Lua Scripts*, comment out or delete the line with `LUA_ALLOWED`,
 * SqirraRNG - Crash Handler and Base code for Chart Editor's Waveform
 * KadeDev - Fixed some cool stuff on Chart Editor and other PRs
 * iFlicky - Composer of Psync and Tea Time, also made the Dialogue Sounds
-* PolybiusProxy - .MP4 Video Loader Library (hxCodec)
+~~* PolybiusProxy - .MP4 Video Loader Library (hxCodec)~~
 * Keoiki - Note Splash Animations
 * Smokey - Sprite Atlas Support
 * Nebula the Zorua - some Lua reworks

diff --git a/assets/shared/stages/limo.json b/assets/shared/stages/limo.json
@@ -11,5 +11,23 @@
 	"camera_boyfriend": [-200, 0],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"limo/limoDancer",
+			"limo/limoDrive",
+			"limo/fastCarLol",
+			"limo/limoSunset",
+			"limo/bgLimo",
+			"gore/"
+		],
+		"images_low":
+		[
+			"limo/fastCarLol",
+			"limo/limoSunset",
+			"limo/bgLimo"
+		]
+	}
 }
diff --git a/assets/shared/stages/mall.json b/assets/shared/stages/mall.json
@@ -11,5 +11,26 @@
 	"camera_boyfriend": [0, -100],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"christmas/bgWalls",
+			"christmas/upperBop",
+			"christmas/bottomBop",
+			"christmas/bgEscalator",
+			"christmas/christmasTree",
+			"christmas/fgSnow",
+			"christmas/santa"
+		],
+		"images_low":
+		[
+			"christmas/bgWalls",
+			"christmas/bottomBop",
+			"christmas/christmasTree",
+			"christmas/fgSnow",
+			"christmas/santa"
+		]
+	}
 }
diff --git a/assets/shared/stages/mallEvil.json b/assets/shared/stages/mallEvil.json
@@ -11,5 +11,14 @@
 	"camera_boyfriend": [0, 0],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"christmas/evilBG",
+			"christmas/evilSnow",
+			"christmas/evilTree"
+		]
+	}
 }
diff --git a/assets/shared/stages/philly.json b/assets/shared/stages/philly.json
@@ -11,5 +11,24 @@
 	"camera_boyfriend": [0, 0],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"philly/city",
+			"philly/street",
+			"philly/train",
+			"philly/window",
+			"philly/behindTrain",
+			"philly/sky"
+		],
+		"images_low":
+		[
+			"philly/city",
+			"philly/street",
+			"philly/train",
+			"philly/window"
+		]
+	}
 }
diff --git a/assets/shared/stages/school.json b/assets/shared/stages/school.json
@@ -11,5 +11,25 @@
 	"camera_boyfriend": [-100, -100],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"weeb/weebSky",
+			"weeb/weebSchool",
+			"weeb/weebStreet",
+			"weeb/weebTreesBack",
+			"weeb/weebTrees",
+			"weeb/petals",
+			"weeb/bgFreaks"
+		],
+		"images_low":
+		[
+			"weeb/weebSky",
+			"weeb/weebSchool",
+			"weeb/weebStreet",
+			"weeb/weebTrees"
+		]
+	}
 }
diff --git a/assets/shared/stages/schoolEvil.json b/assets/shared/stages/schoolEvil.json
@@ -11,5 +11,17 @@
 	"camera_boyfriend": [-100, -100],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"weeb/animatedEvilSchool",
+			"weeb/bgGhouls"
+		],
+		"images_low":
+		[
+			"weeb/animatedEvilSchool_low"
+		]
+	}
 }
diff --git a/assets/shared/stages/spooky.json b/assets/shared/stages/spooky.json
@@ -11,5 +11,16 @@
 	"camera_boyfriend": [0, 0],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"halloween_bg"
+		],
+		"images_low":
+		[
+			"halloween_bg_low"
+		]
+	}
 }
diff --git a/assets/shared/stages/stage.json b/assets/shared/stages/stage.json
@@ -11,5 +11,20 @@
 	"camera_boyfriend": [0, 0],
 	"camera_opponent": [0, 0],
 	"camera_girlfriend": [0, 0],
-	"camera_speed": 1
+	"camera_speed": 1,
+
+	"preload": {
+		"images":
+		[
+			"stageback",
+			"stagefront",
+			"stagecurtains",
+			"stage_light"
+		],
+		"images_low":
+		[
+			"stageback",
+			"stagefront"
+		]
+	}
 }
diff --git a/assets/shared/stages/tank.json b/assets/shared/stages/tank.json
@@ -5,5 +5,37 @@
 
 	"boyfriend": [810, 100],
 	"girlfriend": [200, 65],
-	"opponent": [20, 100]
+	"opponent": [20, 100],
+
+	"preload": {
+		"images":
+		[
+			"tank0",
+			"tank1",
+			"tank2",
+			"tank3",
+			"tank4",
+			"tank5",
+			"tankClouds",
+			"tankMountains",
+			"tankBuildings",
+			"smokeLeft",
+			"smokeRight",
+			"tankWatchtower",
+			"tankGround",
+			"tankRolling",
+			"tankRuins",
+			"tankSky"
+		],
+		"images_low":
+		[
+			"tank0",
+			"tank2",
+			"tank5",
+			"tankGround",
+			"tankRolling",
+			"tankRuins",
+			"tankSky"
+		]
+	}
 }
diff --git a/hmm.json b/hmm.json
@@ -36,7 +36,7 @@
       "version": null
     },
     {
-      "name": "hxCodec",
+      "name": "hxvlc",
       "type": "haxelib",
       "version": null
     },

diff --git a/setup/setup-unix.sh b/setup/setup-unix.sh
@@ -10,7 +10,7 @@ haxelib install flixel-addons
 haxelib install flixel-ui
 haxelib install flixel-tools
 haxelib install SScript
-haxelib install hxCodec
+haxelib install hxvlc
 haxelib install tjson
 haxelib git flxanimate https://github.com/ShadowMario/flxanimate dev
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit

diff --git a/setup/setup-windows.bat b/setup/setup-windows.bat
@@ -10,7 +10,7 @@ haxelib install flixel-addons
 haxelib install flixel-ui
 haxelib install flixel-tools
 haxelib install SScript
-haxelib install hxCodec
+haxelib install hxvlc
 haxelib install tjson
 haxelib git flxanimate https://github.com/ShadowMario/flxanimate dev
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit