Update readme? lol jk not this time

Assorion · Sep 2, 2023 · 2839c6b · 2839c6b
1 parent a199994
commit 2839c6b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,3 +19,12 @@ Making the MK (MakeMeGenius) engine a reality.
 11. Fixed a lot of tiny bugs (post events timer being corrected, freeplay song not unpausing on vocals, highscore problems, etc).
 12. Donate button replaced with Github button.
 13. Made note types easier to implement!
+
+## V - 1.1.1
+
+Minor update with a few fixes.
+
+1. **Actually** Fixed the README fully this time (I promise) (Thx to Byzol).
+2. Fixed NOTE_assets again.
+3. Fixed bug with the chart editor that locked your input forever (Thus losing your work).
+4. Exclude Firealpaca's art files (.mdp) in the build folder.
diff --git a/Project.xml b/Project.xml
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin' Assorion Engine" file="AssorionEngine" packageName="com.candicejoe.funkin" main="Main" version="1.1.0" company="candicejoe" />
+	<app title="Friday Night Funkin' Assorion Engine" file="AssorionEngine" packageName="com.candicejoe.funkin" main="Main" version="1.1.1" company="candicejoe" />
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
@@ -25,8 +25,8 @@
 
 	<classpath name="source" />
 
-	<assets path="assets" exclude="*.mp3" unless="web"/>
-	<assets path="assets" exclude="*.ogg" if="web"/>
+	<assets path="assets" exclude="*.mp3|*.mdp" unless="web"/>
+	<assets path="assets" exclude="*.ogg|*.mdp" if="web"/>
 	<assets path="embedded" rename="assets" embed="true"/>
 
 	<assets path="CHANGELOG.md"/>

diff --git a/assets/images/gameplay/NOTE_assets.xml b/assets/images/gameplay/NOTE_assets.xml
@@ -4,15 +4,15 @@
 	<!-- http://www.adobe.com/products/animate.html -->
 	<SubTexture name="arrowDOWN0000" x="0" y="235" width="155" height="153"/>
 	<SubTexture name="arrowLEFT0000" x="310" y="235" width="153" height="157"/>
-	<SubTexture name="arrowRIGHT0000" x="157" y="235" width="153" height="157"/>
+	<SubTexture name="arrowRIGHT0000" x="156" y="235" width="153" height="157"/>
 	<SubTexture name="arrowUP0000" x="784" y="232" width="157" height="153"/>
 	<SubTexture name="blue0000" x="1850" y="154" width="157" height="154"/>
 	<SubTexture name="blue hold end0000" x="1170" y="447" width="50" height="64"/>
 	<SubTexture name="blue hold piece0000" x="1370" y="449" width="50" height="44"/>
-	<SubTexture name="blue confirm0000" x="0" y="0" width="238" height="235"/>
-	<SubTexture name="blue confirm0001" x="238" y="0" width="238" height="235"/>
-	<SubTexture name="blue confirm0002" x="1176" y="230" width="219" height="208" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
-	<SubTexture name="blue confirm0003" x="1176" y="230" width="219" height="208" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
+	<SubTexture name="blue confirm0000" x="0" y="0" width="238" height="234"/>
+	<SubTexture name="blue confirm0001" x="238" y="0" width="238" height="234"/>
+	<SubTexture name="blue confirm0002" x="1176" y="230" width="219" height="208" frameX="-10" frameY="-12" frameWidth="238" frameHeight="235"/>
+	<SubTexture name="blue confirm0003" x="1176" y="230" width="219" height="208" frameX="-10" frameY="-12" frameWidth="238" frameHeight="235"/>
 	<SubTexture name="blue press0000" x="149" y="392" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
 	<SubTexture name="blue press0001" x="149" y="392" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
 	<SubTexture name="blue press0002" x="0" y="388" width="149" height="146"/>
@@ -42,8 +42,8 @@
 	<SubTexture name="red press0001" x="932" y="442" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
 	<SubTexture name="red press0002" x="784" y="385" width="148" height="151"/>
 	<SubTexture name="red press0003" x="784" y="385" width="148" height="151"/>
-	<SubTexture name="green confirm0000" x="476" y="0" width="236" height="232"/>
-	<SubTexture name="green confirm0001" x="712" y="0" width="236" height="232"/>
+	<SubTexture name="green confirm0000" x="476" y="0" width="236" height="231"/>
+	<SubTexture name="green confirm0001" x="712" y="0" width="236" height="231"/>
 	<SubTexture name="green confirm0002" x="948" y="231" width="214" height="206" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
 	<SubTexture name="green confirm0003" x="948" y="231" width="214" height="206" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
 	<SubTexture name="green press0000" x="609" y="389" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>

diff --git a/source/gameplay/PauseSubState.hx b/source/gameplay/PauseSubState.hx
@@ -89,6 +89,7 @@ class PauseSubState extends MusicBeatSubstate
 				FlxG.resetState();
 			case 2:
 				Settings.pr.botplay = !Settings.pr.botplay;
+				alphaTexts.members[curSelected].alpha = 0;
 			case 3:
 				exitToProperMenu();
 		}

diff --git a/source/ui/ChartingState.hx b/source/ui/ChartingState.hx
@@ -524,6 +524,7 @@ class ChartingState extends MusicBeatState {
     {
         uiElements.clear();
         inSecUi = true;
+        blockInput = false;
 
         var mustHitSection:ChartUI_CheckBox = new ChartUI_CheckBox(uiBG.x + 10, uiBG.y + 10, PlayState.SONG.notes[curSec].mustHitSection, (c:Bool)->{
             PlayState.SONG.notes[curSec].mustHitSection = c;

diff --git a/source/ui/MainMenuState.hx b/source/ui/MainMenuState.hx
@@ -142,7 +142,7 @@ class MainMenuState extends MusicBeatState
 				case 1:
 					FlxG.switchState(new FreeplayState());
 				case 2:
-					CoolUtil.browserLoad('https://github.com/Legendary-Candice-Joe/Funkin-MKG/');
+					CoolUtil.browserLoad('https://github.com/Legendary-Candice-Joe/FNF-Assorion-Engine/');
 					FlxG.resetState();
 				case 3:
 					FlxG.switchState(new OptionsState());