Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion objects/o_animatedtextfinalstats/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion objects/o_levelselectchooselevel/Mouse_4.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,4 +37,4 @@ loadhud()
if (levelmusic != -1 && !audio_is_playing(levelmusic)) {
audio_play_sound(levelmusic, 0, 1)
}
}
}
2 changes: 2 additions & 0 deletions scripts/loadstatschallenge/loadstatschallenge.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions scripts/scr_loading/scr_loading.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/scr_workshopchallenge/scr_workshopchallenge.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down