Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper

Levels/Level04.tscn

@@ -1,9 +1,12 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://Levels/Level04.gd" type="Script" id=1]
+[ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Materials/Glasse_Mat.tres" type="Material" id=4]
 [ext_resource path="res://Player.tscn" type="PackedScene" id=5]
 [ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=6]
+[ext_resource path="res://Materials/Bark_Mat.tres" type="Material" id=7]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8]
 [ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=9]
 
@@ -58,14 +61,16 @@ use_collision = true
 [node name="CSGCylinder" type="CSGCylinder" parent="CSGCombiner"]
 transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -0.000628059, -15.8918, 2.57037 )
 radius = 4.46988
-height = 14.0879
+height = 13.8
+material = ExtResource( 7 )
 
 [node name="CSGCylinder2" type="CSGCylinder" parent="CSGCombiner"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00225494, -22.3349, 9.22848 )
 radius = 11.1679
+material = ExtResource( 4 )
 
 [node name="Player" parent="." instance=ExtResource( 5 )]
-transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, -11.2336, 13.3483 )
+transform = Transform( 0.762555, 0, -0.646923, 0, 1, 0, 0.646923, 0, 0.762555, 1, -18.459, 13.673 )
 
 [node name="Messages" type="Control" parent="."]
 margin_right = 40.0
@@ -103,6 +108,13 @@ transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.70710
 [node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
 environment = SubResource( 14 )
 
+[node name="InfoScreen" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1.23501, -0.634057, -1.43969, 0.163799, 1.87223, -0.68404, 1.56458, 0.304489, 1.20805, 10, -10, 5 )
+text = "Quick Reminder:
+You can't escape
+Even in death
+:)"
+
 [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
 [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
 [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]

Levels/Level05.tscn

@@ -1,11 +1,17 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://Levels/Level05.gd" type="Script" id=1]
+[ext_resource path="res://Materials/Metal_Mat.tres" type="Material" id=2]
 [ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Materials/WoodenPlank.tres" type="Material" id=4]
 [ext_resource path="res://Player.tscn" type="PackedScene" id=5]
 [ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=6]
+[ext_resource path="res://Materials/Grid_Mat.tres" type="Material" id=7]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8]
 [ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=9]
+[ext_resource path="res://Materials/LongGrill_Mat.tres" type="Material" id=10]
+[ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=11]
+[ext_resource path="res://Levels/Sparks.gd" type="Script" id=12]
 
 [sub_resource type="DynamicFont" id=8]
 size = 64
@@ -47,6 +53,24 @@ glow_bloom = 0.02
 glow_hdr_threshold = 0.44
 glow_bicubic_upscale = true
 
+[sub_resource type="SpatialMaterial" id=18]
+flags_transparent = true
+albedo_color = Color( 0.686275, 0.67451, 0.345098, 0.756863 )
+
+[sub_resource type="QuadMesh" id=19]
+material = SubResource( 18 )
+size = Vector2( 0.25, 0.25 )
+
+[sub_resource type="Curve" id=20]
+min_value = -360.0
+max_value = 360.0
+_data = [ Vector2( 0.00495049, 184.091 ), 0.0, 167.601, 0, 0, Vector2( 1, 1 ), 0.0, 0.0, 0, 0 ]
+
+[sub_resource type="Curve" id=21]
+min_value = -200.0
+max_value = 200.0
+_data = [ Vector2( 0, 50.9091 ), 0.0, 0.0, 0, 0, Vector2( 0.960396, -32.7273 ), 0.0, 0.0, 0, 0 ]
+
 [node name="lvl5" type="Spatial"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.990751, 0 )
 script = ExtResource( 1 )
@@ -59,36 +83,43 @@ use_collision = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.06902, -0.132225, -21.8733 )
 width = 22.1248
 depth = 19.4055
+material = ExtResource( 7 )
 
 [node name="CSGBox2" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 0.00137887, 0.999998, -0.000244009, -0.999999, 0.00137855, -0.000244346, -0.000244009, 0.000244345, 0.999999, -9.06442, 10.7573, -22.0477 )
 width = 22.1248
 depth = 20.0379
+material = ExtResource( 4 )
 
 [node name="CSGBox3" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 0.00767621, -0.0788052, -0.996858, -0.995582, -0.0939, -0.000243266, -0.0935858, 0.992456, -0.0791777, 0.131084, 10.7573, -30.6408 )
 width = 22.1248
 depth = 20.0379
+material = ExtResource( 10 )
 
 [node name="CSGBox4" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 0.0123419, 0.999243, 0.0368199, -0.999918, 0.0122129, 0.00371112, 0.00325864, -0.0368625, 0.999312, 8.956, 10.7573, -24.2874 )
 width = 22.1248
 depth = 20.9881
+material = ExtResource( 4 )
 
 [node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( -0.00414683, -0.0358436, -0.999345, -0.999918, 0.0122129, 0.00371112, 0.0120725, 0.999279, -0.0358912, -0.242548, 10.7573, -13.4628 )
 width = 22.1248
 depth = 20.9881
+material = ExtResource( 2 )
 
 [node name="CSGBox6" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 0.00782422, -0.0787367, -0.996862, -0.714767, -0.697608, 0.0494901, -0.699319, 0.712137, -0.0617365, 0.130855, 24.2183, -29.7022 )
 width = 22.1248
 depth = 20.0379
+material = ExtResource( 10 )
 
 [node name="CSGBox7" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 0.00786304, -0.0784375, -0.996885, 0.513185, -0.855306, 0.0713453, -0.858241, -0.512147, 0.0335276, 0.125876, 24.6812, -9.32691 )
 width = 40.3216
 depth = 20.0379
+material = ExtResource( 2 )
 
 [node name="CSGBox8" type="CSGBox" parent="CSGCombiner"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.07383, -0.132225, -2.19238 )
@@ -111,7 +142,7 @@ width = 22.1248
 depth = 20.9881
 
 [node name="Player" parent="." instance=ExtResource( 5 )]
-transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 12.3171, -21.0435 )
+transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 3.76586, -28.4352 )
 
 [node name="Messages" type="Control" parent="."]
 margin_right = 40.0
