From e8ff01e0978091a4e97b644f733266796a5b99fc Mon Sep 17 00:00:00 2001 From: Minimata Date: Fri, 6 Feb 2026 11:02:38 +0100 Subject: [PATCH] fixed toolbox menu issue --- .../base/scenes/autoloads/scene_loader.gd | 3 ++- maps/levels/tuto_enemies.tscn | 3 +++ maps/levels/tuto_movement.tscn | 2 ++ menus/scenes/menus/level_select_menu/level_select_menu.gd | 1 + menus/scenes/menus/main_menu/main_menu_with_animations.tscn | 1 + menus/scenes/overlaid_menus/toolbox.gd | 5 ++++- scenes/player_controller/PlayerController.tscn | 6 ++---- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/addons/maaacks_game_template/base/scenes/autoloads/scene_loader.gd b/addons/maaacks_game_template/base/scenes/autoloads/scene_loader.gd index d0b915d3..82cd5677 100644 --- a/addons/maaacks_game_template/base/scenes/autoloads/scene_loader.gd +++ b/addons/maaacks_game_template/base/scenes/autoloads/scene_loader.gd @@ -97,8 +97,8 @@ func load_scene(scene_path : String, in_background : bool = false) -> void: if not _background_loading: change_scene_to_resource() return - ResourceLoader.load_threaded_request(_scene_path) set_process(true) + ResourceLoader.load_threaded_request(_scene_path) if _check_loading_screen() and not _background_loading: change_scene_to_loading_screen() @@ -108,6 +108,7 @@ func _unhandled_key_input(event : InputEvent) -> void: get_tree().quit() func _ready() -> void: + process_mode = Node.PROCESS_MODE_ALWAYS set_process(false) func _process(_delta) -> void: diff --git a/maps/levels/tuto_enemies.tscn b/maps/levels/tuto_enemies.tscn index 7a753ebc..094661fb 100644 --- a/maps/levels/tuto_enemies.tscn +++ b/maps/levels/tuto_enemies.tscn @@ -24,6 +24,9 @@ use_collision = true size = Vector3(1, 17.5, 9.5) material = ExtResource("3_1qo78") +[node name="Player" parent="." index="7" unique_id=1309399929] +transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 3, 0, 0) + [node name="GroundedSpawner" parent="." index="8" unique_id=580981173 node_paths=PackedStringArray("Target") instance=ExtResource("4_jaqjx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.5, 1, -42.5) EnemyToSpawn = ExtResource("5_iq67o") diff --git a/maps/levels/tuto_movement.tscn b/maps/levels/tuto_movement.tscn index a8e0ec4c..e8dca5d5 100644 --- a/maps/levels/tuto_movement.tscn +++ b/maps/levels/tuto_movement.tscn @@ -39,6 +39,8 @@ transform = Transform3D(-0.1772511, 0.44628847, 0.87715954, 0.49540228, -0.72966 [node name="Player" parent="." index="6" unique_id=1309399929] transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0.4102497, 0.5415039) +HasSword = false +HasParry = false [node name="Greybox" type="CSGCombiner3D" parent="." index="7" unique_id=2082385716] use_collision = true diff --git a/menus/scenes/menus/level_select_menu/level_select_menu.gd b/menus/scenes/menus/level_select_menu/level_select_menu.gd index 8e07398f..69bff0e5 100644 --- a/menus/scenes/menus/level_select_menu/level_select_menu.gd +++ b/menus/scenes/menus/level_select_menu/level_select_menu.gd @@ -34,4 +34,5 @@ func add_levels_to_container() -> void: func _on_level_buttons_container_item_activated(index: int) -> void: var level_to_load = scene_lister.files.get(index) + level_selected.emit() SceneLoader.load_scene(level_to_load) diff --git a/menus/scenes/menus/main_menu/main_menu_with_animations.tscn b/menus/scenes/menus/main_menu/main_menu_with_animations.tscn index 407363a9..4de07208 100644 --- a/menus/scenes/menus/main_menu/main_menu_with_animations.tscn +++ b/menus/scenes/menus/main_menu/main_menu_with_animations.tscn @@ -397,6 +397,7 @@ text = "Start" [node name="ContinueGameButton" type="Button" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="1" unique_id=861746608] unique_name_in_owner = true +visible = false layout_mode = 2 text = "Continue" diff --git a/menus/scenes/overlaid_menus/toolbox.gd b/menus/scenes/overlaid_menus/toolbox.gd index 1dc3ee12..2a5f6bad 100644 --- a/menus/scenes/overlaid_menus/toolbox.gd +++ b/menus/scenes/overlaid_menus/toolbox.gd @@ -30,8 +30,11 @@ func _on_restart_current_level_pressed() -> void: func _on_select_level_pressed() -> void: var menu: LevelSelectMenu = level_selection_menu.instantiate() + menu.level_selected.connect(_on_level_selected) add_child(menu) - + +func _on_level_selected() -> void: + close() func _on_player_health_changed(value: float) -> void: player.SetPlayerHealthOverride(value) diff --git a/scenes/player_controller/PlayerController.tscn b/scenes/player_controller/PlayerController.tscn index f908e8aa..28d4ccc8 100644 --- a/scenes/player_controller/PlayerController.tscn +++ b/scenes/player_controller/PlayerController.tscn @@ -50,6 +50,7 @@ [ext_resource type="Texture2D" uid="uid://bnwj7ltdfximr" path="res://icon.svg" id="30_h23go"] [ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://scenes/player_controller/components/dash/light-ring.jpg" id="32_lgpc8"] [ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="41_ruloh"] +[ext_resource type="Texture2D" uid="uid://c40orhfdgsim" path="res://assets/ui/IconGodotNode/white/icon_circle.png" id="45_u8rdp"] [ext_resource type="PackedScene" uid="uid://cyw8p0p6a78tl" path="res://scenes/ui/healthbar/healthbar.tscn" id="47_76kmc"] [sub_resource type="Resource" id="Resource_cb2lu"] @@ -105,9 +106,6 @@ radius = 1.5 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"] blend_mode = 1 -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_ue7xq"] -load_path = "res://.godot/imported/fireball.svg-da8480a7a8e47ac511e0971f6fa164bd.ctex" - [node name="Player" type="CharacterBody3D" unique_id=709076448] collision_mask = 272 script = ExtResource("1_poq2x") @@ -507,7 +505,7 @@ offset_right = 20.0 offset_bottom = 20.0 grow_horizontal = 2 grow_vertical = 2 -texture = SubResource("CompressedTexture2D_ue7xq") +texture = ExtResource("45_u8rdp") expand_mode = 1 [node name="Healthbar" parent="UI" unique_id=1462180337 instance=ExtResource("47_76kmc")]