diff --git a/cate-bossfight-gm.yyp b/cate-bossfight-gm.yyp index 64b7e3f..51587d0 100644 --- a/cate-bossfight-gm.yyp +++ b/cate-bossfight-gm.yyp @@ -122,7 +122,7 @@ {"id":{"name":"spr_gun","path":"sprites/spr_gun/spr_gun.yy",},"order":46,}, {"id":{"name":"spr_COOL","path":"sprites/spr_COOL/spr_COOL.yy",},"order":27,}, {"id":{"name":"snd_glass_breaking","path":"sounds/snd_glass_breaking/snd_glass_breaking.yy",},"order":26,}, - {"id":{"name":"obj_scrolltoggle","path":"objects/obj_scrolltoggle/obj_scrolltoggle.yy",},"order":46,}, + {"id":{"name":"obj_scoretoggle","path":"objects/obj_scoretoggle/obj_scoretoggle.yy",},"order":46,}, {"id":{"name":"obj_jinx4","path":"objects/obj_jinx4/obj_jinx4.yy",},"order":5,}, {"id":{"name":"snd_music_phase1","path":"sounds/snd_music_phase1/snd_music_phase1.yy",},"order":21,}, {"id":{"name":"snd_firstlaunch","path":"sounds/snd_firstlaunch/snd_firstlaunch.yy",},"order":64,}, diff --git a/objects/obj_explosion/Step_0.gml b/objects/obj_explosion/Step_0.gml index 091d11f..29e98aa 100644 --- 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 index d4fe2af..4d8a33d 100644 --- a/objects/obj_explosion/obj_explosion.yy +++ b/objects/obj_explosion/obj_explosion.yy @@ -5,6 +5,7 @@ }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, diff --git a/objects/obj_fullscreen/Create_0.gml b/objects/obj_fullscreen/Create_0.gml index b133381..2d120da 100644 --- 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) } \ No newline at end of file diff --git a/objects/obj_hardmodecutscene/Step_0.gml b/objects/obj_hardmodecutscene/Step_0.gml index 6f03465..5da1157 100644 --- 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 index 2034141..1397da1 100644 --- 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 index 6631935..04eea22 100644 --- 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 \ No newline at end of file diff --git a/objects/obj_manager/Draw_0.gml b/objects/obj_manager/Draw_0.gml index d6ba322..c72e307 100644 --- 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 index c6af711..b5dd691 100644 --- 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 b/objects/obj_scoretoggle/Draw_0.gml similarity index 100% rename from objects/obj_scrolltoggle/Draw_0.gml rename to objects/obj_scoretoggle/Draw_0.gml diff --git a/objects/obj_scrolltoggle/Step_0.gml b/objects/obj_scoretoggle/Step_0.gml similarity index 100% rename from objects/obj_scrolltoggle/Step_0.gml rename to objects/obj_scoretoggle/Step_0.gml diff --git a/objects/obj_scrolltoggle/obj_scrolltoggle.yy b/objects/obj_scoretoggle/obj_scoretoggle.yy similarity index 95% rename from objects/obj_scrolltoggle/obj_scrolltoggle.yy rename to objects/obj_scoretoggle/obj_scoretoggle.yy index c3d2ad0..aacaa78 100644 --- a/objects/obj_scrolltoggle/obj_scrolltoggle.yy +++ b/objects/obj_scoretoggle/obj_scoretoggle.yy @@ -5,6 +5,7 @@ }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -31,7 +32,7 @@ "path": "folders/Objects.yy", }, "resourceVersion": "1.0", - "name": "obj_scrolltoggle", + "name": "obj_scoretoggle", "tags": [], "resourceType": "GMObject", } \ No newline at end of file diff --git a/rooms/bonusend/bonusend.yy b/rooms/bonusend/bonusend.yy index b728187..7bfdc13 100644 --- a/rooms/bonusend/bonusend.yy +++ b/rooms/bonusend/bonusend.yy @@ -3,7 +3,7 @@ "volume": 1.0, "parentRoom": null, "views": [ - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, + {"inherit":false,"visible":true,"xview":0,"yview":0,"wview":640,"hview":360,"xport":0,"yport":0,"wport":640,"hport":360,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, @@ -30,7 +30,7 @@ }, "viewSettings": { "inheritViewSettings": false, - "enableViews": false, + "enableViews": true, "clearViewBackground": false, "clearDisplayBuffer": true, }, diff --git a/rooms/mainroom/mainroom.yy b/rooms/mainroom/mainroom.yy index ba24ac0..dff4938 100644 --- a/rooms/mainroom/mainroom.yy +++ b/rooms/mainroom/mainroom.yy @@ -33,7 +33,7 @@ {"propertyId":{"name":"intro","path":"objects/obj_guitar/obj_guitar.yy",},"objectId":{"name":"obj_guitar","path":"objects/obj_guitar/obj_guitar.yy",},"value":"True","resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMOverriddenProperty",}, ],"isDnd":false,"objectId":{"name":"obj_guitar","path":"objects/obj_guitar/obj_guitar.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.1,"scaleY":0.1,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":272.0,"y":-192.0,"resourceVersion":"1.0","name":"inst_5226DE92","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_spinjinx5","path":"objects/obj_spinjinx5/obj_spinjinx5.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.1,"scaleY":0.1,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":48.0,"y":48.0,"resourceVersion":"1.0","name":"inst_1AA9AC3F","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"obj_spinjinx6","path":"objects/obj_spinjinx6/obj_spinjinx6.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.2,"scaleY":0.2,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":384.0,"y":32.0,"resourceVersion":"1.0","name":"inst_7DD2181F","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_spinjinx6","path":"objects/obj_spinjinx6/obj_spinjinx6.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.2,"scaleY":0.2,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":320.0,"y":32.0,"resourceVersion":"1.0","name":"inst_7DD2181F","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_hurt","path":"objects/obj_hurt/obj_hurt.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":640.0,"y":0.0,"resourceVersion":"1.0","name":"inst_28A0E7C4","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":-9901,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4285361766,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":-9801,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, diff --git a/rooms/title/title.yy b/rooms/title/title.yy index cff1cb2..1024699 100644 --- a/rooms/title/title.yy +++ b/rooms/title/title.yy @@ -44,7 +44,7 @@ {"propertyId":{"name":"progress","path":"objects/obj_roombutton/obj_roombutton.yy",},"objectId":{"name":"obj_roombutton","path":"objects/obj_roombutton/obj_roombutton.yy",},"value":"3","resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMOverriddenProperty",}, {"propertyId":{"name":"finaleintro","path":"objects/obj_roombutton/obj_roombutton.yy",},"objectId":{"name":"obj_roombutton","path":"objects/obj_roombutton/obj_roombutton.yy",},"value":"True","resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMOverriddenProperty",}, ],"isDnd":false,"objectId":{"name":"obj_roombutton","path":"objects/obj_roombutton/obj_roombutton.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":560.0,"y":160.0,"resourceVersion":"1.0","name":"inst_7545B596","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"obj_scrolltoggle","path":"objects/obj_scrolltoggle/obj_scrolltoggle.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":384.0,"y":320.0,"resourceVersion":"1.0","name":"inst_79B4D139","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_scoretoggle","path":"objects/obj_scoretoggle/obj_scoretoggle.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":384.0,"y":320.0,"resourceVersion":"1.0","name":"inst_79B4D139","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":200,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -61,11 +61,11 @@ {"name":"inst_74A017B2","path":"rooms/title/title.yy",}, {"name":"inst_7545B596","path":"rooms/title/title.yy",}, {"name":"inst_5B93886B","path":"rooms/title/title.yy",}, - {"name":"inst_3A46C03E","path":"rooms/title/title.yy",}, {"name":"inst_2D5B0ED1","path":"rooms/title/title.yy",}, {"name":"inst_7540CBA0","path":"rooms/title/title.yy",}, {"name":"inst_67066163","path":"rooms/title/title.yy",}, {"name":"inst_79B4D139","path":"rooms/title/title.yy",}, + {"name":"inst_3A46C03E","path":"rooms/title/title.yy",}, ], "inheritCreationOrder": false, "sequenceId": null,