James/TowerDefense
2
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: James:7aac67b7655c1e1f1527bfde8606223dee532ab7
Branches Tags
James:main
James:update/godot-4.5-feature
..
compare: James:d68f496ad1279576bbb4dd5a089500c98a4d897f
Branches Tags
James:main
James:update/godot-4.5-feature

No commits in common. "7aac67b7655c1e1f1527bfde8606223dee532ab7" and "d68f496ad1279576bbb4dd5a089500c98a4d897f" have entirely different histories.
7aac67b765 ... d68f496ad1

9 changed files with 21 additions and 78 deletions
Show stats Expand all files Collapse all files

10
Globals/EventBus.gd
View file

@ -41,14 +41,4 @@ signal wave_has_change(waveNumber : int, timeRemaining : float)
## [b]Subscriber[/b] : [WorldManager] ## [b]Subscriber[/b] : [WorldManager]
signal lauch_next_wave signal lauch_next_wave
## [b]Emitter[/b] : [gui.gd][br]
## [b]Subscriber[/b] : [TowerManager]
signal mouse_entered_gui
## [b]Emitter[/b] : [gui.gd][br]
## [b]Subscriber[/b] : [TowerManager]
signal mouse_exited_gui
@warning_ignore_restore("unused_signal") @warning_ignore_restore("unused_signal")

4
Levels/Scripts/Camera.gd
View file

@ -1,8 +1,8 @@
extends Camera3D extends Camera3D
const SCREEN_MARGIN : int = 15 const SCREEN_MARGIN : int = 50
const SCREEN_MOVEMENT_SPEED : float = .08 const SCREEN_MOVEMENT_SPEED : float = .05
@export var curve : Curve @export var curve : Curve
var shouldMove : bool = true var shouldMove : bool = true

4
Towers/Scenes/aline.tscn
View file

@ -7,7 +7,6 @@
[ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="5_lhd8w"] [ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="5_lhd8w"]
[sub_resource type="SphereShape3D" id="SphereShape3D_lhd8w"] [sub_resource type="SphereShape3D" id="SphereShape3D_lhd8w"]
radius = 0.2
[sub_resource type="Resource" id="Resource_lhd8w"] [sub_resource type="Resource" id="Resource_lhd8w"]
script = ExtResource("4_ck6a3") script = ExtResource("4_ck6a3")
@ -43,6 +42,3 @@ frame = 10
[node name="EnergyBar3D" parent="." index="6"] [node name="EnergyBar3D" parent="." index="6"]
texture = SubResource("ViewportTexture_gjbai") texture = SubResource("ViewportTexture_gjbai")
[node name="EnergyBar2D" parent="EnergyBar3D/SubViewport" index="0"]
value = 100.0

1
Towers/Scenes/maxence.tscn
View file

@ -43,4 +43,3 @@ texture = SubResource("ViewportTexture_7fox5")
[node name="EnergyBar2D" parent="EnergyBar3D/SubViewport" index="0"] [node name="EnergyBar2D" parent="EnergyBar3D/SubViewport" index="0"]
max_value = 50.0 max_value = 50.0
value = 50.0

17
Towers/TowerManager.gd
View file

@ -10,14 +10,11 @@ var usedLocations : Dictionary
var selectedTile : Vector3 var selectedTile : Vector3
var selected_tower : Tower var selected_tower : Tower
var buildedTower : int = 0 var buildedTower : int = 0
var is_on_gui : bool = false
func _ready() -> void: func _ready() -> void:
EventBus.tower_selected.connect(onTowerSelect) EventBus.tower_selected.connect(onTowerSelect)
#$AnimationPlayer.play("arrow_bobbing") #$AnimationPlayer.play("arrow_bobbing")
EventBus.mouse_entered_gui.connect(onMouseEnteredGui)
EventBus.mouse_exited_gui.connect(onMouseExitedGui)
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
@ -49,10 +46,6 @@ func _input(event: InputEvent) -> void:
func handle_player_controls() -> Node3D: func handle_player_controls() -> Node3D:
#If the player has the mouse on the GUI, player can't place tower
if is_on_gui:
return
var space_state : PhysicsDirectSpaceState3D = get_world_3d().direct_space_state var space_state : PhysicsDirectSpaceState3D = get_world_3d().direct_space_state
var mouse_pos : Vector2 = get_viewport().get_mouse_position() var mouse_pos : Vector2 = get_viewport().get_mouse_position()
@ -154,13 +147,3 @@ func handleTowerShortCuts(event: InputEventKey) -> void:
if Game.towers.has(towerType): if Game.towers.has(towerType):
selectTower(towerType, true) selectTower(towerType, true)
func onMouseEnteredGui() -> void:
is_on_gui = true
print(is_on_gui)
func onMouseExitedGui() -> void:
is_on_gui = false
print(is_on_gui)

