diff --git a/AM2R.project.gmx b/AM2R.project.gmx index c67300c..769c4f3 100644 --- a/AM2R.project.gmx +++ b/AM2R.project.gmx @@ -5420,6 +5420,7 @@ objects\oTrialSelect objects\oTrialClear + objects\oTrialReset objects\oTrialGoal objects\oTrialLogic objects\oTrialAutoad @@ -5870,6 +5871,7 @@ rooms\trialselectroom rooms\trialclearroom + rooms\trialresetroom rooms\trialeditor rooms\empty_room diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 7e2b56a..b8fea03 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -389,7 +389,6 @@ yShake = 0; // If rooms are added (or, presumably, removed) it must be recreated. room_width_map = ds_map_create(); ds_map_read(room_width_map, "9201000075010000000000000000000000907040000000000000000000007440000000000000000000E06840000000000000000000007440000000000000000000607340000000000000000000008440000000000000000000C05840000000000000000000009440000000000000000000B07740000000000000000000008440000000000000000000C06F40000000000000000000007440000000000000000000407440000000000000000000009940000000000000000000A06640000000000000000000007440000000000000000000004D40000000000000000000009940000000000000000000805640000000000000000000008440000000000000000000806140000000000000000000008E40000000000000000000003640000000000000000000009940000000000000000000804440000000000000000000008440000000000000000000507740000000000000000000008440000000000000000000206F40000000000000000000007440000000000000000000A07440000000000000000000007440000000000000000000005F40000000000000000000008440000000000000000000707040000000000000000000008440000000000000000000006840000000000000000000007440000000000000000000807340000000000000000000009940000000000000000000606140000000000000000000009440000000000000000000405140000000000000000000008E40000000000000000000406640000000000000000000008440000000000000000000A06740000000000000000000008440000000000000000000004C40000000000000000000007440000000000000000000805740000000000000000000007440000000000000000000806040000000000000000000009440000000000000000000003740000000000000000000007440000000000000000000907140000000000000000000008440000000000000000000E06940000000000000000000007440000000000000000000607240000000000000000000009940000000000000000000C05940000000000000000000007440000000000000000000B07640000000000000000000007440000000000000000000C06E40000000000000000000008E40000000000000000000407540000000000000000000007440000000000000000000606040000000000000000000007440000000000000000000107840000000000000000000007440000000000000000000405040000000000000000000007440000000000000000000406740000000000000000000008440000000000000000000804540000000000000000000007440000000000000000000507640000000000000000000007440000000000000000000206E4000000000000000000080A140000000000000000000A07540000000000000000000009440000000000000000000005E40000000000000000000007440000000000000000000707140000000000000000000008440000000000000000000006940000000000000000000007440000000000000000000807240000000000000000000008440000000000000000000804640000000000000000000008440000000000000000000507540000000000000000000008440000000000000000000206D40000000000000000000007440000000000000000000A07640000000000000000000008440000000000000000000005D40000000000000000000009440000000000000000000707240000000000000000000007440000000000000000000006A40000000000000000000007440000000000000000000807140000000000000000000007440000000000000000000606340000000000000000000008440000000000000000000405340000000000000000000009440000000000000000000406440000000000000000000008440000000000000000000907240000000000000000000007440000000000000000000E06A40000000000000000000007440000000000000000000607140000000000000000000008440000000000000000000C05A40000000000000000000008440000000000000000000B07540000000000000000000007440000000000000000000C06D40000000000000000000008E40000000000000000000407640000000000000000000008440000000000000000000A06440000000000000000000007440000000000000000000004F40000000000000000000007440000000000000000000805440000000000000000000009440000000000000000000806340000000000000000000008440000000000000000000007840000000000000000000008440000000000000000000606240000000000000000000009440000000000000000000405240000000000000000000008440000000000000000000406540000000000000000000007440000000000000000000804740000000000000000000008440000000000000000000507440000000000000000000008440000000000000000000206C40000000000000000000007440000000000000000000A07740000000000000000000007440000000000000000000005C40000000000000000000009440000000000000000000707340000000000000000000007440000000000000000000006B40000000000000000000008440000000000000000000807040000000000000000000007440000000000000000000A06540000000000000000000007440000000000000000000004E4000000000000000000000844000000000000000000080554000000000000000000000744000000000000000000080624000000000000000000000844000000000000000000000354000000000000000000080B140000000000000000000907340000000000000000000009440000000000000000000E06B40000000000000000000007440000000000000000000607040000000000000000000007440000000000000000000C05B40000000000000000000007440000000000000000000B07440000000000000000000009440000000000000000000C06C4000000000000000000000744000000000000000000040774000000000000000000000A440000000000000000000A06340000000000000000000008E40000000000000000000004840000000000000000000009440000000000000000000805340000000000000000000007440000000000000000000207840000000000000000000008E40000000000000000000806440000000000000000000008E40000000000000000000907540000000000000000000007440000000000000000000E06D40000000000000000000008E40000000000000000000607640000000000000000000007440000000000000000000C05D40000000000000000000007440000000000000000000B07240000000000000000000007440000000000000000000C06A40000000000000000000008E40000000000000000000407140000000000000000000008440000000000000000000606440000000000000000000007440000000000000000000405440000000000000000000008440000000000000000000406340000000000000000000009940000000000000000000804140000000000000000000009440000000000000000000507240000000000000000000007440000000000000000000206A40000000000000000000008440000000000000000000A07140000000000000000000007440000000000000000000005A40000000000000000000008E40000000000000000000707540000000000000000000007440000000000000000000006D40000000000000000000008440000000000000000000807640000000000000000000008E40000000000000000000907440000000000000000000007440000000000000000000E06C40000000000000000000008E40000000000000000000607740000000000000000000007440000000000000000000C05C40000000000000000000008440000000000000000000B07340000000000000000000008440000000000000000000C06B40000000000000000000009440000000000000000000407040000000000000000000008440000000000000000000A06240000000000000000000009440000000000000000000004940000000000000000000007440000000000000000000805240000000000000000000007440000000000000000000806540000000000000000000007440000000000000000000804040000000000000000000009440000000000000000000507340000000000000000000008440000000000000000000206B40000000000000000000007440000000000000000000A07040000000000000000000008440000000000000000000005B40000000000000000000008440000000000000000000707440000000000000000000007440000000000000000000006C40000000000000000000008E40000000000000000000807740000000000000000000007440000000000000000000606540000000000000000000008E40000000000000000000405540000000000000000000007440000000000000000000406240000000000000000000007440000000000000000000606640000000000000000000009440000000000000000000405640000000000000000000007440000000000000000000406140000000000000000000007440000000000000000000804340000000000000000000008440000000000000000000507040000000000000000000008440000000000000000000206840000000000000000000008E40000000000000000000A07340000000000000000000008E4000000000000000000000584000000000000000000000744000000000000000000070774000000000000000000040BF40000000000000000000006F40000000000000000000007440000000000000000000807440000000000000000000007440000000000000000000A06140000000000000000000007440000000000000000000004A40000000000000000000007440000000000000000000805140000000000000000000007440000000000000000000806640000000000000000000008440000000000000000000907740000000000000000000008440000000000000000000E06F40000000000000000000008440000000000000000000607440000000000000000000007440000000000000000000C05F40000000000000000000007440000000000000000000B07040000000000000000000008440000000000000000000C06840000000000000000000008E40000000000000000000407340000000000000000000009940000000000000000000804240000000000000000000008440000000000000000000507140000000000000000000007440000000000000000000206940000000000000000000008440000000000000000000A07240000000000000000000008E40000000000000000000005940000000000000000000007440000000000000000000707640000000000000000000007440000000000000000000006E40000000000000000000008440000000000000000000807540000000000000000000009940000000000000000000606740000000000000000000007440000000000000000000405740000000000000000000008E40000000000000000000406040000000000000000000008440000000000000000000307840000000000000000000008E40000000000000000000907640000000000000000000007440000000000000000000E06E40000000000000000000008440000000000000000000607540000000000000000000009E40000000000000000000C05E40000000000000000000009940000000000000000000B07140000000000000000000008E40000000000000000000C06940000000000000000000007440000000000000000000407240000000000000000000009940000000000000000000A06040000000000000000000007440000000000000000000004B40000000000000000000009E40000000000000000000805040000000000000000000007440000000000000000000806740000000000000000000009940000000000000000000206540000000000000000000009440000000000000000000804E40000000000000000000008440000000000000000000005540000000000000000000008440000000000000000000006240000000000000000000007440000000000000000000107340000000000000000000009440000000000000000000606B40000000000000000000008440000000000000000000E07040000000000000000000009940000000000000000000405B40000000000000000000007440000000000000000000307440000000000000000000008440000000000000000000406C40000000000000000000008440000000000000000000C07740000000000000000000007440000000000000000000E06240000000000000000000007440000000000000000000C05240000000000000000000008E40000000000000000000C06540000000000000000000007440000000000000000000004740000000000000000000007440000000000000000000D07440000000000000000000009440000000000000000000A06C40000000000000000000007440000000000000000000207740000000000000000000007440000000000000000000805C40000000000000000000009940000000000000000000F07340000000000000000000009440000000000000000000806B40000000000000000000008E40000000000000000000007040000000000000000000007440000000000000000000003C40000000000000000000008E40000000000000000000107240000000000000000000009440000000000000000000606A40000000000000000000007440000000000000000000E07140000000000000000000007440000000000000000000405A40000000000000000000007440000000000000000000307540000000000000000000007440000000000000000000406D40000000000000000000008E40000000000000000000C07640000000000000000000009940000000000000000000206440000000000000000000007440000000000000000000804F40000000000000000000007440000000000000000000005440000000000000000000009440000000000000000000006340000000000000000000008440000000000000000000807840000000000000000000009440000000000000000000004640000000000000000000007440000000000000000000D07540000000000000000000007440000000000000000000A06D40000000000000000000007440000000000000000000207640000000000000000000007440000000000000000000805D40000000000000000000008E40000000000000000000F07240000000000000000000007440000000000000000000806A40000000000000000000008E40000000000000000000007140000000000000000000009440000000000000000000003D40000000000000000000007440000000000000000000E06340000000000000000000008E40000000000000000000C05340000000000000000000009940000000000000000000607840000000000000000000007440000000000000000000C06440000000000000000000009440000000000000000000E06040000000000000000000007440000000000000000000907840000000000000000000007440000000000000000000C05040000000000000000000008440000000000000000000C06740000000000000000000008E40000000000000000000004540000000000000000000008440000000000000000000D07640000000000000000000008440000000000000000000A06E40000000000000000000008E40000000000000000000207540000000000000000000009E40000000000000000000805E4000000000000000000080A640000000000000000000F07140000000000000000000007440000000000000000000806940000000000000000000007440000000000000000000007240000000000000000000009940000000000000000000003E40000000000000000000008E40000000000000000000206740000000000000000000008440000000000000000000804C40000000000000000000007440000000000000000000005740000000000000000000008E40000000000000000000006040000000000000000000008440000000000000000000707840000000000000000000007440000000000000000000107140000000000000000000007440000000000000000000606940000000000000000000007440000000000000000000E07240000000000000000000008440000000000000000000405940000000000000000000007440000000000000000000307640000000000000000000008440000000000000000000406E40000000000000000000009940000000000000000000C07540000000000000000000009440000000000000000000004440000000000000000000008440000000000000000000D07740000000000000000000008440000000000000000000A06F40000000000000000000009940000000000000000000207440000000000000000000007440000000000000000000805F40000000000000000000008440000000000000000000F07040000000000000000000008440000000000000000000806840000000000000000000008440000000000000000000007340000000000000000000007440000000000000000000003F40000000000000000000008440000000000000000000E06140000000000000000000008E40000000000000000000C05140000000000000000000008E40000000000000000000C06640000000000000000000008E40000000000000000000107040000000000000000000008E40000000000000000000606840000000000000000000009440000000000000000000E07340000000000000000000008440000000000000000000405840000000000000000000008E40000000000000000000307740000000000000000000009440000000000000000000406F40000000000000000000009440000000000000000000C0744000000000000000000000844000000000000000000020664000000000000000000080A140000000000000000000804D4000000000000000000000A940000000000000000000005640000000000000000000007440000000000000000000006140000000000000000000007440000000000000000000107640000000000000000000007440000000000000000000606E40000000000000000000009440000000000000000000E07540000000000000000000009940000000000000000000405E40000000000000000000009440000000000000000000307140000000000000000000008440000000000000000000406940000000000000000000007440000000000000000000C07240000000000000000000008440000000000000000000206040000000000000000000008440000000000000000000804B40000000000000000000007440000000000000000000507840000000000000000000007440000000000000000000005040000000000000000000007440000000000000000000006740000000000000000000008E40000000000000000000004240000000000000000000008440000000000000000000D07140000000000000000000007440000000000000000000A06940000000000000000000008440000000000000000000207240000000000000000000009440000000000000000000805940000000000000000000007440000000000000000000F07640000000000000000000009440000000000000000000806E40000000000000000000009440000000000000000000007540000000000000000000008440000000000000000000003940000000000000000000007440000000000000000000E06740000000000000000000008440000000000000000000C05740000000000000000000008440000000000000000000C06040000000000000000000007440000000000000000000206140000000000000000000009440000000000000000000804A40000000000000000000008440000000000000000000005140000000000000000000007440000000000000000000006640000000000000000000007440000000000000000000107740000000000000000000008E40000000000000000000606F40000000000000000000007440000000000000000000E07440000000000000000000008440000000000000000000405F40000000000000000000008440000000000000000000307040000000000000000000009940000000000000000000406840000000000000000000008440000000000000000000C07340000000000000000000008440000000000000000000E06640000000000000000000008440000000000000000000C05640000000000000000000007440000000000000000000C06140000000000000000000009440000000000000000000004340000000000000000000007440000000000000000000D07040000000000000000000007440000000000000000000A06840000000000000000000008E40000000000000000000207340000000000000000000009440000000000000000000805840000000000000000000007440000000000000000000F07740000000000000000000008440000000000000000000806F40000000000000000000008E40000000000000000000007440000000000000000000007440000000000000000000003840000000000000000000008E40000000000000000000004040000000000000000000009940000000000000000000D07340000000000000000000008440000000000000000000A06B40000000000000000000007440000000000000000000207040000000000000000000007440000000000000000000805B40000000000000000000007440000000000000000000F07440000000000000000000009940000000000000000000806C4000000000000000000000744000000000000000000000774000000000000000000080A640000000000000000000003B40000000000000000000007440000000000000000000E06540000000000000000000008E40000000000000000000C05540000000000000000000009940000000000000000000C06240000000000000000000008E40000000000000000000107440000000000000000000007440000000000000000000606C40000000000000000000007440000000000000000000E07740000000000000000000007440000000000000000000405C40000000000000000000008440000000000000000000307340000000000000000000007440000000000000000000406B40000000000000000000007440000000000000000000C07040000000000000000000007440000000000000000000206240000000000000000000007440000000000000000000804940000000000000000000007440000000000000000000005240000000000000000000008E40000000000000000000006540000000000000000000007440000000000000000000E06440000000000000000000007440000000000000000000C0544000000000000000000000AE40000000000000000000C06340000000000000000000007440000000000000000000407840000000000000000000008440000000000000000000004140000000000000000000007440000000000000000000D07240000000000000000000007440000000000000000000A06A40000000000000000000008E40000000000000000000207140000000000000000000007440000000000000000000805A40000000000000000000008E40000000000000000000F07540000000000000000000007440000000000000000000806D40000000000000000000008E40000000000000000000007640000000000000000000007440000000000000000000003A40000000000000000000008E40000000000000000000206340000000000000000000007440000000000000000000804840000000000000000000008440000000000000000000005340000000000000000000009440000000000000000000006440000000000000000000008440000000000000000000107540000000000000000000008440000000000000000000606D40000000000000000000008E40000000000000000000E07640000000000000000000007440000000000000000000405D40000000000000000000009E40000000000000000000307240000000000000000000007440000000000000000000406A40000000000000000000008440000000000000000000C07140000000000000000000007440"); - @@ -1263,8 +1262,7 @@ if (room != rm_transition) { if (reloadgame == 0) { room_change(titleroom, 1); //room_goto(titleroom); } else { - global.newgame = 0; - room_goto(rm_loading); + room_change(trialresetroom,0); } exit; } diff --git a/objects/oEditorCamera.object.gmx b/objects/oEditorCamera.object.gmx index 6e8ab5a..8799a12 100644 --- a/objects/oEditorCamera.object.gmx +++ b/objects/oEditorCamera.object.gmx @@ -54,27 +54,27 @@ velocity_y = 0; 1 // basic camera buttons if (keyboard_check(ord("A"))){ - velocity_x -= 0.25; + velocity_x -= 1; } if (keyboard_check(ord("D"))){ - velocity_x += 0.25; + velocity_x += 1; } if (keyboard_check(ord("W"))){ - velocity_y -= 0.25; + velocity_y -= 1; } if (keyboard_check(ord("S"))){ - velocity_y += 0.25; + velocity_y += 1; } if (!keyboard_check(ord("A")) && !keyboard_check(ord("D"))){ if !(velocity_x == 0){ if (velocity_x > 0){ - velocity_x -= 0.25; + velocity_x -= 1; }else{ - velocity_x += 0.25; + velocity_x += 1; } } } @@ -82,9 +82,9 @@ if (!keyboard_check(ord("A")) && !keyboard_check(ord("D"))){ if (!keyboard_check(ord("W")) && !keyboard_check(ord("S"))){ if !(velocity_y == 0){ if (velocity_y > 0){ - velocity_y -= 0.25; + velocity_y -= 1; }else{ - velocity_y += 0.25; + velocity_y += 1; } } } @@ -95,8 +95,10 @@ if ((instance_exists(oEditorInfo))){ } // clamps -velocity_x = clamp(velocity_x,-3,3); -velocity_y = clamp(velocity_y,-3,3); +var x_t = 3; +if (keyboard_check(vk_shift)) then x_t = 9; +velocity_x = clamp(velocity_x,-x_t,x_t); +velocity_y = clamp(velocity_y,-x_t,x_t); // move the camera! x += velocity_x; @@ -106,7 +108,7 @@ y += velocity_y; if (x < 160) then x = 160; if (x > room_width-160) then x = room_width-160; if (y < 120) then y = 120; -if (y > room_height-120) then x = room_height-120; +if (y > room_height-120) then y = room_height-120; diff --git a/objects/oEditorInfo.object.gmx b/objects/oEditorInfo.object.gmx index 3bfebe0..1ba29c4 100644 --- a/objects/oEditorInfo.object.gmx +++ b/objects/oEditorInfo.object.gmx @@ -31,10 +31,11 @@ keyboard_string = ""; bu[0] = c_white; bu[1] = c_white; -create_button_alt(214,90,200,10,0,oTrialEditor.stage_name,0,bu[0]); -create_button_alt(214,110,200,10,1,oTrialEditor.stage_auth,1,bu[1]); +create_button_alt(214,80,200,10,0,oTrialEditor.stage_name,0,bu[0]); +create_button_alt(214,100,200,10,1,oTrialEditor.stage_auth,1,bu[1]); -create_button_alt(160,140,70,10,2,"Confirm",2,c_lime); +create_button_alt(232,130,80,10,3,"Toggle",2,c_aqua); +create_button_alt(160,160,70,10,2,"Confirm",2,c_lime); relay_button = -1; type_mode = -1; @@ -124,6 +125,13 @@ if (relay_button > -1){ case 2: // perish instance_destroy(); break; + case 3: // set hidden block + if (oTrialEditor.objs_hidden){ + oTrialEditor.objs_hidden = 0; + }else{ + oTrialEditor.objs_hidden = 1; + } + break; } relay_button = -1; } @@ -176,8 +184,12 @@ draw_set_font(fontGUI2Default); draw_set_color(c_white); draw_set_halign(fa_right); draw_set_valign(fa_center); -draw_text(80+x,90+y,"Level Name"); -draw_text(80+x,110+y,"Level Author"); +draw_text(80+x,80+y,"Level Name"); +draw_text(80+x,100+y,"Level Author"); + +var s = "Enabled"; +if (oTrialEditor.objs_hidden = false) then s = "Disabled"; +draw_text(160+x,130+y,"Hidden Blocks: "+s); diff --git a/objects/oPauseMenuOptions.object.gmx b/objects/oPauseMenuOptions.object.gmx index b80b0b9..c06360b 100644 --- a/objects/oPauseMenuOptions.object.gmx +++ b/objects/oPauseMenuOptions.object.gmx @@ -124,8 +124,8 @@ global.tiptext = tip[global.curropt]; active = 0; } if (global.curropt == 1) { - //instance_create(50, 92, oOptionsReload); - //instance_destroy(); + instance_create(50, 92, oOptionsReload); + instance_destroy(); } if (global.curropt == 2) { instance_create(50, 92, oOptionsMain); @@ -191,7 +191,6 @@ op1.label = get_text("PauseMenu", "Resume"); op2 = instance_create(x, y + 16, oPauseOption); op2.optionid = 1; op2.label = get_text("PauseMenu", "Restart"); -op2.alarm[0] = 1; op3 = instance_create(x, y + 32, oPauseOption); op3.optionid = 2; op3.label = get_text("PauseMenu", "Options"); diff --git a/objects/oTTScrew.object.gmx b/objects/oTTScrew.object.gmx index b2dbe6a..d853e5c 100644 --- a/objects/oTTScrew.object.gmx +++ b/objects/oTTScrew.object.gmx @@ -49,6 +49,8 @@ 1 audio_stop_sound(sndMessage); +audio_stop_sound(sndSpinJump); +audio_stop_sound(sndSpaceJump); sfx_play(sndMessage); make_notification("New Item","Screw Attack Acquired",140,"",""); global.screwattack = 1; diff --git a/objects/oTTSpace.object.gmx b/objects/oTTSpace.object.gmx index a16fce7..c79de4b 100644 --- a/objects/oTTSpace.object.gmx +++ b/objects/oTTSpace.object.gmx @@ -51,7 +51,7 @@ audio_stop_sound(sndMessage); sfx_play(sndMessage); make_notification("New Item","Space Jump Acquired",140,"",""); -global.screwattack = 1; +global.spacejump = 1; instance_destroy(); diff --git a/objects/oTrialEditor.object.gmx b/objects/oTrialEditor.object.gmx index d1a00f8..17c7ee5 100644 --- a/objects/oTrialEditor.object.gmx +++ b/objects/oTrialEditor.object.gmx @@ -32,6 +32,7 @@ instance_create(0,0,oEditorHelp); cursor_active = 1; placed_objs = 0; +objs_hidden = 1; trial_tab_bottom = instance_create(160,225,oEditorTab); diff --git a/objects/oTrialLogic.object.gmx b/objects/oTrialLogic.object.gmx index 01503d0..0c15fa8 100644 --- a/objects/oTrialLogic.object.gmx +++ b/objects/oTrialLogic.object.gmx @@ -39,9 +39,12 @@ var grid = ds_grid_create(200,150); // open the file yoinked from global.level_is var file = file_text_open_read("stages/"+global.level_is); // skip the strings, they aren't important -repeat (4){ +repeat (3){ file_text_readln(file); } +// get a var from the last one +var hdn = real(file_text_read_string(file)); +file_text_readln(file); // objs while (!file_text_eof(file)){ @@ -163,7 +166,9 @@ for (var i = 0; i < 200; ++i;){ tile_add(tlTimeTrial,48,0,16,16,i*16,v*16,-100); break; case 4: - tile_add(tlTimeTrial,16,0,16,16,i*16,v*16,-122); + if (hdn){ // only make block sprites if hdn isn't false + tile_add(tlTimeTrial,16,0,16,16,i*16,v*16,-122); + } break; case 5: // spikes var place = 0; @@ -203,6 +208,8 @@ for (var i = 0; i < 200; ++i;){ } // kill the grid because memory leaks are bad ds_grid_destroy(grid); +// and kill the file because i didn't do that apparently..? +file_text_close(file); diff --git a/objects/oTrialReset.object.gmx b/objects/oTrialReset.object.gmx new file mode 100644 index 0000000..e446da0 --- /dev/null +++ b/objects/oTrialReset.object.gmx @@ -0,0 +1,49 @@ + + + <undefined> + 0 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + //remove_persistent_objects(); +//global.ingame = 0; +start_trial(); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/rooms/initroom.room.gmx b/rooms/initroom.room.gmx index ab6809f..387d598 100644 --- a/rooms/initroom.room.gmx +++ b/rooms/initroom.room.gmx @@ -10,13 +10,7 @@ 0 0 -1 - global.skip_mMenu = 0; - -window_set_caption("AM2R: Time Trials"); -/* -i genuinely have no idea why this resets to -"made in GMS" even though i set it otherwise but.. this will fix it -*/ + global.skip_mMenu = 0; -1 -1 0 diff --git a/rooms/trialresetroom.room.gmx b/rooms/trialresetroom.room.gmx new file mode 100644 index 0000000..d813df9 --- /dev/null +++ b/rooms/trialresetroom.room.gmx @@ -0,0 +1,65 @@ + + + + 320 + 240 + 32 + 32 + 0 + 60 + 0 + 12632256 + -1 + + 0 + -1 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 1024 + 768 + 0 + 10 + 0.100000001490116 + diff --git a/scripts/editor_load.gml b/scripts/editor_load.gml index 56790f1..71eae0f 100644 --- a/scripts/editor_load.gml +++ b/scripts/editor_load.gml @@ -14,6 +14,12 @@ if (load != ""){ file_text_readln(file); stage_id = file_text_read_string(file); file_text_readln(file); + var s = file_text_read_string(file); + if (s == ""){ + objs_hidden = 1; + }else{ + objs_hidden = real(s); + } file_text_readln(file); // objs diff --git a/scripts/editor_save.gml b/scripts/editor_save.gml index a548f60..42681b4 100644 --- a/scripts/editor_save.gml +++ b/scripts/editor_save.gml @@ -24,6 +24,7 @@ file_text_write_string(file,stage_auth); file_text_writeln(file); file_text_write_string(file,stage_id); file_text_writeln(file); +file_text_write_string(file,string(objs_hidden)); file_text_writeln(file); // save all the objects. ALL. OF. THEM. and then pray it doesn't break