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

Dev beta 1.2

Browse Source 
* Ajout d'un tutoriel pour recommencer
* Fix du Surchargeur de Talion qui ne fonctionnait pas
* Suppression de flou sur beaucoup d'éléments visuels pour des raisons de performances
* Augmentation du rayon de spawn du Talion
* Fix léger de la météo (suppression du brouillard lors de la pluie)
This commit is contained in:
Zacharie Guet
2026-05-03 22:45:37 +02:00
parent e7da19cb15
commit 73c1c67f1e
26 changed files with 641 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gui/game/announce/announce.tscn
View File

@@ -2,7 +2,6 @@
[ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/hud.tres" id="1_0ssee"]
[ext_resource type="Script" uid="uid://bvb4v66bqteuc" path="res://gui/game/announce/scripts/announce.gd" id="1_4evne"]
[ext_resource type="Shader" uid="uid://cuni3ggtw2uuy" path="res://common/vfx/materials/shaders/blur.gdshader" id="2_b6hac"]
[ext_resource type="Texture2D" uid="uid://bi5jo6pf0acjb" path="res://common/icons/carambola.svg" id="2_iwcrn"]
[ext_resource type="LabelSettings" uid="uid://dqwayi8yjwau2" path="res://gui/ressources/title_label_settings.tres" id="3_7nrno"]
[ext_resource type="FontFile" uid="uid://qt80w6o01q5s" path="res://gui/ressources/fonts/TitanOne-Regular.ttf" id="4_aao0q"]
@@ -10,11 +9,6 @@
[ext_resource type="Script" uid="uid://bqisp5hjs06rj" path="res://gui/game/announce/scripts/announce_inspectable.gd" id="6_aao0q"]
[ext_resource type="Texture2D" uid="uid://dcgnamu7sb3ov" path="res://common/icons/bolt.svg" id="9_b6hac"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_f0v68"]
shader = ExtResource("2_b6hac")
shader_parameter/strength = 5.00000023424012
shader_parameter/mix_percentage = 0.3
[sub_resource type="ViewportTexture" id="ViewportTexture_huxc5"]
viewport_path = NodePath("Particles/SubViewport")
@@ -85,6 +79,18 @@ tracks/3/keys = {
"update": 0,
"values": [Color(1, 1, 1, 1)]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("MarginContainer/BackgroundRect:modulate:a")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [1.0]
}
[sub_resource type="Animation" id="Animation_b6hac"]
resource_name = "appear"
@@ -137,6 +143,18 @@ tracks/3/keys = {
"update": 0,
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("MarginContainer/BackgroundRect:modulate:a")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0.03333333, 0.8),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, 0.8]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_6qyp1"]
_data = {
@@ -155,8 +173,7 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="BlurRect" type="ColorRect" parent="MarginContainer" unique_id=1271832904]
material = SubResource("ShaderMaterial_f0v68")
[node name="BackgroundRect" type="ColorRect" parent="MarginContainer" unique_id=1271832904]
layout_mode = 2
color = Color(0.0352941, 0.0196078, 0.12549, 0.705882)
@@ -231,7 +248,7 @@ size = Vector2i(300, 300)
[node name="AnnouceObject" type="Node3D" parent="AnnounceContainer/ObjectVisualiser/SubViewport" unique_id=986671004]
unique_name_in_owner = true
transform = Transform3D(-0.4963247, -0.7514756, 0.43456152, -0.8508927, 0.32199714, -0.4149924, 0.17189625, -0.57574874, -0.79934174, 0, 0, 0)
transform = Transform3D(-0.4322992, 0.01924802, 0.90143085, -0.8508927, 0.32199714, -0.4149924, -0.29827252, -0.94641316, -0.1228672, 0, 0, 0)
[node name="Camera3D" type="Camera3D" parent="AnnounceContainer/ObjectVisualiser/SubViewport" unique_id=1788331074]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1)

31
gui/game/inventory_gui/inventory_item/inventory_item_3d.tscn
View File

