contento

Author: VMan-2002

source/Achievements.hx

@@ -25,7 +25,8 @@ class Achievements
 		//"6kBothPlay", //Dunno lol
 		"fridayNight",
 		"calibrateDeath",
-		"modFunkboxPlay"
+		"modFunkboxPlay",
+		"modRegGuitPlay"
 	];
 
 	public static function giveAchievement(name:String, ?modName:Null<String>) {
@@ -98,6 +99,8 @@ class Achievements
 		switch(thing) {
 			case [428567, "funny_nep_mod"]:
 				return category == "storyModeWeek" && giveAchievement("modFunkboxPlay");
+			case [437809, "regular_guitar_song"]:
+				return giveAchievement("modRegGuitPlay");
 			default:
 				return false;
 		}

source/Main.hx

@@ -19,7 +19,7 @@ import Sys;
 class Main extends Sprite
 {
 	public static final gameVersionInt = 2;
-	public static final gameVersionStr = "v1.0.1 Funny Day 0 Patch";
+	public static final gameVersionStr = "v1.1.0 I'm Guitarin'";
 
 	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/Note.hx

@@ -504,22 +504,23 @@ class Note extends FlxSprite
 				var stuff = ((noteSkin.imageDownscroll != "" && noteSkin.imageDownscroll != null && Options.instance.downScroll) ? noteSkin.imageDownscroll : noteSkin.image).replace("\\", "/").split("/");
 				stuff[stuff.length - 1] = typedata.imagePrefix + stuff[stuff.length - 1];
 				frames = Paths.getSparrowAtlas(stuff.join("/"));
+				var noteAnimPrefix = strumLineNum < 0 ? "" : typedata.noteAnimPrefix;
 				//trace('Images [normal: ${noteSkin.image}] [downscroll: ${noteSkin.imageDownscroll}] Stuff is ${stuff.join("/")}');
 
 				if (noteSkin.arrows == null) {
-					animation.addByPrefix('${myArrow}Scroll', '${typedata.noteAnimPrefix}${myArrow}0', 24);
-					animation.addByPrefix('${myArrow}holdend', '${typedata.noteAnimPrefix}${myArrow} hold end', 24);
-					animation.addByPrefix('${myArrow}hold', '${typedata.noteAnimPrefix}${myArrow} hold piece', 24);
-					animation.addByPrefix('${myArrow}Release', '${typedata.noteAnimPrefix}${myArrow} release', 24);
-					animation.addByPrefix('${myArrow}holdstart', '${typedata.noteAnimPrefix}${myArrow} hold start', 24);
+					animation.addByPrefix('${myArrow}Scroll', '${noteAnimPrefix}${myArrow}0', 24);
+					animation.addByPrefix('${myArrow}holdend', '${noteAnimPrefix}${myArrow} hold end', 24);
+					animation.addByPrefix('${myArrow}hold', '${noteAnimPrefix}${myArrow} hold piece', 24);
+					animation.addByPrefix('${myArrow}Release', '${noteAnimPrefix}${myArrow} release', 24);
+					animation.addByPrefix('${myArrow}holdstart', '${noteAnimPrefix}${myArrow} hold start', 24);
 				} else {
 					for (anim in noteSkin.arrows[myArrow]) {
 						if (noteAnimExclude.indexOf(anim.name) > -1) {
 							continue;
 						}
 						animation.addByPrefix(
 							'${myArrow}${anim.name}',
-							'${typedata.noteAnimReplace != null ? typedata.noteAnimReplace : (typedata.noteAnimPrefix + anim.anim)}',
+							'${typedata.noteAnimReplace != null ? typedata.noteAnimReplace : (noteAnimPrefix + anim.anim)}',
 							anim.framerate,
 							anim.loop
 						);

source/PlayState.hx

@@ -2022,10 +2022,12 @@ class PlayState extends MusicBeatState
 			newState.maxCombo = maxCombo;
 			newState.possibleMoreScore = possibleMoreScore;
 			newState.songFC = songFC;
+			Achievements.awardModPlay("endless", ModLoad.primaryMod, this);
 			return FlxG.switchState(newState);
 		}
 
 		Achievements.giveAchievement("anyClear");
+		Achievements.awardModPlay("anyPlay", ModLoad.primaryMod, this);
 		if (songMisses <= 9 && songHits > 0) {
 			Achievements.giveAchievement("anySDCB");
 			if (songMisses <= 0) {
@@ -2060,6 +2062,7 @@ class PlayState extends MusicBeatState
 			campaignMisses += songMisses;
 
 			storyPlaylist.shift();
+			Achievements.awardModPlay("storyMode", ModLoad.primaryMod, this);
 
 			if (storyPlaylist.length <= 0) {
 				CoolUtil.playMenuMusic();
@@ -2112,6 +2115,7 @@ class PlayState extends MusicBeatState
 				LoadingState.loadAndSwitchState(new PlayState());
 			}
 		} else {
+			Achievements.awardModPlay("freeplay", ModLoad.primaryMod, this);
 			trace('WENT BACK TO FREEPLAY??');
 			FlxG.switchState(new FreeplayState());
 		}

sourceUpdater/Main.hx

@@ -106,15 +106,18 @@ class Main extends Sprite
 		} else if (!triedProtocolInstall) {
 			triedProtocolInstall = true;
 			trace("Browser protocol is NOT installed, try install");
+			titleText.text = "VMan Engine Updater";
 			//var msgbox = new MessageBox();
 			//todo: wtf am i doning
 			/*msgbox.title = "Info";
 			msgbox.text = "The browser protocol is not installed. If installed,\nyou can download mod packs using special links on GameBanana pages.\n\nInstall the browser protocol?";
 			msgbox.type = TYPE_YESNO;
 			msgbox.onDialogClosed = function(evnt) {
 				if (evnt == DialogButton.YES) {*/
-					var elevateCheck = new sys.io.Process("net file").stdout.readAll().toString().toLowerCase().contains("access is denied");
-					if (!elevateCheck) {
+					var elevateCheck = new sys.io.Process("net file").stdout.readAll().toString().toLowerCase();
+					trace("elevate check: "+elevateCheck);
+					var elevateAllowed = (!elevateCheck.contains("access is denied")) && (elevateCheck.length > 1); //because for some reason, an empty response can happen.
+					if (elevateAllowed) {
 						trace(Sys.programPath());
 						var commands = [
 							"HKCR\\"+protocolName+" /d \"URL:"+protocolName+" Protocol\"",
@@ -129,6 +132,8 @@ class Main extends Sprite
 							new sys.io.Process("reg add "+cmd);
 						}
 						trace("Attempted installing the protocol");
+						textThing.text = "Attempted installing the browser protocol";
+						stage.invalidate();
 					} else {
 						//var msgbox = new MessageBox();
 						//msgbox.title = "Info";
@@ -194,6 +199,7 @@ class Main extends Sprite
 			return;
 		}
 		textThing.text = "This is the VMan Engine updater, used for Auto-Download links in mod pages and will eventually be able to update the engine itself";
+		titleText.text = "VMan Engine Updater";
 	}
 
 	var title:String = "Updater";