gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev

Browse Source
This commit is contained in:
lunarcleint
2024-02-07 22:08:51 -07:00
parent 5f4fe391ee cb5fb40adb
commit ac301ddf33
9 changed files with 110 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/scripts/pixel.hx
+7
View File
@@ -3,6 +3,7 @@ import funkin.backend.scripting.events.NoteHitEvent;
public var pixelNotesForBF = true; public var pixelNotesForBF = true;
public var pixelNotesForDad = true; public var pixelNotesForDad = true;
public var pixelSplashes = true;
public var enablePixelUI = true; public var enablePixelUI = true;
public var enablePixelGameOver = true; public var enablePixelGameOver = true;
public var enableCameraHacks = Options.week6PixelPerfect; public var enableCameraHacks = Options.week6PixelPerfect;
@@ -34,6 +35,12 @@ function onNoteCreation(event) {
note.updateHitbox(); note.updateHitbox();
} }
function onPostNoteCreation(event) {
var splashes = event.note;
if (pixelSplashes)
splashes.splash = "pixel-default";
}
function onStrumCreation(event) { function onStrumCreation(event) {
if (event.player == 1 && !pixelNotesForBF) return; if (event.player == 1 && !pixelNotesForBF) return;
if (event.player == 0 && !pixelNotesForDad) return; if (event.player == 0 && !pixelNotesForDad) return;
assets/data/splashes/pixel-default.xml
+20
View File
@@ -0,0 +1,20 @@
<!DOCTYPE codename-engine-splashes>
<!--Pixel Splashes by APurples!!-->
<splashes sprite="stages/school/ui/pixel-splashes" alpha="0.6" antialiasing="false" scale="3.5">
<strum id="0"> <!-- LEFT -->
<anim name="splashleft1" anim="splash purple 1" fps="24" x="-1" y="-2" />
<anim name="splashleft2" anim="splash purple 2" fps="24" x="-1" y="-2" />
</strum>
<strum id="1"> <!-- DOWN -->
<anim name="splashdown1" anim="splash blue 1" fps="24" x="-1" y="-2" />
<anim name="splashdown2" anim="splash blue 2" fps="24" x="-1" y="-2" />
</strum>
<strum id="2"> <!-- UP -->
<anim name="splashup1" anim="splash green 1" fps="24" x="-1" y="-2" />
<anim name="splashup2" anim="splash green 2" fps="24" x="-1" y="-2" />
</strum>
<strum id="3"> <!-- RIGHT -->
<anim name="splashright1" anim="splash red 1" fps="24" x="-1" y="-2" />
<anim name="splashright2" anim="splash red 2" fps="24" x="-1" y="-2" />
</strum>
</splashes>
assets/data/splashes/pixel-secret.xml
+16
View File
@@ -0,0 +1,16 @@
<!DOCTYPE codename-engine-splashes>
<!--Pixel Splashes by APurples!!-->
<splashes sprite="stages/school/ui/pixel-secret-splashes" alpha="0.6" antialiasing="false" scale="3.5">
<strum id="0"> <!-- LEFT -->
<anim name="splashleft1" anim="splash purple 1" fps="24" x="-3"/>
</strum>
<strum id="1"> <!-- DOWN -->
<anim name="splashdown1" anim="splash blue 1" fps="24" x="-3"/>
</strum>
<strum id="2"> <!-- UP -->
<anim name="splashup1" anim="splash green 1" fps="24" x="-3"/>
</strum>
<strum id="3"> <!-- RIGHT -->
<anim name="splashright1" anim="splash red 1" fps="24" x="-3"/>
</strum>
</splashes>
assets/images/stages/school/ui/pixel-secret-splashes.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

assets/images/stages/school/ui/pixel-secret-splashes.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="pixel-secret-splashes.png">
<!-- Made using Maru Aseprite JSON to XML converter -->
<SubTexture name="splash purple 100000" x="0" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100001" x="64" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100002" x="128" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100003" x="192" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100004" x="256" y="0" width="64" height="64"/>
<SubTexture name="splash blue 100000" x="0" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100001" x="64" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100002" x="128" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100003" x="192" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100004" x="256" y="64" width="64" height="64"/>
<SubTexture name="splash green 100000" x="0" y="128" width="64" height="64"/>
<SubTexture name="splash green 100001" x="64" y="128" width="64" height="64"/>
<SubTexture name="splash green 100002" x="128" y="128" width="64" height="64"/>
<SubTexture name="splash green 100003" x="192" y="128" width="64" height="64"/>
<SubTexture name="splash green 100004" x="256" y="128" width="64" height="64"/>
<SubTexture name="splash red 100000" x="0" y="192" width="64" height="64"/>
<SubTexture name="splash red 100001" x="64" y="192" width="64" height="64"/>
<SubTexture name="splash red 100002" x="128" y="192" width="64" height="64"/>
<SubTexture name="splash red 100003" x="192" y="192" width="64" height="64"/>
<SubTexture name="splash red 100004" x="256" y="192" width="64" height="64"/>
</TextureAtlas>
assets/images/stages/school/ui/pixel-splashes.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

assets/images/stages/school/ui/pixel-splashes.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="pixel-splashes.png">
<!-- Made using Maru Aseprite JSON to XML converter -->
<SubTexture name="splash purple 100000" x="0" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100001" x="64" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100002" x="128" y="0" width="64" height="64"/>
<SubTexture name="splash purple 100003" x="192" y="0" width="64" height="64"/>
<SubTexture name="splash purple 200000" x="256" y="0" width="64" height="64"/>
<SubTexture name="splash purple 200001" x="320" y="0" width="64" height="64"/>
<SubTexture name="splash purple 200002" x="0" y="64" width="64" height="64"/>
<SubTexture name="splash purple 200003" x="64" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100000" x="128" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100001" x="192" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100002" x="256" y="64" width="64" height="64"/>
<SubTexture name="splash blue 100003" x="320" y="64" width="64" height="64"/>
<SubTexture name="splash blue 200000" x="0" y="128" width="64" height="64"/>
<SubTexture name="splash blue 200001" x="64" y="128" width="64" height="64"/>
<SubTexture name="splash blue 200002" x="128" y="128" width="64" height="64"/>
<SubTexture name="splash blue 200003" x="192" y="128" width="64" height="64"/>
<SubTexture name="splash green 100000" x="256" y="128" width="64" height="64"/>
<SubTexture name="splash green 100001" x="320" y="128" width="64" height="64"/>
<SubTexture name="splash green 100002" x="0" y="192" width="64" height="64"/>
<SubTexture name="splash green 100003" x="64" y="192" width="64" height="64"/>
<SubTexture name="splash green 200000" x="128" y="192" width="64" height="64"/>
<SubTexture name="splash green 200001" x="192" y="192" width="64" height="64"/>
<SubTexture name="splash green 200002" x="256" y="192" width="64" height="64"/>
<SubTexture name="splash green 200003" x="320" y="192" width="64" height="64"/>
<SubTexture name="splash red 100000" x="0" y="256" width="64" height="64"/>
<SubTexture name="splash red 100001" x="64" y="256" width="64" height="64"/>
<SubTexture name="splash red 100002" x="128" y="256" width="64" height="64"/>
<SubTexture name="splash red 100003" x="192" y="256" width="64" height="64"/>
<SubTexture name="splash red 200000" x="256" y="256" width="64" height="64"/>
<SubTexture name="splash red 200001" x="320" y="256" width="64" height="64"/>
<SubTexture name="splash red 200002" x="0" y="320" width="64" height="64"/>
<SubTexture name="splash red 200003" x="64" y="320" width="64" height="64"/>
</TextureAtlas>
project.xml
+1 -1
View File
@@ -142,7 +142,7 @@
<haxedef name="USE_ADAPTED_ASSETS" unless="web" /> <haxedef name="USE_ADAPTED_ASSETS" unless="web" />
<!-- Comment this out to disable support for custom ndlls. !--> <!-- Comment this out to disable support for custom ndlls. !-->
<haxedef name="NDLLS_SUPPORTED" unless="web" /> <haxedef name="NDLLS_SUPPORTED" unless="web || iphonesim" />
<!-- Comment this out to disable support for custom extended classes (data/classes). !--> <!-- Comment this out to disable support for custom extended classes (data/classes). !-->
<define name="SOFTCODED_CLASSES" /> <define name="SOFTCODED_CLASSES" />
source/funkin/backend/utils/NdllUtil.hx
+6 -5
View File
@@ -18,10 +18,11 @@ import lime.app.Application;
*/ */
class NdllUtil { class NdllUtil {
#if NDLLS_SUPPORTED #if NDLLS_SUPPORTED
#if windows public static final os:String = "windows"; #end #if windows public static final os:String = "windows"; #end
#if linux public static final os:String = "linux"; #end #if linux public static final os:String = "linux"; #end
#if macos public static final os:String = "mac"; #end #if macos public static final os:String = "mac"; #end
#if android public static final os:String = "android"; #end #if android public static final os:String = "android"; #end
#if ios public static final os:String = "ios"; #end
#end #end
/** /**
@@ -74,4 +75,4 @@ class NdllUtil {
} }
@:dox(hide) @:noCompletion static function noop() {} @:dox(hide) @:noCompletion static function noop() {}
} }