EDIT changement de l'ecran de chargement et des barres d'oubli/douleur/trauma.

scenes/interfaces/game_menu/game_ui.gd

@@ -12,7 +12,7 @@ func change_oubli( value ):
         $stats_window.get_content_child( "douleur" ).value -= value/2
     
 func change_trauma( value ):
-    $stats_window.get_content_child( "trauma" ).value += value
+    $stats_window.get_content_child( "trauma" ).self_modulate.a += value/6.0
     
 func set_douleur( value ):
     var delta = value - $stats_window.get_content_child( "douleur" ).value
@@ -25,11 +25,11 @@ func set_oubli( value ):
     if delta > 0.0:
         $stats_window.get_content_child( "douleur" ).value -= delta/2
 func set_trauma( value ):
-    $stats_window.get_content_child( "trauma" ).value = value
+    $stats_window.get_content_child( "trauma" ).self_modulate.a = value/6.0
 
 
 func update_trauma():
-    $stats_window.get_content_child( "trauma" ).value = ($stats_window.get_content_child( "oubli" ).value+$stats_window.get_content_child( "douleur" ).value)/2
+    $stats_window.get_content_child( "trauma" ).self_modulate.a = (($stats_window.get_content_child( "oubli" ).value+$stats_window.get_content_child( "douleur" ).value)/2)/6.0
 
 func _on_douleur_value_changed(value):
     $stats_window.get_content_child( "douleur" ).self_modulate.a = (value / 18.0) * (value / 18.0)
@@ -41,5 +41,5 @@ func _on_oubli_value_changed(value):
 
 
 func _on_trauma_value_changed(value):
-    $stats_window.get_content_child( "trauma" ).self_modulate.a = (value / 6.0) * (value / 6.0)
+    $stats_window.get_content_child( "trauma" ).self_modulate.a = (value / 6.0)
 

scenes/interfaces/game_menu/game_ui.tscn

@@ -1,12 +1,15 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://addons/ui_window/ui_window.gd" type="Script" id=1]
 [ext_resource path="res://scenes/interfaces/game_menu/game_ui.gd" type="Script" id=2]
-[ext_resource path="res://assets/interfaces/jauges/jauge_ring_white.png" type="Texture" id=3]
+[ext_resource path="res://assets/interfaces/jauges/peurs_oubli_douleur.png" type="Texture" id=3]
+[ext_resource path="res://assets/interfaces/jauges/peurs_trauma.png" type="Texture" id=4]
 
 [node name="game_ui" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_left = -1.0
+margin_right = -1.0
 mouse_filter = 2
 script = ExtResource( 2 )
 __meta__ = {
@@ -28,41 +31,38 @@ is_dragged_by_header_only = false
 title = ""
 
 [node name="douleur" type="TextureProgress" parent="stats_window"]
-margin_right = 126.0
-margin_bottom = 126.0
+margin_right = 128.0
+margin_bottom = 128.0
 max_value = 18.0
 step = 0.5
 texture_progress = ExtResource( 3 )
 fill_mode = 4
-tint_progress = Color( 1, 0, 0, 1 )
-radial_fill_degrees = 135.0
+radial_fill_degrees = 180.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="oubli" type="TextureProgress" parent="stats_window"]
-margin_right = 126.0
-margin_bottom = 126.0
+margin_right = 128.0
+margin_bottom = 128.0
 max_value = 18.0
 step = 0.5
 texture_progress = ExtResource( 3 )
 fill_mode = 5
-tint_progress = Color( 0, 1, 0, 1 )
-radial_fill_degrees = 135.0
+radial_fill_degrees = 180.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="trauma" type="TextureProgress" parent="stats_window"]
-margin_right = 126.0
-margin_bottom = 126.0
+self_modulate = Color( 1, 1, 1, 0 )
+margin_right = 128.0
+margin_bottom = 128.0
 max_value = 6.0
 step = 0.5
-texture_progress = ExtResource( 3 )
+value = 6.0
+texture_progress = ExtResource( 4 )
 fill_mode = 8
-tint_progress = Color( 0, 0, 1, 1 )
-radial_initial_angle = 180.0
-radial_fill_degrees = 90.0
 __meta__ = {
 "_edit_use_anchors_": false
 }

scenes/interfaces/loading_screen/loading_screen.tscn

