Final edits before initial release. Various bug fixes and gameplay pr…

…ogression tweaks.

objects/obj_game/Create_0.gml

@@ -39,7 +39,6 @@ global.puzzle_limit = 0;
 // Global indicator of whether current puzzle is solved
 global.puzzle_solved = false;
 solved = false; // local variable to determine when puzzle has *just* been solved
-unlock = false; // local variable indicating whether we've just unlocked a new puzzle branch
 next = rm_menu; // next room to go to
 rumble = audio_play_sound(snd_rumble, 30, true); // error sound (plays only when a puzzle element is incorrect)
 audio_sound_gain(rumble, 0, 0);

objects/obj_game/Other_4.gml

@@ -6,7 +6,6 @@ class = [];
 // Reset solve status
 global.puzzle_solved = false;
 solved = false;
-unlock = false;
 audio_sound_gain(rumble, 0, 500);
 
 // Set global puzzle type

objects/obj_game/Step_0.gml

@@ -35,13 +35,17 @@ if (global.puzzle_solved == true && solved == false)
 	solved = true;
 
 	// Update internal puzzle progress variables (it returns true if we've unlocked a new branch)
-	unlock = scr_puzzle_save(room, 2);
+	var unlock = scr_puzzle_save(room, 2);
 
 	// Update next room (if there is one)
 	next = scr_puzzle_next(room);
 	if (next != rm_menu)
 		scr_puzzle_save(next, 1);
 
+	// Override next room to go to main menu if we've just unlocked something
+	if (unlock == true)
+		next = rm_menu;
+
 	// Save game
 	scr_save_game();
 
@@ -51,6 +55,7 @@ if (global.puzzle_solved == true && solved == false)
 		global.game_complete = scr_game_complete();
 
 		// Go to ending room if we've just completed the game
-		next = rm_ending;
+		if (global.game_complete == true)
+			next = rm_ending;
 	}
 }

objects/obj_menu/Alarm_0.gml

@@ -1,3 +1,4 @@
-/// @desc Begin to fade save message.
+/// @desc Begin to fade save message in.
 
-fading = true;
+fading = abs(fading); // ensure a positive value
+alarm[1] = 3*room_speed; // delay until message fades out

objects/obj_menu/Alarm_1.gml

@@ -0,0 +1,3 @@
+/// @desc Begin to fade save message out.
+
+fading = -abs(fading); // ensure a negative value

objects/obj_menu/Create_0.gml

@@ -2,11 +2,10 @@
 
 // If new game, display automatic save message
 msg = 0.0; // opacity of save message
-fading = false; // whether message is fading
+fading = -0.01*(60/room_speed); // fade rate (negative to fade out, positive to fade in)
 if (global.new_game == true)
 {
-	alarm[0] = 5*room_speed; // delay until message fades
-	msg = 1.0;
+	alarm[0] = 2*room_speed; // delay until message fades in
 	global.new_game = false;
 }
 

objects/obj_menu/Draw_64.gml

@@ -1,12 +1,11 @@
 /// @desc Draw a save reminder if the game is new.
 
 // Do nothing if message is invisible
-if (msg <= 0)
+if (msg <= 0 && fading < 0)
 	exit;
 
-// Decrease opacity if fading
-if (fading == true)
-	msg -= 0.01*(60/room_speed);
+// Change opacity according to fade rate
+msg += fading;
 
 // Set text attributes
 draw_set_font(fnt_standard);

objects/obj_music/Step_0.gml

@@ -4,12 +4,7 @@
 if (global.gains[global.music] != vol)
 {
 	vol = global.gains[global.music];
-
-	// Transition speed depends on whether we're turning the music off
-	if (vol > 0)
-		audio_sound_gain(music, vol, 4000);
-	else
-		audio_sound_gain(music, 0, 1000);
+	audio_sound_gain(music, vol, 1000);
 }
 
 /*

scripts/scr_puzzle_list/scr_puzzle_list.gml

@@ -43,8 +43,8 @@ for (var i = 0; i < array_length_1d(global.coloring_puzzles); i++)
 global.edge_puzzles =
 [
 	[200, rm_edge_dart, 4, space/2 + 5*space],
-	[201, rm_edge_k33, 3, space],
-	[202, rm_edge_k4, 3, space], // branch to decomposition
+	[201, rm_edge_k4, 3, space],
+	[202, rm_edge_k33, 3, space], // branch to decomposition
 	[203, rm_edge_petersen_star, 4, space], // 1/2 branch to total coloring (or replace with an earlier one)
 	//[204, rm_edge_dragonfly, 5, space],
 	//[205, rm_edge_cube, 3, space],
@@ -114,8 +114,8 @@ global.dominating_puzzles =
 [
 	[600, rm_dominating_spider3, 3, 8*space],
 	[601, rm_dominating_p5, 2, space],
-	[602, rm_dominating_cube, 2, space], // 1/2 branch to fall coloring
-	[603, rm_dominating_double_hexagon, 3, space],
+	//[602, rm_dominating_cube, 2, space], //XXX 1/2 branch to fall coloring
+	[603, rm_dominating_double_hexagon, 3, space], // 1/2 branch to fall coloring
 	[604, rm_dominating_hypercube, 4, space],
 	//[605, rm_dominating_king_grid_6x6, 4, space],
 	//[606, rm_dominating_andrasfai_4, 3, space],
@@ -139,8 +139,8 @@ global.fall_puzzles =
 	[704, rm_fall_king_3, 4, space],
 	[705, rm_fall_hypercube, 4, space],
 	//[706, rm_fall_k3xhouse, 3, space],
-	[707, rm_fall_clebsch, 4, space],
-	[708, rm_fall_c5_cart_c5, 5, space]
+	[707, rm_fall_c5_cart_c5, 5, space],
+	[708, rm_fall_clebsch, 4, space]
 ];
 global.fall_save = [];
 for (var i = 0; i < array_length_1d(global.fall_puzzles); i++)
@@ -153,7 +153,7 @@ global.equitable_puzzles =
 	[801, rm_equitable_crab, 3, space],
 	[802, rm_equitable_cube_4, 4, space],
 	[803, rm_equitable_snowflake_5_3, 3, space],
-	[804, rm_equitable_flower_6_4, 4, space],
+	//[804, rm_equitable_flower_6_4, 4, space],
 	[805, rm_equitable_5cube_sun, 3, space],
 	//[806, rm_equitable_hypercube_4, 4, space],
 	[807, rm_equitable_dodecahedron, 4, space]//,
@@ -188,7 +188,7 @@ global.puzzle_prereq =
 	[301], // graceful trees
 	[202], // decomposition
 	[106], // dominating set
-	[109, 602], // fall coloring
+	[109, 603], // fall coloring
 	[104] // equitable coloring
 ]