1.7.0 real this probably works

Skirlez · Jul 14, 2022 · e1d9556 · e1d9556
1 parent 18f73ab
commit e1d9556
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 16 deletions.
diff --git a/cate-bossfight-gm.yyp b/cate-bossfight-gm.yyp
diff --git a/objects/obj_explosion/Step_0.gml b/objects/obj_explosion/Step_0.gml
@@ -6,7 +6,8 @@ repeat(global.execute) {
 		room_goto(bonuscat)
 	}
 }
-if mouse_check_button_pressed(mb_middle) {
+if mouse_check_button_pressed(mb_middle) and timer > 1 {
+	audio_stop_sound(snd_boom_cloud)
 	play_sound(snd_pluck, false)
 	room_goto(bonuscat)	
 }

diff --git a/objects/obj_explosion/obj_explosion.yy b/objects/obj_explosion/obj_explosion.yy
diff --git a/objects/obj_fullscreen/Create_0.gml b/objects/obj_fullscreen/Create_0.gml
@@ -1,5 +1,7 @@
 if os_browser != browser_not_a_browser {
-	obj_shakescreentoggle.x = 320
-	obj_shakescreentoggle.y = 288
+	obj_shakescreentoggle.x = 224
+	obj_visualstoggle.x = 288
+	obj_volumetest.x = 352
+	obj_scoretoggle.x = 416
 	instance_destroy(id)
 }
diff --git a/objects/obj_hardmodecutscene/Step_0.gml b/objects/obj_hardmodecutscene/Step_0.gml
@@ -96,6 +96,7 @@ repeat(global.execute) {
 	}
 }
 if mouse_check_button_pressed(mb_middle) {
+	global.hard = true
 	change_progress(2)
 	room_goto(mainroom)
 }
diff --git a/objects/obj_jinx5/Step_0.gml b/objects/obj_jinx5/Step_0.gml
@@ -115,6 +115,7 @@ else {
 		}
 		image_index = 0
 		image_angle = 0
+		deathtimer = 1
 	}
 
 	if deathtimer < 312 and deathtimer > 30 {

diff --git a/objects/obj_manager/Create_0.gml b/objects/obj_manager/Create_0.gml
@@ -4,7 +4,7 @@ global.screenHeight = display_get_height()
 
 draw_set_halign(fa_center)
 draw_set_valign(fa_middle)
-surface_resize(application_surface, global.screenWidth, global.screenHeight)
+
 
 /* unused as of 1.6
 if !variable_global_exists("fps")
@@ -50,4 +50,4 @@ stoptiming = false
 global.hp = 1
 currentjinx = -1
 global.version = "v1.7.0"
-global.misses = 0
+global.misses = 0
diff --git a/objects/obj_manager/Draw_0.gml b/objects/obj_manager/Draw_0.gml
@@ -48,7 +48,6 @@ if paused == false {
 				}
 				*/
 
-
 				/*
 				if keyboard_check_pressed(ord("Q"))
 					object.hp = 0
@@ -78,7 +77,7 @@ if paused == false {
 			if global.attackcooldown > 0 {
 				draw_sprite(spr_varframe, 0, 320, 50)
 				if instance_exists(obj_jinx7.summon)
-						draw_text(320, 50, obj_jinx7.summon.hp)
+					draw_text(320, 50, obj_jinx7.summon.hp)
 				else
 					draw_text(320, 50, obj_jinx7.hp)
 			}	

diff --git a/objects/obj_manager/Step_0.gml b/objects/obj_manager/Step_0.gml
@@ -2,7 +2,11 @@ repeat(global.execute) {
 	if os_browser != browser_not_a_browser {
 		global.screenWidth = display_get_width()
 		global.screenHeight = display_get_height()
-		window_set_size(global.screenWidth, global.screenHeight)
+
+		if global.screenWidth != window_get_width() or global.screenHeight != window_get_height() {
+			window_set_size(global.screenWidth, global.screenHeight)
+			surface_resize(application_surface, global.screenWidth, global.screenHeight)
+		}
 	}
 	camera_set_view_pos(view_camera[0], 0, 0)	
 	if global.shake > 0 {
@@ -265,7 +269,7 @@ if paused == false {
 							whitescreencolor = c_white	
 						}
 						else if finaletimer == 222 {
-							obj_jinx7.go = true		
+							obj_jinx7.go = true
 							change_progress(3)
 							stoptiming = false	
 							cattime = 0

diff --git a/objects/obj_scrolltoggle/Draw_0.gml → objects/obj_scoretoggle/Draw_0.gml b/objects/obj_scrolltoggle/Draw_0.gml → objects/obj_scoretoggle/Draw_0.gml
diff --git a/objects/obj_scrolltoggle/Step_0.gml → objects/obj_scoretoggle/Step_0.gml b/objects/obj_scrolltoggle/Step_0.gml → objects/obj_scoretoggle/Step_0.gml
diff --git a/objects/obj_scrolltoggle/obj_scrolltoggle.yy → objects/obj_scoretoggle/obj_scoretoggle.yy b/objects/obj_scrolltoggle/obj_scrolltoggle.yy → objects/obj_scoretoggle/obj_scoretoggle.yy
diff --git a/rooms/bonusend/bonusend.yy b/rooms/bonusend/bonusend.yy
diff --git a/rooms/mainroom/mainroom.yy b/rooms/mainroom/mainroom.yy
diff --git a/rooms/title/title.yy b/rooms/title/title.yy