Remove unfinished songs. Might release now

Sylveondev · Nov 11, 2022 · 29a336b · 29a336b
1 parent 63545c2
commit 29a336b
Show file tree

Hide file tree

Showing 27 changed files with 8,377 additions and 5,910 deletions.
diff --git a/Project-dev.xml.old b/Project-dev.xml.old
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+	<!-- _________________________ Pokehell! _________________________ -->
+	<define name="DEVBUILD"/>
+
+	<!-- _________________________ Application Settings _________________________ -->
+
+	<app title="Friday Night Funkin': Pokehell" file="Pokehell" packageName="com.sylveondev.pokehell" package="com.sylveondev.pokehell" main="Main" version="1.2.2" company="SylveonDev" />
+
+	<!--Switch Export with Unique ApplicationID and Icon-->
+	<set name="APP_ID" value="0x0100f6c013bbc000" />
+
+	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
+		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
+	<!-- <app preloader="Preloader" resizable="true" /> -->
+	<app preloader="flixel.system.FlxPreloader" />
+
+	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
+	<set name="SWF_VERSION" value="11.8" />
+
+	<!-- ____________________________ Window Settings ___________________________ -->
+
+	<!--These window settings apply to all targets-->
+	<window width="1280" height="720" fps="" background="#000000" hardware="true" vsync="false" />
+
+	<!--HTML5-specific-->
+	<window if="html5" resizable="true" />
+
+	<!--Desktop-specific-->
+	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
+
+	<!--Mobile-specific-->
+	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false"/>
+
+	<!--Switch-specific-->
+	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
+
+	<!-- _____________________________ Path Settings ____________________________ -->
+
+	<set name="BUILD_DIR" value="export/dev" if="dev" />
+	<set name="BUILD_DIR" value="export/debug" if="debug" />
+	<set name="BUILD_DIR" value="export/release" unless="debug || dev" />
+	<set name="BUILD_DIR" value="export/32bit" if="32bits" />
+
+	<classpath name="source" />
+
+	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
+	<assets path="assets/preload" rename="assets" exclude="*.mp3"  unless="web"/>
+
+	<!-- PSYCH ENGINE CUSTOMIZATION -->
+	<define name="MODS_ALLOWED" if="desktop" />
+	<define name="LUA_ALLOWED" if="windows" />
+	<define name="ACHIEVEMENTS_ALLOWED" />
+	<define name="VIDEOS_ALLOWED" if="web || windows" unless="32bits"/>
+
+	<!-- DONT ENABLE THIS -->
+	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
+
+	<!-- <define name="PRELOAD_ALL" /> -->
+	<!-- <define name="PRELOAD_ALL" unless="web" /> -->
+	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
+
+	<library name="videos"        preload="true" />
+	<section if="PRELOAD_ALL">
+		<library name="songs"         preload="true" />
+		<library name="shared"        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="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="plugins/"             rename=''               if="VIDEOS_ALLOWED windows" />
+	<assets path="dlls/"                rename=''               if="VIDEOS_ALLOWED windows" />
+	<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/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"/>
+
+	<!-- Boring ass psych engine shit -->
+	<assets path='example_mods' rename='mods' embed='false' if="MODS_ALLOWED"/>
+	<assets path='art/readme.txt' rename='do NOT readme.txt' />
+	<!-- Windows users will see the pokehell logo as the folder icon 
+	<assets path='art/foldericon.txt' rename='desktop.ini' if="windows" />
+	<assets path='art/pokehelllogo.ico' rename='foldericon.ico' if="windows" />-->
+	<!-- Allows desktop to reset the mods folder by opening a batch script -->
+	<!-- Linux users will have support for this soon -->
+	<assets path='art/resetmods.bat' rename='reset the mods folder.bat' if="windows" />
+	<assets path='art/mods.zip' rename='assets/mods.zip' if="desktop" />
+	<!-- Links to a google drive. Pokemods are dead, this is useless. -->
+	<assets path='art/Pokemods.url' rename='download a pokemod.url' if="MODS_ALLOWED" />
+	<!-- <template path='mods' /> -->
+
+	<!-- assets path="CHANGELOG.md" rename='changelog.txt' -->
+
+	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY 
+		TO FIX ONE OF THEM, I CONVERTED IT TO OTF. DUNNO IF YOU NEED TO
+		THEN UHHH I USED THE NAME OF THE FONT WITH SETFORMAT() ON THE TEXT!!!
+		NOT USING A DIRECT THING TO THE ASSET!!!
+	-->
+	<assets path="assets/fonts" embed='true'/>
+	<!-- _______________________________ Libraries ______________________________ -->
+
+	<haxelib name="flixel" />
+	<haxedev set='webgl' />
+
+	<!--In case you want to use the addons package-->
+	<haxelib name="flixel-addons" />
+	<haxelib name="hscript" />
+
+	<!--In case you want to use the ui package-->
+	<haxelib name="flixel-ui" />
+	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
+	<haxelib name="faxe" if='switch'/>
+	<!--<haxelib name="polymod"/> -->
+	<haxelib name="discord_rpc" if="desktop"/>
+	<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
+
+	<!-- <haxelib name="markdown" /> -->
+	<!-- <haxelib name="HtmlParser" /> -->
+
+	<!--In case you want to use nape with flixel-->
+	<!--<haxelib name="nape-haxe4" />-->
+
+	<!-- ______________________________ Haxedefines _____________________________ -->
+
+	<!--Enable the Flixel core recording system-->
+	<!--<haxedef name="FLX_RECORD" />-->
+
+	<!--Disable the right and middle mouse buttons-->
+	<!-- <haxedef name="FLX_NO_MOUSE_ADVANCED" /> -->
+
+	<!--Disable the native cursor API on Flash-->
+	<!--<haxedef name="FLX_NO_NATIVE_CURSOR" />-->
+
+	<!--Optimise inputs, be careful you will get null errors if you don't use conditionals in your game-->
+	<!-- <haxedef name="FLX_NO_MOUSE" if="mobile" /> -->
+	<!-- <haxedef name="FLX_NO_KEYBOARD" if="mobile" /> -->
+	<!-- <haxedef name="FLX_NO_TOUCH" if="desktop" /> -->
+	<!--<haxedef name="FLX_NO_GAMEPAD" />-->
+
+	<!--Disable the Flixel core sound tray-->
+	<!--<haxedef name="FLX_NO_SOUND_TRAY" />-->
+
+	<!--Disable the Flixel sound management code-->
+	<!--<haxedef name="FLX_NO_SOUND_SYSTEM" />-->
+
+	<!--Disable the Flixel core focus lost screen-->
+	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
+
+	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
+	<haxedef name="FLX_NO_DEBUG" unless="debug" />
+
+	<!--Enable this for Nape release builds for a serious peformance improvement-->
+	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
+
+	<!-- Always enable Null Object Reference check for crash dialog -->
+	<haxedef name="HXCPP_CHECK_POINTER" if="release" />
+	<haxedef name="HXCPP_STACK_LINE" if="release" />
+
+	<!-- _________________________________ Custom _______________________________ -->
+
+	<!--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" />
+</project>
diff --git a/Project.xml b/Project.xml
@@ -5,7 +5,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': Pokehell" file="Pokehell" packageName="com.sylveondev.pokehell" package="com.sylveondev.pokehell" main="Main" version="1.2.2" company="SylveonDev" />
+	<app title="Friday Night Funkin': Pokehell" file="Pokehell" packageName="com.sylveondev.pokehell" package="com.sylveondev.pokehell" main="Main" version="1.3" company="SylveonDev" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -44,8 +44,8 @@
 
 	<classpath name="source" />
 
