darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loading scenes (#70)

Browse Source 
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#70
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
This commit is contained in:
darknight
2021-06-03 23:17:53 +02:00
parent d1bf0f76d8
commit 6f1ac4d03f
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/UI/Ending.gd
+1 -1
View File
@@ -6,4 +6,4 @@ func _ready():
func _on_Timer_timeout(): func _on_Timer_timeout():
print("[ending#_on_Timer_timeout]") print("[ending#_on_Timer_timeout]")
Global.goto_scene("res://scenes/main.tscn") Global.goto_scene("res://scenes/Main.tscn")
scenes/UI/choose_scenes/ChooseScene.gd
+4 -4
View File
@@ -32,8 +32,8 @@ func _apply_scene(level, index):
var node = _build_path(level.name()) var node = _build_path(level.name())
_configure_select(level, node) _configure_select(level, node)
_configure_reset(level, node, index) configure_reset(level, node, index)
_configure_counter(level, node) configure_counter(level, node)
func _configure_select(level, node): func _configure_select(level, node):
var select = get_node(node+"/TextureRect/TextureButton") var select = get_node(node+"/TextureRect/TextureButton")
@@ -41,7 +41,7 @@ func _configure_select(level, node):
select.set_normal_texture(_load_texture(level.thumbnail())) select.set_normal_texture(_load_texture(level.thumbnail()))
select.connect("pressed", Event, _build_method(level.name())) select.connect("pressed", Event, _build_method(level.name()))
func _configure_reset(level, node, index): func configure_reset(level, node, index):
var reset = get_node(node+"/VBoxContainer/MarginContainer/ButtonReset") var reset = get_node(node+"/VBoxContainer/MarginContainer/ButtonReset")
if int(level.object_finding()) == 0: if int(level.object_finding()) == 0:
@@ -52,7 +52,7 @@ func _configure_reset(level, node, index):
reset.set_disabled(false) reset.set_disabled(false)
reset.connect("pressed", Event, "_on_reset_level", [level, node, index, self]) reset.connect("pressed", Event, "_on_reset_level", [level, node, index, self])
func _configure_counter(level, node): func configure_counter(level, node):
var count = get_node(node+"/VBoxContainer/MarginContainer2/ButtonCount/Label") var count = get_node(node+"/VBoxContainer/MarginContainer2/ButtonCount/Label")
count.set_text(level.object_finding()+" / "+level.object_to_find()) count.set_text(level.object_finding()+" / "+level.object_to_find())
scenes/levels/Levels.gd
+1 -1
View File
@@ -122,7 +122,7 @@ func _start_dissolve(key):
func _check_victory_condition(): func _check_victory_condition():
if victory_condition == victory_progress: if victory_condition == victory_progress:
print("[levels#_check_victory_condition] \\o/") print("[levels#_check_victory_condition] \\o/")
Global.goto_scene("res://scenes/UI/ending.tscn") Global.goto_scene("res://scenes/UI/Ending.tscn")
func _node_to_mesh(key): func _node_to_mesh(key):
return get_node(meshes[key].mesh()) return get_node(meshes[key].mesh())
scenes/levels/warcraft/WarCraft.gd
+2 -2
View File
@@ -1,4 +1,4 @@
extends "res://scenes/levels/levels.gd" extends "res://scenes/levels/Levels.gd"
export (PackedScene) var object_first = load("res://scenes/UI/list_ho/ObjectListFirst.tscn") export (PackedScene) var object_first = load("res://scenes/UI/list_ho/ObjectListFirst.tscn")
export (PackedScene) var object_std = load("res://scenes/UI/list_ho/ObjectListStd.tscn") export (PackedScene) var object_std = load("res://scenes/UI/list_ho/ObjectListStd.tscn")
@@ -23,7 +23,7 @@ func _display_hud_menu():
# Back to main scene # Back to main scene
func _on_TextureButton_pressed(): func _on_TextureButton_pressed():
Global.goto_scene("res://scenes/main.tscn") Global.goto_scene("res://scenes/Main.tscn")
func _create_button_info(scene, counter, label_counter): func _create_button_info(scene, counter, label_counter):
var btn = null var btn = null
scripts/Setting.gd
+1 -1
View File
@@ -34,7 +34,7 @@ func get_setting_language():
func set_setting_language(value): func set_setting_language(value):
setting.set_langue(value) setting.set_langue(value)
apply_language(setting.translate_int_to_locale(value)) apply_language(translate_int_to_locale(value))
func get_setting_gyrosocpe(): func get_setting_gyrosocpe():
return setting.get_gyroscope() return setting.get_gyroscope()