From 58e9685ab4e0a303081aa0b731ce7471b44058f8 Mon Sep 17 00:00:00 2001 From: Vortex2Oblivion <73261680+Vortex2Oblivion@users.noreply.github.com> Date: Sun, 11 Feb 2024 17:25:21 -0500 Subject: [PATCH] fix crash --- .../data/event data/create custom shader.lua | 5 ----- assets/preload/data/event data/init shader.lua | 5 +++++ assets/preload/data/event data/no shader.lua | 6 ------ .../data/event data/remove camera shader.lua | 13 +++++++++++++ .../data/event data/set actor custom shader.lua | 5 ----- .../data/event data/set actor no custom shader.lua | 5 ----- .../data/event data/set camera custom shader.lua | 10 ---------- .../data/event data/set camera no custom shader.lua | 10 ---------- .../preload/data/event data/set camera shader.lua | 13 +++++++++++++ assets/preload/data/eventList.txt | 12 +++++------- source/game/StrumNote.hx | 6 +++--- source/ui/Option.hx | 4 +++- source/utilities/CoolUtil.hx | 6 +++--- 13 files changed, 45 insertions(+), 55 deletions(-) delete mode 100644 assets/preload/data/event data/create custom shader.lua create mode 100644 assets/preload/data/event data/init shader.lua delete mode 100644 assets/preload/data/event data/no shader.lua create mode 100644 assets/preload/data/event data/remove camera shader.lua delete mode 100644 assets/preload/data/event data/set actor custom shader.lua delete mode 100644 assets/preload/data/event data/set actor no custom shader.lua delete mode 100644 assets/preload/data/event data/set camera custom shader.lua delete mode 100644 assets/preload/data/event data/set camera no custom shader.lua create mode 100644 assets/preload/data/event data/set camera shader.lua diff --git a/assets/preload/data/event data/create custom shader.lua b/assets/preload/data/event data/create custom shader.lua deleted file mode 100644 index e81a5a5448..0000000000 --- a/assets/preload/data/event data/create custom shader.lua +++ /dev/null @@ -1,5 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "create custom shader" then - createCustomShader(argument1, argument2) - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/init shader.lua b/assets/preload/data/event data/init shader.lua new file mode 100644 index 0000000000..00bf0ccd4d --- /dev/null +++ b/assets/preload/data/event data/init shader.lua @@ -0,0 +1,5 @@ +function onEventLoaded(name, position, argument1, argument2) + if string.lower(name) == "init shader" then + initShader(tostring(argument1), tostring(argument2)) + end +end \ No newline at end of file diff --git a/assets/preload/data/event data/no shader.lua b/assets/preload/data/event data/no shader.lua deleted file mode 100644 index e9b627d8f8..0000000000 --- a/assets/preload/data/event data/no shader.lua +++ /dev/null @@ -1,6 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "no shader" then - local actor = charFromEvent(argument1) - setActorNoShader(actor) - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/remove camera shader.lua b/assets/preload/data/event data/remove camera shader.lua new file mode 100644 index 0000000000..51f73564c1 --- /dev/null +++ b/assets/preload/data/event data/remove camera shader.lua @@ -0,0 +1,13 @@ + +function onEvent(name, position, value1, value2) + if string.lower(name) == "set camera shader" then + if value2 == "hud" then + setCameraShader("hud", value1) + elseif value2 == "game" then + setCameraShader("game", value1) + else + setCameraShader("game", value1) + setCameraShader("hud", value1) + end + end +end \ No newline at end of file diff --git a/assets/preload/data/event data/set actor custom shader.lua b/assets/preload/data/event data/set actor custom shader.lua deleted file mode 100644 index 19670cdea7..0000000000 --- a/assets/preload/data/event data/set actor custom shader.lua +++ /dev/null @@ -1,5 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "set actor custom shader" then - setActorCustomShader(argument1, argument2) - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/set actor no custom shader.lua b/assets/preload/data/event data/set actor no custom shader.lua deleted file mode 100644 index e4b28263a9..0000000000 --- a/assets/preload/data/event data/set actor no custom shader.lua +++ /dev/null @@ -1,5 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "set actor no custom shader" then - setActorNoCustomShader(argument1) - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/set camera custom shader.lua b/assets/preload/data/event data/set camera custom shader.lua deleted file mode 100644 index 1d8d1efe0e..0000000000 --- a/assets/preload/data/event data/set camera custom shader.lua +++ /dev/null @@ -1,10 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "set camera custom shader" then - if argument2 ~= "hud" or agument2 ~= "game" then - setCameraCustomShader(argument1, "hud") - setCameraCustomShader(argument1, "game") - else - setCameraCustomShader(argument1, argument2) - end - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/set camera no custom shader.lua b/assets/preload/data/event data/set camera no custom shader.lua deleted file mode 100644 index 8dc11b8d83..0000000000 --- a/assets/preload/data/event data/set camera no custom shader.lua +++ /dev/null @@ -1,10 +0,0 @@ -function onEvent(name, position, argument1, argument2) - if string.lower(name) == "set camera no custom shader" then - if argument1 ~= "hud" or argument1 ~= "game" then - setCameraNoCustomShader("hud") - setCameraNoCustomShader("game") - else - setCameraNoCustomShader(argument1) - end - end -end \ No newline at end of file diff --git a/assets/preload/data/event data/set camera shader.lua b/assets/preload/data/event data/set camera shader.lua new file mode 100644 index 0000000000..51f73564c1 --- /dev/null +++ b/assets/preload/data/event data/set camera shader.lua @@ -0,0 +1,13 @@ + +function onEvent(name, position, value1, value2) + if string.lower(name) == "set camera shader" then + if value2 == "hud" then + setCameraShader("hud", value1) + elseif value2 == "game" then + setCameraShader("game", value1) + else + setCameraShader("game", value1) + setCameraShader("hud", value1) + end + end +end \ No newline at end of file diff --git a/assets/preload/data/eventList.txt b/assets/preload/data/eventList.txt index 04bad15b51..d28f0461a8 100644 --- a/assets/preload/data/eventList.txt +++ b/assets/preload/data/eventList.txt @@ -14,12 +14,10 @@ Set Camera Zoom~Game Camera Zoom (default is defaultCameraZoom)~Hud Camera Zoom Add Camera Zoom~Game Camera Add (default = 0.015)~Hud Camera Add (default = 0.03) Screen Shake~Camera Shake (duration, intensity)~Hud Shake (duration, intensity) Camera Flash~Color (example: 'red')~Duration +Add Trail~Object Name (dad, boyfriend, girlfriend, etc)~Properties, formatted like: '10,3,0.4,0.05' (sprite count, frame delay, alpha, alpha diff) +Remove Trail~Object Name (dad, boyfriend, girlfriend, etc)~Nothing 3D Shader~Character (BF, Dad, GF)~Properties formated like: '3,10,0.25' (speed, frequency, amplitude) No Shader~Character (BF, Dad, GF)~Nothing -Create Custom Shader~Id~Filename -Set Actor Custom Shader~Id~Actor -Set Actor No Custom Shader~Actor~Nothing -Set Camera Custom Shader~Id~Camera - "game" for camGame, "hud" for camHUD, anything else for both. -Set Camera No Custom Shader~Camera - "game" for camGame, "hud" for camHUD, anything else for both.~Nothing -Add Trail~Object Name (dad, boyfriend, girlfriend, etc)~Properties, formatted like: '10,3,0.4,0.05' (sprite count, frame delay, alpha, alpha diff) -Remove Trail~Object Name (dad, boyfriend, girlfriend, etc)~Nothing \ No newline at end of file +Init Shader~Id~Filename Shaders must be created before using in other events and scripts +Set Camera Shader~Id~Camera (hud, game, or both) Adds a shader to a camera. +Remove Camera Shader~Id~Camera (hud, game, or both) Removes a shader fro, a camera. \ No newline at end of file diff --git a/source/game/StrumNote.hx b/source/game/StrumNote.hx index 7a6ad823d5..9cdd8651f4 100644 --- a/source/game/StrumNote.hx +++ b/source/game/StrumNote.hx @@ -57,7 +57,7 @@ class StrumNote extends FlxSkewedSprite noteData = leData; - var localKeyCount = (isPlayer == 1) ? PlayState.SONG.playerKeyCount : keyCount; + var localKeyCount = (isPlayer == 1) ? (FlxG.state == PlayState.instance ? PlayState.SONG.playerKeyCount : keyCount) : keyCount; this.ui_Skin = ui_Skin; this.ui_settings = ui_settings; @@ -79,7 +79,7 @@ class StrumNote extends FlxSkewedSprite var charColors; - if(affectedbycolor){ + if(affectedbycolor && FlxG.state == PlayState.instance){ if(Options.getData("middlescroll")){ charColors = (isPlayer == 1) ? PlayState.dad : PlayState.boyfriend; } @@ -98,7 +98,7 @@ class StrumNote extends FlxSkewedSprite colorSwap.r = noteColor[0]; colorSwap.g = noteColor[1]; colorSwap.b = noteColor[2]; - } + } } override function update(elapsed:Float) diff --git a/source/ui/Option.hx b/source/ui/Option.hx index 42cfb641cf..5bcb06d200 100644 --- a/source/ui/Option.hx +++ b/source/ui/Option.hx @@ -323,7 +323,9 @@ class ChangeModOption extends FlxTypedGroup { FlxG.resetState(); lime.utils.Assets.cache.clear(); openfl.utils.Assets.cache.clear(); - CoolUtil.changeWindowIcon("mods/"+Options.getData("curMod")+"/_polymod_icon.png"); + #if windows + //utilities.Windows.setWindowIcon("mods/"+Options.getData("curMod")+"/_polymod_icon.png"); + #end } }else { Alphabet_Text.alpha = 0.6; diff --git a/source/utilities/CoolUtil.hx b/source/utilities/CoolUtil.hx index a13699b7bc..7a9d2f2b44 100644 --- a/source/utilities/CoolUtil.hx +++ b/source/utilities/CoolUtil.hx @@ -14,6 +14,8 @@ import lime.utils.Assets; using StringTools; + + class CoolUtil { public static function boundTo(value:Float, min:Float, max:Float):Float { var newValue:Float = value; @@ -302,9 +304,7 @@ class CoolUtil { } - public static function changeWindowIcon(path:String){ - if(#if sys sys.FileSystem.exists(path) || #end Assets.exists(path)) FlxG.stage.window.setIcon(Image.fromBitmapData(path)); - } + /**