From f9dd4c24c7b231628f2bacd4ce25a4f47105cd58 Mon Sep 17 00:00:00 2001
From: Nennneko5787 <nennneko@tensi.org>
Date: Fri, 17 Mar 2023 13:47:05 +0900
Subject: [PATCH] bug fix

---
 .github/workflows/main.yml | 3 +++
 Project.xml                | 4 ++++
 README.md                  | 1 +
 art/setup_libraries.bat    | 1 +
 art/update_libraries.bat   | 1 +
 source/Character.hx        | 6 ++++--
 source/StrumNote.hx        | 9 +++++----
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a1067d03d..2e5284c2b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,6 +50,7 @@ jobs:
           haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+          haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
@@ -90,6 +91,7 @@ jobs:
           haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+          haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
         shell: cmd
       - name: Create Version Tag
@@ -131,6 +133,7 @@ jobs:
           haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+          haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
diff --git a/Project.xml b/Project.xml
index faba656d6..342b18121 100644
--- a/Project.xml
+++ b/Project.xml
@@ -64,6 +64,7 @@
 		<library name="scripts"  preload="true" />
 		<library name="shaders"	 preload="true" />
 		<library name="characters"	preload="true" />
+		<library name="stages"	preload="true" />
 	</section>
 	
 	<section if="NO_PRELOAD_ALL">
@@ -81,6 +82,7 @@
 		<library name="scripts"  preload="false" />
 		<library name="shaders"	 preload="false" />
 		<library name="characters"	preload="false" />
+		<library name="stages"	preload="false" />
 	</section>
 	
 	<assets path="assets/songs"    library="songs"    exclude="*.fla|*.ogg" if="web"/>
@@ -111,6 +113,8 @@
 	<assets path="assets/shaders"  library="shaders"  exclude="*.fla|*.mp3" unless="web"/>
 	<assets path="assets/characters"  library="characters"  exclude="*.fla|*.ogg" if="web"/>
 	<assets path="assets/characters"  library="characters"  exclude="*.fla|*.mp3" unless="web"/>
+	<assets path="assets/stages"  library="stages"  exclude="*.fla|*.ogg" if="web"/>
+	<assets path="assets/stages"  library="stages"  exclude="*.fla|*.mp3" unless="web"/>
 
 	<template path="example_mods" rename="mods" />
 
diff --git a/README.md b/README.md
index c80b9a279..da7c3f6ec 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ Then, execute this command.
 ```
 haxelib git polymod https://github.com/larsiusprime/polymod.git
 haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
 ```
 At the moment, you can optionally fix the transition bug in songs with zoomed-out cameras.
 ```
diff --git a/art/setup_libraries.bat b/art/setup_libraries.bat
index 55f0976ce..b448fe36b 100644
--- a/art/setup_libraries.bat
+++ b/art/setup_libraries.bat
@@ -19,6 +19,7 @@ haxelib install hxCodec
 haxelib install hxcpp-debug-server
 haxelib git polymod https://github.com/larsiusprime/polymod.git
 haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
 haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
 @echo off
 echo Setup Successful!
diff --git a/art/update_libraries.bat b/art/update_libraries.bat
index 2f661fb12..0955f9f01 100644
--- a/art/update_libraries.bat
+++ b/art/update_libraries.bat
@@ -18,6 +18,7 @@ haxelib update hxCodec
 haxelib update hxcpp-debug-server
 haxelib git polymod https://github.com/larsiusprime/polymod.git
 haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
+haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
 haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
 @echo off
 echo Update Successful!
diff --git a/source/Character.hx b/source/Character.hx
index e8d6398c3..2a2a19326 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -17,6 +17,7 @@ import haxe.format.JsonParser;
 
 using StringTools;
 
+#if desktop
 typedef CharacterFile = {
 	var texture:String;
 	var onInit:String;
@@ -34,6 +35,7 @@ typedef AnimArray = {
 	var type:String;
 	var indices:Array<Int>;
 }
+#end
 
 class Character extends FlxSprite
 {
@@ -46,7 +48,6 @@ class Character extends FlxSprite
 	public var holdTimer:Float = 0;
 
 	public var animationNotes:Array<Dynamic> = [];
-
 	public var healthColorArray:Array<Int> = [255, 0, 0];
 
 	public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
@@ -58,13 +59,14 @@ class Character extends FlxSprite
 		this.isPlayer = isPlayer;
 
 		var tex:FlxAtlasFrames;
-		antialiasing = PreferencesMenu.getPref('antialiasing');
+		antialiasing = true;
 
 		switch (curCharacter)
 		{
 			case 'gf':
 				// Color Set
 				healthColorArray = [165,0,77];
+
 				// GIRLFRIEND CODE
 				tex = Paths.getSparrowAtlas('characters/GF_assets');
 				frames = tex;
diff --git a/source/StrumNote.hx b/source/StrumNote.hx
index 805a70822..94b8d00bb 100644
--- a/source/StrumNote.hx
+++ b/source/StrumNote.hx
@@ -52,10 +52,11 @@ class StrumNote extends FlxSprite
 
 		if (PlayState.curStage.startsWith('school'))
 		{
-			loadGraphic(Paths.image('pixelUI/' + texture));
+			texture = "arrows-pixels";
+			loadGraphic(Paths.image('weeb/pixelUI/' + texture));
 			width = width / 4;
 			height = height / 5;
-			loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
+			loadGraphic(Paths.image('weeb/pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
 
 			antialiasing = false;
 			setGraphicSize(Std.int(width * PlayState.daPixelZoom));
@@ -141,7 +142,7 @@ class StrumNote extends FlxSprite
 			}
 		}
 		//if(animation.curAnim != null){ //my bad i was upset
-		if(animation.curAnim.name == 'confirm' && !PlayState.curStage.startsWith('school')) {
+		if(getAnimName(animation) == 'confirm' && !PlayState.curStage.startsWith('school')) {
 			centerOffsets();
 			offset.x -= 13;
 			offset.y -= 13;
@@ -179,7 +180,7 @@ class StrumNote extends FlxSprite
 				colorSwap.brightness = ClientPrefs.arrowHSV[noteData][2] / 100;
 			}
 			*/
-			if(animation.curAnim.name == 'confirm' && !PlayState.curStage.startsWith('school')) {
+			if(getAnimName(animation) == 'confirm' && !PlayState.curStage.startsWith('school')) {
 				centerOrigin();
 				centerOffsets();
 				offset.x -= 13;