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

Dev pour la béta 1

Browse Source 
* ajout des artefacts avec la pile et l'emplacement de graine
* affichage des artefacts dans le vaisseau sur une étagère
* ajout des distributeurs d'artefacts dans les régions
* affichage des attributs de bases de plantes dans le vaisseau
* changement de l'affichage du choix des régions
* changement des icônes du détecteur
This commit is contained in:
Zacharie Guet
2026-04-10 16:16:54 +02:00
parent 84a2eafe57
commit 8062c42e7b
154 changed files with 2780 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/game/card/card.tscn
View File

@@ -53,7 +53,7 @@ _data = {
}
[node name="Card" type="PanelContainer" unique_id=1085885349]
custom_minimum_size = Vector2(300, 0)
custom_minimum_size = Vector2(450, 0)
offset_right = 250.0
offset_bottom = 70.0
size_flags_horizontal = 0

5
gui/game/card/card_section.tscn
View File

@@ -63,9 +63,8 @@ stretch_mode = 5
[node name="TitleText" type="Label" parent="MarginContainer/CardSectionContainer/CardSectionTitle" unique_id=1260458359]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
theme = ExtResource("1_t7m3x")
text = "Hello"
text = "Hella"
label_settings = SubResource("LabelSettings_ycbno")
[node name="Text" type="RichTextLabel" parent="MarginContainer/CardSectionContainer" unique_id=2102977326]
@@ -74,7 +73,7 @@ layout_mode = 2
size_flags_horizontal = 3
theme = ExtResource("1_t7m3x")
bbcode_enabled = true
text = "Lorem ipsum dolor sit amet"
text = "Hello"
fit_content = true
scroll_active = false
vertical_alignment = 1

17
gui/game/card/card_visualiser.tscn
View File

@@ -46,8 +46,8 @@ metadata/_custom_type_script = "uid://dj2pv1hiwjfv0"
shader = ExtResource("1_x54se")
shader_parameter/fov = 90.0
shader_parameter/cull_back = true
shader_parameter/y_rot = -1.4576089e-33
shader_parameter/x_rot = 9.688164e-35
shader_parameter/y_rot = -7e-45
shader_parameter/x_rot = 1.237e-42
shader_parameter/inset = 0.0
[sub_resource type="Animation" id="Animation_1et8x"]
@@ -71,8 +71,8 @@ anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -125.0
offset_top = -30.0
offset_right = 125.0
offset_bottom = 131.0
offset_right = 225.0
offset_bottom = 121.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(1.0000002, 1.0000002)
@@ -84,6 +84,7 @@ theme_override_constants/margin_top = -25
theme_override_constants/margin_right = -25
theme_override_constants/margin_bottom = -25
script = ExtResource("2_ntbk8")
card_width = 350
card_info = SubResource("Resource_eb1v6")
[node name="SubViewportContainer" type="SubViewportContainer" parent="." unique_id=1594926759]
@@ -96,14 +97,14 @@ mouse_filter = 2
unique_name_in_owner = true
transparent_bg = true
handle_input_locally = false
size = Vector2i(300, 211)
size = Vector2i(400, 201)
size_2d_override_stretch = true
render_target_update_mode = 4
[node name="CardContainer" type="MarginContainer" parent="SubViewportContainer/SubViewport" unique_id=1240228608]
unique_name_in_owner = true
offset_right = 300.0
offset_bottom = 211.0
offset_right = 400.0
offset_bottom = 201.0
mouse_filter = 2
theme_override_constants/margin_left = 25
theme_override_constants/margin_top = 25
@@ -112,7 +113,7 @@ theme_override_constants/margin_bottom = 25
[node name="Card" parent="SubViewportContainer/SubViewport/CardContainer" unique_id=1169470018 instance=ExtResource("1_we78f")]
unique_name_in_owner = true
custom_minimum_size = Vector2(250, 0)
custom_minimum_size = Vector2(350, 0)
layout_mode = 2
mouse_filter = 2
down_arrow = true

8
gui/game/energy_info/energy_info.tscn
View File

@@ -46,9 +46,9 @@ stretch_mode = 5
[node name="TextPlacer" type="MarginContainer" parent="." unique_id=1669037421]
layout_mode = 2
size_flags_vertical = 0
theme_override_constants/margin_left = 20
theme_override_constants/margin_left = 26
theme_override_constants/margin_top = 9
theme_override_constants/margin_right = 418
theme_override_constants/margin_right = 691
[node name="EnergyCount" type="RichTextLabel" parent="TextPlacer" unique_id=1073572949]
unique_name_in_owner = true
@@ -74,11 +74,11 @@ metadata/_custom_type_script = "uid://0dhj8sdpil7q"
[node name="BatteryViewport" type="SubViewport" parent="." unique_id=146346475]
own_world_3d = true
transparent_bg = true
size = Vector2i(529, 190)
size = Vector2i(800, 190)
[node name="EnergyInfo3d" parent="BatteryViewport" unique_id=1798644168 instance=ExtResource("6_tj7lw")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.918, 2)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.918, 3.81)
max_energy = 3
[node name="WorldEnvironment" type="WorldEnvironment" parent="BatteryViewport" unique_id=1322215759]

13
gui/game/inventory_gui/inventory_3d.tscn
View File

