Merge branch 'AP-CustomEx' of https://github.com/Z11Coding/Mixtape-Engine-Rework into AP-CustomEx

Author: Yuta12342

assets/shared/images/globalIcons/Coin.png

@@ -709,6 +709,7 @@ class Note extends NoteObject
 		// If this is an AP check note, override the texture
 		if(isCheck && value != 'noteSkins/ap_assets/AP_NOTE') {
 			value = 'noteSkins/ap_assets/AP_NOTE';
+			this.shader = null; // no shader please :D
 		}
 
 		if(texture != value) reloadNote(value);

assets/shared/images/shop/defaultItem.png

@@ -71,13 +71,19 @@ class DaShop extends MusicBeatState
 		descBG.scrollFactor.set(1,1);
         add(descBG);
 
+        var alphabet = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
         desc = new undertale.UnderTextParser(250, descBG.y + 30, Std.int(FlxG.width * 0.6), '', 20);
         desc.font = Paths.font("fnf1.ttf");
-        desc.sounds = [FlxG.sound.load(Paths.sound('ut/monsterfont'), 0.6)];
+        for (letter in alphabet) {
+			desc.soundOnChars.set(letter, FlxG.sound.load(Paths.sound('ut/uifont'), 1));
+			desc.soundOnChars.set(letter.toUpperCase(), FlxG.sound.load(Paths.sound('ut/uifont'), 1));
+		}
         desc.alignment = CENTER;
         desc.scrollFactor.set(1,1);
         add(desc);
 
+
+
         super.create();
     }
 

assets/shared/images/shop/defaultTrap.png

@@ -103,11 +103,11 @@ class ShopData {
             items.set('h?', ['h?', 100, 'unknownMod', false, false]);
         }*/
         //Test Item
-        items.set('Fanta Can', ['(Insert dylan line here)', 100, 'emptyAchievement', false, false]);
-        items.set('h?', ['h?', 100, 'unknownMod', false, false]);
-        items.set('Test A', ['Space Test 1', 100, 'unknownMod', false, false]);
-        items.set('Test B', ['Space Test 2', 100, 'unknownMod', false, false]);
-        items.set('Test C', ['Space Test 3', 100, 'unknownMod', false, false]);
+        items.set('Fanta Can', ['(Insert dylan line here)', 100, 'defaultItem', false, false]);
+        items.set('h?', ['h?', 100, 'defaultTrap', false, false]);
+        items.set('Test A', ['Space Test 1', 100, 'defaultTrap', false, false]);
+        items.set('Test B', ['Space Test 2', 100, 'defaultItem', false, false]);
+        items.set('Test C', ['Space Test 3', 100, 'unknownItem', false, false]);
     }
 
     public static function saveShop() {

assets/shared/images/shop/unknownItem.png

@@ -11,6 +11,7 @@ import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
 import games.match3.Match3TestState;
 import objects.Alphabet;
+import shop.DaShop;
 import states.MainMenuState;
 // import states.MicrophoneTestState;
 import yutautil.StatePick;

source/objects/Note.hx

@@ -45,7 +45,7 @@ class SplashScreen extends MusicBeatState
         if (currentDate.getDate() == 5) {
             // Skip intro and show video
             trace("Playing Video!");
-            startVideo("splashscreen/bat");
+            startVideo("splashscreen/bat.mp4");
         }
         states.FirstCheckState.gameInitialized = true;
         if (!isVideo) {

source/shop/DaShop.hx

@@ -185,7 +185,7 @@ class GameOverSubstate extends MusicBeatSubstate
 		causeofdeath = new UnderTextParser(0, 0, Std.int(deathbysquare.width), "", 32);
 		causeofdeath.scrollFactor.set();
 		causeofdeath.font = Paths.font("fnf1.ttf");
-        causeofdeath.color = 0xFFFFFFFF;
+    causeofdeath.color = 0xFFFFFFFF;
 		causeofdeath.visible = false; // Start invisible
 		for (letter in alphabet) {
 			causeofdeath.soundOnChars.set(letter, FlxG.sound.load(Paths.sound('ut/uifont'), 1));