diff --git a/Levels/Level04.tscn b/Levels/Level04.tscn index 30f030f..ccde01d 100644 --- a/Levels/Level04.tscn +++ b/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"] diff --git a/Materials/Arbre_Mat.tres b/Materials/Arbre_Mat.tres index 5c8b2ba..e15edf9 100644 --- a/Materials/Arbre_Mat.tres +++ b/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 diff --git a/Materials/Bark_Mat.tres b/Materials/Bark_Mat.tres new file mode 100644 index 0000000..aaa5460 --- /dev/null +++ b/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 ) diff --git a/Materials/Sapin_Mat.tres b/Materials/Sapin_Mat.tres index 53bfbff..013317a 100644 --- a/Materials/Sapin_Mat.tres +++ b/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 diff --git a/Scenes/Arbre.tscn b/Scenes/Arbre.tscn index ea1a994..9cee20e 100644 --- a/Scenes/Arbre.tscn +++ b/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 ) diff --git a/Scenes/Sapin.tscn b/Scenes/Sapin.tscn index 208f074..805fbc1 100644 --- a/Scenes/Sapin.tscn +++ b/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 ) diff --git a/Textures/Custom/Bark_Albedo.png b/Textures/Custom/Bark_Albedo.png new file mode 100644 index 0000000..0581ccf Binary files /dev/null and b/Textures/Custom/Bark_Albedo.png differ diff --git a/Textures/Custom/Bark_Albedo.png.import b/Textures/Custom/Bark_Albedo.png.import new file mode 100644 index 0000000..c903cb8 --- /dev/null +++ b/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 diff --git a/Textures/Custom/Bark_NormalMap.png b/Textures/Custom/Bark_NormalMap.png new file mode 100644 index 0000000..87ed4e0 Binary files /dev/null and b/Textures/Custom/Bark_NormalMap.png differ diff --git a/Textures/Custom/Bark_NormalMap.png.import b/Textures/Custom/Bark_NormalMap.png.import new file mode 100644 index 0000000..ca7a67d --- /dev/null +++ b/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