-	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
-	<assets path="assets/preload" rename="assets" exclude="*.mp3"  unless="web"/>
+	<assets path="assets/preload" rename="assets"/>
+	<assets path="assets/preload" rename="assets"/>
 
 	<!-- PSYCH ENGINE CUSTOMIZATION -->
 	<define name="MODS_ALLOWED" if="desktop" />

diff --git a/assets/preload/characters/Player.json → assets/preload/characters/player.json b/assets/preload/characters/Player.json → assets/preload/characters/player.json
diff --git a/assets/preload/data/burned/burned.json b/assets/preload/data/burned/burned.json
@@ -13548,6 +13548,15 @@
 				"changeBPM": false,
 				"mustHitSection": true
 			},
+			{
+				"lengthInSteps": 16,
+				"bpm": 240,
+				"changeBPM": false,
+				"mustHitSection": true,
+				"sectionNotes": [],
+				"typeOfSection": 0,
+				"altAnim": false
+			},
 			{
 				"lengthInSteps": 16,
 				"bpm": 240,
@@ -13559,7 +13568,7 @@
 			}
 		],
 		"player2": "flareon",
-		"player3": "gf-car",
+		"player3": "gf",
 		"song": "Burned",
 		"needsVoices": true,
 		"validScore": true,
@@ -13568,10 +13577,16 @@
 		"mania": 3,
 		"timebarColor": [
 			"0xFF915D0F",
-			""
+			"0xFFF5AA42"
 		],
 		"soundPrefix": "",
-		"fontColor": "",
-		"stage": "hell"
+		"fontColor": "0xFFF5AA42",
+		"stage": "hell",
+		"noBotplay": false,
+		"noPractice": false,
+		"forceMiddlescroll": false,
+		"forceGhostingOff": false,
+		"hideGF": false,
+		"disableChartEditor": false
 	}
 }