v3.0.0

README.md

@@ -1,4 +1,4 @@
-<h1 align="center">SnowState 2.4.0</h1>
+<h1 align="center">SnowState 3.0.0</h1>
 <p align="center">@sohomsahaun</p>
 
 ---
@@ -20,4 +20,4 @@ You can find downloadable .yyz (project file with demo) and .yymps (SnowState on
 To know more about SnowState, please visit the [Wiki](https://github.com/sohomsahaun/SnowState/wiki)!
 
 ## Note
-This version of SnowState is for GameMaker Studio 2.3.2 or higher. If you are using earlier version(s) of GameMaker Studio, please check out earlier version(s) of SnowState.
+This version of SnowState is for GameMaker Studio 2.3.6 or higher. If you are using earlier version(s) of GameMaker Studio, please check out earlier version(s) of SnowState.

objects/oCamera/Create_0.gml

@@ -5,7 +5,7 @@ width = 480;
 height = 270;
 
 targetPos = [x,y];
-targetInst = oPlayer;
+targetInst = (DEMO == "D") ? oPlayerD : oPlayerT;
 rate = 2;
 
 // Resize window and app surface

objects/oGame/Alarm_0.gml

@@ -6,4 +6,4 @@ with (instance_create_layer(_x, _y, "SmallClouds", oCloud)) {
 	hspeed = -random_range(.2, .4);
 }
 
-alarm[0] = irandom_range(5, 15) * game_get_speed(gamespeed_fps);
+alarm[0] = irandom_range(5, 15) * game_get_speed(gamespeed_fps);

objects/oGame/Draw_64.gml

@@ -27,20 +27,25 @@ if (showHistory) {
 	_x = 10;
 	_y = 10;
 
-	var _str, _states, _i;
-	_states = oPlayer.fsm.history_get();
+	var _player, _states, _str, _i, _col;
+	_player = (DEMO == "D") ? oPlayerD : oPlayerT;
+	_states = _player.fsm.history_get();
 	_str = "groundAttack3";
 
 	draw_set_alpha(.9);
 	draw_rectangle_color(0, 0, 20+string_width(_str), display_get_gui_height(),
 						 c_black, c_black, c_black, c_black, 0);
 	draw_set_alpha(1);
 
-	draw_text_outline(_x, _y, "HISTORY", c_white, c_black, _thickness);
+	draw_text_color(_x, _y, "HISTORY", c_white, c_white, c_white, c_white, 1);
 	_y += 10;
 
+	_col = c_white;
 	_i = 0; repeat (array_length(_states)) {
-		_y += _diff; draw_text_outline(_x, _y, _states[@ _i], c_white, c_black, _thickness);
+		_str = _states[_i];
+		_y += _diff;
+		draw_text_color(_x, _y, _str, _col, _col, _col, _col, 1);
+		_col = c_gray;
 		++_i;
 	}
 }

objects/oGame/Step_0.gml

@@ -1,2 +1,2 @@
 showControls ^= keyboard_check_released(vk_f2);
-showHistory ^= keyboard_check_released(ord("H"));
+showHistory ^= keyboard_check_released(ord("H"));

objects/oPlayer/Create_0.gml → objects/oPlayerD/Create_0.gml

@@ -69,8 +69,6 @@ fsm
 			vspd = 0;
 		},
 		step: function() {
-			check_input();
-
 			// If left or right keys are pressed, run
 			if (abs(input.hdir)) {
 				fsm.change("run");
@@ -97,10 +95,7 @@ fsm
 				}
 			} else {
 				// Recall the sword
-				if (input.recallSword) {
-					var _sword = instance_find(oSword, 0);
-					_sword.recall();
-				}
+				recall_sword();
 			}
 
 			// Movement
@@ -120,8 +115,6 @@ fsm
 			image_speed = 1;
 		},
 		step: function() {
-			check_input();
-
 			var _dir = input.hdir;
 			hspd = spd * _dir;
 
@@ -153,10 +146,7 @@ fsm
 				}
 			} else {
 				// Recall the sword
-				if (input.recallSword) {
-					var _sword = instance_find(oSword, 0);
-					_sword.recall();
-				}
+				recall_sword();
 			}
 
 			// Movement
@@ -185,19 +175,14 @@ fsm
 				image_index = image_number - 1;
 			}
 
-			check_input();
-
 			// Throw the sword
 			if (input.throwSword && hasSword) {
 				fsm.change("throwSword");
 				return;
 			}
 
 			// Recall the sword
-			if (input.recallSword && !hasSword) {
-				var _sword = instance_find(oSword, 0);
-				_sword.recall();
-			}
+			recall_sword();
 
 			// Movement
 			apply_gravity();
@@ -229,7 +214,6 @@ fsm
 				image_index = image_number - 1;
 			}
 
-			check_input();
 			var _dir = input.hdir;
 			hspd = spd * _dir;
 			if (_dir != 0) face = _dir;
@@ -248,14 +232,11 @@ fsm
 				}
 			} else {
 				// Recall the sword
-				if (input.recallSword) {
-					var _sword = instance_find(oSword, 0);
-					_sword.recall();
-				}
+				recall_sword();
 			}
 
 			// Coyote time
-			if ((fsm.get_time() <= coyoteDuration) && input.jump) {
+			if ((fsm.get_time(false) <= coyoteDuration) && input.jump) {
 				// Apply only if we were running
 				if (fsm.get_previous_state() == "run") {
 					fsm.change("jump");
@@ -292,8 +273,6 @@ fsm
 			}
 		},
 		step: function() {
-			check_input();
-
 			// If attack key is pressed any time during the current state,
 			// go to the next attack state after the animation ends
 			if (input.attack) {
@@ -436,4 +415,4 @@ fsm
 		leave: function() {
 			grav = gravGround;	
 		}
-	});
+	});

objects/oPlayerD/KeyRelease_82.gml

@@ -0,0 +1 @@
+game_restart();

objects/oPlayer/Other_25.gml → objects/oPlayerD/Other_25.gml

@@ -58,7 +58,7 @@ move_and_collide = function() {
 };
 
 spawn_sword = function() {
-	with (instance_create_depth(x+6*face, y-14, depth, oSword)) {
+	with (instance_create_depth(x+6*face, y-14, depth, oSwordD)) {
 		owner = other.id;
 		face  = owner.face;
 		fsm.change("spinning");
@@ -68,4 +68,11 @@ spawn_sword = function() {
 equip_sword = function() {
 	hasSword = true;
 	sprite_index = get_sprite();
+};
+
+recall_sword = function() {
+	if (!hasSword && input.recallSword) {
+		var _sword = instance_find(oSwordD, 0);
+		_sword.recall();
+	}	
 };

objects/oPlayerD/Step_0.gml

@@ -0,0 +1,2 @@
+check_input();
+fsm.step();