@@ -146,6 +177,37 @@ environment = SubResource( 14 )
 [node name="Enemy2" parent="." instance=ExtResource( 3 )]
 transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -0.602382, 23.6634, -11.5108 )
 
+[node name="InfoScreen" parent="." instance=ExtResource( 11 )]
+transform = Transform( -1.48596, 0.19758, 0.0357537, 0.197452, 1.48693, -0.00475089, -0.054102, -1.25729e-08, -0.999349, 0, 12.672, -14.633 )
+text = " You can jump
+the walls are too high for you to leave
+[ Press spacebar to jump ]"
+
+[node name="Sparks" type="CPUParticles" parent="InfoScreen"]
+transform = Transform( -0.801275, 0.23656, -0.549543, 0.241817, 0.968196, 0.0641897, 0.547251, -0.081455, -0.832995, 4.43559, -1.39239, -0.302538 )
+amount = 12
+lifetime = 0.22
+explosiveness = 0.27
+randomness = 0.84
+lifetime_randomness = 0.24
+mesh = SubResource( 19 )
+emission_shape = 2
+emission_box_extents = Vector3( 1, 1, 1 )
+flag_align_y = true
+flag_rotate_y = true
+gravity = Vector3( 0, -5, 0 )
+initial_velocity_random = 0.11
+angular_velocity_curve = SubResource( 20 )
+linear_accel_curve = SubResource( 21 )
+radial_accel = 11.01
+radial_accel_random = 0.18
+angle_random = 0.28
+script = ExtResource( 12 )
+
+[node name="Timer" type="Timer" parent="InfoScreen/Sparks"]
+autostart = true
+
 [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
 [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
 [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]
+[connection signal="timeout" from="InfoScreen/Sparks/Timer" to="InfoScreen/Sparks" method="_on_Timer_timeout"]

Materials/Arbre_Mat.tres

@@ -4,6 +4,7 @@
 
 [resource]
 flags_transparent = true
+flags_unshaded = true
 params_diffuse_mode = 4
 params_specular_mode = 3
 params_billboard_mode = 2

Materials/Bark_Mat.tres

@@ -0,0 +1,14 @@
+[gd_resource type="SpatialMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://Textures/Custom/Bark_Albedo.png" type="Texture" id=1]
+[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=2]
+[ext_resource path="res://Textures/Custom/Bark_NormalMap.png" type="Texture" id=3]
+
+[resource]
+next_pass = ExtResource( 2 )
+params_diffuse_mode = 4
+params_specular_mode = 3
+albedo_texture = ExtResource( 1 )
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 3 )

Materials/Mirror_Mat.tres

@@ -0,0 +1,10 @@
+[gd_resource type="SpatialMaterial" format=2]
+
+[resource]
+metallic = 1.0
+roughness = 0.49
+subsurf_scatter_enabled = true
+subsurf_scatter_strength = 0.0
+refraction_enabled = true
+refraction_scale = 0.05
+refraction_texture_channel = 0

Materials/Sapin_Mat.tres

@@ -4,6 +4,7 @@
 
 [resource]
 flags_transparent = true
+flags_unshaded = true
 params_diffuse_mode = 4
 params_specular_mode = 3
 params_billboard_mode = 2

Materials/WoodenPlank.tres

@@ -0,0 +1,14 @@
+[gd_resource type="SpatialMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://Textures/Custom/wooden_planks_Albedo.png" type="Texture" id=1]
+[ext_resource path="res://Textures/Custom/wooden_planks_NormalMap.png" type="Texture" id=2]
+[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=3]
+
+[resource]
+next_pass = ExtResource( 3 )
+albedo_texture = ExtResource( 1 )
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 2 )
+uv1_scale = Vector3( 1, 0.05, 0.5 )
+uv1_triplanar = true

