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

Réparation de bug, paufinnage du rayon tracteur et insert de l'outil dans l'histoire

Browse Source
This commit is contained in:
Zacharie Guet
2026-06-14 16:19:36 +02:00
parent 7c66d8b9de
commit 33a8f022e5
30 changed files with 540 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/audio_manager/assets/sfx/tractor_beam/drop.wav Normal file
View File

Binary file not shown.

24
common/audio_manager/assets/sfx/tractor_beam/drop.wav.import Normal file
View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://cam4vv1am40dy"
path="res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.sample"
[deps]
source_file="res://common/audio_manager/assets/sfx/tractor_beam/drop.wav"
dest_files=["res://.godot/imported/drop.wav-b76e8a2f6f5f0c41737e74496f01ceaa.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

BIN
common/audio_manager/assets/sfx/tractor_beam/take.wav Normal file
View File

Binary file not shown.

24
common/audio_manager/assets/sfx/tractor_beam/take.wav.import Normal file
View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://bdrdnli5k27a2"
path="res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.sample"
[deps]
source_file="res://common/audio_manager/assets/sfx/tractor_beam/take.wav"
dest_files=["res://.godot/imported/take.wav-d597c4daf1adbf3b061372ab36ef9940.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

10
common/audio_manager/audio_manager.tscn
View File

@@ -68,6 +68,8 @@
[ext_resource type="AudioStream" uid="uid://53ixfbcd5qwu" path="res://common/audio_manager/assets/sfx/holo/holo_appear.wav" id="63_aedoe"]
[ext_resource type="AudioStream" uid="uid://dsijqgnnadgem" path="res://common/audio_manager/assets/sfx/holo/holo_disappear.wav" id="64_ge2sc"]
[ext_resource type="AudioStream" uid="uid://dscyqjujj1com" path="res://common/audio_manager/assets/sfx/unlock_tool/unlock_tool.wav" id="64_yr73o"]
[ext_resource type="AudioStream" uid="uid://bdrdnli5k27a2" path="res://common/audio_manager/assets/sfx/tractor_beam/take.wav" id="69_5rlid"]
[ext_resource type="AudioStream" uid="uid://cam4vv1am40dy" path="res://common/audio_manager/assets/sfx/tractor_beam/drop.wav" id="70_gfbcu"]
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_6o1yh"]
streams_count = 3
@@ -384,3 +386,11 @@ volume_db = -11.0
[node name="Unlock_tool" type="AudioStreamPlayer" parent="Sfx" unique_id=667077616]
stream = ExtResource("64_yr73o")
volume_db = -5.0
[node name="TractorBeamTake" type="AudioStreamPlayer" parent="Sfx" unique_id=1321980229]
stream = ExtResource("69_5rlid")
volume_db = -5.0
[node name="TractorBeamDrop" type="AudioStreamPlayer" parent="Sfx" unique_id=2023233451]
stream = ExtResource("70_gfbcu")
volume_db = -5.0

6
common/game_data/scripts/story/story_steps/1_2_mercury_story_step.gd
View File

@@ -3,6 +3,7 @@ class_name MercuryStoryStep
const MERCURY_DEPARTURE_DIALOG_PATH = "res://dialogs/timelines/1_waking_up/6_mercury_departure.dtl"
const VENDING_MACHINE_DIALOG_PATH = "res://dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl"
const VENUS_ARRIVAL_DIALOG_PATH = "res://dialogs/timelines/1_waking_up/7_venus_arrival.dtl"
func get_respawn_scene() -> Scene:
@@ -21,12 +22,11 @@ func get_destination_scene() -> Scene:
"002"
)
func get_first_vending_machine_occurence(_level : int) -> int:
return 1
func get_ship_dialog_path(level : int, ship_in_space := true) -> String:
if level == 0:
return MERCURY_DEPARTURE_DIALOG_PATH
elif level == 1:
return MERCURY_DEPARTURE_DIALOG_PATH
if ship_in_space and is_run_finished(level + 1):
return VENUS_ARRIVAL_DIALOG_PATH
return ""

67
common/icons/tractor-beam.svg Normal file
View File

@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="#ffffff"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="icon icon-tabler icons-tabler-outline icon-tabler-hand-stop"
version="1.1"
id="svg5"
sodipodi:docname="tractor-beam.svg"
inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs5" /><sodipodi:namedview
id="namedview5"
pagecolor="#505050"
bordercolor="#ffffff"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
inkscape:deskcolor="#505050"
inkscape:zoom="18.5"
inkscape:cx="12.621622"
inkscape:cy="19.72973"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg5" /><path
stroke="none"
d="M 0,0 H 23.749739 V 23.9144 H 0 Z"
fill="none"
id="path1"
style="stroke-width:1.99999" /><path
d="M 6.8271984,12.845525 V 5.3722753 a 1.4843591,1.4946504 0 0 1 2.968718,0 v 6.4768177"
id="path2"
style="stroke-width:1.99999" /><path
d="M 9.7959164,5.3722753 V 3.3794087 a 1.4843589,1.4946502 0 1 1 2.9687166,0 v 8.4696843"
id="path3"
style="stroke-width:1.99999" /><path
d="m 12.764633,5.3722753 a 1.4843591,1.4946504 0 0 1 2.968718,0 v 6.4768177"
id="path4"
style="stroke-width:1.99999" /><path
d="m 15.733351,7.365142 c 0,-1.9928659 2.968717,-1.9928659 2.968717,0 v 2.975834 m -7.710749,11.47245 C 8.9938986,21.813765 7.1301633,20.802796 6.0315822,19.123055 5.9666761,19.023581 5.9020237,18.923936 5.837626,18.824125 5.5288793,18.346835 4.4452975,16.444642 2.5858908,13.116556 2.1917476,12.411131 2.4268816,11.517964 3.1163016,11.101767 c 0.726623,-0.439011 1.6566878,-0.324001 2.2562253,0.279001 l 1.4546715,1.464757"
id="path5"
sodipodi:nodetypes="cscccccccc"
style="stroke-width:1.99999" /><g
style="fill:none;stroke:#ffffff;stroke-width:3.85163;stroke-linecap:round;stroke-linejoin:round"
id="g5"
transform="matrix(0.51747196,0,0,0.52105962,10.491291,11.386461)"><path
stroke="none"
d="M 0,0 H 24 V 24 H 0 Z"
fill="none"
id="path1-9"
style="stroke-width:3.85163" /><path
d="M 21,12 H 19 C 18.106,12 17.338,11.143 17.239,10 16.943,6.55 16.49,4 14.49,4 c -2,0 -2.5,3.582 -2.5,8 0,4.418 -0.5,8 -2.5,8 -2,0 -2.452,-2.547 -2.749,-6 -0.1,-1.147 -0.867,-2 -1.763,-2 h -2"
id="path2-1"
style="stroke-width:3.85163" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

43
common/icons/tractor-beam.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d2nnlb6u5tvrk"
path="res://.godot/imported/tractor-beam.svg-4c2610322ae48f5564558f00d6fd6d1a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/tractor-beam.svg"
dest_files=["res://.godot/imported/tractor-beam.svg-4c2610322ae48f5564558f00d6fd6d1a.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false