pass some shit through oxipng

MaybeMaru · Jan 26, 2024 · 082726c · 082726c
1 parent 9b8a51f
commit 082726c
Show file tree

Hide file tree

Showing 123 changed files with 24 additions and 24 deletions.
diff --git a/assets/preload/images/options/bf_offset.png b/assets/preload/images/options/bf_offset.png
diff --git a/assets/preload/images/options/buttonSprite.png b/assets/preload/images/options/buttonSprite.png
diff --git a/assets/preload/images/options/latencyBG.png b/assets/preload/images/options/latencyBG.png
diff --git a/assets/preload/images/options/latencyDesat.png b/assets/preload/images/options/latencyDesat.png
diff --git a/assets/preload/images/options/modButton.png b/assets/preload/images/options/modButton.png
diff --git a/assets/preload/images/options/optionCheckbox.png b/assets/preload/images/options/optionCheckbox.png
diff --git a/assets/preload/images/options/packedEvent.png b/assets/preload/images/options/packedEvent.png
diff --git a/assets/preload/images/options/quaverMod.png b/assets/preload/images/options/quaverMod.png
diff --git a/assets/preload/images/options/soundtray.png b/assets/preload/images/options/soundtray.png
diff --git a/assets/preload/images/options/spray.png b/assets/preload/images/options/spray.png
diff --git a/assets/preload/images/options/titleOptions.png b/assets/preload/images/options/titleOptions.png
diff --git a/assets/shared/images/characters/speakers.png b/assets/shared/images/characters/speakers.png
diff --git a/assets/shared/images/characters/speakers/speakerLights.png b/assets/shared/images/characters/speakers/speakerLights.png
diff --git a/assets/shared/images/characters/speakers/tankmanBodyPart.png b/assets/shared/images/characters/speakers/tankmanBodyPart.png
diff --git a/assets/shared/images/characters/speakers/tankmanTop1.png b/assets/shared/images/characters/speakers/tankmanTop1.png
diff --git a/assets/shared/images/characters/speakers/tankmanTop2.png b/assets/shared/images/characters/speakers/tankmanTop2.png
diff --git a/assets/shared/images/characters/week1/BOYFRIEND-DEAD.png b/assets/shared/images/characters/week1/BOYFRIEND-DEAD.png
diff --git a/assets/shared/images/characters/week1/BOYFRIEND.png b/assets/shared/images/characters/week1/BOYFRIEND.png
diff --git a/assets/shared/images/characters/week1/DADDY_DEAREST.png b/assets/shared/images/characters/week1/DADDY_DEAREST.png
diff --git a/assets/shared/images/characters/week1/GF_assets.png b/assets/shared/images/characters/week1/GF_assets.png
diff --git a/assets/shared/images/characters/week2/Monster_Assets.png b/assets/shared/images/characters/week2/Monster_Assets.png
diff --git a/assets/shared/images/characters/week2/spookyKids.png b/assets/shared/images/characters/week2/spookyKids.png
diff --git a/assets/shared/images/characters/week3/Pico_FNF_assetss.png b/assets/shared/images/characters/week3/Pico_FNF_assetss.png
diff --git a/assets/shared/images/characters/week4/Mom_Assets.png b/assets/shared/images/characters/week4/Mom_Assets.png
diff --git a/assets/shared/images/characters/week4/bfCar.png b/assets/shared/images/characters/week4/bfCar.png
diff --git a/assets/shared/images/characters/week4/gfCar.png b/assets/shared/images/characters/week4/gfCar.png
diff --git a/assets/shared/images/characters/week4/momCar.png b/assets/shared/images/characters/week4/momCar.png
diff --git a/assets/shared/images/characters/week5/bfChristmas.png b/assets/shared/images/characters/week5/bfChristmas.png
diff --git a/assets/shared/images/characters/week5/gfChristmas.png b/assets/shared/images/characters/week5/gfChristmas.png
diff --git a/assets/shared/images/characters/week5/mom_dad_christmas_assets.png b/assets/shared/images/characters/week5/mom_dad_christmas_assets.png
diff --git a/assets/shared/images/characters/week5/monsterChristmas.png b/assets/shared/images/characters/week5/monsterChristmas.png
diff --git a/assets/shared/images/characters/week7/bf-hold-gf-DEAD.png b/assets/shared/images/characters/week7/bf-hold-gf-DEAD.png
diff --git a/assets/shared/images/characters/week7/bf-hold-gf.png b/assets/shared/images/characters/week7/bf-hold-gf.png
diff --git a/assets/shared/images/characters/week7/gfTankmen.png b/assets/shared/images/characters/week7/gfTankmen.png
diff --git a/assets/shared/images/characters/week7/picoSpeaker.png b/assets/shared/images/characters/week7/picoSpeaker.png
diff --git a/assets/shared/images/characters/week7/tankmanCaptain.png b/assets/shared/images/characters/week7/tankmanCaptain.png
diff --git a/assets/shared/images/pauseAlt/pauseBG.png b/assets/shared/images/pauseAlt/pauseBG.png
diff --git a/assets/shared/images/portraits/bf-pixel.png b/assets/shared/images/portraits/bf-pixel.png
diff --git a/assets/shared/images/portraits/bf.png b/assets/shared/images/portraits/bf.png
diff --git a/assets/shared/images/portraits/dad.png b/assets/shared/images/portraits/dad.png
diff --git a/assets/shared/images/skins/default/coloredNoteAssets.png b/assets/shared/images/skins/default/coloredNoteAssets.png
diff --git a/assets/shared/images/skins/default/coloredStrumAssets.png b/assets/shared/images/skins/default/coloredStrumAssets.png
diff --git a/assets/shared/images/skins/default/go.png b/assets/shared/images/skins/default/go.png
diff --git a/assets/shared/images/skins/default/healthBar.png b/assets/shared/images/skins/default/healthBar.png
diff --git a/assets/shared/images/skins/default/noteAssets.png b/assets/shared/images/skins/default/noteAssets.png
diff --git a/assets/shared/images/skins/default/ratings/nums.png b/assets/shared/images/skins/default/ratings/nums.png
diff --git a/assets/shared/images/skins/default/ratings/ratings.png b/assets/shared/images/skins/default/ratings/ratings.png
diff --git a/assets/shared/images/skins/default/ready.png b/assets/shared/images/skins/default/ready.png
diff --git a/assets/shared/images/skins/default/set.png b/assets/shared/images/skins/default/set.png
diff --git a/assets/shared/images/skins/default/strumAssets.png b/assets/shared/images/skins/default/strumAssets.png
diff --git a/assets/shared/images/storymenu/characters/bf-christmas.png b/assets/shared/images/storymenu/characters/bf-christmas.png
diff --git a/assets/shared/images/storymenu/characters/bf.png b/assets/shared/images/storymenu/characters/bf.png
diff --git a/assets/shared/images/storymenu/characters/dad.png b/assets/shared/images/storymenu/characters/dad.png
diff --git a/assets/shared/images/storymenu/characters/gf-christmas.png b/assets/shared/images/storymenu/characters/gf-christmas.png
diff --git a/assets/shared/images/storymenu/characters/gf-tank.png b/assets/shared/images/storymenu/characters/gf-tank.png
diff --git a/assets/shared/images/storymenu/characters/gf.png b/assets/shared/images/storymenu/characters/gf.png
diff --git a/assets/shared/images/storymenu/characters/mom.png b/assets/shared/images/storymenu/characters/mom.png
diff --git a/assets/shared/images/storymenu/characters/pico.png b/assets/shared/images/storymenu/characters/pico.png
diff --git a/assets/shared/images/storymenu/characters/senpai.png b/assets/shared/images/storymenu/characters/senpai.png
diff --git a/assets/shared/images/storymenu/characters/spooky.png b/assets/shared/images/storymenu/characters/spooky.png
diff --git a/assets/shared/images/storymenu/characters/tankman.png b/assets/shared/images/storymenu/characters/tankman.png
diff --git a/assets/shared/images/storymenu/weeks/tutorial.png b/assets/shared/images/storymenu/weeks/tutorial.png
diff --git a/assets/shared/images/storymenu/weeks/week3.png b/assets/shared/images/storymenu/weeks/week3.png
diff --git a/assets/shared/images/storymenu/weeks/week4.png b/assets/shared/images/storymenu/weeks/week4.png
diff --git a/assets/shared/images/storymenu/weeks/week6.png b/assets/shared/images/storymenu/weeks/week6.png
diff --git a/assets/shared/images/storymenu/weeks/week7.png b/assets/shared/images/storymenu/weeks/week7.png
diff --git a/assets/weeks/week2/images/halloweenBg.png b/assets/weeks/week2/images/halloweenBg.png
diff --git a/assets/weeks/week2/images/tankman/spookyBg.png b/assets/weeks/week2/images/tankman/spookyBg.png
diff --git a/assets/weeks/week2/images/tankman/spookyTankman.png b/assets/weeks/week2/images/tankman/spookyTankman.png
diff --git a/assets/weeks/week3/images/blammed/blammedTrain.png b/assets/weeks/week3/images/blammed/blammedTrain.png
diff --git a/assets/weeks/week3/images/blammed/cityLoop.png b/assets/weeks/week3/images/blammed/cityLoop.png
diff --git a/assets/weeks/week3/images/blammed/tunnelLights.png b/assets/weeks/week3/images/blammed/tunnelLights.png
diff --git a/assets/weeks/week3/images/blammed/tunnelLightsBlur.png b/assets/weeks/week3/images/blammed/tunnelLightsBlur.png
diff --git a/assets/weeks/week3/images/philly/behindTrain.png b/assets/weeks/week3/images/philly/behindTrain.png
diff --git a/assets/weeks/week3/images/philly/city.png b/assets/weeks/week3/images/philly/city.png
diff --git a/assets/weeks/week3/images/philly/phillyWindow-blur.png b/assets/weeks/week3/images/philly/phillyWindow-blur.png
diff --git a/assets/weeks/week3/images/philly/phillyWindow.png b/assets/weeks/week3/images/philly/phillyWindow.png
diff --git a/assets/weeks/week3/images/philly/street.png b/assets/weeks/week3/images/philly/street.png
diff --git a/assets/weeks/week3/images/philly/train.png b/assets/weeks/week3/images/philly/train.png
diff --git a/assets/weeks/week4/images/limo/bgLimo.png b/assets/weeks/week4/images/limo/bgLimo.png
diff --git a/assets/weeks/week4/images/limo/blood.png b/assets/weeks/week4/images/limo/blood.png
diff --git a/assets/weeks/week4/images/limo/limoDrive.png b/assets/weeks/week4/images/limo/limoDrive.png
diff --git a/assets/weeks/week4/images/limo/limoOverlay.png b/assets/weeks/week4/images/limo/limoOverlay.png
diff --git a/assets/weeks/week4/images/limo/limoSunset.png b/assets/weeks/week4/images/limo/limoSunset.png
diff --git a/assets/weeks/week5/images/bgEscalator.png b/assets/weeks/week5/images/bgEscalator.png
diff --git a/assets/weeks/week5/images/bgSnow.png b/assets/weeks/week5/images/bgSnow.png
diff --git a/assets/weeks/week5/images/bgWalls.png b/assets/weeks/week5/images/bgWalls.png
diff --git a/assets/weeks/week5/images/bottom bop.png b/assets/weeks/week5/images/bottom bop.png
diff --git a/assets/weeks/week5/images/christmasTree.png b/assets/weeks/week5/images/christmasTree.png
diff --git a/assets/weeks/week5/images/evilBG.png b/assets/weeks/week5/images/evilBG.png
diff --git a/assets/weeks/week5/images/evilSnow.png b/assets/weeks/week5/images/evilSnow.png
diff --git a/assets/weeks/week5/images/evilTree.png b/assets/weeks/week5/images/evilTree.png
diff --git a/assets/weeks/week5/images/fgEvilSnow.png b/assets/weeks/week5/images/fgEvilSnow.png
diff --git a/assets/weeks/week5/images/fgSnow.png b/assets/weeks/week5/images/fgSnow.png
diff --git a/assets/weeks/week5/images/santa.png b/assets/weeks/week5/images/santa.png
diff --git a/assets/weeks/week5/images/snow loop.png b/assets/weeks/week5/images/snow loop.png
diff --git a/assets/weeks/week5/images/snow roof.png b/assets/weeks/week5/images/snow roof.png
diff --git a/assets/weeks/week5/images/upper crowd.png b/assets/weeks/week5/images/upper crowd.png
diff --git a/assets/weeks/week7/images/cutscenes/demon_gf-censor.png b/assets/weeks/week7/images/cutscenes/demon_gf-censor.png
diff --git a/assets/weeks/week7/images/cutscenes/demon_gf.png b/assets/weeks/week7/images/cutscenes/demon_gf.png
diff --git a/assets/weeks/week7/images/cutscenes/faceplantGf.png b/assets/weeks/week7/images/cutscenes/faceplantGf.png
diff --git a/assets/weeks/week7/images/cutscenes/john-censor.png b/assets/weeks/week7/images/cutscenes/john-censor.png
diff --git a/assets/weeks/week7/images/cutscenes/john.png b/assets/weeks/week7/images/cutscenes/john.png
diff --git a/assets/weeks/week7/images/cutscenes/steve-censor.png b/assets/weeks/week7/images/cutscenes/steve-censor.png
diff --git a/assets/weeks/week7/images/cutscenes/steve.png b/assets/weeks/week7/images/cutscenes/steve.png
diff --git a/assets/weeks/week7/images/smokeLeft.png b/assets/weeks/week7/images/smokeLeft.png
diff --git a/assets/weeks/week7/images/smokeRight.png b/assets/weeks/week7/images/smokeRight.png
diff --git a/assets/weeks/week7/images/stress/tankmenShot-censor.png b/assets/weeks/week7/images/stress/tankmenShot-censor.png
diff --git a/assets/weeks/week7/images/stress/tankmenShot.png b/assets/weeks/week7/images/stress/tankmenShot.png
diff --git a/assets/weeks/week7/images/tank0.png b/assets/weeks/week7/images/tank0.png
diff --git a/assets/weeks/week7/images/tank1.png b/assets/weeks/week7/images/tank1.png
diff --git a/assets/weeks/week7/images/tank2.png b/assets/weeks/week7/images/tank2.png
diff --git a/assets/weeks/week7/images/tank3.png b/assets/weeks/week7/images/tank3.png
diff --git a/assets/weeks/week7/images/tank5.png b/assets/weeks/week7/images/tank5.png
diff --git a/assets/weeks/week7/images/tankBuildings.png b/assets/weeks/week7/images/tankBuildings.png
diff --git a/assets/weeks/week7/images/tankClouds.png b/assets/weeks/week7/images/tankClouds.png
diff --git a/assets/weeks/week7/images/tankGround.png b/assets/weeks/week7/images/tankGround.png
diff --git a/assets/weeks/week7/images/tankMountains.png b/assets/weeks/week7/images/tankMountains.png
diff --git a/assets/weeks/week7/images/tankRuins.png b/assets/weeks/week7/images/tankRuins.png
diff --git a/assets/weeks/week7/images/tankSky.png b/assets/weeks/week7/images/tankSky.png
diff --git a/assets/weeks/week7/images/tankmanCutscene_body.png b/assets/weeks/week7/images/tankmanCutscene_body.png
diff --git a/assets/weeks/week7/images/tankmanCutscene_head.png b/assets/weeks/week7/images/tankmanCutscene_head.png
diff --git a/source/funkin/util/modding/FunkScript.hx b/source/funkin/util/modding/FunkScript.hx
@@ -413,29 +413,29 @@ class FunkScript extends hscript.Script implements IFlxDestroyable {
 	}
 }
 