Scenes/Arbre.tscn

@@ -9,7 +9,3 @@ material = ExtResource( 1 )
 
 [node name="Plane01" type="MeshInstance" parent="."]
 mesh = SubResource( 2 )
-
-[node name="Plane02" type="MeshInstance" parent="."]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0 )
-mesh = SubResource( 2 )

Scenes/Sapin.tscn

@@ -9,7 +9,3 @@ material = ExtResource( 1 )
 
 [node name="Plane01" type="MeshInstance" parent="."]
 mesh = SubResource( 2 )
-
-[node name="Plane02" type="MeshInstance" parent="."]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0 )
-mesh = SubResource( 2 )

Textures/Custom/Bark_Albedo.png.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Bark_Albedo.png-b99faa6e4cacaeb4520d035466dc7154.s3tc.stex"
+path.etc2="res://.import/Bark_Albedo.png-b99faa6e4cacaeb4520d035466dc7154.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Custom/Bark_Albedo.png"
+dest_files=[ "res://.import/Bark_Albedo.png-b99faa6e4cacaeb4520d035466dc7154.s3tc.stex", "res://.import/Bark_Albedo.png-b99faa6e4cacaeb4520d035466dc7154.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Custom/Bark_NormalMap.png.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Bark_NormalMap.png-f5193a558dd1d24088a0fa5d5baa78df.s3tc.stex"
+path.etc2="res://.import/Bark_NormalMap.png-f5193a558dd1d24088a0fa5d5baa78df.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Custom/Bark_NormalMap.png"
+dest_files=[ "res://.import/Bark_NormalMap.png-f5193a558dd1d24088a0fa5d5baa78df.s3tc.stex", "res://.import/Bark_NormalMap.png-f5193a558dd1d24088a0fa5d5baa78df.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Custom/wooden_planks_NormalMap.png.import

@@ -2,26 +2,28 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.stex"
+path.s3tc="res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.s3tc.stex"
+path.etc2="res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Textures/Custom/wooden_planks_NormalMap.png"
-dest_files=[ "res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.stex" ]
+dest_files=[ "res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.s3tc.stex", "res://.import/wooden_planks_NormalMap.png-e4608bec4d0b338069e0627895bd7579.etc2.stex" ]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
-compress/normal_map=0
+compress/normal_map=1
-flags/repeat=0
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
 flags/srgb=2
 process/fix_alpha_border=true
@@ -31,5 +33,5 @@ process/invert_color=false
 process/normal_map_invert_y=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0