0.8.0d Patch

Co-Authored-By: T-San <[email protected]>

assets/preload/data/stages/limo.json

@@ -6,7 +6,7 @@
 	"boyfriend": [1025, -145],
 	"girlfriend": [400, 130],
 	"opponent": [100, 100],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [-200, 0],

assets/preload/data/stages/mall.json

@@ -6,7 +6,7 @@
 	"boyfriend": [970, 100],
 	"girlfriend": [400, 130],
 	"opponent": [100, 100],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [0, -100],

assets/preload/data/stages/mallEvil.json

@@ -6,7 +6,7 @@
 	"boyfriend": [1090, 100],
 	"girlfriend": [400, 130],
 	"opponent": [100, 20],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [0, 0],

assets/preload/data/stages/philly.json

@@ -6,7 +6,7 @@
 	"boyfriend": [770, 100],
 	"girlfriend": [400, 130],
 	"opponent": [100, 100],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [0, 0],

assets/preload/data/stages/school.json

@@ -6,7 +6,7 @@
 	"boyfriend": [1032, 300],
 	"girlfriend": [642, 432],
 	"opponent": [126, 54],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [-208, -114],

assets/preload/data/stages/schoolEvil.json

@@ -6,7 +6,7 @@
 	"boyfriend": [972, 318],
 	"girlfriend": [582, 432],
 	"opponent": [102, 102],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [-132, -102],

assets/preload/data/stages/spooky.json

@@ -6,7 +6,7 @@
 	"boyfriend": [770, 100],
 	"girlfriend": [400, 130],
 	"opponent": [100, 100],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [0, 0],

assets/preload/data/stages/stage.json

@@ -6,7 +6,7 @@
 	"boyfriend": [770, 100],
 	"girlfriend": [400, 130],
 	"opponent": [100, 100],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": false,
 
 	"camera_boyfriend": [0, 0],

assets/preload/data/stages/streetlight.json

@@ -6,7 +6,7 @@
 	"boyfriend": [1330, 250],
 	"girlfriend": [1330, 250],
 	"opponent": [340, 250],
-	"p4": [-300, -1200],
+	"p4": [0, 0],
 	"hide_girlfriend": true,
 
 	"camera_boyfriend": [100, 60],

assets/preload/scripts/modcharts/none.hscript

@@ -0,0 +1,28 @@
+var PlayState = require("PlayState");
+var FlxTypedGroup = require("flixel.group.FlxGroup.FlxTypedGroup");
+var StrumNote = require("Note.StrumNote");
+var Note = require("Note");
+
+var strum:FlxTypedGroup<StrumNote>;
+var strumNum:Int = 0;
+
+function onStartModchart(str) {
+    strum = PlayState.instance.thirdStrums;
+    strumNum = str;
+}
+
+function onUpdatePost(elapsed) {
+    strum.forEach(function(spr:StrumNote)
+	{
+        switch(PlayState.mania) {
+            case 0 | 1 | 2:
+		        spr.x = (PlayState.instance.player4.x) + (spr.width * spr.noteData) + (5 * spr.noteData);
+            case 3:
+            	spr.x = (PlayState.instance.player4.x) + (Note.swagWidth * spr.noteData) + (5 * spr.noteData);
+            default:
+                spr.x = (PlayState.instance.player4.x) + ((spr.width - Note.lessX[PlayState.mania]) * spr.noteData) + (5 * spr.noteData);
+        }
+        spr.x -= 10;
+        spr.y = (PlayState.instance.player4.y) - 110;
+	});
+}

assets/preload/update/tracking/GitVer.txt

@@ -1 +1 @@
-0.8.0b
+0.8.0d

source/CharacterSelectSubstate.hx

@@ -104,13 +104,16 @@ class CharacterSelectSubstate extends MusicBeatSubstate
         Paths.setModsDirectoryFromType(NONE, '', true);
 	}
 
