fix crash with ghost misses

Author: VMan-2002

source/Discord.hx

@@ -132,9 +132,12 @@ class DiscordClient
 			songName = PlayState.SONG.song;
 			modifierString = Highscore.getModeString(false, true);
 			difficultyText = '${PlayState.instance.storyDifficultyText}${modifierString}';
+			if (Options.instance.botplay) {
+				difficultyText += " (Botplay)";
+			}
 		}
 		var detailsText:String = PlayState.isStoryMode ? "Story Mode: Week " + PlayState.storyWeek : "Freeplay";
-		var songText:String = songName + difficultyText;
+		var songText:String = songName + " " + difficultyText;
 		switch(type) {
 			case "paused":
 				changePresence("Paused - "+detailsText, songText, PlayState.instance.iconRPC);

source/HealthIcon.hx

@@ -23,6 +23,8 @@ typedef SwagHealthIcon = {
 	public var scale:Array<Float>;
 	public var folderType:String;
 	public var position_freeplay:Null<Array<Float>>;
+	public var tileWidth:Null<Int>;
+	public var tileHeight:Null<Int>;
 }
 
 typedef SwagHealthIconItem = {
@@ -178,7 +180,10 @@ class HealthIcon extends FlxSprite
 				loadGraphic(bitmap);
 				var ratio = width / height;
 				var intHeight = Math.floor(height);
-				if (ratio > 2.5) {
+				if (isJson && jsonData != null && jsonData.tileWidth != null) {
+					//todo: load anims
+					loadGraphic(bitmap, true, jsonData.tileWidth, jsonData.tileHeight == null ? intHeight : jsonData.tileHeight);
+				} else if (ratio > 2.5) {
 					loadGraphic(bitmap, true, Math.floor(width / 3), intHeight);
 					animation.add('winning', [2], 0, false, isPlayer);
 					animation.add('neutral', [0], 0, false, isPlayer);

source/Main.hx

@@ -18,8 +18,8 @@ import Sys;
 
 class Main extends Sprite
 {
-	public static final gameVersionInt = 5;
-	public static final gameVersionStr = "v1.1.3 I'm Guitarin' (& fix the modmenu)";
+	public static final gameVersionInt = 6;
+	public static final gameVersionStr = "v1.1.4 I'm Guitarin' (& fix the misses)";
 
 	var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom).
 	var gameHeight:Int = 720; // Height of the game in pixels (might be less / more in actual pixels depending on your zoom).

source/Options.hx

@@ -6,6 +6,7 @@ import lime.ui.ScanCode;
 class Options {
 	public static var saved:Options;
 	public static var instance:Options;
+	public static var playedVersion:Int = -1; //-1 when you've never played before
 
 	public static var masterVolume:Float = 1;
 	public var downScroll:Bool = false;
@@ -175,6 +176,7 @@ class Options {
 		svd.data.playstate_guitar = playstate_guitar;
 		svd.data.playstate_confusion = playstate_confusion;
 
+		svd.data.playedVersion = Main.gameVersionInt;
 		svd.data.optionVersion = Std.int(0);
 		svd.close();
 	}

source/PlayState.hx

@@ -2656,7 +2656,7 @@ class PlayState extends MusicBeatState
 			var validNote = note != null;
 			var noteTypeData = validNote ? note.getNoteTypeData() : Note.SwagNoteType.loadNoteType(Note.SwagNoteType.normalNote, PlayState.modName);
 
-			if (validNote && !noteTypeData.ignoreMiss) {
+			if ((validNote && !noteTypeData.ignoreMiss) || !validNote) {
 				health += noteTypeData.healthMiss;
 				if (combo > 5)
 					gf.playAvailableAnim(Options.instance.playstate_opponentmode ? ["sad_opponent", "sad"] : ["sad"]);
@@ -2671,15 +2671,17 @@ class PlayState extends MusicBeatState
 				if (Options.noteMissAction_MissSound[Options.instance.noteMissAction])
 					FlxG.sound.play(Paths.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2));
 
-				if (!note.isSustainNote)
-					songHittableMisses += 1;
-				
-				if (noteTypeData.bob != 0 && noteTypeData.glitch)
-					bobBleeds.push({
-						timeLeft: 3,
-						mult: noteTypeData.bob * 1.5,
-						maxHealth: 2 * noteTypeData.healthMaxMult
-					});
+				if (validNote) {
+					if (!note.isSustainNote)
+						songHittableMisses += 1;
+					
+					if (noteTypeData.bob != 0 && noteTypeData.glitch)
+						bobBleeds.push({
+							timeLeft: 3,
+							mult: noteTypeData.bob * 1.5,
+							maxHealth: 2 * noteTypeData.healthMaxMult
+						});
+				}
 			}
 			// FlxG.sound.play(Paths.sound('missnote1'), 1, false);
 			// FlxG.log.add('played imss note');
@@ -2805,7 +2807,9 @@ class PlayState extends MusicBeatState
 	}
 
 	function animateForNote(?note:Note, ?isBoyfriend:Bool = true, ?noteData:Int = 0, ?isMiss:Bool = false):Void {
-		if (note != null) {
+		//Note to editors: Check if the note EXISTS before doing anything with it
+		var validNote = note != null;
+		if (validNote) {
 			isBoyfriend = note.mustPress;
 			if (allowGameplayChanges) {
 				if (Options.instance.playstate_bothside)
@@ -2814,13 +2818,13 @@ class PlayState extends MusicBeatState
 					isBoyfriend = !isBoyfriend;
 			}
 		}
-		var noteTypeData = note != null ? note.getNoteTypeData() : Note.SwagNoteType.loadNoteType("Normal Note", modName);
+		var noteTypeData = validNote ? note.getNoteTypeData() : Note.SwagNoteType.loadNoteType("Normal Note", modName);
 		if (noteTypeData.noAnim)
 			return;
-		var char:Character = (note != null && note.charNum != -1) ? Character.activeArray[note.charNum] : (noteTypeData.charNums != null ? Character.activeArray[noteTypeData.charNums[0]] : (isBoyfriend ? boyfriend : dad));
+		var char:Character = (validNote && note.charNum != -1) ? Character.activeArray[note.charNum] : (noteTypeData.charNums != null ? Character.activeArray[noteTypeData.charNums[0]] : (isBoyfriend ? boyfriend : dad));
 		if (char == null)
 			return;
-		var color = (note.strumLineNum < 0 ? funnyManias[-2 - note.strumLineNum] : curManiaInfo).arrows[note == null ? noteData : note.noteData];
+		var color = validNote ? ((note.strumLineNum < 0 ? funnyManias[-2 - note.strumLineNum] : curManiaInfo).arrows[note.noteData]) : curManiaInfo.arrows[noteData];
 		var colorNote = "sing" + color.toUpperCase();
 		if (isMiss)
 			return char.playAvailableAnim(['${colorNote}miss', 'sing${ManiaInfo.Dir[color]}miss'], true);

source/PlayStateChangesSubState.hx

@@ -30,7 +30,7 @@ class PlayStateChangesSubState extends OptionsSubStateBasic
 			case "endless mode":
 				return ["The song repeats forever! Freeplay Only", Options.saved.playstate_endless ? "Enabled" : "Disabled"];
 			case "guitar mode":
-				return ["Guitar Hero, basically. Hold the arrow key down and use square bracket keys to hit notes.", Options.saved.playstate_guitar ? "Enabled" : "Disabled"];
+				return ["Guitar Hero, basically. Hold the arrow key down and use Guitar Strum keybind to hit notes.", Options.saved.playstate_guitar ? "Enabled" : "Disabled"];
 			case "confusion":
 				return ["Notes may sometimes appear visually in wrong lanes.", Options.saved.playstate_confusion ? "Enabled" : "Disabled"];
 			case "clear gameplay changes":

sourceUpdater/Main.hx

@@ -43,6 +43,11 @@ class Main extends Sprite
 		"songs"
 	];
 
+	var dontCopyGameContent:Array<String> = [
+		"mods/modList.txt", //this file shouldn't exist in distributed versions but if it DOES....!!!
+		"vmanengineupdater.exe" //would be moved in by the game.
+	];
+
 	public static function main():Void
 	{
 		#if (debug && !html5)

version/vman_engine.txt

@@ -1,2 +1,2 @@
-5
-1.1.3
+6
+1.1.4

version/vman_engine_changelog.txt

@@ -1,3 +1,3 @@
-Fixed crashes related to modList.txt and mods menu
-Also removed modList.txt from distributed build
-and added the (optional) ability to antialias stuff in mod menu
+Botplay now visible in discord
+Fixed an antimash crash fix (specifically, when you miss without an associated note)
+Clarified something in the Guitar Mode option description

version/vman_engine_changelog_upcoming.txt

@@ -0,0 +1,2 @@
+Botplay now visible in discord
+Fixed an antimash crash fix (specifically, when you miss without an associated note)