diff --git a/Levels/Level01.tscn b/Levels/Level01.tscn index 831511e..30fadc0 100644 --- a/Levels/Level01.tscn +++ b/Levels/Level01.tscn @@ -40,7 +40,6 @@ ssao_intensity2 = 13.38 ssao_bias = 0.288 ssao_quality = 0 ssao_edge_sharpness = 26.86 -dof_blur_far_enabled = true dof_blur_far_transition = 214.88 dof_blur_far_amount = 0.12 dof_blur_far_quality = 0 diff --git a/Levels/Level02.tscn b/Levels/Level02.tscn index e75f0e8..0aba9d4 100644 --- a/Levels/Level02.tscn +++ b/Levels/Level02.tscn @@ -66,7 +66,6 @@ ssao_intensity2 = 13.38 ssao_bias = 0.288 ssao_quality = 0 ssao_edge_sharpness = 26.86 -dof_blur_far_enabled = true dof_blur_far_transition = 214.88 dof_blur_far_amount = 0.12 dof_blur_far_quality = 0 @@ -90,7 +89,6 @@ 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, 0, 0, 0 ) width = 18.2596 depth = 80.7948 material = SubResource( 18 ) @@ -783,7 +781,7 @@ transform = Transform( -7.94393, 0, -6.07403, 0, 9, 0, 6.07403, 0, -7.94393, -55 environment = SubResource( 17 ) [node name="InvisibleWall" type="StaticBody" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8015, 40.0335 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.351067, 1.8015, 40.3004 ) collision_layer = 8 collision_mask = 8 diff --git a/Levels/Level03.tscn b/Levels/Level03.tscn index 249217b..2a77360 100644 --- a/Levels/Level03.tscn +++ b/Levels/Level03.tscn @@ -1,23 +1,16 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://Levels/Level03.gd" type="Script" id=1] -[ext_resource path="res://Textures/kenney_prototype_textures/orange/texture_01.png" type="Texture" id=2] +[ext_resource path="res://Materials/Grid_Mat.tres" type="Material" id=2] [ext_resource path="res://Scenes/Enemy.tscn" type="PackedScene" id=3] +[ext_resource path="res://Scenes/Eye.tscn" type="PackedScene" 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://Textures/kenney_prototype_textures/purple/texture_01.png" type="Texture" 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/kenney_prototype_textures/dark/texture_01.png" type="Texture" id=11] - -[sub_resource type="SpatialMaterial" id=9] -albedo_texture = ExtResource( 11 ) - -[sub_resource type="SpatialMaterial" id=10] -albedo_texture = ExtResource( 2 ) - -[sub_resource type="SpatialMaterial" id=12] -albedo_texture = ExtResource( 7 ) +[ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=10] +[ext_resource path="res://Materials/LongGrill_Mat.tres" type="Material" id=11] +[ext_resource path="res://Levels/Sparks.gd" type="Script" id=12] [sub_resource type="DynamicFont" id=8] size = 64 @@ -34,12 +27,12 @@ panorama = ExtResource( 6 ) background_mode = 2 background_sky = SubResource( 13 ) ambient_light_energy = 0.5 -fog_color = Color( 0.305882, 0.372549, 0.52549, 1 ) +fog_color = Color( 0.356863, 0.360784, 0.364706, 1 ) fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 ) fog_sun_amount = 1.0 -fog_depth_begin = 98.8 -fog_depth_end = 1444.5 -fog_depth_curve = 0.466516 +fog_depth_begin = 2158.3 +fog_depth_end = 3768.4 +fog_depth_curve = 1.6245 fog_transmit_enabled = true fog_transmit_curve = 0.659754 fog_height_enabled = true @@ -59,6 +52,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=15] +material = SubResource( 18 ) +size = Vector2( 0.25, 0.25 ) + +[sub_resource type="Curve" id=16] +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=17] +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="lvl3" type="Spatial"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.990751, 0 ) script = ExtResource( 1 ) @@ -71,22 +82,22 @@ use_collision = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.858472, -1.98215, 0.0803872 ) width = 28.7268 depth = 39.2853 -material = SubResource( 9 ) +material = ExtResource( 11 ) [node name="CSGBox2" type="CSGBox" parent="CSGCombiner"] transform = Transform( 0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, -0.650235, -1.05012, 50.3919 ) width = 5.52827 depth = 31.9112 -material = SubResource( 10 ) +material = ExtResource( 2 ) [node name="CSGBox4" type="CSGBox" parent="CSGCombiner"] transform = Transform( -0.00610858, 0.99998, -0.000245838, -0.999979, -0.00610863, -0.000244341, -0.000245838, 0.000244341, 0.999997, 3.90277, 2.53261, 50.393 ) width = 5.52827 depth = 31.9112 -material = SubResource( 12 ) +material = ExtResource( 2 ) [node name="Player" parent="." instance=ExtResource( 5 )] -transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 7.59106, -6.04147 ) +transform = Transform( -0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866026, -5, 2, -6.041 ) [node name="Messages" type="Control" parent="."] margin_right = 40.0 @@ -136,6 +147,44 @@ 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="Eye" parent="." instance=ExtResource( 4 )] +transform = Transform( -4.37114e-07, -200, 0, 10, -8.74228e-06, 0, 0, 0, 200, 0, -150, 0 ) + +[node name="InfoScreen" parent="." instance=ExtResource( 10 )] +transform = Transform( -2.59808, 0, -1.5, 0, 3, 0, 1.5, 0, -2.59808, 14, 4, 20 ) +text = " Don't forget +You can restart in the menu +[ Press Escape to open the menu ]" + +[node name="HeBeWatching" parent="." instance=ExtResource( 10 )] +transform = Transform( 0.974945, -0.198619, 0.100165, 0.206643, 0.97536, -0.0772759, -0.0823489, 0.0960382, 0.991965, 0, 2.16359, -22.3236 ) +text = " He's Watching" +offset = Vector2( 1, 2 ) + +[node name="Sparks" type="CPUParticles" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.59884, 0.875956, -22.2329 ) +amount = 12 +lifetime = 0.22 +explosiveness = 0.27 +randomness = 0.84 +lifetime_randomness = 0.24 +mesh = SubResource( 15 ) +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( 16 ) +linear_accel_curve = SubResource( 17 ) +radial_accel = 11.01 +radial_accel_random = 0.18 +angle_random = 0.28 +script = ExtResource( 12 ) + +[node name="Timer" type="Timer" parent="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"] @@ -144,3 +193,4 @@ environment = SubResource( 14 ) [connection signal="dying" from="Enemy5" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy6" to="." method="_on_Enemy_dying"] [connection signal="dying" from="Enemy7" to="." method="_on_Enemy_dying"] +[connection signal="timeout" from="Sparks/Timer" to="Sparks" method="_on_Timer_timeout"] diff --git a/Levels/Sparks.gd b/Levels/Sparks.gd new file mode 100644 index 0000000..73115e8 --- /dev/null +++ b/Levels/Sparks.gd @@ -0,0 +1,6 @@ +extends CPUParticles + + + +func _on_Timer_timeout(): + emitting = !emitting diff --git a/Materials/LongGrill_Mat.tres b/Materials/LongGrill_Mat.tres new file mode 100644 index 0000000..1336887 --- /dev/null +++ b/Materials/LongGrill_Mat.tres @@ -0,0 +1,16 @@ +[gd_resource type="SpatialMaterial" load_steps=4 format=2] + +[ext_resource path="res://Textures/Custom/longGrill_NormalMap.png" type="Texture" id=1] +[ext_resource path="res://Textures/Custom/longGrill.png" type="Texture" id=2] +[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=3] + +[resource] +next_pass = ExtResource( 3 ) +params_diffuse_mode = 4 +params_specular_mode = 3 +albedo_texture = ExtResource( 2 ) +metallic = 0.35 +roughness = 0.81 +normal_enabled = true +normal_scale = 1.0 +normal_texture = ExtResource( 1 ) diff --git a/Player.tscn b/Player.tscn index d69d1f2..ca76a54 100644 --- a/Player.tscn +++ b/Player.tscn @@ -117,6 +117,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.84218, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0154071, 0.355, -0.246618 ) doppler_tracking = 2 fov = 90.0 +far = 1500.0 [node name="HitBox" type="Area" parent="Head/Camera"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0154071, -0.355, 0.246618 ) diff --git a/Textures/Custom/longGrill.png b/Textures/Custom/longGrill.png new file mode 100644 index 0000000..8a8d2a4 Binary files /dev/null and b/Textures/Custom/longGrill.png differ diff --git a/Textures/Custom/longGrill.png.import b/Textures/Custom/longGrill.png.import new file mode 100644 index 0000000..149cede --- /dev/null +++ b/Textures/Custom/longGrill.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/longGrill.png-7910cd99ee11e97ae481597d3fdee29a.s3tc.stex" +path.etc2="res://.import/longGrill.png-7910cd99ee11e97ae481597d3fdee29a.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/Custom/longGrill.png" +dest_files=[ "res://.import/longGrill.png-7910cd99ee11e97ae481597d3fdee29a.s3tc.stex", "res://.import/longGrill.png-7910cd99ee11e97ae481597d3fdee29a.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/longGrill_NormalMap.png b/Textures/Custom/longGrill_NormalMap.png new file mode 100644 index 0000000..847feda Binary files /dev/null and b/Textures/Custom/longGrill_NormalMap.png differ diff --git a/Textures/Custom/longGrill_NormalMap.png.import b/Textures/Custom/longGrill_NormalMap.png.import new file mode 100644 index 0000000..204c084 --- /dev/null +++ b/Textures/Custom/longGrill_NormalMap.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/longGrill_NormalMap.png-78912365fa9bb8e68af7ef38cbdf53a9.s3tc.stex" +path.etc2="res://.import/longGrill_NormalMap.png-78912365fa9bb8e68af7ef38cbdf53a9.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/Custom/longGrill_NormalMap.png" +dest_files=[ "res://.import/longGrill_NormalMap.png-78912365fa9bb8e68af7ef38cbdf53a9.s3tc.stex", "res://.import/longGrill_NormalMap.png-78912365fa9bb8e68af7ef38cbdf53a9.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