From 64565eab8bc4db9c2dd739749ae0b8e094e10bd7 Mon Sep 17 00:00:00 2001 From: Daydreel Date: Mon, 25 Aug 2025 23:42:09 +0200 Subject: [PATCH] temp fixed tower.gd --- Towers/tower.gd | 6 ++---- Towers/tower.tscn | 12 ++++-------- game_menu.gd | 13 ++++++++++++- game_menu.tscn | 28 ++++++++++++++++------------ 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Towers/tower.gd b/Towers/tower.gd index 34cb400..6ab2e4d 100644 --- a/Towers/tower.gd +++ b/Towers/tower.gd @@ -3,6 +3,8 @@ class_name Tower var bullet : PackedScene = preload("res://Bullets/bullet.tscn") @export var tower_name : String = "Pierre" +@export var icone : Texture2D +@export var bio : String @export var price : int = 100 @@ -154,7 +156,3 @@ func _on_energy_cooldown_timeout() -> void: func _on_EventBus_tower_upgraded(tower_to_upgrade : String, upgrade : TowerUpgrade) -> void: if tower_to_upgrade == tower_name: apply_upgrade(upgrade) - - -func _on_input_event(camera: Node, event: InputEvent, event_position: Vector3, normal: Vector3, shape_idx: int) -> void: - if event diff --git a/Towers/tower.tscn b/Towers/tower.tscn index ff1be78..6dd5543 100644 --- a/Towers/tower.tscn +++ b/Towers/tower.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://8kpvuurr5h5n" path="res://Towers/tower.gd" id="1_egfuc"] [ext_resource type="Texture2D" uid="uid://bn6ikwol6x8r0" path="res://Assets/Characters/Male1.png" id="2_egfuc"] -[ext_resource type="Script" uid="uid://bg0x4egeu17qb" path="res://Scripts/Upgrades/TowerUpgrade.gd" id="2_mnaic"] +[ext_resource type="Texture2D" uid="uid://uptdcefxlv4c" path="res://Assets/Icones/ppdf_bio_image_placeholder_2.png" id="2_mnaic"] [ext_resource type="Resource" uid="uid://c6844q5o2gjhd" path="res://Upgrades/Tower/TowerUpgradeMaxEnergy1.tres" id="3_jv31o"] [ext_resource type="PackedScene" uid="uid://bm303ot1ck82l" path="res://UI/energy_bar_3d.tscn" id="3_pajr1"] [ext_resource type="Resource" uid="uid://bus11qw5jg8yo" path="res://Upgrades/Tower/TowerUpgradeMaxEnergy2.tres" id="4_5dr1v"] @@ -17,14 +17,10 @@ radius = 3.0 collision_layer = 4 collision_mask = 4 script = ExtResource("1_egfuc") -tower_name = null -price = null +icone = ExtResource("2_mnaic") +bio = "Aime se promener dans l'herbe et manger des framboises. Sa petite bouille la rend trop mignonne." bullet_damage = 5 -action_cooldown = null -max_energy = null -energy_regen = null -energy_cost = null -tower_shop = Array[ExtResource("2_mnaic")]([ExtResource("3_jv31o"), ExtResource("4_5dr1v")]) +tower_shop = [ExtResource("3_jv31o"), ExtResource("4_5dr1v")] [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00914001, 0) diff --git a/game_menu.gd b/game_menu.gd index 5f431ec..9d000d5 100644 --- a/game_menu.gd +++ b/game_menu.gd @@ -8,4 +8,15 @@ func _ready() -> void: func _on_EventBus_tower_selected(tower : PackedScene, tower_button : TowerButton): selected_tower = tower - selected_tower_button = tower_button + + +func _on_button_return_desktop_pressed() -> void: + get_tree().quit() + + +func _on_button_back_to_start_screen_pressed() -> void: + Transition.goto("res://UI/start_menu.tscn") + + +func _on_button_continue_pressed() -> void: + visible = false diff --git a/game_menu.tscn b/game_menu.tscn index 5d7ea80..b224b6a 100644 --- a/game_menu.tscn +++ b/game_menu.tscn @@ -32,25 +32,25 @@ offset_right = 1918.0 offset_bottom = 82.0 alignment = 1 -[node name="ButtonSettings" type="Button" parent="MenuHeader"] -layout_mode = 2 -size_flags_horizontal = 3 -text = "Settings" - -[node name="ButtonPause" type="Button" parent="MenuHeader"] -layout_mode = 2 -size_flags_horizontal = 3 -text = "Pause" - [node name="ButtonContinue" type="Button" parent="MenuHeader"] layout_mode = 2 size_flags_horizontal = 3 text = "Continue" -[node name="ButtonQuit" type="Button" parent="MenuHeader"] +[node name="ButtonSettings" type="Button" parent="MenuHeader"] layout_mode = 2 size_flags_horizontal = 3 -text = "Quit" +text = "Settings" + +[node name="ButtonBackToStartScreen" type="Button" parent="MenuHeader"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "Quitter partie" + +[node name="ButtonReturnDesktop" type="Button" parent="MenuHeader"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "Retour bureau" [node name="ButtonMoney" type="Button" parent="MenuHeader"] layout_mode = 2 @@ -360,3 +360,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="CharacterSheet/TowerSkills/MarginContainer/VBoxContainer/SkillUI3"] layout_mode = 2 text = "Cinéphile" + +[connection signal="pressed" from="MenuHeader/ButtonContinue" to="." method="_on_button_continue_pressed"] +[connection signal="pressed" from="MenuHeader/ButtonBackToStartScreen" to="." method="_on_button_back_to_start_screen_pressed"] +[connection signal="pressed" from="MenuHeader/ButtonReturnDesktop" to="." method="_on_button_return_desktop_pressed"]