diff --git a/blends/npcs.blend b/blends/npcs.blend index 1bd52ca..0fc911f 100644 --- a/blends/npcs.blend +++ b/blends/npcs.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef8057297bf18797976b9b5c8b348b95b7e6d5dfc504ff6aa8ead721303e998d -size 58932318 +oid sha256:f53c20f1fcaa121201b3df35c3a327faf1d646eaffc9fc9009510c594273dad4 +size 58938826 diff --git a/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.md5 b/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.md5 index 1814456..5f577c4 100644 --- a/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.md5 +++ b/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.md5 @@ -1,3 +1,3 @@ -source_md5="2554afb5c4b4c0b3234728ec1f254bd7" -dest_md5="c587dc91132ce3516a0838c4b8706a7f" +source_md5="5c673e25c3e3dc71a3646df566aa28c7" +dest_md5="25a0817ae7bb536ce0a39b0dc1d7209c" diff --git a/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.scn b/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.scn index 75a56a8..35f03af 100644 Binary files a/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.scn and b/godot/.import/male.glb-07d34a83ae9306abcd8a64edc0836e11.scn differ diff --git a/godot/assets/meat_bore/meat_module/level_alexis.tscn b/godot/assets/meat_bore/meat_module/level_alexis.tscn index edd6184..1b02ab5 100644 --- a/godot/assets/meat_bore/meat_module/level_alexis.tscn +++ b/godot/assets/meat_bore/meat_module/level_alexis.tscn @@ -1,10 +1,41 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_3.png" type="Texture" id=3] +[ext_resource path="res://assets/meat_bore/Swquish.tscn" type="PackedScene" id=4] +[ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=6] [node name="level_alexis" type="Spatial"] [node name="meat_module_3" parent="." instance=ExtResource( 1 )] transform = Transform( -0.341905, 0, -0.939734, 0, 1, 0, 0.939734, 0, -0.341905, 0, -229.622, 0 ) texture = ExtResource( 3 ) + +[node name="Swquish" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -247.072, 0 ) + +[node name="Swquish2" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.79733, -259.517, 0 ) + +[node name="Swquish3" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.14428, -273.779, 0 ) + +[node name="Swquish4" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.71687, -281.578, 0 ) + +[node name="Swquish5" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.71687, -298.215, 0 ) + +[node name="Swquish6" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.71687, -317.156, 0 ) + +[node name="bridge" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.35255, -237.925, -7.85863 ) + +[node name="dialogue_platform" parent="." instance=ExtResource( 6 )] +transform = Transform( -0.00622234, 0.26132, -0.965232, 0.984724, -0.166367, -0.0513891, -0.174012, -0.950807, -0.256293, -9.27767, -292.621, 24.8008 ) + +[node name="alexis" parent="." instance=ExtResource( 5 )] +transform = Transform( -0.929686, 0, 0.368352, 0, 1, 0, -0.368352, 0, -0.929686, -9.16289, -292.219, 24.2675 ) diff --git a/godot/assets/meat_bore/npcs/inherited/guy.tscn b/godot/assets/meat_bore/npcs/inherited/guy.tscn index dc70c3a..a8d9a9f 100644 --- a/godot/assets/meat_bore/npcs/inherited/guy.tscn +++ b/godot/assets/meat_bore/npcs/inherited/guy.tscn @@ -28,4 +28,4 @@ active = true parameters/playback = SubResource( 3 ) [node name="Heart_2" parent="." index="4" instance=ExtResource( 4 )] -transform = Transform( 1, 0, 0, 0, 0.988268, 0.152727, 0, -0.152727, 0.988268, 0, 0.588648, -0.0990121 ) +transform = Transform( 0.622, 0, 0, 0, 0.614703, 0.0949962, 0, -0.0949962, 0.614703, 0, 0.588648, -0.0807165 ) diff --git a/godot/assets/meat_bore/npcs/male.glb b/godot/assets/meat_bore/npcs/male.glb index 1b307dd..b00a8ae 100644 --- a/godot/assets/meat_bore/npcs/male.glb +++ b/godot/assets/meat_bore/npcs/male.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fcb149d1f03cca4303daa1622704e0b6c8794d2c1deece2015024736b476efc -size 5206964 +oid sha256:ca9e59b36a049f865dd01bb26f366c8a0edd4b298afd8bbe4508b8e50ad503b2 +size 3698800 diff --git a/godot/tests/bore_hole/test_level_alexis.tscn b/godot/tests/bore_hole/test_level_alexis.tscn index a054786..c91f4f1 100644 --- a/godot/tests/bore_hole/test_level_alexis.tscn +++ b/godot/tests/bore_hole/test_level_alexis.tscn @@ -10,6 +10,7 @@ transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 36.3761, 1.22013 ) [node name="test_level_common" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -20.9465, 0, 0 ) [node name="level_alexis" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 269.296, 0 )