diff --git a/Levels/Level07.tscn b/Levels/Level07.tscn index 277142a..c606453 100644 --- a/Levels/Level07.tscn +++ b/Levels/Level07.tscn @@ -1,11 +1,18 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://Levels/Level07.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/SquareGrill_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/Brick01_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://Textures/Custom/Eye_Albedo.png" type="Texture" id=10] +[ext_resource path="res://Scenes/Eye.tscn" type="PackedScene" id=11] +[ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=12] +[ext_resource path="res://Materials/Grass_Mat.tres" type="Material" id=13] [sub_resource type="DynamicFont" id=8] size = 64 @@ -47,6 +54,18 @@ glow_bloom = 0.02 glow_hdr_threshold = 0.44 glow_bicubic_upscale = true +[sub_resource type="SpatialMaterial" id=15] +albedo_texture = ExtResource( 10 ) +metallic_specular = 0.63 +roughness = 0.33 +clearcoat_enabled = true +clearcoat = 1.0 +clearcoat_gloss = 0.5 +refraction_enabled = true +refraction_scale = 0.05 +refraction_texture_channel = 0 +uv1_scale = Vector3( 0.01, 0.943, 0.562 ) + [node name="lvl7" type="Spatial"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.990751, 0 ) script = ExtResource( 1 ) @@ -56,68 +75,79 @@ transform = Transform( 1, 0, 0.000244346, 0, 1, 0, -0.000244346, 0, 1, 0, 0, 0 ) use_collision = true [node name="CSGBox" type="CSGBox" parent="CSGCombiner"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.7323, 0, 3.83593 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.3446, 0, 3.83559 ) width = 54.8806 height = 4.26933 depth = 135.006 +material = ExtResource( 4 ) [node name="CSGTorus" type="CSGTorus" parent="CSGCombiner"] transform = Transform( -0.0130023, 0.999914, -0.000247523, -0.999915, -0.0130022, -0.000244325, -0.000247523, 0.000244325, 0.999999, -14.7742, 7.28439, 53.2558 ) inner_radius = 4.02972 outer_radius = 10.1934 +material = ExtResource( 2 ) [node name="CSGTorus2" type="CSGTorus" parent="CSGCombiner"] transform = Transform( -0.0130023, 0.999914, -0.000247523, -0.999915, -0.0130022, -0.000244325, -0.000247522, 0.000244325, 0.999999, -14.7641, 7.28439, 11.7923 ) inner_radius = 4.02972 outer_radius = 10.1934 +material = ExtResource( 2 ) [node name="CSGTorus3" type="CSGTorus" parent="CSGCombiner"] transform = Transform( -0.0130023, 0.999914, -0.000247523, -0.999915, -0.0130022, -0.000244325, -0.000247522, 0.000244325, 0.999999, -14.7511, 7.28439, -41.2553 ) inner_radius = 4.02972 outer_radius = 10.1934 +material = ExtResource( 2 ) [node name="CSGBox2" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -58.5244, 3.43431, -30.5957 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGBox3" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -56.8637, 3.43431, -49.2217 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGBox4" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -58.5324, 3.43431, 2.3445 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGBox5" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -57.2992, 3.34029, 20.4663 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGBox6" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -57.3053, 3.34029, 45.2067 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGBox7" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -57.3096, 3.34029, 63.0448 ) width = 87.7098 height = 69.0626 depth = 3.49386 +material = ExtResource( 7 ) [node name="CSGSphere" type="CSGSphere" parent="CSGCombiner"] transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -61.1579, 7.67452, 53.7674 ) radius = 2.35474 +material = ExtResource( 13 ) [node name="Player" parent="." instance=ExtResource( 5 )] -transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 37.763, 21.5903, 3.17083 ) +transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 31.3121, 5.61961, 3.17083 ) [node name="Messages" type="Control" parent="."] margin_right = 40.0 @@ -147,7 +177,7 @@ transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 4.0267, 7 transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -66.0945, 3.70733, 12.6761 ) [node name="Enemy3" parent="." instance=ExtResource( 3 )] -transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -68.9686, 3.70733, -41.2269 ) +transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -68.9686, 7.12754, -41.2269 ) [node name="Enemy4" parent="." instance=ExtResource( 3 )] transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, 12.7431, 6.4701, 11.6252 ) @@ -165,9 +195,19 @@ transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.70710 environment = SubResource( 14 ) [node name="CSGCylinder" type="CSGCylinder" parent="."] -transform = Transform( 0.0250777, 0.999685, 6.12765e-06, -0.999685, 0.0250778, -0.000244269, -0.000244346, 0, 0.999999, -14.6573, 8.23895, -40.7858 ) +transform = Transform( 0.0250777, 0.999685, 6.12765e-06, -0.999685, 0.0250778, -0.000244269, -0.000244346, 0, 0.999999, -14.6573, 7.23676, -41.1843 ) radius = 6.51179 height = 1.13578 +material = SubResource( 15 ) + +[node name="Eye" parent="." instance=ExtResource( 11 )] +transform = Transform( 2.64008, -4.19739, 0.641761, 4.18193, 2.70123, 0.463519, -0.735823, 0.292014, 4.93693, -44.1584, -16.7615, -37.3894 ) + +[node name="InfoScreen" parent="." instance=ExtResource( 12 )] +transform = Transform( 0.82087, -1.23598, 1.34109, 0.485261, 1.56568, 1.14594, -1.75804, -0.144942, 0.942495, -46.9491, -9.31074, -42.5998 ) +text = "You shouldn't +cheat +I'm watching" [connection signal="timeout" from="End" to="." method="_on_Win_timeout"] [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"] diff --git a/Materials/Brick01_Mat.tres b/Materials/Brick01_Mat.tres new file mode 100644 index 0000000..8d65ad6 --- /dev/null +++ b/Materials/Brick01_Mat.tres @@ -0,0 +1,13 @@ +[gd_resource type="SpatialMaterial" load_steps=3 format=2] + +[ext_resource path="res://Textures/Custom/Brick01.png" type="Texture" id=1] +[ext_resource path="res://Textures/Custom/Brick01_NormalMap.png" type="Texture" id=2] + +[resource] +albedo_texture = ExtResource( 1 ) +normal_enabled = true +normal_scale = 1.0 +normal_texture = ExtResource( 2 ) +uv1_scale = Vector3( 0.01, 0.01, 0.01 ) +uv1_triplanar = true +uv1_triplanar_sharpness = 1.93187 diff --git a/Materials/Grass_Mat.tres b/Materials/Grass_Mat.tres index b648e6d..e43150e 100644 --- a/Materials/Grass_Mat.tres +++ b/Materials/Grass_Mat.tres @@ -1,9 +1,11 @@ -[gd_resource type="SpatialMaterial" load_steps=3 format=2] +[gd_resource type="SpatialMaterial" load_steps=4 format=2] [ext_resource path="res://Textures/Custom/Grass_Albedo.png" type="Texture" id=1] [ext_resource path="res://Textures/Custom/Grass_Normal.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 = 2.11 diff --git a/Player.gd b/Player.gd index d2f88bb..5c3c939 100644 --- a/Player.gd +++ b/Player.gd @@ -5,8 +5,8 @@ export var speed = 20 export var h_acceleration = 6 export var air_acceleration = 1 export var normal_acceleration = 6 -export var gravity = 100 -export var jump = 30 +export var gravity = 50 +export var jump = 15 export var slapkill = 0.8 var slap = 0.0 var chargeSlap = false diff --git a/Textures/Custom/Brick01.png b/Textures/Custom/Brick01.png new file mode 100644 index 0000000..324d32d Binary files /dev/null and b/Textures/Custom/Brick01.png differ diff --git a/Textures/Custom/Brick01.png.import b/Textures/Custom/Brick01.png.import new file mode 100644 index 0000000..68f60fa --- /dev/null +++ b/Textures/Custom/Brick01.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/Brick01.png-d52b11cbe6337fb4d00620457b8e7a32.s3tc.stex" +path.etc2="res://.import/Brick01.png-d52b11cbe6337fb4d00620457b8e7a32.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/Custom/Brick01.png" +dest_files=[ "res://.import/Brick01.png-d52b11cbe6337fb4d00620457b8e7a32.s3tc.stex", "res://.import/Brick01.png-d52b11cbe6337fb4d00620457b8e7a32.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/Brick01_NormalMap.png b/Textures/Custom/Brick01_NormalMap.png new file mode 100644 index 0000000..aef0e29 Binary files /dev/null and b/Textures/Custom/Brick01_NormalMap.png differ diff --git a/Textures/Custom/Brick01_NormalMap.png.import b/Textures/Custom/Brick01_NormalMap.png.import new file mode 100644 index 0000000..e4c4d44 --- /dev/null +++ b/Textures/Custom/Brick01_NormalMap.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/Brick01_NormalMap.png-ec3df83fbf7653cc8d37b0e4e8b5d93d.s3tc.stex" +path.etc2="res://.import/Brick01_NormalMap.png-ec3df83fbf7653cc8d37b0e4e8b5d93d.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/Custom/Brick01_NormalMap.png" +dest_files=[ "res://.import/Brick01_NormalMap.png-ec3df83fbf7653cc8d37b0e4e8b5d93d.s3tc.stex", "res://.import/Brick01_NormalMap.png-ec3df83fbf7653cc8d37b0e4e8b5d93d.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=2 +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