Last modifs (maybe (we dunno))

This commit is contained in:
Zacharie Guet 2024-09-02 00:04:56 +02:00
parent c4961da0dc
commit 55afdb608e
25 changed files with 236 additions and 63 deletions

View File

@ -1,8 +1,7 @@
[gd_scene load_steps=18 format=3 uid="uid://b56357feudy7x"]
[gd_scene load_steps=17 format=3 uid="uid://b56357feudy7x"]
[ext_resource type="Script" path="res://scripts/gui/menu.gd" id="1_88exu"]
[ext_resource type="Texture2D" uid="uid://bkwi6yurko7gm" path="res://assets/texture/sol_gamejam_fleurs.png" id="1_t32ec"]
[ext_resource type="Texture2D" uid="uid://24ift4wt1h2h" path="res://assets/plants/evolution2.1.png" id="2_b6wtb"]
[ext_resource type="Texture2D" uid="uid://34v3ub405uwp" path="res://assets/plants/evolution2.3.png" id="4_4gpyw"]
[ext_resource type="Texture2D" uid="uid://rc3mom584tm8" path="res://assets/plants/arbre5.png" id="4_nalxd"]
[ext_resource type="Texture2D" uid="uid://damy6xcp3jd0s" path="res://assets/plants/herbe1.png" id="5_ismvq"]
@ -157,12 +156,7 @@ grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("1_t32ec")
expand_mode = 2
stretch_mode = 4
[node name="Evolution2_1" type="Sprite2D" parent="."]
position = Vector2(85, 558)
scale = Vector2(0.256, 0.256)
texture = ExtResource("2_b6wtb")
stretch_mode = 6
[node name="Fée2" type="Sprite2D" parent="."]
position = Vector2(764, 229)

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dihwqp24jd2gk"
path="res://.godot/imported/Interface sans boutons.png-60f631009367d0091e0e79656d1b3c79.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/gui/image/Interface sans boutons.png"
dest_files=["res://.godot/imported/Interface sans boutons.png-60f631009367d0091e0e79656d1b3c79.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dmlm0jugr70sg"
path="res://.godot/imported/Tablette info.png-ed0c49161767c772fb7b2362dc3127e8.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/gui/image/Tablette info.png"
dest_files=["res://.godot/imported/Tablette info.png-ed0c49161767c772fb7b2362dc3127e8.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c84bc7d0f8gtn"
path="res://.godot/imported/sky.png-797942cf14c3d3c2fe0d423f60874e07.ctex"
uid="uid://baqi0tv2xfs31"
path="res://.godot/imported/controls.png-089f3100eb2b00a6e73db7ff84e655aa.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/texture/sky.png"
dest_files=["res://.godot/imported/sky.png-797942cf14c3d3c2fe0d423f60874e07.ctex"]
source_file="res://assets/gui/image/controls.png"
dest_files=["res://.godot/imported/controls.png-089f3100eb2b00a6e73db7ff84e655aa.ctex"]
[params]

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://7njhgvmycx40"
path="res://.godot/imported/Déplacement 2.mp3-7d56ed3be33dc526249f1cb498ed58c2.mp3str"
[deps]
source_file="res://assets/sounds/Actions/Déplacement 2.mp3"
dest_files=["res://.godot/imported/Déplacement 2.mp3-7d56ed3be33dc526249f1cb498ed58c2.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://b7ad35ieccl77"
path="res://.godot/imported/Déplacement 3.mp3-3ac2ea56166a00dfe43b9beeac6aac3a.mp3str"
[deps]
source_file="res://assets/sounds/Actions/Déplacement 3.mp3"
dest_files=["res://.godot/imported/Déplacement 3.mp3-3ac2ea56166a00dfe43b9beeac6aac3a.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://dad5u8723jcx2"
path="res://.godot/imported/Déplacement 4.mp3-cfdc645193821ed4a1b8d4ee644ecbaa.mp3str"
[deps]
source_file="res://assets/sounds/Actions/Déplacement 4.mp3"
dest_files=["res://.godot/imported/Déplacement 4.mp3-cfdc645193821ed4a1b8d4ee644ecbaa.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://ca4t82yt5vbsm"
path="res://.godot/imported/Déplacement 5.mp3-ecf1ba0dd059abf8f9b073cc1b00f261.mp3str"
[deps]
source_file="res://assets/sounds/Actions/Déplacement 5.mp3"
dest_files=["res://.godot/imported/Déplacement 5.mp3-ecf1ba0dd059abf8f9b073cc1b00f261.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

View File

@ -1,8 +1,11 @@
[gd_scene load_steps=6 format=3 uid="uid://bp3c63qgkmi6o"]
[gd_scene load_steps=9 format=3 uid="uid://bp3c63qgkmi6o"]
[ext_resource type="Script" path="res://scripts/robot.gd" id="1_4eix8"]
[ext_resource type="SpriteFrames" path="res://assets/sprites/robot/walk/Robot.tres" id="2_k06te"]
[ext_resource type="SpriteFrames" uid="uid://8ewbadpftqoh" path="res://assets/sprites/robot/walk/Robot.tres" id="2_k06te"]
[ext_resource type="PackedScene" uid="uid://dyuqq8v1tckrv" path="res://objects/Wanderer.tscn" id="2_mhqh4"]
[ext_resource type="AudioStream" uid="uid://7njhgvmycx40" path="res://assets/sounds/Actions/Déplacement 2.mp3" id="6_aqa2n"]
[ext_resource type="AudioStream" uid="uid://b7ad35ieccl77" path="res://assets/sounds/Actions/Déplacement 3.mp3" id="7_u5h4g"]
[ext_resource type="AudioStream" uid="uid://ca4t82yt5vbsm" path="res://assets/sounds/Actions/Déplacement 5.mp3" id="8_lcptp"]
[ext_resource type="AudioStream" uid="uid://cb4ouq4awiyri" path="res://assets/sounds/Actions/Planter.mp3" id="51_f30v0"]
[ext_resource type="AudioStream" uid="uid://c1jt77fyb2lx4" path="res://assets/sounds/Actions/Déplacement.mp3" id="52_xvi3g"]
@ -29,4 +32,17 @@ stream = ExtResource("51_f30v0")
stream = ExtResource("52_xvi3g")
pitch_scale = 1.5
[node name="MoveSound2" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("6_aqa2n")
[node name="MoveSound3" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("7_u5h4g")
[node name="MoveSound4" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("6_aqa2n")
pitch_scale = 1.5
[node name="MoveSound5" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("8_lcptp")
[connection signal="timeout" from="Planting" to="." method="_on_planting_timeout"]

View File

@ -1,6 +1,7 @@
[gd_scene load_steps=12 format=3 uid="uid://iaf4md4cbwqh"]
[ext_resource type="Script" path="res://scripts/gui/seed_card.gd" id="1_ecgsq"]
[ext_resource type="Texture2D" uid="uid://dmlm0jugr70sg" path="res://assets/gui/image/Tablette info.png" id="2_33be8"]
[ext_resource type="Theme" uid="uid://dnebunkx13tbr" path="res://assets/gui/Text.tres" id="2_n5opx"]
[ext_resource type="Texture2D" uid="uid://dpfe11wn04ntd" path="res://assets/gui/icons/watering-soil.svg" id="3_4sryb"]
[ext_resource type="Texture2D" uid="uid://be2uusaqcpcpd" path="res://assets/gradients/Fertility.tres" id="4_5omu3"]
@ -10,13 +11,6 @@
[ext_resource type="Texture2D" uid="uid://bdg3ep75da6xd" path="res://assets/gui/icons/tree.svg" id="8_i3l01"]
[ext_resource type="Texture2D" uid="uid://biti1wmdsg7xr" path="res://assets/gradients/Presence.tres" id="9_w0o2o"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8gji7"]
draw_center = false
border_width_left = 1
border_width_top = 1
border_width_right = 1
border_width_bottom = 1
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_kiud1"]
[node name="SeedCard" type="Control"]
@ -26,7 +20,7 @@ size_flags_horizontal = 8
size_flags_vertical = 8
script = ExtResource("1_ecgsq")
[node name="Card" type="PanelContainer" parent="."]
[node name="Card" type="Control" parent="."]
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
@ -34,19 +28,29 @@ anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -277.0
offset_top = -280.0
offset_top = -434.0
grow_horizontal = 0
grow_vertical = 0
[node name="TextureRect" type="Panel" parent="Card"]
[node name="TextureRect2" type="TextureRect" parent="Card"]
layout_mode = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_8gji7")
offset_left = -57.0
offset_top = -54.0
offset_right = 277.0
offset_bottom = 434.0
texture = ExtResource("2_33be8")
expand_mode = 1
stretch_mode = 6
[node name="MarginContainer" type="MarginContainer" parent="Card"]
layout_mode = 2
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10
offset_left = -51.0
offset_top = -31.0
offset_right = 277.0
offset_bottom = 434.0
theme_override_constants/margin_left = 20
theme_override_constants/margin_top = 30
theme_override_constants/margin_right = 30
theme_override_constants/margin_bottom = 10
[node name="VBoxContainer" type="VBoxContainer" parent="Card/MarginContainer"]

View File

@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://bm8nlb7kmaa6k"]
[gd_scene load_steps=4 format=3 uid="uid://bm8nlb7kmaa6k"]
[ext_resource type="Script" path="res://scripts/gui/seed_queue.gd" id="1_6lrhe"]
[ext_resource type="Texture2D" uid="uid://dihwqp24jd2gk" path="res://assets/gui/image/Interface sans boutons.png" id="2_eutr6"]
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_reedq"]
@ -13,26 +14,43 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_6lrhe")
[node name="HBoxContainer" type="HBoxContainer" parent="."]
[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 12
anchors_preset = 2
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
offset_top = -201.0
offset_right = 426.0
grow_vertical = 0
texture = ExtResource("2_eutr6")
expand_mode = 2
[node name="HBoxContainer" type="Control" parent="."]
layout_mode = 1
anchors_preset = 2
anchor_top = 1.0
anchor_bottom = 1.0
offset_top = -100.0
grow_vertical = 0
theme_override_constants/separation = 10
[node name="NextSeed" type="TextureRect" parent="HBoxContainer"]
custom_minimum_size = Vector2(100, 100)
layout_mode = 2
offset_left = 64.0
offset_top = -54.0
offset_right = 164.0
offset_bottom = 46.0
texture = SubResource("NoiseTexture2D_reedq")
expand_mode = 2
[node name="Queue" type="HBoxContainer" parent="HBoxContainer"]
layout_mode = 2
offset_left = 132.0
offset_top = -42.0
offset_right = 422.0
offset_bottom = 58.0
theme_override_constants/separation = 10
alignment = 2
alignment = 1
[node name="Seed5" type="TextureRect" parent="HBoxContainer/Queue"]
custom_minimum_size = Vector2(50, 50)
@ -57,19 +75,3 @@ size_flags_horizontal = 4
size_flags_vertical = 8
texture = SubResource("NoiseTexture2D_reedq")
expand_mode = 2
[node name="Seed2" type="TextureRect" parent="HBoxContainer/Queue"]
custom_minimum_size = Vector2(50, 50)
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 8
texture = SubResource("NoiseTexture2D_reedq")
expand_mode = 2
[node name="Seed1" type="TextureRect" parent="HBoxContainer/Queue"]
custom_minimum_size = Vector2(50, 50)
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 8
texture = SubResource("NoiseTexture2D_reedq")
expand_mode = 2

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://dha8pa1les53a"]
[gd_scene load_steps=12 format=3 uid="uid://dha8pa1les53a"]
[ext_resource type="Script" path="res://scripts/gui.gd" id="1_6gq27"]
[ext_resource type="PackedScene" uid="uid://bm8nlb7kmaa6k" path="res://objects/gui/Seed_queue.tscn" id="1_lh8u1"]
@ -7,6 +7,7 @@
[ext_resource type="Script" path="res://scripts/tuto.gd" id="5_5h6w8"]
[ext_resource type="Texture2D" uid="uid://dqogq148ksscp" path="res://assets/sprites/robot/walk/frame_01.png" id="5_kwcrh"]
[ext_resource type="Theme" uid="uid://dnebunkx13tbr" path="res://assets/gui/Text.tres" id="6_tw1fh"]
[ext_resource type="Texture2D" uid="uid://baqi0tv2xfs31" path="res://assets/gui/image/controls.png" id="8_0b6a6"]
[ext_resource type="AudioStream" uid="uid://n7seb2bqfped" path="res://assets/sounds/Dialogue.mp3" id="8_8y3ei"]
[sub_resource type="LabelSettings" id="LabelSettings_kryjr"]
@ -75,7 +76,7 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme_override_constants/margin_left = 20
theme_override_constants/margin_top = 20
theme_override_constants/margin_top = 60
theme_override_constants/margin_right = 20
theme_override_constants/margin_bottom = 20
@ -111,6 +112,13 @@ label_settings = SubResource("LabelSettings_y5jk3")
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect2" type="TextureRect" parent="Tuto/MarginContainer"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 0
texture = ExtResource("8_0b6a6")
stretch_mode = 5
[node name="RobotSpeak" type="AudioStreamPlayer" parent="Tuto"]
stream = ExtResource("8_8y3ei")

View File

@ -1,9 +1,8 @@
[gd_scene load_steps=16 format=3 uid="uid://d3hul8b7hlmj7"]
[gd_scene load_steps=15 format=3 uid="uid://d3hul8b7hlmj7"]
[ext_resource type="Script" path="res://scripts/map.gd" id="1_3np0o"]
[ext_resource type="PackedScene" uid="uid://6ferubyu2uy1" path="res://scenes/Scanners.tscn" id="1_6mlj0"]
[ext_resource type="PackedScene" uid="uid://cj457q2fx5mim" path="res://objects/Animal.tscn" id="4_pkphc"]
[ext_resource type="Texture2D" uid="uid://c84bc7d0f8gtn" path="res://assets/texture/sky.png" id="4_uy8vn"]
[ext_resource type="PackedScene" uid="uid://byv2a5d0n1538" path="res://objects/Animal.tscn" id="4_pkphc"]
[ext_resource type="Texture2D" uid="uid://bkwi6yurko7gm" path="res://assets/texture/sol_gamejam_fleurs.png" id="5_6sl35"]
[ext_resource type="Shader" path="res://scripts/shaders/TextureSplit.gdshader" id="5_iqvbx"]
[ext_resource type="Texture2D" uid="uid://6h5ieh6ba7re" path="res://assets/texture/sol_gamejam_mort.png" id="6_wj5l3"]
@ -50,9 +49,10 @@ script = ExtResource("1_3np0o")
[node name="Scanners" parent="." instance=ExtResource("1_6mlj0")]
[node name="OutOfBound" type="Polygon2D" parent="."]
modulate = Color(0.537011, 0.537011, 0.537011, 1)
z_index = -3
texture_repeat = 2
texture = ExtResource("4_uy8vn")
texture = ExtResource("7_iuq0o")
texture_scale = Vector2(5, 5)
[node name="Ground" type="Polygon2D" parent="."]
@ -68,7 +68,6 @@ texture_repeat = 2
material = SubResource("ShaderMaterial_4rqj7")
color = Color(1, 1, 1, 0)
texture_scale = Vector2(5, 5)
polygon = PackedVector2Array(27, 788, 54, 1452, 1715, 1163, 1439, -501, -416, -340)
[node name="Animals" type="Node2D" parent="."]
y_sort_enabled = true

View File

@ -3,8 +3,6 @@ extends Control
@onready var next_seed: TextureRect = $HBoxContainer/NextSeed
@onready var queue_image := [
$HBoxContainer/Queue/Seed1,
$HBoxContainer/Queue/Seed2,
$HBoxContainer/Queue/Seed3,
$HBoxContainer/Queue/Seed4,
$HBoxContainer/Queue/Seed5,
@ -15,7 +13,7 @@ var planter: Planter
func update_queue():
var next_seed_param := planter.get_plant_from_queue()
next_seed.texture = next_seed_param.seed_sprite
var index := 0
var index := 2
for child in queue_image:
var seed_param := planter.get_plant_from_queue(index)
child.texture = seed_param.seed_sprite

View File

@ -3,7 +3,7 @@ extends CenterContainer
@export var gradient : GradientTexture1D
const CURSOR_WIDTH = 0.08
const CURSOR_WIDTH = 0.04
# Called when the node enters the scene tree for the first time.
func _ready():

View File

@ -13,6 +13,13 @@ signal Planted
@onready var wanderer: Wanderer = $Wanderer
@onready var planting: Timer = $Planting
@onready var move_sounds = [
$MoveSound,
$MoveSound2,
$MoveSound3,
$MoveSound4,
$MoveSound5,
]
var target_pos := Vector2()
@ -42,7 +49,7 @@ func _process(delta: float) -> void:
$AnimatedSprite2D.flip_h = true
func go_to(new_target_pos: Vector2):
$MoveSound.play()
move_sounds[randi()%len(move_sounds)].play()
state = MoveState.MOVING
target_pos = new_target_pos

View File

@ -20,6 +20,7 @@ var cursor = 0
func _ready():
next_text()
show()
$RobotSpeak.playing = true
func _input(event):