Merge branch 'pe-1.0'

.github/workflows/main.yml

@@ -73,6 +73,11 @@ jobs:
         run: echo "${{github.run_id}}" > VERSION
       - name: Compile
         run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}"  -D officialBuild
+      - name: Cleanup
+        run: |
+          rd /s /q .\"export/release/windows/bin/lua"
+          rd /s /q .\"export/release/windows/bin/hrtfs"
+        shell: cmd
       - name: Publish Artifact
         uses: actions/upload-artifact@v4.3.4
         with:

Project.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project>
+<project
+xmlns="http://lime.openfl.org/project/1.0.4"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
 	<!-- _________________________ Application Settings _________________________ -->
 
 	<app title="Friday Night Funkin': P-Slice Engine" file="PsychEngine" packageName="com.mikolka9144.pslice" package="com.mikolka9144.pslice" main="Main" version="0.1" company="mikolka9144" />
@@ -8,8 +11,7 @@
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 
 	<!-- NOTE TO SELF: DISABLE THIS IF ISSUES ARE FOUND -->
-	<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB"/>
-	<!-- stable luas PUT AFTER FIRST LINE WITH APP NAME AND ETC -->
+	<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB"/> <!-- stable luas PUT AFTER FIRST LINE WITH APP NAME AND ETC -->
 
 	<!--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"-->
@@ -18,39 +20,39 @@
 
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
 	<set name="SWF_VERSION" value="11.8" />
-
+	
 	<!-- ______________________ PSYCH ENGINE CUSTOMIZATION ______________________ -->
+
 	<define name="MODS_ALLOWED" if="desktop" />
 	<define name="HSCRIPT_ALLOWED" if="desktop" />
 	<define name="LUA_ALLOWED" if="desktop" />
 	<define name="ACHIEVEMENTS_ALLOWED" />
 	<define name="DISCORD_ALLOWED" />
-	<define name="PSYCH_WATERMARKS"/>
-	<define name="VIDEOS_ALLOWED" if="windows || linux" unless="32bits"/>
-	<!-- DELETE THIS TO REMOVE WATERMARKS/DEV NAMES ON TITLE SCREEN -->
+	<define name="TRANSLATIONS_ALLOWED" />
 
-	<!-- <section if="officialBuild">
-		<define name="TITLE_SCREEN_EASTER_EGG"/>
-		
-		 IF YOU WANT TO USE VIDEOS ON YOUR SOURCE MOD, GET THIS LINE OUTSIDE OF THE SECTION 
-	</section> -->
+
+	<define name="SHOW_LOADING_SCREEN" />
+	<define name="PSYCH_WATERMARKS"/> <!-- DELETE THIS TO REMOVE THE PSYCH LOGO FROM LOADING SCREEN -->
+	<define name="TITLE_SCREEN_EASTER_EGG"/>
+	<define name="BASE_GAME_FILES" />
+	<define name="VIDEOS_ALLOWED" if="windows || linux || android" unless="32bits"/> <!-- IF YOU WANT TO USE VIDEOS ON YOUR SOURCE MOD, GET THIS LINE OUTSIDE OF THE SECTION -->
 
 	<!-- ____________________________ Window Settings ___________________________ -->
 
 	<!--These window settings apply to all targets-->
 	<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" />
 
 	<!--HTML5-specific-->
-	<window if="html5" resizable="true" fps="60"/>
+	<window if="html5" resizable="true" />
 
 	<!--Desktop-specific-->
-	<window if="desktop" orientation="landscape" fullscreen="false" fps="60" resizable="true" vsync="false"/>
+	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
 
 	<!--Mobile-specific-->
-	<window if="mobile" orientation="landscape" fullscreen="true" fps="60" width="0" height="0" resizable="false"/>
+	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false"/>
 
 	<!--Switch-specific-->
-	<window if="switch" orientation="landscape" fullscreen="true" fps="60" width="0" height="0" resizable="true" />
+	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
 
 	<!-- _____________________________ Path Settings ____________________________ -->
 
@@ -61,47 +63,59 @@
 	<classpath name="source" />
 
 	<!-- __________________________ Game Assets & Etc. __________________________ -->
-
+	
 	<!-- Turn on Crash Handler -->
-	<define name="CRASH_HANDLER" if="desktop" />
+	<define name="CRASH_HANDLER" if="desktop release" />
 
 	<!-- Assets -->
 	<assets path="assets/fonts" />
-	<assets path="assets/shared" exclude="*.ogg" if="web"/>
-	<assets path="assets/shared" exclude="*.mp3" unless="web"/>
-	<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/week_assets" library="week_assets" rename="assets" exclude="*.ogg" if="web"/>
-	<assets path="assets/week_assets" library="week_assets" rename="assets" exclude="*.mp3" unless="web"/>
+	<assets path="assets/shared"        exclude="*.ogg" if="web"/>
+	<assets path="assets/shared"        exclude="*.mp3" unless="web"/>
+	<assets path="assets/embed"         exclude="*.ogg" if="web" embed="true"/>
+	<assets path="assets/embed"         exclude="*.mp3" unless="web" embed="true"/>
+	<assets path="assets/videos"        if="VIDEOS_ALLOWED"/>
+	<assets path="assets/songs"         exclude="*.ogg" if="web"/>
+	<assets path="assets/songs"         exclude="*.mp3" unless="web"/>
+	<assets path="assets/week_assets"   rename="assets" exclude="*.ogg" if="web"/>
+	<assets path="assets/week_assets"   rename="assets" exclude="*.mp3" unless="web"/>
 	<section if="TITLE_SCREEN_EASTER_EGG">
 		<assets path="assets/secrets" rename="assets/shared" exclude="*.ogg" if="web"/>