@@ -2,7 +2,6 @@
[ext_resource type="Script" uid="uid://mrw23oxsai10" path="res://gui/game/inventory_gui/inventory_item/scripts/inventory_item_3d.gd" id="1_nsad1"]
[ext_resource type="PackedScene" uid="uid://oktd71knql00" path="res://gui/game/inventory_gui/assets/3d/item_screen.blend" id="2_1uxm0"]
[ext_resource type="Texture2D" uid="uid://dex283rx00fjb" path="res://common/icons/logout.svg" id="2_hv1tg"]
[ext_resource type="Script" uid="uid://bq7admu4ahs5r" path="res://entities/player/inventory/scripts/item.gd" id="3_ixa47"]
[ext_resource type="Texture2D" uid="uid://cgmxjom200bej" path="res://common/icons/chevrons-up.svg" id="5_g1uf8"]
[ext_resource type="Texture2D" uid="uid://ds4m14vl7he6v" path="res://common/icons/pick.svg" id="6_jdjjl"]
@@ -60,14 +59,12 @@ texture = SubResource("GradientTexture2D_g1uf8")
[node name="ItemScreen" type="Sprite3D" parent="." unique_id=1128109703]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.08962244)
visible = false
transparent = false
texture = SubResource("GradientTexture2D_jdjjl")
[node name="ToolScreen" type="Sprite3D" parent="." unique_id=1384339729]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.08962244)
visible = false
transparent = false
texture = SubResource("GradientTexture2D_gj8fm")
@@ -76,20 +73,40 @@ unique_name_in_owner = true
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0, 0.004884802, -0.0937915)
modulate = Color(1, 1, 1, 0.3)
pixel_size = 0.0020833334
texture = ExtResource("2_hv1tg")
[node name="ParticleSprite1" type="Sprite3D" parent="." unique_id=811884632]
[node name="ParticleSprites" type="Node3D" parent="." unique_id=427396867]
unique_name_in_owner = true
[node name="ParticleSprite1" type="Sprite3D" parent="ParticleSprites" unique_id=811884632]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.04235574, -0.03381054, -0.105405755)
pixel_size = 0.001
texture = ExtResource("5_g1uf8")
[node name="ParticleSprite2" type="Sprite3D" parent="." unique_id=1076243108]
unique_name_in_owner = true
[node name="ParticleSprite2" type="Sprite3D" parent="ParticleSprites" unique_id=1076243108]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.042, -0.034, -0.105)
pixel_size = 0.001
texture = ExtResource("6_jdjjl")
[node name="ParticleSprite3" type="Sprite3D" parent="ParticleSprites" unique_id=490761808]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0029564463, -0.034, -0.105)
pixel_size = 0.001
texture = ExtResource("6_jdjjl")
[node name="ParticleSprite4" type="Sprite3D" parent="ParticleSprites" unique_id=1224179780]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.04235574, 0.04323736, -0.105405755)
pixel_size = 0.001
texture = ExtResource("5_g1uf8")
[node name="ParticleSprite5" type="Sprite3D" parent="ParticleSprites" unique_id=241043116]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.042, 0.043047898, -0.105)
pixel_size = 0.001
texture = ExtResource("6_jdjjl")
[node name="ParticleSprite6" type="Sprite3D" parent="ParticleSprites" unique_id=1794865960]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0029564463, 0.043047898, -0.105)
pixel_size = 0.001
texture = ExtResource("6_jdjjl")
[node name="Area3D" type="Area3D" parent="." unique_id=426596211]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" unique_id=2020875183]

21
gui/game/inventory_gui/inventory_item/scripts/inventory_item_3d.gd
View File

@@ -19,10 +19,9 @@ func _ready():
func set_item(i : Item = item):
item = i
if is_node_ready():
%ParticleSprite1.visible = false
%ParticleSprite2.visible = false
%ParticleSprite1.modulate = Color.WHITE
%ParticleSprite2.modulate = Color.WHITE
for c in %ParticleSprites.get_children():
c.visible = false
c.modulate = Color.WHITE
%ItemIconSprite.texture = null
if i and i.icon:
@@ -30,15 +29,11 @@ func set_item(i : Item = item):
%ItemIconSprite.pixel_size = SPRITE_SIZE / i.icon.get_width()
for j in range(len(i.get_particles())):
if j == 0:
%ParticleSprite1.visible = true
%ParticleSprite1.texture = i.get_particles()[j].texture
%ParticleSprite1.modulate = i.get_particles()[j].color
if j == 1:
%ParticleSprite2.visible = true
%ParticleSprite2.texture = i.get_particles()[j].texture
%ParticleSprite2.modulate = i.get_particles()[j].color
if j < 6:
var sprite = %ParticleSprites.get_children()[j] as Sprite3D
sprite.visible = true
sprite.texture = i.get_particles()[j].texture
sprite.modulate = i.get_particles()[j].color
func set_state(s := state):

33
gui/game/tutorial/tutorial.tscn
View File

@@ -4,7 +4,6 @@
[ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/hud.tres" id="2_1wikm"]
[ext_resource type="Texture2D" uid="uid://1ynlp05wj0hm" path="res://common/icons/rocket.svg" id="3_8kuag"]
[ext_resource type="FontFile" uid="uid://qt80w6o01q5s" path="res://gui/ressources/fonts/TitanOne-Regular.ttf" id="4_1wikm"]
[ext_resource type="Shader" uid="uid://cuni3ggtw2uuy" path="res://common/vfx/materials/shaders/blur.gdshader" id="5_5i4hd"]
[ext_resource type="LabelSettings" uid="uid://dqwayi8yjwau2" path="res://gui/ressources/title_label_settings.tres" id="6_hgus1"]
[ext_resource type="PackedScene" uid="uid://753270jjxmfg" path="res://gui/game/card/card.tscn" id="6_vg3tr"]
[ext_resource type="Texture2D" uid="uid://bgi4rc50par30" path="res://common/icons/arrow-narrow-right.svg" id="7_6k6bq"]
@@ -30,11 +29,6 @@ corner_radius_bottom_left = 20
font = ExtResource("4_1wikm")
font_size = 20
[sub_resource type="ShaderMaterial" id="ShaderMaterial_pu6eb"]
shader = ExtResource("5_5i4hd")
shader_parameter/strength = 8.00000037674012
shader_parameter/mix_percentage = 0.3
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ebkn5"]
[sub_resource type="Resource" id="Resource_ditr3"]
@@ -99,6 +93,18 @@ tracks/2/keys = {
"update": 1,
"values": [1.0]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Background:modulate:a")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [1.0]
}
[sub_resource type="Animation" id="Animation_58nqq"]
resource_name = "appear"
@@ -139,6 +145,18 @@ tracks/2/keys = {
"update": 0,
"values": [0.0, 1.0]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Background:modulate:a")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0.06666667, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, 0.8]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ebkn5"]
_data = {
@@ -200,8 +218,7 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="BlurRect" type="ColorRect" parent="PlantInfoTutorial" unique_id=35513528]
material = SubResource("ShaderMaterial_pu6eb")
[node name="Background" type="ColorRect" parent="PlantInfoTutorial" unique_id=35513528]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0