diff --git a/export/ready_folders.bat b/export/ready_folders.bat index 8b2902e..d841e4e 100644 --- a/export/ready_folders.bat +++ b/export/ready_folders.bat @@ -8,7 +8,6 @@ rmdir /s /q linux mkdir linux rmdir /s /q mac -mkdir mac rmdir /s /q web mkdir web diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index e3c7e2f..be79224 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -73,6 +73,7 @@ var username := "crate_kid" export (Array, Color) var palette := [] var player_colors = [8, 0, 11, 13] var preset_palettes = [[7, 13, 6, 3], [8, 0, 11, 13], [11, 7, 9, 0], [12, 1, 7, 5], [9, 8, 12, 3]] +var last_palette = -1 func _ready(): print("Shared._ready(): ") @@ -506,7 +507,13 @@ func die(): print("you died") func pick_player_colors(): - return preset_palettes[randi() % preset_palettes.size()] + var s = preset_palettes.size() + var r = randi() % s + if r == last_palette: + r = (r + 1) % s + + last_palette = r + return preset_palettes[r] # look into a folder and return a list of filenames without file extension func dir_list(path : String): diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd index 200f9e8..7f1d860 100644 --- a/src/menu/StartMenu.gd +++ b/src/menu/StartMenu.gd @@ -44,8 +44,9 @@ func btn_no(): is_credits = false credits_node.visible = false close_sub() - stage.rnd() Audio.play("menu_back", 0.3, 2.0) + stage.rnd() + Player.set_palette(demo_player_mat, Shared.pick_player_colors()) else: if menu_items == open_items: Player.set_palette(demo_player_mat, Shared.pick_player_colors())