-		<assets path="assets/secrets" rename="assets/shared" exclude="*.mp3" unless="web"/>
+		<assets path="assets/secrets" rename="assets/shared" exclude="*.mp3"  unless="web"/>
 	</section>
 
-	<library name="videos" preload="true" if="VIDEOS_ALLOWED"/>
-	<library name="songs" preload="true" />
-	<library name="week_assets" preload="true" />
+	<section if="TRANSLATIONS_ALLOWED">
+		<assets path="assets/translations" rename="assets" exclude="*.ogg" if="web"/>
+		<assets path="assets/translations" rename="assets" exclude="*.mp3"  unless="web"/>
+	</section>
 
-	<define name="CHECK_FOR_UPDATES" if="desktop"/>
+	<section if="BASE_GAME_FILES">
+		<assets path="assets/base_game" rename="assets" exclude="*.ogg" if="web"/>
+		<assets path="assets/base_game" rename="assets" exclude="*.mp3"  unless="web"/>
+		<haxelib name="grig.audio" if="BASE_GAME_FILES"/>
+		<haxelib name="funkin.vis" if="BASE_GAME_FILES"/>
+	</section>
+
+	<!-- TODO:re-enable this once PE 1.0 is complete <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' />
 
 	<!-- _______________________________ Libraries ______________________________ -->
 
-	<haxelib name="flixel" />
-	<haxelib name="flixel-ui" />
-	<haxelib name="flixel-addons" />
-	<haxelib name="FlxPartialSound" />
-	<haxelib name="tjson" />
+	<haxelib name="flixel"/>
+	<haxelib name="flixel-addons" version="3.2.2"/>
+	<haxelib name="tjson" version="1.4.0"/>
+	<haxelib name="FlxPartialSound" version="git"/>
 
 	<!--Psych stuff needed-->
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
-	<haxelib name="SScript" if="HSCRIPT_ALLOWED"/>
-	<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>
+	<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.0.2"/>
+	<section if="VIDEOS_ALLOWED">
+		<haxelib name="hxCodec" unless="windows"/>
+		<haxelib name="hxvlc" if="windows"/>
+	</section>
 	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
 	<haxelib name="flxanimate"/>
 
@@ -111,8 +125,14 @@
 
 	<!-- Enables a terminal log prompt on debug builds -->
 	<haxelib name="hxcpp-debug-server" if="debug"/>
-	<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
-
+	<section if="debug">
+		<!--These defines are mostly for testing (aren't required to be used)-->
+		<haxedef name="HXVLC_VERBOSE" value="2" />
+		<haxedef name="HXC_LIBVLC_LOGGING"/>
+		<haxedef name="HXVLC_LOGGING" />
+	</section>
+
+
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
 	<!--Enable the Flixel core recording system-->
@@ -138,34 +158,40 @@
 
 	<!--Disable the Flixel core focus lost screen-->
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
-
+	
 	<!-- Show debug traces for hxCodec -->
 	<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" />
 
 	<!--Enable this for Nape release builds for a serious peformance improvement-->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
-
+	
 	<!--Used for Izzy Engine's crash handler-->
 	<haxedef name="HXCPP_CHECK_POINTER" if="CRASH_HANDLER" />
 	<haxedef name="HXCPP_STACK_LINE" if="CRASH_HANDLER" />
 	<haxedef name="HXCPP_STACK_TRACE" if="CRASH_HANDLER" />
-
+	
 	<!--Disable deprecated warnings-->
 	<haxedef name='no-deprecation-warnings' />
 
+	<!-- Haxe 4.3.0+: Enable pretty syntax errors and stuff. -->
+	<!-- pretty (haxeflixel default), indent, classic (haxe compiler default) -->
+	<haxedef name="message.reporting" value="pretty" />
+
 	<!--Macro fixes-->
 	<haxeflag name="--macro" value="allowPackage('flash')" />
 	<haxeflag name="--macro" value="include('my.pack')" />
 
-	<!-- _________________________________ Custom _______________________________ -->
+	<!-- more verbose HScript-->
+	<define name="IRIS_DEBUG" if="debug"/>
+	<haxedef name="hscriptPos" if="HSCRIPT_ALLOWED"/>
 
-	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
+	<!-- _________________________________ Custom _______________________________ -->
 
 	<assets path='art/iconOG.png' rename='icon.png' if="linux" />
-
+	
 	<icon path="art/icon16.png" size='16'/>
 	<icon path="art/icon32.png" size='32'/>
 	<icon path="art/icon64.png" size='64'/>

README.md

@@ -13,4 +13,8 @@ Mods made for P-Slice now can select which sticker pack and set to use on the ne
 
 > custom freeplay icons
 
-You can now put V-slice freeplay icons into `images/freeplay/icons/{charId}pixel.png`
+You can now put V-slice freeplay icons into `images/freeplay/icons/{charId}pixel.png` where {charId} is the name of the character icon.
+
+> custom commercials
+
+If your mod affects entire engine (either is global or loaded as the first mod), you can add additional commercials in `videos/commercials`

example_mods/Base game/characters/bf-holding-gf.json → assets/base_game/shared/characters/bf-holding-gf.json

@@ -129,5 +129,6 @@
 		0
 	],
 	"sing_duration": 4,
-	"scale": 1
+	"scale": 1,
+	"_editor_isPlayer": true
 }