Moves the opening curtains scene to autoloads

2024-04-08 10:09:36 +02:00
parent a905543351
commit b7c22a4b53
17 changed files with 27 additions and 161 deletions
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cuk6aur2mqe6y"
-path="res://.godot/imported/bonuspath_a_01_complete.png-897bda4de5428c7b46c5eb63574d356c.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/bonuspath_a_01_complete.png"
-dest_files=["res://.godot/imported/bonuspath_a_01_complete.png-897bda4de5428c7b46c5eb63574d356c.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
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://blxcf17gus8c"
-path="res://.godot/imported/bonuspath_a_01_not_complete.png-64b0f6f0d472897aab337e8a484b9938.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/bonuspath_a_01_not_complete.png"
-dest_files=["res://.godot/imported/bonuspath_a_01_not_complete.png-64b0f6f0d472897aab337e8a484b9938.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
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bb080qc6juomq"
-path="res://.godot/imported/path_a_01.png-93a1b4c2adfbc89d6517f795a9e687a9.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/path_a_01.png"
-dest_files=["res://.godot/imported/path_a_01.png-93a1b4c2adfbc89d6517f795a9e687a9.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
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://byv4d55but7c"
-path="res://.godot/imported/path_b_01.png-17f14a7bc673650b104023018c190eb3.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/path_b_01.png"
-dest_files=["res://.godot/imported/path_b_01.png-17f14a7bc673650b104023018c190eb3.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
@@ -30,7 +30,7 @@ Database="*res://sources/utils/autoloads/Database.gd"
 UserDataManager="*res://sources/utils/autoloads/user_data_manager.gd"
 MusicManager="*res://sources/utils/autoloads/music_manager.tscn"
 Validation="*res://addons/godot-form-validator/validation.gd"
-OpeningCurtain="*res://sources/minigames/base/opening_curtain.tscn"
+OpeningCurtain="*res://sources/utils/autoloads/opening_curtain.tscn"

 [debug]

@@ -1,7 +1,7 @@
 [gd_scene load_steps=9 format=3 uid="uid://b7cfjs2iipagq"]

 [ext_resource type="Script" path="res://sources/menus/register/register.gd" id="1_jsnxc"]
-[ext_resource type="PackedScene" uid="uid://cp27bjh6v5bkj" path="res://sources/minigames/base/opening_curtain.tscn" id="2_kfcp0"]
+[ext_resource type="PackedScene" uid="uid://cp27bjh6v5bkj" path="res://sources/utils/autoloads/opening_curtain.tscn" id="2_kfcp0"]
 [ext_resource type="PackedScene" uid="uid://wdjp1sv55q4f" path="res://sources/menus/components/night_sky/night_sky.tscn" id="2_tirf6"]
 [ext_resource type="PackedScene" uid="uid://dxc82xcl7jncd" path="res://sources/menus/main/plants/palm.tscn" id="3_25mko"]
 [ext_resource type="PackedScene" uid="uid://nwur175781jf" path="res://sources/menus/main/plants/large_flower.tscn" id="5_23tyx"]
@@ -29,7 +29,6 @@ class_name Minigame
@export var lose_kalulu_speech: AudioStream = preload("res://language_resources/fr/minigames/kalulu/kalulu_lose_minigame_all.mp3")

@onready var minigame_ui: = $MinigameUI
-@onready var opening_curtain: = $OpeningCurtain
@onready var audio_player: MinigameAudioStreamPlayer = $AudioStreamPlayer
@onready var fireworks: = $Fireworks

@@ -1,9 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://8awe4usnucyv"]
+[gd_scene load_steps=5 format=3 uid="uid://8awe4usnucyv"]

 [ext_resource type="Script" path="res://sources/minigames/base/base_minigame.gd" id="1_jdfsm"]
 [ext_resource type="PackedScene" uid="uid://weree6bnlt6f" path="res://sources/minigames/base/minigame_ui.tscn" id="2_a3tib"]
 [ext_resource type="Script" path="res://sources/minigames/base/MinigameAudioStreamPlayer.gd" id="2_dkgx4"]
-[ext_resource type="PackedScene" path="res://sources/minigames/base/opening_curtain.tscn" id="3_p5ryr"]
 [ext_resource type="PackedScene" uid="uid://d1gkvqxe1n8o8" path="res://sources/utils/fx/fireworks.tscn" id="4_yekwo"]

 [node name="BaseMinigame" type="Control"]
@@ -5,8 +5,8 @@
 [ext_resource type="PackedScene" uid="uid://cn2rw06pltyiu" path="res://sources/utils/fx/right.tscn" id="2_edt4e"]
 [ext_resource type="PackedScene" uid="uid://cge0uyn30tcpv" path="res://sources/utils/fx/highlight.tscn" id="3_5uhvd"]
 [ext_resource type="Script" path="res://sources/utils/percent_margin_container.gd" id="3_vllju"]
-[ext_resource type="PackedScene" uid="uid://c6klih3h3ws6f" path="res://sources/utils/auto_size_label.tscn" id="4_26xiq"]
-[ext_resource type="SpriteFrames" uid="uid://dquynn3nx52o" path="res://sources/minigames/jellyfish/red_jellyfish_animations.tres" id="5_bh1cr"]
+[ext_resource type="PackedScene" uid="uid://bgio7muqck2bu" path="res://sources/utils/auto_size_label.tscn" id="4_26xiq"]
+[ext_resource type="SpriteFrames" uid="uid://dkemftb4jdxvs" path="res://sources/minigames/jellyfish/green_jellyfish_animations.tres" id="5_v2n7t"]
 [ext_resource type="PackedScene" uid="uid://dlmbxcgiv8tpr" path="res://sources/utils/fx/wrong.tscn" id="6_w1tlu"]

 [node name="Jellyfish" type="Control"]
@@ -15,8 +15,9 @@ layout_mode = 3
 anchors_preset = 0
 offset_right = 400.0
 offset_bottom = 400.0
-scale = Vector2(1.14493, 1.14493)
+scale = Vector2(1.3285, 1.3285)
 script = ExtResource("1_06uwq")
+color = 1

 [node name="BackFX" type="Control" parent="."]
 custom_minimum_size = Vector2(0, 220)
@@ -65,10 +66,10 @@ sprites = [NodePath("AnimatedSprite2D")]

 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="SpriteControl"]
 unique_name_in_owner = true
-scale = Vector2(2.15054, 2.15054)
-sprite_frames = ExtResource("5_bh1cr")
+scale = Vector2(1.84332, 1.84332)
+sprite_frames = ExtResource("5_v2n7t")
 animation = &"idle"
-frame_progress = 0.0795803
+frame_progress = 0.1048
 centered = false
 offset = Vector2(-0.000205994, 0.00019455)

@@ -253,7 +253,10 @@ func get_lessons_count() -> int:


 func get_audio_stream_for_path(path: String) -> AudioStream:
-	return load(base_path + language + "/" + path)
+	var full_path : String = base_path.path_join(language).path_join(path)
+	if not FileAccess.file_exists(full_path):
+		return null
+	return load(full_path)


 func get_audio_stream_for_word(word: String) -> AudioStream:
@@ -1,6 +1,6 @@
 [gd_scene load_steps=7 format=3 uid="uid://cp27bjh6v5bkj"]

-[ext_resource type="Script" path="res://sources/minigames/base/opening_curtain.gd" id="1_xih0r"]
+[ext_resource type="Script" path="res://sources/utils/autoloads/opening_curtain.gd" id="1_xih0r"]
 [ext_resource type="Texture2D" uid="uid://4u85b8th4uuv" path="res://assets/minigames/minigame_ui/graphic/curtain/bush.png" id="1_yhjvv"]

 [sub_resource type="Animation" id="Animation_eyrra"]