diff --git a/objects/o_animatedtextfinalstats/Create_0.gml b/objects/o_animatedtextfinalstats/Create_0.gml index 9acddbd3..fdc59584 100644 --- a/objects/o_animatedtextfinalstats/Create_0.gml +++ b/objects/o_animatedtextfinalstats/Create_0.gml @@ -28,7 +28,7 @@ x4 = -1000 //Challanges -if global.cheats = 0 && global.levelselect = 0 { +if global.cheats = 0 && global.levelselect = 0 && global.challenge_levelselect = 0 { if (variable_global_exists("workshopchallenge") && global.workshopchallenge == 1) { showhighscore = 0 alarm[0] = 1 diff --git a/objects/o_levelselectchooselevel/Mouse_4.gml b/objects/o_levelselectchooselevel/Mouse_4.gml index 75c26c58..bdec08ce 100644 --- a/objects/o_levelselectchooselevel/Mouse_4.gml +++ b/objects/o_levelselectchooselevel/Mouse_4.gml @@ -7,11 +7,13 @@ exit; if locked = 0 { window_set_cursor(cr_default) global.levelselect = 1 +global.challenge_levelselect = 0 global.special = 0 global.hatmerchantdiscount = 1.3333333333333 global.pickup = 0 if (is_challenge && challenge_id >= 0) { + global.challenge_levelselect = 1 // Set up challenge globals so the game knows we're in a challenge global.challenges = 1 global.currentchallenge = challenge_id @@ -35,4 +37,4 @@ loadhud() if (levelmusic != -1 && !audio_is_playing(levelmusic)) { audio_play_sound(levelmusic, 0, 1) } -} \ No newline at end of file +} diff --git a/scripts/loadstatschallenge/loadstatschallenge.gml b/scripts/loadstatschallenge/loadstatschallenge.gml index faaad166..5f196034 100644 --- a/scripts/loadstatschallenge/loadstatschallenge.gml +++ b/scripts/loadstatschallenge/loadstatschallenge.gml @@ -474,6 +474,7 @@ function scr_challenge_start(_id) { global.currentchallenge = _def.id; global.DiamondMedalTimeChallenge = _def.diamond_time; global.workshop = 0; + global.challenge_levelselect = 0; global.challenge_custom = (_def.is_custom == true); global.challenge_level_dir = ""; global.challenge_level_index = 0; @@ -565,6 +566,7 @@ function scr_challenge_apply_reward(_def) { if (is_undefined(_def)) return [_save_skins, _save_hats]; if (global.cheats != 0) return [_save_skins, _save_hats]; if (global.levelselect == 1) return [_save_skins, _save_hats]; + if (global.challenge_levelselect == 1) return [_save_skins, _save_hats]; if (_def.reward_credits > 0) { global.creditscurrency += floor(_def.reward_credits * global.creditsmultiplier); diff --git a/scripts/scr_loading/scr_loading.gml b/scripts/scr_loading/scr_loading.gml index 8bb57c37..2bfcc94a 100644 --- a/scripts/scr_loading/scr_loading.gml +++ b/scripts/scr_loading/scr_loading.gml @@ -121,6 +121,7 @@ audio_master_gain(global.mastervolume) global.hardmode = 0 global.hardmodelives = 100; global.levelselect = 0 +global.challenge_levelselect = 0 global.autopausesettings = 0 global.hardmodedifficulty = 0 global.vignettesettings = 1 diff --git a/scripts/scr_workshopchallenge/scr_workshopchallenge.gml b/scripts/scr_workshopchallenge/scr_workshopchallenge.gml index 65976dbc..b5e8b0da 100644 --- a/scripts/scr_workshopchallenge/scr_workshopchallenge.gml +++ b/scripts/scr_workshopchallenge/scr_workshopchallenge.gml @@ -191,6 +191,7 @@ function scr_workshopchallenge_start(_challenge) { global.challenges = 1 global.workshop = 1 global.workshopchallenge = 1 + global.challenge_levelselect = 0 global.workshopchallenge_title = variable_struct_exists(_challenge, "title") ? _challenge.title : "Workshop Challenge" global.workshopchallenge_levels = _challenge.levels