-typedef SuperMethod = {
-	var callback:HscriptFunctionCallback;
-	var ?value:Dynamic;
+enum abstract SuperType(String) from String to String {
+	var CREATE = "create";
+	var UPDATE = "update";
+	var STEP = "stepHit";
+	var BEAT = "beatHit";
+	var SECTION = "sectionHit";
 }
 
 class CustomState extends MusicBeatState {
-	public var script:FunkScript;
-	private var _scriptKey:String;
-
-	var super_map:Map<String, SuperMethod> = [];
-	var super_methods:Array<String> = ['create', 'update', 'stepHit', 'beatHit', 'sectionHit', 'destroy'];
+	public var script(default, null):FunkScript;
+	public var key(default, null):String;
 
 	public function initScript(scriptCode:String, stateTag:String) {
-		_scriptKey = stateTag;
+		key = stateTag;
 		script = new FunkScript(scriptCode, '_custom_state_$stateTag');
 		script.set('Parent', cast this);
 
-		// This method sucks, but it works, sooooooo yeah... sorry
-		for (i in super_methods) {
-			script.set('super_' + i, function(?v:Dynamic) {
-				callDynamicSuper(i);
-			});
-		}
+		// Add the super arguments
+		script.set("super_" + CREATE, super_create);
+		script.set("super_" + UPDATE, super_update);
+		script.set("super_" + STEP, super_stepHit);
+		script.set("super_" + BEAT, super_beatHit);
+		script.set("super_" + SECTION, super_sectionHit);
 
 		return this;
 	}
@@ -446,13 +446,13 @@ class CustomState extends MusicBeatState {
 	final function super_beatHit(b:Int) super.beatHit(b);
 	final function super_sectionHit(s:Int) super.sectionHit(s);
 
-	function callDynamicSuper(f:String, ?v:Dynamic) {
+	inline function callDynamicSuper(f:SuperType, ?v:Dynamic) {
 		switch(f) {
-			case "create": super_create();
-			case "update": super_update(v);
-			case "stepHit": super_stepHit(v);
-			case "beatHit": super_beatHit(v);
-			case "sectionHit": super_sectionHit(v);
+			case CREATE: super_create();
+			case UPDATE: super_update(v);
+			case STEP: super_stepHit(v);
+			case BEAT: super_beatHit(v);
+			case SECTION: super_sectionHit(v);
 		}
 	}
 
@@ -465,13 +465,13 @@ class CustomState extends MusicBeatState {
 	}
 
     override public function create() {
-		ModdingUtil.addPrint(_scriptKey + " / Custom State");
+		ModdingUtil.addPrint(key + " / Custom State");
 		checkSuper("create");
     }
 
     override public function update(elapsed:Float) {
-		if (FlxG.keys.justPressed.F4) switchState(new StoryMenuState()); // emergency exit
-		if (FlxG.keys.justPressed.F5) ScriptUtil.switchCustomState(_scriptKey, false, false);
+		if (FlxG.keys.justPressed.F4) switchState(new MainMenuState()); // emergency exit
+		if (FlxG.keys.justPressed.F5) ScriptUtil.switchCustomState(key, false, false);
 		checkSuper("update", [elapsed]);
     }