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

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()