12
UI/gui.gd
View file

@ -24,10 +24,6 @@ func _ready() -> void:
%QuitLevelBtn.pressed.connect(Helper.showConfirmPopup.bind("Quit level ?", self, Game.quitLevel)) %QuitLevelBtn.pressed.connect(Helper.showConfirmPopup.bind("Quit level ?", self, Game.quitLevel))
%QuitGameBtn.pressed.connect(Helper.showConfirmPopup.bind("Quit game ?", self, Game.quitGame)) %QuitGameBtn.pressed.connect(Helper.showConfirmPopup.bind("Quit game ?", self, Game.quitGame))
$TowerInfoPanel.visible = false $TowerInfoPanel.visible = false
$TowerInfoPanel.mouse_entered.connect(onMouseEnteredGui)
$TowerInfoPanel.mouse_exited.connect(onMouseExitedGui)
$TowerButtonPanel.mouse_entered.connect(onMouseEnteredGui)
$TowerButtonPanel.mouse_exited.connect(onMouseExitedGui)
if Engine.is_editor_hint(): if Engine.is_editor_hint():
var allowedTowers : Array[Tower.TYPE] var allowedTowers : Array[Tower.TYPE]
@ -77,11 +73,3 @@ func createTowerButton(towerType : Tower.TYPE) -> void:
else: else:
btn.disabled = true btn.disabled = true
buttonContainer.add_child(btn) buttonContainer.add_child(btn)
func onMouseEnteredGui() -> void:
EventBus.mouse_entered_gui.emit()
func onMouseExitedGui() -> void:
EventBus.mouse_exited_gui.emit()

44
UI/gui.tscn
View file

