diff --git a/asset_dev/level/player_ship/player_ship_tank.ubpd b/asset_dev/level/player_ship/player_ship_tank.ubpd new file mode 100644 index 0000000..aaf7fde Binary files /dev/null and b/asset_dev/level/player_ship/player_ship_tank.ubpd differ diff --git a/assets/level/player_ship/player_ship_tank_C.png b/assets/level/player_ship/player_ship_tank_C.png new file mode 100644 index 0000000..5f1b131 --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_C.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e303bb11c11db6fcca8c1b4f5f06da6b3db85b224e9a686e3b0870d0aacd359 +size 19757 diff --git a/assets/level/player_ship/player_ship_tank_C.png.import b/assets/level/player_ship/player_ship_tank_C.png.import new file mode 100644 index 0000000..5e30939 --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_C.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dupdt58lfmd85" +path="res://.godot/imported/player_ship_tank_C.png-2e28f4e40d6659b147f8774c8f00a92c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/player_ship/player_ship_tank_C.png" +dest_files=["res://.godot/imported/player_ship_tank_C.png-2e28f4e40d6659b147f8774c8f00a92c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/level/player_ship/player_ship_tank_M.png b/assets/level/player_ship/player_ship_tank_M.png new file mode 100644 index 0000000..89d3f97 --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_M.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cb9d4ef16f3fd0714e253faa03c6f11d01ae5c859c2816fa51ce9c712fd8c1e +size 7560 diff --git a/assets/level/player_ship/player_ship_tank_M.png.import b/assets/level/player_ship/player_ship_tank_M.png.import new file mode 100644 index 0000000..c232549 --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_M.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmcdypipuh3gc" +path="res://.godot/imported/player_ship_tank_M.png-038b169c5185b0df793fe61b4a39d2a5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/player_ship/player_ship_tank_M.png" +dest_files=["res://.godot/imported/player_ship_tank_M.png-038b169c5185b0df793fe61b4a39d2a5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/level/player_ship/player_ship_tank_N.png b/assets/level/player_ship/player_ship_tank_N.png new file mode 100644 index 0000000..f08749a --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_N.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f4e68e3dca3100d629b45cf0d3962bf7a857e0b0c0da3d23c001231bbbd77ea +size 9438 diff --git a/assets/level/player_ship/player_ship_tank_N.png.import b/assets/level/player_ship/player_ship_tank_N.png.import new file mode 100644 index 0000000..16d057b --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_N.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bux766vwb1rrc" +path="res://.godot/imported/player_ship_tank_N.png-e252c9c00a914aed6a656535d06377a5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/player_ship/player_ship_tank_N.png" +dest_files=["res://.godot/imported/player_ship_tank_N.png-e252c9c00a914aed6a656535d06377a5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/level/player_ship/player_ship_tank_N.png" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/level/player_ship/player_ship_tank_R.png b/assets/level/player_ship/player_ship_tank_R.png new file mode 100644 index 0000000..a0ef5eb --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_R.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2185bb37607c3140db8acc2fc124228fbf5fc515a9974ca49b3b0b3c8801093d +size 11624 diff --git a/assets/level/player_ship/player_ship_tank_R.png.import b/assets/level/player_ship/player_ship_tank_R.png.import new file mode 100644 index 0000000..9afb81f --- /dev/null +++ b/assets/level/player_ship/player_ship_tank_R.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3swdihtwt7n0" +path="res://.godot/imported/player_ship_tank_R.png-dcde35e7c6dcee74b85671e215b7b04c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/player_ship/player_ship_tank_R.png" +dest_files=["res://.godot/imported/player_ship_tank_R.png-dcde35e7c6dcee74b85671e215b7b04c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/levels/ghost_ship/player_ship/player_ship.tscn b/levels/ghost_ship/player_ship/player_ship.tscn index 16bbc51..3f6fef6 100644 --- a/levels/ghost_ship/player_ship/player_ship.tscn +++ b/levels/ghost_ship/player_ship/player_ship.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=47 format=3 uid="uid://oowut88kr2ox"] +[gd_scene load_steps=53 format=3 uid="uid://oowut88kr2ox"] [ext_resource type="Script" uid="uid://lfd36ps52xgk" path="res://levels/ghost_ship/player_ship/player_ship.gd" id="1_0r2ng"] [ext_resource type="ArrayMesh" uid="uid://dq4aj5ph31rce" path="res://assets/level/player_ship/player_ship.obj" id="1_nafoa"] @@ -6,11 +6,15 @@ [ext_resource type="Material" uid="uid://x1h5m3w0m0g7" path="res://assets/materials/metal_plate_02/metal_plate_02.material" id="3_0e0pl"] [ext_resource type="Texture2D" uid="uid://duo8ph784g4gd" path="res://assets/level/player_ship/tank_facade_M.png" id="3_e4hmc"] [ext_resource type="Texture2D" uid="uid://ccnk8eicahcw8" path="res://assets/level/player_ship/tank_facade_N.png" id="4_0r2ng"] +[ext_resource type="Texture2D" uid="uid://dupdt58lfmd85" path="res://assets/level/player_ship/player_ship_tank_C.png" id="4_66f7e"] [ext_resource type="Texture2D" uid="uid://btq7agwq1vdqk" path="res://assets/materials/rubber/rubber_gasket_C.png" id="4_veot7"] [ext_resource type="Texture2D" uid="uid://dv2876ywyq6rf" path="res://assets/level/player_ship/tank_facade_R.png" id="5_22nd2"] +[ext_resource type="Texture2D" uid="uid://dmcdypipuh3gc" path="res://assets/level/player_ship/player_ship_tank_M.png" id="5_eicqe"] [ext_resource type="Texture2D" uid="uid://d0oxo3u6ts6k5" path="res://assets/materials/rubber/rubber_gasket_N.png" id="5_qj4yg"] +[ext_resource type="Texture2D" uid="uid://bux766vwb1rrc" path="res://assets/level/player_ship/player_ship_tank_N.png" id="6_8v6o6"] [ext_resource type="Script" uid="uid://deg5xd87cy8rg" path="res://src/props/interactive.gd" id="6_e4hmc"] [ext_resource type="Texture2D" uid="uid://ktr5niaf6psx" path="res://assets/materials/rubber/rubber_gasket_R.png" id="6_ny71l"] +[ext_resource type="Texture2D" uid="uid://3swdihtwt7n0" path="res://assets/level/player_ship/player_ship_tank_R.png" id="7_rfxeu"] [ext_resource type="ArrayMesh" uid="uid://djgqnuxrja1mo" path="res://assets/level/player_ship/player_ship_tank_facade.obj" id="8_2mvif"] [ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk/gunk.gdshader" id="8_al8ma"] [ext_resource type="ArrayMesh" uid="uid://bc8457r4rxpey" path="res://assets/level/player_ship/grunk_liquid.obj" id="8_xuj2g"] @@ -26,6 +30,15 @@ [ext_resource type="AudioStream" uid="uid://b601aiv71ddra" path="res://assets/sfx/space_door.wav" id="20_3rulp"] [ext_resource type="AudioStream" uid="uid://bckqqojs6pcu1" path="res://assets/sfx/space_door_close.wav" id="21_bmg36"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rts36"] +albedo_texture = ExtResource("4_66f7e") +metallic = 1.0 +metallic_texture = ExtResource("5_eicqe") +roughness_texture = ExtResource("7_rfxeu") +normal_enabled = true +normal_texture = ExtResource("6_8v6o6") +texture_filter = 2 + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_66f7e"] albedo_color = Color(0.281187, 0.281187, 0.281187, 1) albedo_texture = ExtResource("4_veot7") @@ -297,6 +310,9 @@ size = Vector3(1.25, 2.5, 0.1) [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_0e0pl"] data = PackedVector3Array(-0.625, 1.25, 0.05, 0.625, 1.25, 0.05, -0.625, -1.25, 0.05, 0.625, 1.25, 0.05, 0.625, -1.25, 0.05, -0.625, -1.25, 0.05, 0.625, 1.25, -0.05, -0.625, 1.25, -0.05, 0.625, -1.25, -0.05, -0.625, 1.25, -0.05, -0.625, -1.25, -0.05, 0.625, -1.25, -0.05, 0.625, 1.25, 0.05, 0.625, 1.25, -0.05, 0.625, -1.25, 0.05, 0.625, 1.25, -0.05, 0.625, -1.25, -0.05, 0.625, -1.25, 0.05, -0.625, 1.25, -0.05, -0.625, 1.25, 0.05, -0.625, -1.25, -0.05, -0.625, 1.25, 0.05, -0.625, -1.25, 0.05, -0.625, -1.25, -0.05, 0.625, 1.25, 0.05, -0.625, 1.25, 0.05, 0.625, 1.25, -0.05, -0.625, 1.25, 0.05, -0.625, 1.25, -0.05, 0.625, 1.25, -0.05, -0.625, -1.25, 0.05, 0.625, -1.25, 0.05, -0.625, -1.25, -0.05, 0.625, -1.25, 0.05, 0.625, -1.25, -0.05, -0.625, -1.25, -0.05) +[sub_resource type="FogMaterial" id="FogMaterial_66f7e"] +density = -8.0 + [node name="PlayerShip" type="Node3D"] script = ExtResource("1_0r2ng") @@ -307,6 +323,7 @@ collision_layer = 5 sorting_offset = 3.0 mesh = ExtResource("1_nafoa") surface_material_override/0 = ExtResource("3_0e0pl") +surface_material_override/1 = SubResource("StandardMaterial3D_rts36") surface_material_override/2 = SubResource("StandardMaterial3D_66f7e") [node name="TankFacadeMesh" type="MeshInstance3D" parent="StaticBody3D"] @@ -351,10 +368,9 @@ skeleton = NodePath("../..") surface_material_override/0 = SubResource("ShaderMaterial_3trrp") [node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.9, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.85878, 0) light_color = Color(1, 1, 0.956863, 1) -light_energy = 2.0 -light_indirect_energy = 8.0 +light_indirect_energy = 16.0 shadow_enabled = true omni_range = 10.0 @@ -434,6 +450,11 @@ volume_db = -8.0 unit_size = 4.0 bus = &"SFX" +[node name="NegativeFog" type="FogVolume" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 1.5) +size = Vector3(6, 3.5, 12) +material = SubResource("FogMaterial_66f7e") + [connection signal="activated" from="TankInteractBody/TankInteractor" to="." method="deposit_grunk"] [connection signal="body_entered" from="DoorArea" to="DoorArea" method="_on_body_entered"] [connection signal="body_exited" from="DoorArea" to="DoorArea" method="_on_body_exited"] diff --git a/src/world/world.tscn b/src/world/world.tscn index 2f8b682..a67352d 100644 --- a/src/world/world.tscn +++ b/src/world/world.tscn @@ -4,7 +4,7 @@ [ext_resource type="Resource" uid="uid://tgac5tnfx56r" path="res://src/world/world_manager.tres" id="2_5kmgb"] [ext_resource type="PackedScene" uid="uid://byvjsvavbg5xe" path="res://src/ui/menus/pause_menu/pause_menu.tscn" id="2_6fy3g"] [ext_resource type="Resource" uid="uid://0i72bf8ip1lx" path="res://src/world/spook_manager.tres" id="3_l0av5"] -[ext_resource type="PackedScene" uid="uid://dc4tts6342cuj" path="res://levels/testing/prop_test/prop_test.tscn" id="4_5kmgb"] +[ext_resource type="PackedScene" uid="uid://bov4ok76woyc" path="res://levels/ghost_ship/ghost_ship.tscn" id="4_5kmgb"] [ext_resource type="PackedScene" uid="uid://c0uitm5cg88h1" path="res://src/ui/menus/kill_screen/kill_screen.tscn" id="6_l0av5"] [ext_resource type="PackedScene" uid="uid://brknr57xc2cp0" path="res://src/ui/elements/save_icon/save_icon.tscn" id="7_5kmgb"]