+    var blockInput:Bool = false;
 	override function update(elapsed:Float)
 	{
         super.update(elapsed);
         if (FlxG.sound.music != null)
 			Conductor.songPosition = FlxG.sound.music.time;
 
+        if (blockInput) return;
         if (controls.ACCEPT) {
+            blockInput = true;
             Paths.clearUnusedCache();
             character.skipDance = true;
             if (character != null) {
@@ -128,6 +131,7 @@ class CharacterSelectSubstate extends MusicBeatSubstate
             leEpicTween();
         }
         if (controls.BACK) {
+            blockInput = true;
             Paths.clearUnusedCache();
             character.skipDance = true;
             FlxG.sound.play(Paths.sound('cancelMenu'), 1);
@@ -136,23 +140,28 @@ class CharacterSelectSubstate extends MusicBeatSubstate
         if (controls.NOTE_DOWN_P) {
             if(character != null && character.animOffsets.exists('singDOWN')) {
                 character.playAnim('singDOWN', true);
+                canDance = false;
             }
         }
         if (controls.NOTE_LEFT_P) {
             if(character != null && character.animOffsets.exists('singLEFT')) {
                 character.playAnim('singLEFT', true);
+                canDance = false;
             }
         }
         if (controls.NOTE_RIGHT_P) {
             if(character != null && character.animOffsets.exists('singRIGHT')) {
                 character.playAnim('singRIGHT', true);
+                canDance = false;
             }
         }
         if (controls.NOTE_UP_P) {
             if(character != null && character.animOffsets.exists('singUP')) {
                 character.playAnim('singUP', true);
+                canDance = false;
             }
         }
+        if (controls.NOTE_DOWN_R || controls.NOTE_LEFT_R || controls.NOTE_RIGHT_R || controls.NOTE_UP_R) canDance = true;
         if (controls.UI_LEFT_P) {
             changeSelection(-1);
         }
@@ -173,10 +182,11 @@ class CharacterSelectSubstate extends MusicBeatSubstate
         super.destroy();
     }
 
+    var canDance = true;
     override function beatHit() {
         super.beatHit();
 
-        if (character != null) character.dance();
+        if (character != null && canDance) character.dance();
     }
 
     var dummyTween:FlxTween = null;
@@ -234,10 +244,7 @@ class CharacterSelectSubstate extends MusicBeatSubstate
         Paths.setModsDirectoryFromType(NONE, '', true);
     }
 
-    var alreadyDoingExit:Bool = false;
     function leEpicTween() {
-        if (alreadyDoingExit) return;
-        alreadyDoingExit = true;
         FlxTween.tween(bg, {alpha: 0}, 0.7, {
             onComplete: function(_) {
                 bg.kill();
@@ -253,6 +260,6 @@ class CharacterSelectSubstate extends MusicBeatSubstate
                 }
             });
         }
-        new FlxTimer().start(0.75, function(_){ close(); });
+        new FlxTimer().start(0.75, _ -> close());
     }
 }

source/FreeplayState.hx

@@ -72,7 +72,7 @@ class FreeplayState extends MusicBeatState
 	override function create()
 	{
 		Paths.clearUnusedCache();
-		Paths.refreshModsMaps();
+		Paths.refreshModsMaps(false, true, true);
 		instance = this;
 
 		persistentUpdate = true;

source/FunkinLua.hx

@@ -1318,10 +1318,7 @@ class FunkinLua {
 							} else if(PlayState.instance.members.indexOf(PlayState.instance.dadGroup) < position) {
 								position = PlayState.instance.members.indexOf(PlayState.instance.dadGroup);
 							}
-							if (PlayState.instance.addedCharaGroups)
-								PlayState.instance.insert(position, sprite);
-							else
-								getInstance().add(sprite);
+							PlayState.instance.insert(position, sprite);
 						}
 					}
 					sprite.wasAdded = true;

source/GameplayChangersSubstate.hx

@@ -30,6 +30,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 		option.scrollSpeed = 2.0;
 		option.minValue = 0.35;
 		option.changeValue = 0.05;