@ -54,7 +54,7 @@ theme_override_font_sizes/font_size = 40
[node name="Timer" type="Timer" parent="WaveCooldown"] [node name="Timer" type="Timer" parent="WaveCooldown"]
wait_time = 0.1 wait_time = 0.1
[node name="TowerButtonPanel" type="HBoxContainer" parent="."] [node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 1 layout_mode = 1
anchors_preset = 3 anchors_preset = 3
anchor_left = 1.0 anchor_left = 1.0
@ -67,23 +67,22 @@ grow_horizontal = 0
grow_vertical = 0 grow_vertical = 0
theme_override_constants/separation = 0 theme_override_constants/separation = 0
[node name="InfoPanel" type="PanelContainer" parent="TowerButtonPanel"] [node name="InfoPanel" type="PanelContainer" parent="HBoxContainer"]
custom_minimum_size = Vector2(200, 0) custom_minimum_size = Vector2(200, 0)
layout_mode = 2 layout_mode = 2
mouse_filter = 1
theme_override_styles/panel = SubResource("StyleBoxFlat_h4fn5") theme_override_styles/panel = SubResource("StyleBoxFlat_h4fn5")
[node name="MarginContainer" type="MarginContainer" parent="TowerButtonPanel/InfoPanel"] [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/InfoPanel"]
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_left = 10 theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 10 theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10 theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 10 theme_override_constants/margin_bottom = 10
[node name="VBoxContainer" type="VBoxContainer" parent="TowerButtonPanel/InfoPanel/MarginContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/InfoPanel/MarginContainer"]
layout_mode = 2 layout_mode = 2
[node name="LabelMoney" type="Label" parent="TowerButtonPanel/InfoPanel/MarginContainer/VBoxContainer"] [node name="LabelMoney" type="Label" parent="HBoxContainer/InfoPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_vertical = 1 size_flags_vertical = 1
@ -94,7 +93,7 @@ text = "1'000'000 €"
horizontal_alignment = 2 horizontal_alignment = 2
vertical_alignment = 2 vertical_alignment = 2
[node name="LabelTowerInCube" type="Label" parent="TowerButtonPanel/InfoPanel/MarginContainer/VBoxContainer"] [node name="LabelTowerInCube" type="Label" parent="HBoxContainer/InfoPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
tooltip_text = "Le nombre de héros disponible dans le cube !" tooltip_text = "Le nombre de héros disponible dans le cube !"
@ -103,7 +102,7 @@ theme_override_colors/font_color = Color(0.2, 0.2, 0.2, 1)
text = "0" text = "0"
horizontal_alignment = 2 horizontal_alignment = 2
[node name="LabelTowerOnTerrain" type="Label" parent="TowerButtonPanel/InfoPanel/MarginContainer/VBoxContainer"] [node name="LabelTowerOnTerrain" type="Label" parent="HBoxContainer/InfoPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
tooltip_text = "Le nombre de héros en action sur le terrain !" tooltip_text = "Le nombre de héros en action sur le terrain !"
@ -112,18 +111,17 @@ theme_override_colors/font_color = Color(0.2, 0.2, 0.2, 1)
text = "0" text = "0"
horizontal_alignment = 2 horizontal_alignment = 2
[node name="WaveNumber" type="Label" parent="TowerButtonPanel/InfoPanel/MarginContainer/VBoxContainer"] [node name="WaveNumber" type="Label" parent="HBoxContainer/InfoPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
theme_override_colors/font_color = Color(0.2, 0.2, 0.2, 1) theme_override_colors/font_color = Color(0.2, 0.2, 0.2, 1)
[node name="CubeIntegrity" type="ProgressBar" parent="TowerButtonPanel"] [node name="CubeIntegrity" type="ProgressBar" parent="HBoxContainer"]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(10, 0) custom_minimum_size = Vector2(10, 0)
layout_mode = 2 layout_mode = 2
size_flags_vertical = 1 size_flags_vertical = 1
tooltip_text = "Les points d'intégrités du Cube. S'ils arrivent à 0, fin de la partie." tooltip_text = "Les points d'intégrités du Cube. S'ils arrivent à 0, fin de la partie."
mouse_filter = 1
theme_override_styles/background = SubResource("StyleBoxFlat_nxmp4") theme_override_styles/background = SubResource("StyleBoxFlat_nxmp4")
theme_override_styles/fill = SubResource("StyleBoxFlat_epgl5") theme_override_styles/fill = SubResource("StyleBoxFlat_epgl5")
max_value = 50.0 max_value = 50.0
@ -131,13 +129,12 @@ value = 50.0
fill_mode = 3 fill_mode = 3
show_percentage = false show_percentage = false
[node name="ControlPanelBase" type="PanelContainer" parent="TowerButtonPanel"] [node name="ControlPanelBase" type="PanelContainer" parent="HBoxContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
mouse_filter = 1
theme_override_styles/panel = SubResource("StyleBoxFlat_3lugd") theme_override_styles/panel = SubResource("StyleBoxFlat_3lugd")
[node name="MarginContainer" type="MarginContainer" parent="TowerButtonPanel/ControlPanelBase"] [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/ControlPanelBase"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 0 size_flags_vertical = 0
theme_override_constants/margin_left = 10 theme_override_constants/margin_left = 10
@ -145,37 +142,34 @@ theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10 theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 10 theme_override_constants/margin_bottom = 10
[node name="ButtonContainer" type="GridContainer" parent="TowerButtonPanel/ControlPanelBase/MarginContainer"] [node name="ButtonContainer" type="GridContainer" parent="HBoxContainer/ControlPanelBase/MarginContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 0 size_flags_horizontal = 0
size_flags_vertical = 0 size_flags_vertical = 0
columns = 4 columns = 4
[node name="CubeBtn" parent="TowerButtonPanel/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")] [node name="CubeBtn" parent="HBoxContainer/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")]
layout_mode = 2 layout_mode = 2
mouse_filter = 1
texture = ExtResource("7_fffne") texture = ExtResource("7_fffne")
[node name="QuitLevelBtn" parent="TowerButtonPanel/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")] [node name="QuitLevelBtn" parent="HBoxContainer/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
mouse_filter = 1
texture = ExtResource("8_decjp") texture = ExtResource("8_decjp")
[node name="QuitGameBtn" parent="TowerButtonPanel/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")] [node name="QuitGameBtn" parent="HBoxContainer/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
mouse_filter = 1
texture = ExtResource("9_reygo") texture = ExtResource("9_reygo")
[node name="NextWaveBtn" parent="TowerButtonPanel/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")] [node name="NextWaveBtn" parent="HBoxContainer/ControlPanelBase/MarginContainer/ButtonContainer" instance=ExtResource("7_parkk")]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
mouse_filter = 1
texture = ExtResource("8_ay13l") texture = ExtResource("8_ay13l")
[node name="TowerInfoPanel" type="HBoxContainer" parent="."] [node name="TowerInfoPanel" type="HBoxContainer" parent="."]
visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 2 anchors_preset = 2
anchor_top = 1.0 anchor_top = 1.0
@ -189,7 +183,6 @@ script = ExtResource("9_3lugd")
[node name="InfoPanel" type="PanelContainer" parent="TowerInfoPanel"] [node name="InfoPanel" type="PanelContainer" parent="TowerInfoPanel"]
custom_minimum_size = Vector2(200, 0) custom_minimum_size = Vector2(200, 0)
layout_mode = 2 layout_mode = 2
mouse_filter = 1
theme_override_styles/panel = SubResource("StyleBoxFlat_h4fn5") theme_override_styles/panel = SubResource("StyleBoxFlat_h4fn5")
[node name="MarginContainer" type="MarginContainer" parent="TowerInfoPanel/InfoPanel"] [node name="MarginContainer" type="MarginContainer" parent="TowerInfoPanel/InfoPanel"]
@ -266,7 +259,6 @@ horizontal_alignment = 2
[node name="PanelContainer" type="PanelContainer" parent="TowerInfoPanel"] [node name="PanelContainer" type="PanelContainer" parent="TowerInfoPanel"]
layout_mode = 2 layout_mode = 2
mouse_filter = 1
theme_override_styles/panel = SubResource("StyleBoxFlat_3lugd") theme_override_styles/panel = SubResource("StyleBoxFlat_3lugd")
[node name="MarginContainer" type="MarginContainer" parent="TowerInfoPanel/PanelContainer"] [node name="MarginContainer" type="MarginContainer" parent="TowerInfoPanel/PanelContainer"]
@ -282,4 +274,4 @@ layout_mode = 2
size_flags_horizontal = 0 size_flags_horizontal = 0
size_flags_vertical = 0 size_flags_vertical = 0
[connection signal="pressed" from="TowerButtonPanel/ControlPanelBase/MarginContainer/ButtonContainer/CubeBtn" to="." method="_on_button_cube_pressed"] [connection signal="pressed" from="HBoxContainer/ControlPanelBase/MarginContainer/ButtonContainer/CubeBtn" to="." method="_on_button_cube_pressed"]

5
UI/gui_button.tscn
View file

@ -25,7 +25,6 @@ offset_bottom = 80.0
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 4 size_flags_vertical = 4
tooltip_text = "Sélectionner Pierre" tooltip_text = "Sélectionner Pierre"
mouse_filter = 1
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
script = ExtResource("1_snobr") script = ExtResource("1_snobr")
metadata/_custom_type_script = "uid://dyhtr6g7kd1g2" metadata/_custom_type_script = "uid://dyhtr6g7kd1g2"
@ -45,7 +44,6 @@ layout_mode = 0
offset_top = 70.0 offset_top = 70.0
offset_right = 80.0 offset_right = 80.0
offset_bottom = 80.0 offset_bottom = 80.0
mouse_filter = 1
theme_override_styles/fill = SubResource("StyleBoxFlat_i47ne") theme_override_styles/fill = SubResource("StyleBoxFlat_i47ne")
show_percentage = false show_percentage = false
@ -59,11 +57,10 @@ anchor_bottom = 1.0
offset_top = -36.0 offset_top = -36.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 0 grow_vertical = 0
mouse_filter = 1 mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_snobr") theme_override_styles/panel = SubResource("StyleBoxFlat_snobr")
[node name="Label" type="Label" parent="LeFond"] [node name="Label" type="Label" parent="LeFond"]
layout_mode = 2 layout_mode = 2
mouse_filter = 1
label_settings = SubResource("LabelSettings_snobr") label_settings = SubResource("LabelSettings_snobr")
horizontal_alignment = 1 horizontal_alignment = 1

2
UI/upgrade_button.tscn
View file

@ -12,14 +12,12 @@ script = ExtResource("1_xoo7y")
[node name="UpgradeName" type="Label" parent="."] [node name="UpgradeName" type="Label" parent="."]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
mouse_filter = 1
theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_color = Color(0, 0, 0, 1)
theme_override_font_sizes/font_size = 24 theme_override_font_sizes/font_size = 24
text = "test" text = "test"
[node name="UpgradeButton" type="Button" parent="."] [node name="UpgradeButton" type="Button" parent="."]
layout_mode = 2 layout_mode = 2
mouse_filter = 1
theme_override_font_sizes/font_size = 18 theme_override_font_sizes/font_size = 18
text = "Lvl. 0 text = "Lvl. 0
" "