@@ -0,0 +1,90 @@
+[gd_scene load_steps=25 format=2]
+
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_0.png" type="Texture" id=1]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_5.png" type="Texture" id=2]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_11.png" type="Texture" id=3]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_2.png" type="Texture" id=4]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_8.png" type="Texture" id=5]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_12.png" type="Texture" id=6]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_1.png" type="Texture" id=7]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_4.png" type="Texture" id=8]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_9.png" type="Texture" id=9]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_10.png" type="Texture" id=10]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_3.png" type="Texture" id=11]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_6.png" type="Texture" id=12]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_13.png" type="Texture" id=13]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/loading_screen_7.png" type="Texture" id=14]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_7.png" type="Texture" id=15]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_0.png" type="Texture" id=16]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_4.png" type="Texture" id=17]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_2.png" type="Texture" id=18]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_1.png" type="Texture" id=19]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_3.png" type="Texture" id=20]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_6.png" type="Texture" id=21]
+[ext_resource path="res://assets/interfaces/loading_screen/frames/echarpe_5.png" type="Texture" id=22]
+
+[sub_resource type="Animation" id=1]
+resource_name = "loading"
+length = 13.0
+tracks/0/type = "value"
+tracks/0/path = NodePath("background:texture")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
+"update": 1,
+"values": [ ExtResource( 1 ), ExtResource( 7 ), ExtResource( 4 ), ExtResource( 11 ), ExtResource( 8 ), ExtResource( 2 ), ExtResource( 12 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 6 ), ExtResource( 13 ) ]
+}
+
+[sub_resource type="Animation" id=2]
+resource_name = "wave"
+length = 1.4
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath("scarf:texture")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.2, 0.4, 0.6, 0.8, 1, 1.2, 1.4 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ),
+"update": 1,
+"values": [ ExtResource( 16 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 22 ), ExtResource( 21 ), ExtResource( 15 ) ]
+}
+
+[node name="loading_screen" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_bottom = 6.10352e-05
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="background" type="TextureRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+texture = ExtResource( 1 )
+expand = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="scarf" type="TextureRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+texture = ExtResource( 16 )
+expand = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="background_player" type="AnimationPlayer" parent="."]
+anims/loading = SubResource( 1 )
+
+[node name="scarf_player" type="AnimationPlayer" parent="."]
+autoplay = "wave"
+anims/wave = SubResource( 2 )

scenes/main/main.gd

@@ -87,7 +87,9 @@ func set_new_scene( scene_resource ):
 func update_progress():
     var progress = float(self.loader.get_stage()) / self.loader.get_stage_count()
 
-    self.get_node("loading_screen").set_value( progress )
+    self.get_node("loading_screen/background_player").play("loading")
+    self.get_node("loading_screen/background_player").stop()
+    self.get_node("loading_screen/background_player").seek( (progress*13.0)/100.0 )
     
     
 

scenes/main/main.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://scenes/interfaces/main_menu/main_menu.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/interfaces/loading_screen/khanat_sound_cover_hover.png" type="Texture" id=2]
+[ext_resource path="res://scenes/interfaces/loading_screen/loading_screen.tscn" type="PackedScene" id=2]
 [ext_resource path="res://scenes/main/main.gd" type="Script" id=3]
-[ext_resource path="res://assets/interfaces/loading_screen/khanat_sound_cover_bg.png" type="Texture" id=4]
-[ext_resource path="res://assets/interfaces/loading_screen/khanat_sound_cover_progress.png" type="Texture" id=5]
 
 [node name="main" type="Spatial"]
 script = ExtResource( 3 )
@@ -13,19 +11,7 @@ script = ExtResource( 3 )
 
 [node name="main_menu" parent="." instance=ExtResource( 1 )]
 
-[node name="loading_screen" type="TextureProgress" parent="."]
+[node name="loading_screen" parent="." instance=ExtResource( 2 )]
 visible = false
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_bottom = 6.10352e-05
-step = 0.1
-texture_under = ExtResource( 4 )
-texture_over = ExtResource( 2 )
-texture_progress = ExtResource( 5 )
-fill_mode = 6
-nine_patch_stretch = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
 [connection signal="play_pressed" from="main_menu" to="." method="_on_main_menu_play_pressed"]
 [connection signal="quit_pressed" from="main_menu" to="." method="_on_main_menu_quit_pressed"]