@@ -2,16 +2,25 @@
[ext_resource type="Script" uid="uid://c66acjl2dhd7x" path="res://gui/game/inventory_gui/scripts/inventory_3d.gd" id="1_k2pqu"]
[ext_resource type="PackedScene" uid="uid://4r2ab6foer05" path="res://gui/game/inventory_gui/inventory_item/inventory_item_3d.tscn" id="2_1jdtu"]
[ext_resource type="Script" uid="uid://bq7admu4ahs5r" path="res://entities/player/inventory/scripts/item.gd" id="3_qyq7r"]
[ext_resource type="Script" uid="uid://fnu2d6wna4yc" path="res://entities/player/inventory/scripts/inventory.gd" id="4_7pv7m"]
[ext_resource type="PackedScene" uid="uid://yqq3unuxmtdl" path="res://gui/game/inventory_gui/assets/3d/item_separator.blend" id="13_8twi0"]
[sub_resource type="Resource" id="Resource_kcwow"]
script = ExtResource("4_7pv7m")
seeds = Array[ExtResource("3_qyq7r")]([null, null, null, null, null])
seeds_size = 5
metadata/_custom_type_script = "uid://fnu2d6wna4yc"
[node name="Inventory3D" type="Node3D" unique_id=810532522]
script = ExtResource("1_k2pqu")
inventory_item_scene = ExtResource("2_1jdtu")
test_inventory = SubResource("Resource_kcwow")
[node name="Items3D" type="Node3D" parent="." unique_id=893360425]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.65, 0, 0)
[node name="ItemSeparator" parent="." unique_id=999679207 instance=ExtResource("13_8twi0")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.1, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29999998, 0, 0)

18
gui/game/inventory_gui/scripts/inventory_3d.gd
View File

@@ -24,11 +24,11 @@ func _ready():
func update(inventory : Inventory):
var items = inventory.items
var items = inventory.get_all_items()
if no_tools:
items = items.slice(inventory.n_tools, len(items))
items = inventory.seeds
if len(items) != len(inventory_item_objects) or last_n_tools != inventory.n_tools:
if len(items) != len(inventory_item_objects) or last_n_tools != len(inventory.tools):
create_inventory_objects(inventory)
for i in range(len(items)):
var item : Item= items[i]
@@ -38,7 +38,7 @@ func update(inventory : Inventory):
if not no_tools:
if inventory.current_item_ind == i:
object.state = (
InventoryItem3D.State.TOOL if i < inventory.n_tools
InventoryItem3D.State.TOOL if i < len(inventory.tools)
else InventoryItem3D.State.ITEM
)
else:
@@ -48,19 +48,19 @@ func update(inventory : Inventory):
func create_inventory_objects(inventory : Inventory):
for c in %Items3D.get_children():
c.queue_free()
last_n_tools = inventory.n_tools
last_n_tools = len(inventory.tools)
inventory_item_objects = []
var items = inventory.items
var items = inventory.get_all_items()
if no_tools:
items = items.slice(inventory.n_tools, len(items))
items = inventory.seeds
for i in range(len(items)):
var new_inventory_object := (inventory_item_scene.instantiate() as InventoryItem3D)
%Items3D.add_child(new_inventory_object)
new_inventory_object.position.x = -INVENTORY_OBJECT_SIZE * i
if i >= inventory.n_tools and not no_tools:
if i >= len(inventory.tools) and not no_tools:
new_inventory_object.position.x -= SEPARATOR_SIZE
inventory_item_objects.append(new_inventory_object)
@@ -75,6 +75,6 @@ func create_inventory_objects(inventory : Inventory):
) / 2
%ItemSeparator.position.x = (
%Items3D.position.x
- (inventory.n_tools) * INVENTORY_OBJECT_SIZE
- (inventory.tools.size()) * INVENTORY_OBJECT_SIZE
+ SEPARATOR_SIZE/2
)

6
gui/game/inventory_gui/scripts/inventory_gui.gd
View File

@@ -18,9 +18,9 @@ func _ready():
update(GameInfo.game_data.player_data.inventory)
func update(inventory: Inventory):
if last_inventory_size != len(inventory.items) or last_n_tools != inventory.n_tools:
last_inventory_size = len(inventory.items)
last_n_tools = inventory.n_tools
if last_inventory_size != len(inventory.get_all_items()) or last_n_tools != inventory.tools.size():
last_inventory_size = len(inventory.get_all_items())
last_n_tools = inventory.tools.size()
generate_inventory_mouse_detectors(last_inventory_size, last_n_tools)
func generate_inventory_mouse_detectors(inventory_size: int, n_tool : int, test = false):

4
gui/game/inventory_gui/scripts/inventory_gui_item_mouse_detector.gd
View File

@@ -22,8 +22,8 @@ func _ready():
func card_info() -> CardInfo:
var inventory := GameInfo.game_data.player_data.inventory
if inventory and index < len(inventory.items):
var item = GameInfo.game_data.player_data.inventory.items[index]
if inventory and index < len(inventory.get_all_items()):
var item = GameInfo.game_data.player_data.inventory.get_all_items()[index]
if item:
return item.card_info()

4
gui/game/tutorial/scripts/tutorial.gd
View File

@@ -25,7 +25,7 @@ var indicators : Array[InGameIndicator]
Step.new(
"SELECT_ITEM_WITH_SCROLL_CLICK_OR_NUMBER",
(func ():
return player.data.inventory.current_item_ind != player.data.inventory.n_tools)
return player.data.inventory.current_item_ind != player.data.inventory.tools.size())
),
Step.new(
"LEFT_CLICK_TO_USE_ITEMS",
@@ -54,7 +54,7 @@ var indicators : Array[InGameIndicator]
Step.new(
"TAKE_A_SEED_BY_CLICKING_ON_IT",
(func ():
return player.data.inventory.items.find_custom(
return player.data.inventory.seeds.find_custom(
func(i:Item): return i is Seed
) != -1)
),