zacharie/seeding-planets
2
2
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

ajout de la traduction #70

Browse Source 
* Fix de l'inspection de l'inventaire
* Suppression des assets d'objectifs
This commit is contained in:
Zacharie Guet
2025-11-07 17:36:18 +01:00
parent ed675ed532
commit a8bb09407e
91 changed files with 485 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gui/pointer/pointer.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=3 uid="uid://0yr6b2jtuttm"]
[gd_scene load_steps=15 format=3 uid="uid://0yr6b2jtuttm"]
[ext_resource type="Script" uid="uid://vhumsfntpqcl" path="res://gui/pointer/scripts/pointer.gd" id="1_1pe2k"]
[ext_resource type="Texture2D" uid="uid://bspffyprdywgc" path="res://gui/pointer/assets/cursors/pointer.svg" id="2_q4bvb"]
@@ -13,17 +13,14 @@
[ext_resource type="Script" uid="uid://b4tkium34c831" path="res://gui/game/card/scripts/card_stat_info.gd" id="10_d4v46"]
[ext_resource type="Texture2D" uid="uid://bsvxhafoxwmw0" path="res://common/icons/cube-3d-sphere.svg" id="11_s1ym6"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_s1ym6"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_6eft6"]
shader = ExtResource("7_wgcdp")
shader_parameter/fov = 90.0
shader_parameter/cull_back = true
shader_parameter/y_rot = 8.409235e-36
shader_parameter/x_rot = -9.785961e-36
shader_parameter/y_rot = -6e-45
shader_parameter/x_rot = -6e-45
shader_parameter/inset = 0.0
[sub_resource type="ViewportTexture" id="ViewportTexture_xb313"]
viewport_path = NodePath("SubViewport")
[sub_resource type="Resource" id="Resource_mrxa2"]
script = ExtResource("8_xb313")
metadata/_custom_type_script = "uid://dj2pv1hiwjfv0"
@@ -46,8 +43,8 @@ mouse_filter = 2
[node name="Container" type="VBoxContainer" parent="CanvasLayer/Inspector"]
layout_mode = 0
offset_left = 40.0
offset_right = 137.0
offset_left = 28.0
offset_right = 134.0
offset_bottom = 79.0
size_flags_horizontal = 0
size_flags_vertical = 0
@@ -55,26 +52,30 @@ mouse_filter = 2
[node name="Action" type="HBoxContainer" parent="CanvasLayer/Inspector/Container"]
unique_name_in_owner = true
modulate = Color(1, 1, 0.168627, 1)
custom_minimum_size = Vector2(0, 20)
layout_mode = 2
[node name="MouseImage" type="TextureRect" parent="CanvasLayer/Inspector/Container/Action"]
layout_mode = 2
texture = ExtResource("3_pshoq")
expand_mode = 2
stretch_mode = 5
[node name="ActionEnergyImage" type="TextureRect" parent="CanvasLayer/Inspector/Container/Action"]
unique_name_in_owner = true
layout_mode = 2
texture = ExtResource("4_b4uwv")
expand_mode = 2
stretch_mode = 5
[node name="ActionText" type="Label" parent="CanvasLayer/Inspector/Container/Action"]
[node name="ActionText" type="RichTextLabel" parent="CanvasLayer/Inspector/Container/Action"]
unique_name_in_owner = true
z_index = 1
layout_mode = 2
text = "Take"
horizontal_alignment = 1
bbcode_enabled = true
text = "Hello ?"
fit_content = true
scroll_active = false
autowrap_mode = 0
[node name="ActionZone" type="Sprite2D" parent="CanvasLayer/Inspector"]
unique_name_in_owner = true
@@ -111,16 +112,18 @@ offset_right = 175.0
grow_horizontal = 2
grow_vertical = 0
mouse_filter = 2
theme_override_constants/margin_bottom = 30
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 0
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 0
[node name="CardVisualiser" parent="CardsCanvasLayer/CardPosition/MarginContainer" instance=ExtResource("6_7j4mj")]
unique_name_in_owner = true
modulate = Color(1, 1, 1, 0.5003133)
material = SubResource("ShaderMaterial_s1ym6")
material = SubResource("ShaderMaterial_6eft6")
layout_mode = 2
size_flags_horizontal = 4
mouse_filter = 0
texture = SubResource("ViewportTexture_xb313")
card_info = SubResource("Resource_mrxa2")
[node name="Audio" type="Node" parent="."]

17
gui/pointer/scripts/pointer.gd
View File

@@ -8,6 +8,7 @@ const ZONE_ACTIVATED_COLOR = Color.TURQUOISE
const ZONE_DEACTIVATED_COLOR = Color.REBECCA_PURPLE
const CARD_VISUALISATION_TIME = 0.5
const CARD_UP_PADDING = 20
@export var default_cursor : Texture2D
@@ -90,16 +91,23 @@ func inspect(node : Node):
inspected = node
if inspected is InspectableEntity:
inspected_card_info = inspected.card_info()
elif inspected is InventoryGuiItem and inspected.item != null:
inspected_card_info = inspected.item.card_info()
else :
inspected_card_info = null
time_last_inspected = 0
if current_inspect.has_method("inspect"):
current_inspect.inspect(true)
update_inspector()
func update_card():
if not inspected or time_last_inspected > CARD_VISUALISATION_TIME:
if not inspected or inspected_card_info == null or time_last_inspected > CARD_VISUALISATION_TIME:
%CardVisualiser.hide()
elif inspected != null and inspected is InspectableEntity:
elif inspected != null and (
inspected is InspectableEntity
or inspected is InventoryGuiItem
):
if inspected_card_info != %CardVisualiser.card_info:
%CardVisualiser.card_info = inspected_card_info
@@ -107,7 +115,10 @@ func update_card():
var camera = get_viewport().get_camera_2d()
var screen_size = get_viewport().get_visible_rect().size
%CardPosition.position = inspected.global_position - camera.global_position + screen_size / 2
if inspected is InspectableEntity:
%CardPosition.position = inspected.global_position - camera.global_position + screen_size / 2 + CARD_UP_PADDING * Vector2.UP
elif inspected is InventoryGuiItem:
%CardPosition.position = inspected.global_position + inspected.size/2 + CARD_UP_PADDING * Vector2.UP
if %CardVisualiser.is_mouse_over():
time_last_inspected = 0.