minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed toolbox menu issue

Browse Source
This commit is contained in:
Alexandre Serex
2026-02-06 11:02:38 +01:00
parent 66a71067cc
commit e8ff01e097
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/maaacks_game_template/base/scenes/autoloads/scene_loader.gd
View File

@@ -97,8 +97,8 @@ func load_scene(scene_path : String, in_background : bool = false) -> void:
if not _background_loading: if not _background_loading:
change_scene_to_resource() change_scene_to_resource()
return return
ResourceLoader.load_threaded_request(_scene_path)
set_process(true) set_process(true)
ResourceLoader.load_threaded_request(_scene_path)
if _check_loading_screen() and not _background_loading: if _check_loading_screen() and not _background_loading:
change_scene_to_loading_screen() change_scene_to_loading_screen()
@@ -108,6 +108,7 @@ func _unhandled_key_input(event : InputEvent) -> void:
get_tree().quit() get_tree().quit()
func _ready() -> void: func _ready() -> void:
process_mode = Node.PROCESS_MODE_ALWAYS
set_process(false) set_process(false)
func _process(_delta) -> void: func _process(_delta) -> void:

3
maps/levels/tuto_enemies.tscn
View File

@@ -24,6 +24,9 @@ use_collision = true
size = Vector3(1, 17.5, 9.5) size = Vector3(1, 17.5, 9.5)
material = ExtResource("3_1qo78") 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")] [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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.5, 1, -42.5)
EnemyToSpawn = ExtResource("5_iq67o") EnemyToSpawn = ExtResource("5_iq67o")

2
maps/levels/tuto_movement.tscn
View File

@@ -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] [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) 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] [node name="Greybox" type="CSGCombiner3D" parent="." index="7" unique_id=2082385716]
use_collision = true use_collision = true

1
menus/scenes/menus/level_select_menu/level_select_menu.gd
View File

@@ -34,4 +34,5 @@ func add_levels_to_container() -> void:
func _on_level_buttons_container_item_activated(index: int) -> void: func _on_level_buttons_container_item_activated(index: int) -> void:
var level_to_load = scene_lister.files.get(index) var level_to_load = scene_lister.files.get(index)
level_selected.emit()
SceneLoader.load_scene(level_to_load) SceneLoader.load_scene(level_to_load)

1
menus/scenes/menus/main_menu/main_menu_with_animations.tscn
View File

@@ -397,6 +397,7 @@ text = "Start"
[node name="ContinueGameButton" type="Button" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="1" unique_id=861746608] [node name="ContinueGameButton" type="Button" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="1" unique_id=861746608]
unique_name_in_owner = true unique_name_in_owner = true
visible = false
layout_mode = 2 layout_mode = 2
text = "Continue" text = "Continue"

5
menus/scenes/overlaid_menus/toolbox.gd
View File

@@ -30,8 +30,11 @@ func _on_restart_current_level_pressed() -> void:
func _on_select_level_pressed() -> void: func _on_select_level_pressed() -> void:
var menu: LevelSelectMenu = level_selection_menu.instantiate() var menu: LevelSelectMenu = level_selection_menu.instantiate()
menu.level_selected.connect(_on_level_selected)
add_child(menu) add_child(menu)
func _on_level_selected() -> void:
close()
func _on_player_health_changed(value: float) -> void: func _on_player_health_changed(value: float) -> void:
player.SetPlayerHealthOverride(value) player.SetPlayerHealthOverride(value)

6
scenes/player_controller/PlayerController.tscn
View File

@@ -50,6 +50,7 @@
[ext_resource type="Texture2D" uid="uid://bnwj7ltdfximr" path="res://icon.svg" id="30_h23go"] [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="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="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"] [ext_resource type="PackedScene" uid="uid://cyw8p0p6a78tl" path="res://scenes/ui/healthbar/healthbar.tscn" id="47_76kmc"]
[sub_resource type="Resource" id="Resource_cb2lu"] [sub_resource type="Resource" id="Resource_cb2lu"]
@@ -105,9 +106,6 @@ radius = 1.5
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"]
blend_mode = 1 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] [node name="Player" type="CharacterBody3D" unique_id=709076448]
collision_mask = 272 collision_mask = 272
script = ExtResource("1_poq2x") script = ExtResource("1_poq2x")
@@ -507,7 +505,7 @@ offset_right = 20.0
offset_bottom = 20.0 offset_bottom = 20.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
texture = SubResource("CompressedTexture2D_ue7xq") texture = ExtResource("45_u8rdp")
expand_mode = 1 expand_mode = 1
[node name="Healthbar" parent="UI" unique_id=1462180337 instance=ExtResource("47_76kmc")] [node name="Healthbar" parent="UI" unique_id=1462180337 instance=ExtResource("47_76kmc")]