Merge branch 'master' into 'master'

Ajout de couches et correction d'orthographe

See merge request !12

src/menus/principal/Principal.tscn

@@ -9,7 +9,7 @@
 [ext_resource path="res://menus/scripts/edit_name.gd" type="Script" id=7]
 [ext_resource path="res://menus/principal/fond_debut_pressed.png" type="Texture" id=8]
 
-[sub_resource type="StyleBoxFlat" id=4]
+[sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.831373, 0.823529, 0.192157, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -21,7 +21,7 @@ corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
-[sub_resource type="StyleBoxFlat" id=8]
+[sub_resource type="StyleBoxFlat" id=2]
 bg_color = Color( 0.937255, 0.92549, 0.0784314, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -33,7 +33,7 @@ corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
-[sub_resource type="StyleBoxFlat" id=5]
+[sub_resource type="StyleBoxFlat" id=3]
 border_width_left = 2
 border_width_top = 2
 border_width_right = 2
@@ -43,20 +43,20 @@ corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
-[sub_resource type="DynamicFont" id=2]
+[sub_resource type="DynamicFont" id=4]
 size = 38
 use_filter = true
 font_data = ExtResource( 5 )
 
-[sub_resource type="StyleBoxTexture" id=6]
+[sub_resource type="StyleBoxTexture" id=5]
 texture = ExtResource( 8 )
 region_rect = Rect2( 0, 0, 620, 150 )
 
-[sub_resource type="StyleBoxTexture" id=7]
+[sub_resource type="StyleBoxTexture" id=6]
 texture = ExtResource( 6 )
 region_rect = Rect2( 0, 0, 620, 150 )
 
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=7]
 size = 40
 use_filter = true
 font_data = ExtResource( 3 )
@@ -83,9 +83,9 @@ margin_top = 353.951
 margin_right = 202.905
 margin_bottom = 487.951
 rect_pivot_offset = Vector2( 400.49, 64.32 )
-custom_styles/hover = SubResource( 4 )
-custom_styles/focus = SubResource( 8 )
-custom_styles/disabled = SubResource( 5 )
+custom_styles/hover = SubResource( 1 )
+custom_styles/focus = SubResource( 2 )
+custom_styles/disabled = SubResource( 3 )
 custom_fonts/font = ExtResource( 4 )
 custom_colors/font_color = Color( 0.592157, 0.0588235, 0.0588235, 1 )
 disabled = true
@@ -107,7 +107,7 @@ margin_left = 284.77
 margin_top = 375.071
 margin_right = 396.77
 margin_bottom = 436.071
-custom_fonts/font = SubResource( 2 )
+custom_fonts/font = SubResource( 4 )
 custom_colors/font_color = Color( 0.482353, 0.345098, 0.192157, 1 )
 text = "Nom"
 __meta__ = {
@@ -119,9 +119,9 @@ margin_left = 392.0
 margin_top = 368.0
 margin_right = 640.0
 margin_bottom = 426.0
-custom_styles/focus = SubResource( 6 )
-custom_styles/normal = SubResource( 7 )
-custom_fonts/font = SubResource( 3 )
+custom_styles/focus = SubResource( 5 )
+custom_styles/normal = SubResource( 6 )
+custom_fonts/font = SubResource( 7 )
 align = 1
 script = ExtResource( 7 )
 __meta__ = {

src/scenes/jeu/Jeu.tscn

@@ -20,7 +20,7 @@ outline_size = 2
 outline_color = Color( 0.223529, 0.12549, 0, 1 )
 font_data = ExtResource( 7 )
 
-[sub_resource type="StyleBoxFlat" id=6]
+[sub_resource type="StyleBoxFlat" id=2]
 bg_color = Color( 0.592157, 0.0588235, 0.0588235, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -30,7 +30,7 @@ border_color = Color( 1, 0.752941, 0, 1 )
 corner_radius_top_left = 5
 corner_radius_bottom_left = 5
 
-[sub_resource type="StyleBoxFlat" id=7]
+[sub_resource type="StyleBoxFlat" id=3]
 bg_color = Color( 0.937255, 0.92549, 0.0784314, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -40,13 +40,13 @@ border_color = Color( 1, 0.752941, 0, 1 )
 corner_radius_top_left = 5
 corner_radius_bottom_left = 5
 
-[sub_resource type="DynamicFont" id=8]
+[sub_resource type="DynamicFont" id=4]
 outline_size = 1
 outline_color = Color( 0, 0, 0, 1 )
 use_filter = true
 font_data = ExtResource( 12 )
 
-[sub_resource type="StyleBoxFlat" id=3]
+[sub_resource type="StyleBoxFlat" id=5]
 border_width_left = 2
 border_width_top = 2
 border_width_right = 2
@@ -54,7 +54,7 @@ border_width_bottom = 2
 corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 
-[sub_resource type="StyleBoxFlat" id=4]
+[sub_resource type="StyleBoxFlat" id=6]
 bg_color = Color( 0.937255, 0.92549, 0.0784314, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -64,27 +64,27 @@ border_color = Color( 1, 0.752941, 0, 1 )
 corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 
-[sub_resource type="DynamicFont" id=5]
+[sub_resource type="DynamicFont" id=7]
 use_filter = true
 font_data = ExtResource( 7 )
 
-[sub_resource type="DynamicFont" id=10]
+[sub_resource type="DynamicFont" id=8]
 outline_color = Color( 1, 0, 0, 1 )
 use_filter = true
 font_data = ExtResource( 7 )
 
-[sub_resource type="DynamicFont" id=11]
+[sub_resource type="DynamicFont" id=9]
 size = 30
 outline_size = 1
 outline_color = Color( 1, 0, 0, 1 )
 font_data = ExtResource( 7 )
 
-[sub_resource type="DynamicFont" id=9]
+[sub_resource type="DynamicFont" id=10]
 outline_color = Color( 1, 0.752941, 0, 1 )
 use_filter = true
 font_data = ExtResource( 7 )
 
-[sub_resource type="DynamicFont" id=2]
+[sub_resource type="DynamicFont" id=11]
 size = 20
 outline_size = 1
 outline_color = Color( 0, 0, 0, 1 )
@@ -205,7 +205,7 @@ texture_outil = ExtResource( 1 )
 
 [node name="Terrain" parent="Outils" instance=ExtResource( 11 )]
 position = Vector2( 250, 46 )
-_couches = [ [ 0, 1, 10 ], [ 0, 1, 30 ], [ 0, 1, 70 ], [ 1, null, null ], [ 3, null, null ], [ 2, null, null ], [ 1, null, null ], [ 5, null, null ] ]
+_couches = [ [ 0, 1, 10 ], [ 0, 1, 30 ], [ 0, 1, 70 ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, null, null ], [ 1, 2, 20 ], [ 1, 2, 70 ], [ 1, 2, 90 ], [ 2, null, null ], [ 2, null, null ], [ 2, 3, 30 ], [ 2, 3, 70 ], [ 3, 4, 40 ], [ 3, 4, 70 ], [ 5, null, null ] ]
 _taille_x = 32
 _taille_y = 46
 _textures = [ "res://terrain/textures/herbe.png", "res://terrain/textures/terre.png", "res://terrain/textures/sable.png", "res://terrain/textures/gravier.png", "res://terrain/textures/pierre.png", "res://terrain/textures/bedrock.png" ]
@@ -215,9 +215,9 @@ margin_left = 822.5
 margin_top = 561.0
 margin_right = 899.5
 margin_bottom = 596.0
-custom_styles/fg = SubResource( 6 )
-custom_styles/bg = SubResource( 7 )
-custom_fonts/font = SubResource( 8 )
+custom_styles/fg = SubResource( 2 )
+custom_styles/bg = SubResource( 3 )
+custom_fonts/font = SubResource( 4 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -227,9 +227,9 @@ margin_left = 898.216
 margin_top = 560.941
 margin_right = 985.216
 margin_bottom = 595.941
-custom_styles/disabled = SubResource( 3 )
-custom_styles/normal = SubResource( 4 )
-custom_fonts/font = SubResource( 5 )
+custom_styles/disabled = SubResource( 5 )
+custom_styles/normal = SubResource( 6 )
+custom_fonts/font = SubResource( 7 )
 custom_colors/font_color = Color( 0.592157, 0.0588235, 0.0588235, 1 )
 disabled = true
 text = "Suivant"
@@ -242,7 +242,7 @@ margin_left = 251.341
 margin_top = 568.224
 margin_right = 303.341
 margin_bottom = 582.224
-custom_fonts/font = SubResource( 10 )
+custom_fonts/font = SubResource( 8 )
 custom_colors/font_color = Color( 1, 0, 0, 1 )
 text = "Degats :"
 __meta__ = {
@@ -254,7 +254,7 @@ margin_left = 331.234
 margin_top = 558.375
 margin_right = 430.234
 margin_bottom = 595.375
-custom_fonts/font = SubResource( 11 )
+custom_fonts/font = SubResource( 9 )
 custom_colors/font_color = Color( 1, 0, 0, 1 )
 text = "0"
 __meta__ = {
@@ -266,7 +266,7 @@ margin_left = 581.744
 margin_top = 569.427
 margin_right = 818.744
 margin_bottom = 589.427
-custom_fonts/font = SubResource( 9 )
+custom_fonts/font = SubResource( 10 )
 custom_colors/font_color = Color( 0.937255, 0.92549, 0.0784314, 1 )
 text = "Pourcentage de découverte :"
 __meta__ = {
@@ -276,7 +276,7 @@ __meta__ = {
 [node name="Info" type="Label" parent="."]
 margin_right = 40.0
 margin_bottom = 21.0
-custom_fonts/font = SubResource( 2 )
+custom_fonts/font = SubResource( 11 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 __meta__ = {
 "_edit_use_anchors_": false

src/scenes/scene2/scene2.tscn

@@ -194,7 +194,7 @@ margin_right = 672.0
 margin_bottom = 121.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = ", suit a des fouilles archéologiques nous avons retrouvé :"
+text = ", sur cette fouille achéologique j'ai trouvé ::"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -218,7 +218,7 @@ margin_right = 100.0
 margin_bottom = 225.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = "Epoque estime :"
+text = "Epoque estimée :"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -230,7 +230,7 @@ margin_right = 132.0
 margin_bottom = 265.0
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
-text = "Date estime :"
+text = "Date estimée :"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -273,9 +273,9 @@ __meta__ = {
 }
 
 [node name="edit_epoque" type="LineEdit" parent="annalyse/Panel"]
-margin_left = 147.0
+margin_left = 152.0
 margin_top = 205.0
-margin_right = 316.0
+margin_right = 321.0
 margin_bottom = 229.0
 custom_styles/focus = SubResource( 3 )
 custom_styles/normal = SubResource( 4 )
@@ -286,9 +286,9 @@ __meta__ = {
 }
 
 [node name="edit_date" type="LineEdit" parent="annalyse/Panel"]
-margin_left = 132.0
+margin_left = 134.0
 margin_top = 246.0
-margin_right = 244.0
+margin_right = 246.0
 margin_bottom = 270.0
 custom_styles/focus = SubResource( 3 )
 custom_styles/normal = SubResource( 4 )