From 61bba2b17a9cbb6a68b44c04052786c352895be6 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Thu, 20 Aug 2020 18:52:24 +0200 Subject: [PATCH] sources --- images/icon.png | Bin 3305 -> 164 bytes scripts/DialogueAction.gd | 2 +- scripts/Globals.gd | 17 +++++++++++++++++ scripts/MusicPlayer.gd | 6 +++--- scripts/credits.gd | 5 ++++- scripts/main_menu.gd | 1 + 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/images/icon.png b/images/icon.png index c98fbb601c83c81ec8c22b1dba7d1d57c62b323c..b9b0ab737a139e16adba0141901c63af7532774b 100644 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|;yhg(Lo9mV zPW0wFpuppD-{F1z)0d0f)~H17(y4u*H1kjEe6H=`H)T_sYImwE{kGPjL-)Y8iAP@a zKe-T<%)saQGDEt`&+1^8yKu^GrpHmK(?8z&tbeBJq}GG8d+pA1CLh#eT=FmLE6^qe MPgg&ebxsLQ0Fz}v5C8xG literal 3305 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 diff --git a/scripts/DialogueAction.gd b/scripts/DialogueAction.gd index 63d782a..5ee9ffa 100644 --- a/scripts/DialogueAction.gd +++ b/scripts/DialogueAction.gd @@ -16,7 +16,7 @@ func start() -> void: func load_dialogue(file_path) -> Array: var file = File.new() - assert (file.file_exists(file_path)) +# assert (file.file_exists(file_path)) file.open(file_path, file.READ) var dialogue = parse_json(file.get_as_text()) diff --git a/scripts/Globals.gd b/scripts/Globals.gd index 3c94bcb..232a023 100644 --- a/scripts/Globals.gd +++ b/scripts/Globals.gd @@ -3,3 +3,20 @@ extends Node var ui_accept_tip = false var ui_interact_flatfish_tip = false var did_already_play_once = false + +func save_game(): + var file = File.new() + file.open('user://globals.save', File.WRITE) + file.store_line('1' if did_already_play_once else '0') + file.close() + print('saved') + +func load_game(): + var file = File.new() + if not file.file_exists("user://savegame.save"): + return + + file.open('user://globals.save', File.READ) + var d = file.get_line() + did_already_play_once = true if d == '1' else false + print('loaded') diff --git a/scripts/MusicPlayer.gd b/scripts/MusicPlayer.gd index 913b7b3..fe080a1 100644 --- a/scripts/MusicPlayer.gd +++ b/scripts/MusicPlayer.gd @@ -9,9 +9,9 @@ var previous_tracks : Array func play(music, offset=0, duration=1): print('Play music: ' + music) var path = "res://sounds/" + music + ".ogg" - if !File.new().file_exists(path): - path = "res://sounds/" + music - assert(File.new().file_exists(path)) +# if !File.new().file_exists(path): +# path = "res://sounds/" + music +# assert(File.new().file_exists(path)) var stream = load(path) target_track = get_free_track() diff --git a/scripts/credits.gd b/scripts/credits.gd index 7fd4159..617b3a4 100644 --- a/scripts/credits.gd +++ b/scripts/credits.gd @@ -1,7 +1,10 @@ extends Node2D +func _ready(): + Globals.did_already_play_once = true + Globals.save_game() + func _input(event): if event.is_action_pressed("ui_accept"): - Globals.did_already_play_once = true get_tree().change_scene("res://scenes/main_menu.tscn") diff --git a/scripts/main_menu.gd b/scripts/main_menu.gd index c08d1cc..cd5ead4 100644 --- a/scripts/main_menu.gd +++ b/scripts/main_menu.gd @@ -4,5 +4,6 @@ onready var music_player = get_node('/root/MusicPlayer') as MusicPlayer func _ready(): music_player.play('main_title') + Globals.load_game() if Globals.did_already_play_once: $UI/Buttons/AnotherChoiceButton.show()