diff --git a/asset_dev/props/guide_sign/guide_sign_variants.xcf b/asset_dev/props/guide_sign/guide_sign_variants.xcf index 33183ae..4f33c3b 100644 Binary files a/asset_dev/props/guide_sign/guide_sign_variants.xcf and b/asset_dev/props/guide_sign/guide_sign_variants.xcf differ diff --git a/assets/level/guide_signs/guide_sign_airlock_C.png b/assets/level/guide_signs/guide_sign_airlock_C.png index 458bfbd..8f701b5 100644 --- a/assets/level/guide_signs/guide_sign_airlock_C.png +++ b/assets/level/guide_signs/guide_sign_airlock_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce177689f3f2e8cc790782cbadf60192a53af6643a3d865ba95167cced3dc4c5 -size 36848 +oid sha256:89d29371b56db8c48e60c2585bb3c0e8049901d683c9c63a8a4be07dbd3a6c60 +size 42340 diff --git a/assets/level/guide_signs/guide_sign_airlock_E.png b/assets/level/guide_signs/guide_sign_airlock_E.png index f5bca07..e33542c 100644 --- a/assets/level/guide_signs/guide_sign_airlock_E.png +++ b/assets/level/guide_signs/guide_sign_airlock_E.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b64d719526d281ec96db9495fdec3f5aa04179f81a5cf9b3ac9e601cd19fefe1 -size 15855 +oid sha256:8a030835058df38811832cb5a25564c8b7409cedc79643bdf7b6d6368c411eee +size 19262 diff --git a/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png b/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png new file mode 100644 index 0000000..f073740 --- /dev/null +++ b/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b89ee178be73981d8a75aaaa0ca37fdd16a2c63f90f938f6a4f7d5b3946c30d5 +size 40647 diff --git a/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png.import b/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png.import new file mode 100644 index 0000000..b66eda1 --- /dev/null +++ b/assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bb7qesvjimqjh" +path="res://.godot/imported/guide_sign_mess_hall_airlock_C.png-a0a03442bd8752ca9a6a5d73d6d17e3b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/guide_signs/guide_sign_mess_hall_airlock_C.png" +dest_files=["res://.godot/imported/guide_sign_mess_hall_airlock_C.png-a0a03442bd8752ca9a6a5d73d6d17e3b.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/guide_signs/guide_sign_mess_hall_airlock_E.png b/assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png new file mode 100644 index 0000000..aa1a9ea --- /dev/null +++ b/assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:284b8bfbe82d720ff153d6b1ac0c215c9b6323c598a8bf367004f38a60c14f06 +size 19574 diff --git a/assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png.import b/assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png.import new file mode 100644 index 0000000..03d4cb9 --- /dev/null +++ b/assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d1hug5v5o7g5j" +path="res://.godot/imported/guide_sign_mess_hall_airlock_E.png-021499b7fe2567d7ad89c7c31c812293.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/level/guide_signs/guide_sign_mess_hall_airlock_E.png" +dest_files=["res://.godot/imported/guide_sign_mess_hall_airlock_E.png-021499b7fe2567d7ad89c7c31c812293.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/ghost_ship_level.tscn b/levels/ghost_ship/ghost_ship_level.tscn index a0fd6b6..8a8a786 100644 --- a/levels/ghost_ship/ghost_ship_level.tscn +++ b/levels/ghost_ship/ghost_ship_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=242 format=4 uid="uid://crydi5cjgfwe5"] +[gd_scene load_steps=247 format=4 uid="uid://crydi5cjgfwe5"] [ext_resource type="PackedScene" uid="uid://oowut88kr2ox" path="res://levels/ghost_ship/player_ship/player_ship.tscn" id="1_2pyr1"] [ext_resource type="PackedScene" uid="uid://c2omlx4ptrc01" path="res://src/world/gunk_body/gunk_body.tscn" id="2_2egij"] @@ -62,6 +62,7 @@ [ext_resource type="PackedScene" uid="uid://bn8fdu4houoo2" path="res://src/world/world_item/world_item.tscn" id="43_f0xh4"] [ext_resource type="PackedScene" uid="uid://bpsiwx1517pk1" path="res://src/props/tarp_crate/tarp_crate.tscn" id="43_ojd88"] [ext_resource type="Resource" uid="uid://c6ynovu3h6twl" path="res://levels/ghost_ship/item_data/eyeballs.tres" id="44_nmnkj"] +[ext_resource type="ArrayMesh" uid="uid://cojfnrek4kgbb" path="res://assets/props/guide_sign/guide_sign.obj" id="45_mcskc"] [ext_resource type="Material" uid="uid://lp1osos3aqdl" path="res://levels/ghost_ship/guide_sign/ops_sign.material" id="46_anoak"] [ext_resource type="PackedScene" uid="uid://ca7b5gjl3ri0p" path="res://src/props/cafe_table/cafe_table.tscn" id="46_rigxx"] [ext_resource type="PackedScene" uid="uid://c8pkhw0b47xdd" path="res://src/props/cupboard/cupboard.tscn" id="46_vt4uw"] @@ -80,7 +81,12 @@ [ext_resource type="Script" uid="uid://cisuvlqvqfqgo" path="res://src/world/meet_spook/meet_spook_spawner.gd" id="52_4akax"] [ext_resource type="Texture2D" uid="uid://gbvtbiurxrop" path="res://assets/props/vending_machine/vending_machine_R.png" id="52_mcskc"] [ext_resource type="PackedScene" uid="uid://cmmx0j4md4c5p" path="res://src/world/grunk_beast/slutch_beast/meet_spook_slutch/meet_spook_slutch.tscn" id="56_vt4uw"] +[ext_resource type="Texture2D" uid="uid://duvfb656uahuu" path="res://assets/level/guide_signs/guide_sign_mess_hall_C.png" id="62_1ckgi"] +[ext_resource type="Texture2D" uid="uid://dm50ac5enanm6" path="res://assets/level/guide_signs/guide_sign_mess_hall_E.png" id="63_drp1h"] +[ext_resource type="Texture2D" uid="uid://7qbnrtjmvl57" path="res://assets/props/guide_sign/guide_sign_M.png" id="64_dwjsf"] +[ext_resource type="Texture2D" uid="uid://d2h6ec1a0jm7c" path="res://assets/props/guide_sign/guide_sign_N.png" id="65_isly2"] [ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/listener.tscn" id="65_np3w4"] +[ext_resource type="Texture2D" uid="uid://cjm8vlxnejx3w" path="res://assets/props/guide_sign/guide_sign_R.png" id="66_o1vcx"] [ext_resource type="PackedScene" uid="uid://h2gswdcxyotk" path="res://src/props/med_cart/med_cart.tscn" id="70_wqqoq"] [ext_resource type="PackedScene" uid="uid://d0j20q65wnqsr" path="res://src/world/mechanics/heart/gunk_heart.tscn" id="74_rigxx"] [ext_resource type="ArrayMesh" uid="uid://b17naqcl4ie21" path="res://assets/level/floor/floor_1.mesh" id="76_2ybo5"] @@ -479,37 +485,6 @@ shadow_mesh = SubResource("ArrayMesh_lny00") [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_17ivy"] data = PackedVector3Array(1.5, 0, 1.5, -1.5, 0, 1.5, 1.5, 0, -1.5, 1.5, 0, -1.5, -1.5, 0, 1.5, -1.5, 0, -1.5) -[sub_resource type="ArrayMesh" id="ArrayMesh_1ckgi"] -_surfaces = [{ -"aabb": AABB(-0.7, -0.28, -0.14, 1.4, 0.28, 0.28), -"format": 34896613377, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAAADAAEAAgABAAQAAgAEAAAABAABAAMABQADAAAABAADAAUAAAAEAAUA"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 6, -"vertex_data": PackedByteArray("AAD/////AAAAAAAA/38AAAAA//8AAAAA//8AAP9/AAD/////AAAAAP///////wAA") -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_sux6n"] -_surfaces = [{ -"aabb": AABB(-0.7, -0.28, -0.14, 1.4, 0.28, 0.28), -"attribute_data": PackedByteArray("AAD/I/8RAAD/I/8j/yP/I/9N/yP/I//b/03/2/8j/9v/Ef//AAD/2/93/9v/Tf/b/3f/I/9N/yP/I/8j/yP/2wAA/yMAAP/b"), -"format": 34896613399, -"index_count": 24, -"index_data": PackedByteArray("AAABAAIAAwAEAAUABQAEAAYABwAIAAkACgALAAwADAALAA0ADgAPABAAEAAPABEA"), -"material": ExtResource("36_sogkw"), -"name": "Cube", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 18, -"vertex_data": PackedByteArray("AAD///////8AAAAA/3///wAA//8AAP//AAD//wAAsvIAAAAA/3+y8v////8AALLy//8AAP9/svL/////AAD/v///AAD/f/+//////////7////////8mwv//AAD/fybCAAD/////JsIAAAAA/38mwgAA//8AAFTV/////wAAVNUAAP////9U1f///////1TV/z//f/8//3//P/9/PjnAxj45wMY+OcDGPjnAxv9/AAD/fwAA/38AAIYUeOuGFHjrhhR464YUeOtU1aoqVNWqKlTVqipU1aoq") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_1ckgi") - [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_mgo71"] data = PackedVector3Array(-0.7, 0, 0.14, -0.7, -0.28, 0, -0.7, 0, -0.14, -0.7, 0, -0.14, -0.7, -0.28, 0, 0.7, 0, -0.14, 0.7, 0, -0.14, -0.7, -0.28, 0, 0.7, -0.28, 0, 0.7, 0, -0.14, 0.7, -0.28, 0, 0.7, 0, 0.14, 0.7, 0, 0.14, 0.7, -0.28, 0, -0.7, 0, 0.14, -0.7, 0, 0.14, 0.7, -0.28, 0, -0.7, -0.28, 0, -0.7, 0, -0.14, 0.7, 0, -0.14, -0.7, 0, 0.14, -0.7, 0, 0.14, 0.7, 0, -0.14, 0.7, 0, 0.14) @@ -585,6 +560,18 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_h1nog") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lhj8x"] +albedo_texture = ExtResource("62_1ckgi") +metallic = 1.0 +metallic_texture = ExtResource("64_dwjsf") +roughness_texture = ExtResource("66_o1vcx") +emission_enabled = true +emission_energy_multiplier = 3.6 +emission_texture = ExtResource("63_drp1h") +normal_enabled = true +normal_texture = ExtResource("65_isly2") +texture_filter = 4 + [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_2ft6k"] data = PackedVector3Array(-0.7, 0, 0.14, -0.7, -0.28, 0, -0.7, 0, -0.14, -0.7, 0, -0.14, -0.7, -0.28, 0, 0.7, 0, -0.14, 0.7, 0, -0.14, -0.7, -0.28, 0, 0.7, -0.28, 0, 0.7, 0, -0.14, 0.7, -0.28, 0, 0.7, 0, 0.14, 0.7, 0, 0.14, 0.7, -0.28, 0, -0.7, 0, 0.14, -0.7, 0, 0.14, 0.7, -0.28, 0, -0.7, -0.28, 0, -0.7, 0, -0.14, 0.7, 0, -0.14, -0.7, 0, 0.14, -0.7, 0, 0.14, 0.7, 0, -0.14, 0.7, 0, 0.14) @@ -1798,7 +1785,7 @@ label = "SWITCH_BULKHEAD_LABEL" transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -1.5) [node name="AirlockSign" type="MeshInstance3D" parent="BeastNav/Corridor1/Hallway1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 4.5) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 3, 4.5) gi_mode = 2 mesh = SubResource("ArrayMesh_anoak") @@ -1946,9 +1933,10 @@ label = "SWITCH_BULKHEAD_LABEL" transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 3, -1.5) [node name="MessHallSign" type="MeshInstance3D" parent="BeastNav/Corridor1/Hallway4"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 4.5) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 3, 4.5) gi_mode = 2 -mesh = SubResource("ArrayMesh_sux6n") +mesh = ExtResource("45_mcskc") +surface_material_override/0 = ExtResource("36_sogkw") [node name="GunkBody" parent="BeastNav/Corridor1/Hallway4/MessHallSign" instance=ExtResource("2_2egij")] mask_dim = 32 @@ -2458,6 +2446,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -1.2) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -4.5) gi_mode = 2 mesh = SubResource("ArrayMesh_w13dd") +surface_material_override/0 = SubResource("StandardMaterial3D_lhj8x") [node name="GunkBody" parent="BeastNav/Corridor2/Hallway1/MessHallSign" instance=ExtResource("2_2egij")] mask_dim = 32 diff --git a/levels/ghost_ship/guide_sign/mess_hall_sign.material b/levels/ghost_ship/guide_sign/mess_hall_sign.material index 071b8bf..683aa62 100644 Binary files a/levels/ghost_ship/guide_sign/mess_hall_sign.material and b/levels/ghost_ship/guide_sign/mess_hall_sign.material differ diff --git a/src/ui/hud/player_hud.tscn b/src/ui/hud/player_hud.tscn index c6def4e..17a922c 100644 --- a/src/ui/hud/player_hud.tscn +++ b/src/ui/hud/player_hud.tscn @@ -344,10 +344,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -399.906 -offset_top = -299.03 -offset_right = -399.906 -offset_bottom = -299.03 +offset_left = -398.595 +offset_top = -300.206 +offset_right = -398.595 +offset_bottom = -300.206 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("4_ud8na") diff --git a/vault/TODO.md b/vault/TODO.md index 190e073..4bd34da 100644 --- a/vault/TODO.md +++ b/vault/TODO.md @@ -9,7 +9,7 @@ - [x] Point spray - [x] Wide-angle spray - [x] Tall-angle spray? - - [ ] Spray-can? + - [ ] #maybe Spray-can - [x] [[toothbrush]] - [ ] [[radar]] - [ ] [[mp3 player]] @@ -116,6 +116,7 @@ - [x] long crate - [x] tall crate - [ ] other scatter + - [ ] external station model - [ ] [[player ship]] props: - [ ] ship - [ ] bunk