diff --git a/asset_dev/props/eva_suit/eva_suit.blend b/asset_dev/props/eva_suit/eva_suit.blend index e1336df..89fa676 100644 Binary files a/asset_dev/props/eva_suit/eva_suit.blend and b/asset_dev/props/eva_suit/eva_suit.blend differ diff --git a/asset_dev/props/eva_suit/eva_suit.blend1 b/asset_dev/props/eva_suit/eva_suit.blend1 index 3abe0cd..e1336df 100644 Binary files a/asset_dev/props/eva_suit/eva_suit.blend1 and b/asset_dev/props/eva_suit/eva_suit.blend1 differ diff --git a/asset_dev/props/eva_suit/eva_suit.ubpd b/asset_dev/props/eva_suit/eva_suit.ubpd index d8db30e..fcd07fd 100644 Binary files a/asset_dev/props/eva_suit/eva_suit.ubpd and b/asset_dev/props/eva_suit/eva_suit.ubpd differ diff --git a/asset_dev/props/eva_suit/eva_suit_C.png b/asset_dev/props/eva_suit/eva_suit_C.png index ba599fc..a8756ca 100644 --- a/asset_dev/props/eva_suit/eva_suit_C.png +++ b/asset_dev/props/eva_suit/eva_suit_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ace7bbf21635d73dd9446b27efc95d78d7641eb3a411f2be9b9708b0bae8cc05 -size 12065 +oid sha256:d94258e6508905d21eb5e93fd6e34d21c6072bff067f953fa6562052e6fc407d +size 11289 diff --git a/asset_dev/props/eva_suit/eva_suit_N.png b/asset_dev/props/eva_suit/eva_suit_N.png index 18add02..2ce198f 100644 --- a/asset_dev/props/eva_suit/eva_suit_N.png +++ b/asset_dev/props/eva_suit/eva_suit_N.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5907d980f4e01406aea7f634ff9b1b9f6c793e0fea2d9a089f7102d9735459a2 -size 16531 +oid sha256:47093080806e6564e128fc222517158144bb2763ebf18a3ae04876237a30361a +size 16670 diff --git a/assets/props/eva_suit/eva_suit_C.png b/assets/props/eva_suit/eva_suit_C.png index ba599fc..a8756ca 100644 --- a/assets/props/eva_suit/eva_suit_C.png +++ b/assets/props/eva_suit/eva_suit_C.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ace7bbf21635d73dd9446b27efc95d78d7641eb3a411f2be9b9708b0bae8cc05 -size 12065 +oid sha256:d94258e6508905d21eb5e93fd6e34d21c6072bff067f953fa6562052e6fc407d +size 11289 diff --git a/assets/props/eva_suit/eva_suit_N.png b/assets/props/eva_suit/eva_suit_N.png index 18add02..2ce198f 100644 --- a/assets/props/eva_suit/eva_suit_N.png +++ b/assets/props/eva_suit/eva_suit_N.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5907d980f4e01406aea7f634ff9b1b9f6c793e0fea2d9a089f7102d9735459a2 -size 16531 +oid sha256:47093080806e6564e128fc222517158144bb2763ebf18a3ae04876237a30361a +size 16670 diff --git a/levels/ghost_ship/ghost_ship_level.tscn b/levels/ghost_ship/ghost_ship_level.tscn index dda9097..a2e4261 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=425 format=4 uid="uid://crydi5cjgfwe5"] +[gd_scene load_steps=426 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"] @@ -311,6 +311,25 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_mgo71") +[sub_resource type="ArrayMesh" id="ArrayMesh_7ctwk"] +resource_local_to_scene = true +_surfaces = [{ +"aabb": AABB(-0.375, -0.25, -0.75, 0.75, 0.5, 1.5), +"attribute_data": PackedByteArray("/7//P/9v/7//X/8//7//vwAA/78AAP8//6f/v/9H/7//p/+//7//v/+f//f/v////6cAAP/H/wf/n/83/7//P/+X/7//l/8//zf/P/8P/7//x//H/5//x/+/AAD/n/8H/6f/P//H/zf/X/+//0f/P/9v/z//p/8//6f////H//f/D/8//5f/v/+X/z//p/+//6f/P/83/7//R/+//0f/P/9v/z//b/+//1//P/9f/7//N/+//w//v/83/z//D/8/"), +"format": 34896613399, +"index_count": 84, +"index_data": PackedByteArray("FgANAAwADAANABcAFwANAA4ADgANABgAGAANAA8ADwANABkAGgAHAAIAAgAHABsAEAABABEAEQABABwAHQAAAAYABgAAAAMACQAUAAgACAAUABUAFQAUAAoACgAUAB4AHgAUAAsACwAUAB8AIAATAAUABQATAAQAIQAiACMAIwAiACQAJQASACYAJgASACcAKAApACoAKgApACsALAAtAC4ALgAtAC8A"), +"lods": [0.108952, PackedByteArray("DAANAA4ADgANAA8AEAABABEAEAARAAYAEQAAAAYABgAAAAMAEQABAAIAAgABAAcABwASAAIABwATABIAEgATAAUABQATAAQACQAUAAgACAAUABUAFQAUAAoACgAUAAsA"), 0.261829, PackedByteArray("AAABAAIAAQAAAAYABgAAAAMAAgABAAcABwAEAAIAAgAEAAUACAAJAAoACgAJAAsA"), 0.524037, PackedByteArray("AAABAAIAAQAAAAMAAgABAAQAAgAEAAUA")], +"material": SubResource("StandardMaterial3D_anoak"), +"name": "Cube", +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 48, +"vertex_data": PackedByteArray("AAAyM///VNXc3f//AAD/////zMz//1TVAAAyMwAAVNUAADIzAAD8xQAAMjP///zFAADMzAAAVNX//zIzAABU1QAAzMwAAP//AAAyMwAA///c3f//AAD/////MjMAAP/////MzP///7/c3QAA///svyEi/////0TBAAAyM///Fr8hIv//AAD//yEi////////3N0AAP///MUhIgAAAAD8xSEiAAAAAP//ISL//wAA/////zIz////v9zd//////+/AADMzP//DMEhIgAA//+cvP//zMwAAFTV//8yM///VNXc3f///////wAAzMz//1TV///MzAAA///c3QAAAAD//yEiAAD///zFISL//wAAqukhIv////+q6QAAzMwAAKrpAADMzP//qunc3QAAAAD8xf//MjMAAPzF//8yM////MXc3f////+q6dzd//8AAKrp///MzP//qun//8zMAACq6dzdAAAAAP+/ISIAAAAA/7/c3QAA////vyEiAAD///+/VFWqqv9//7+qKqoqVFWqqv45/pz+Of6cVFWqqqoqqir/P/+//z//v/7A/0C2QLbA/3//f/9//3//f/9//3//f/9//7//f/+//xwBRv45/pwOQA3A/z//v/9//3//f/9//3//f/9//3+qKqoqqiqqKv9//79UVaqq0sDSQKlCqML+Of6cCWoEtQlqBLUJagS1CWoEtf8cAUb/HAFG/xwBRgQ19hUENfYVBDX2FQQ19hUAAP9/AAD/fwAA/38AAP9/") +}] +blend_shape_mode = 0 +shadow_mesh = SubResource("ArrayMesh_mgo71") + [sub_resource type="Curve" id="Curve_w3xaq"] _limits = [0.0, 0.4, 0.0, 1.0] _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.3, 0.4), 0.0, 0.0, 0, 0, Vector2(0.7, 0.4), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] @@ -6211,7 +6230,7 @@ skeleton = NodePath("../../..") [node name="CrateLong2" parent="Airlock/Props" instance=ExtResource("26_otfxe")] transform = Transform3D(0.612372, 0.612372, 0.5, -0.707107, 0.707107, 0, -0.353553, -0.353553, 0.866025, 3.71304, 0.441942, 2.81688) -mesh = SubResource("ArrayMesh_2ft6k") +mesh = SubResource("ArrayMesh_7ctwk") skeleton = NodePath("../../..") [node name="GrunkNodule" parent="Airlock" instance=ExtResource("19_ji5cn")]