GKaszewski/przygody-pana-cegly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scene path in village_3.tres and update level_scenes in game_manager.tscn; clean up whitespace in settings_menu.gd

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-05-25 18:16:17 +02:00
parent 7737c56e76
commit 7c0778702d
7 changed files with 119 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
autoloads/ui_manager.gd
View File

@@ -26,6 +26,7 @@ func pop_screen() -> void:
top.hide() top.hide()
top.set_process_input(false) top.set_process_input(false)
screen_popped.emit(top) screen_popped.emit(top)
top.accept_event()
if not ui_stack.is_empty(): if not ui_stack.is_empty():
ui_stack.back().grab_focus() ui_stack.back().grab_focus()

4
objects/game_manager.tscn
View File

@@ -3,11 +3,11 @@
[ext_resource type="Script" uid="uid://dd30bgqiagi25" path="res://scripts/game_manager.gd" id="1_58t7u"] [ext_resource type="Script" uid="uid://dd30bgqiagi25" path="res://scripts/game_manager.gd" id="1_58t7u"]
[ext_resource type="PackedScene" uid="uid://bol7g83v2accs" path="res://scenes/level_village_1.tscn" id="2_bentb"] [ext_resource type="PackedScene" uid="uid://bol7g83v2accs" path="res://scenes/level_village_1.tscn" id="2_bentb"]
[ext_resource type="PackedScene" uid="uid://chqb11pfoqmeb" path="res://scenes/level_village_2.tscn" id="3_ajlkg"] [ext_resource type="PackedScene" uid="uid://chqb11pfoqmeb" path="res://scenes/level_village_2.tscn" id="3_ajlkg"]
[ext_resource type="PackedScene" uid="uid://h60obxmju6mo" path="res://scenes/level_village_4.tscn" id="4_se5tb"] [ext_resource type="PackedScene" uid="uid://h60obxmju6mo" path="res://scenes/level_village_3.tscn" id="4_se5tb"]
[node name="GameManager" type="Node"] [node name="GameManager" type="Node"]
script = ExtResource("1_58t7u") script = ExtResource("1_58t7u")
level_scenes = Array[PackedScene]([ExtResource("2_bentb"), ExtResource("3_ajlkg"), null, ExtResource("4_se5tb")]) level_scenes = Array[PackedScene]([ExtResource("2_bentb"), ExtResource("3_ajlkg"), ExtResource("4_se5tb")])
player_state = { player_state = {
"coins": 0, "coins": 0,
"current_level": 0, "current_level": 0,

2
resources/levels/village/village_3.tres
View File

@@ -5,5 +5,5 @@
[resource] [resource]
script = ExtResource("1_3v5yj") script = ExtResource("1_3v5yj")
level_name = "LEVEL_3_NAME" level_name = "LEVEL_3_NAME"
scene_path = "" scene_path = "res://scenes/level_village_3.tscn"
metadata/_custom_type_script = "uid://cp68km8bykymb" metadata/_custom_type_script = "uid://cp68km8bykymb"

6
resources/tilesets/village/foreground.tres
View File

@@ -126,11 +126,17 @@ texture = ExtResource("2_0dgh6")
11:5/0 = 0 11:5/0 = 0
12:5/0 = 0 12:5/0 = 0
6:9/0 = 0 6:9/0 = 0
6:9/0/probability = 0.4
7:9/0 = 0 7:9/0 = 0
7:9/0/probability = 0.2
8:9/0 = 0 8:9/0 = 0
8:9/0/probability = 0.2
9:9/0 = 0 9:9/0 = 0
9:9/0/probability = 0.2
10:9/0 = 0 10:9/0 = 0
10:9/0/probability = 0.2
11:9/0 = 0 11:9/0 = 0
11:9/0/probability = 0.2
5:10/0 = 0 5:10/0 = 0
6:10/0 = 0 6:10/0 = 0
7:10/0 = 0 7:10/0 = 0

66
scenes/level_village_2.tscn
View File

File diff suppressed because one or more lines are too long

94
scenes/level_village_4.tscn → scenes/level_village_3.tscn
View File

File diff suppressed because one or more lines are too long

1
scripts/ui/settings_menu.gd
View File

@@ -34,7 +34,6 @@ func _ready() -> void:
gameplay_settings.hide() gameplay_settings.hide()
func _unhandled_input(event: InputEvent) -> void: func _unhandled_input(event: InputEvent) -> void:
if event.is_action_pressed("ui_cancel"): if event.is_action_pressed("ui_cancel"):
if UiManager.is_screen_on_top(settings_menu_control): if UiManager.is_screen_on_top(settings_menu_control):