+		option.slowChangeValue = 0.01;
 		option.decimals = 2;
 		if (goption.getValue() != "constant")
 		{
@@ -39,13 +40,14 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 		else
 		{
 			option.displayFormat = "%v";
-			option.maxValue = 6;
+			option.maxValue = 10;
 		}
 		optionsArray.push(option);
 
 		var option:GameplayOption = new GameplayOption('Playback Rate', 'songspeed', 'float', 1);
 		option.scrollSpeed = 2;
 		option.changeValue = 0.25;
+		option.slowChangeValue = 0.05;
 		option.minValue = 0.1;
 		option.maxValue = 10; //peeps wanted 10x speed
 		option.displayFormat = '%vX';
@@ -57,6 +59,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 		option.minValue = 0;
 		option.maxValue = 5;
 		option.changeValue = 0.1;
+		option.slowChangeValue = 0.1;
 		option.displayFormat = '%vX';
 		optionsArray.push(option);
 
@@ -65,6 +68,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 		option.minValue = 0.5;
 		option.maxValue = 5;
 		option.changeValue = 0.1;
+		option.slowChangeValue = 0.1;
 		option.displayFormat = '%vX';
 		optionsArray.push(option);
 
@@ -249,7 +253,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 						if(pressed) {
 							var add:Dynamic = null;
 							if(curOption.type != 'string') {
-								add = controls.UI_LEFT ? -curOption.changeValue : curOption.changeValue;
+								add = (controls.UI_LEFT ? (FlxG.keys.pressed.CONTROL ? -curOption.slowChangeValue : -curOption.changeValue) : (FlxG.keys.pressed.CONTROL ? curOption.slowChangeValue : curOption.changeValue));
 							}
 
 							switch(curOption.type)
@@ -292,7 +296,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 											if (curOption.getValue() == "constant")
 											{
 												oOption.displayFormat = "%v";
-												oOption.maxValue = 6;
+												oOption.maxValue = 10;
 											}
 											else
 											{
@@ -471,6 +475,7 @@ class GameplayOption
 	public var curOption:Int = 0; //Don't change this
 	public var options:Array<String> = null; //Only used in string type
 	public var changeValue:Dynamic = 1; //Only used in int/float/percent type, how much is changed when you PRESS
+	public var slowChangeValue:Dynamic = 1;
 	public var minValue:Dynamic = null; //Only used in int/float/percent type
 	public var maxValue:Dynamic = null; //Only used in int/float/percent type
 	public var decimals:Int = 1; //Only used in float/percent type
@@ -518,6 +523,7 @@ class GameplayOption
 
 			case 'percent':
 				displayFormat = '%v%';
+				slowChangeValue = 0.01;
 				changeValue = 0.01;
 				minValue = 0;
 				maxValue = 1;

source/InitState.hx

@@ -76,7 +76,7 @@ class InitState extends FlxState
 		//why does the fps shit fail to work
 		Main.toggleFPS(ClientPrefs.settings.get("showFPS"));
 
-		Paths.refreshModsMaps();
+		Paths.refreshModsMaps(true, true, true);
 
 		#if HSCRIPT_ALLOWED
 		final foldersToCheck:Array<String> = ["classes", "states", "substates"];
@@ -109,7 +109,7 @@ class InitState extends FlxState
 		parseClasses(["classes"], [H_CLASS]);*/ //Reparse classes with hInit on to do any stuff that needs to be done after all classes have been parsed once!!
 		#end
 
-		#if HSCRIPT_ALLOWED
+		#if (HSCRIPT_ALLOWED && HSCRIPT_DEBUG)
 		trace(InitState.scriptStaticVars);
 		#end
 	}

source/Main.hx

@@ -60,7 +60,7 @@ class Main extends Sprite
 	 * 
 	 * Use `debugVersion` to get the version with build date.
 	 */
-	public static final denpaEngineVersion:GameVersion = new GameVersion(0, 8, 0, 'c');
+	public static final denpaEngineVersion:GameVersion = new GameVersion(0, 8, 0, 'd');
 
 	public static var fpsCounter:FramerateDisplay;
 	public static var ramCount:DebugDisplay;

source/Modcharts.hx

@@ -3,11 +3,10 @@ package;
 import haxescript.Hscript;
 
 class Modcharts {
-
 	public var hscript:Hscript;
 	public var strum:Int;
     public function new(name:String = 'none', strumNum:Int = 0) {
-		if (name != 'none' && strumNum < 2)
+		if (strumNum > 1 || (name != 'none' && strumNum < 2))
 			hscript = new Hscript(Paths.hscript('scripts/modcharts/$name'), true);
 		this.strum = strumNum;
 		if (hscript == null) return;
@@ -21,7 +20,7 @@ class Modcharts {
 			hscript.stop();
 			hscript = null;
 		}
-		if (newName != 'none' && strum < 2)
+		if (strum > 1 || (newName != 'none' && strum < 2))
 			hscript = new Hscript(Paths.hscript('scripts/modcharts/$newName'), true);
 		if (hscript == null) return;
 		PlayState.instance.hscripts.push(hscript);