diff --git a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index 41c5bcc..acd96c5 100644 --- a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres +++ b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres @@ -5,7 +5,7 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.2, 0.23, 0.31, 1 ) +bg_color = Color( 0.03, 0.21, 0.26, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/godot/assets/meat_bore/bridge.tscn b/godot/assets/meat_bore/bridge.tscn index 0223590..81493dc 100644 --- a/godot/assets/meat_bore/bridge.tscn +++ b/godot/assets/meat_bore/bridge.tscn @@ -2,12 +2,12 @@ [ext_resource path="res://assets/meat_bore/bridge.glb" type="PackedScene" id=1] -[sub_resource type="ConcavePolygonShape" id=1] -data = PoolVector3Array( -2.1426, -2.1426, 67.711, -2.1426, 2.1426, -67.711, -2.1426, 2.1426, 67.711, -2.1426, -2.1426, 67.711, -2.1426, -2.1426, -67.711, -2.1426, 2.1426, -67.711, -2.1426, -2.1426, -67.711, 2.1426, 2.1426, -67.711, -2.1426, 2.1426, -67.711, -2.1426, -2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, 2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, 2.1426, 67.711, 2.1426, 2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, -2.1426, 67.711, 2.1426, 2.1426, 67.711, 2.1426, -2.1426, 67.711, -2.1426, 2.1426, 67.711, 2.1426, 2.1426, 67.711, 2.1426, -2.1426, 67.711, -2.1426, -2.1426, 67.711, -2.1426, 2.1426, 67.711, -2.1426, -2.1426, -67.711, 2.1426, -2.1426, 67.711, 2.1426, -2.1426, -67.711, -2.1426, -2.1426, -67.711, -2.1426, -2.1426, 67.711, 2.1426, -2.1426, 67.711, 2.1426, 2.1426, -67.711, -2.1426, 2.1426, 67.711, -2.1426, 2.1426, -67.711, 2.1426, 2.1426, -67.711, 2.1426, 2.1426, 67.711, -2.1426, 2.1426, 67.711 ) +[sub_resource type="BoxShape" id=1] [node name="bridge" instance=ExtResource( 1 )] [node name="StaticBody" type="StaticBody" parent="bridge" index="0"] [node name="CollisionShape" type="CollisionShape" parent="bridge/StaticBody" index="0"] +transform = Transform( 2.46108, 0, 0, 0, 2.17426, 0, 0, 0, 66.86, 0, 0, 0 ) shape = SubResource( 1 ) diff --git a/godot/assets/meat_bore/meat_module/level_alexis.tscn b/godot/assets/meat_bore/meat_module/level_alexis.tscn index dfa467c..edd6184 100644 --- a/godot/assets/meat_bore/meat_module/level_alexis.tscn +++ b/godot/assets/meat_bore/meat_module/level_alexis.tscn @@ -1,12 +1,10 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 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/meat_module/meat_module.gd" type="Script" id=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_3.png" type="Texture" id=3] [node name="level_alexis" type="Spatial"] -[node name="meat_module_3" type="Spatial" parent="." instance=ExtResource( 1 )] +[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 ) -script = ExtResource( 2 ) texture = ExtResource( 3 ) diff --git a/godot/assets/meat_bore/meat_module/level_clark.tscn b/godot/assets/meat_bore/meat_module/level_clark.tscn index 34ee1ea..5d501e3 100644 --- a/godot/assets/meat_bore/meat_module/level_clark.tscn +++ b/godot/assets/meat_bore/meat_module/level_clark.tscn @@ -1,13 +1,30 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=9 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/meat_module/meat_module_outside_walls_2.png" type="Texture" id=2] [ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=3] +[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=4] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/meat_bore/npcs/inherited/clark.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9] [node name="level_clark" type="Spatial"] +[node name="dialogue_platform" parent="." instance=ExtResource( 9 )] +transform = Transform( 0.243226, 0, -0.96997, 0, 2.26855, 0, 0.96997, 0, 0.243226, 26.1711, -176.228, -22.7686 ) + +[node name="dialogue_platform2" parent="." instance=ExtResource( 9 )] +transform = Transform( 0.956904, -0.598612, -1.67324, -0.0329747, 2.31219, -0.468718, 1.32938, 0.246805, 0.657763, 23.6553, -176.884, -23.209 ) + +[node name="clark" parent="." instance=ExtResource( 8 )] +transform = Transform( 0.759033, 0, -0.651052, 0, 1, 0, 0.651052, 0, 0.759033, 26.6483, -175.72, -23.5182 ) + +[node name="OmniLight" type="OmniLight" parent="clark"] +transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, -0.235702, 0.279572, 0.443134 ) +light_color = Color( 0.631373, 0.00784314, 0.00784314, 1 ) +shadow_enabled = true + [node name="meat_module_2" parent="." instance=ExtResource( 1 )] transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 ) texture = ExtResource( 2 ) @@ -26,3 +43,39 @@ transform = Transform( -0.410648, -0.838634, -1.1852, -1.57091, -0.314374, 0.602 [node name="meat_tentacle_small3" parent="." instance=ExtResource( 6 )] transform = Transform( -0.410648, -0.838634, -1.1852, -1.57091, -0.314374, 0.602531, -0.531315, 1.40827, -0.792496, 14.5021, -168.053, -16.188 ) + +[node name="meat_tentacle_small4" parent="." instance=ExtResource( 6 )] +transform = Transform( -0.489359, -0.605855, -1.29543, -1.4574, 0.81789, 0.0286955, 0.745115, 1.32263, -0.846666, 22.3921, -174.268, -25.1671 ) + +[node name="meat_tentacle_small5" parent="." instance=ExtResource( 6 )] +transform = Transform( 1.03372, -1.0095, -0.656781, -1.13794, -0.130078, -1.11695, 0.745115, 1.32263, -0.846666, 22.3921, -174.268, -25.1671 ) + +[node name="bridge" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, 0.975669, -0.21925, 0, 0.21925, 0.975669, 0, -128.368, 0 ) + +[node name="bridge2" parent="." instance=ExtResource( 4 )] +transform = Transform( -0.687996, -0.185038, -0.701729, -0.0458551, 0.9761, -0.212428, 0.724265, -0.113972, -0.680037, 0, -142.201, -4.313 ) + +[node name="bridge7" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.542912, 0.134295, -0.828983, -0.155709, 0.986112, 0.0577737, 0.825228, 0.0977144, 0.556283, 0, -179.405, -4.313 ) + +[node name="bridge3" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.372578, -0.193908, 0.907516, -0.0503471, 0.972262, 0.228412, -0.926634, -0.130792, 0.352481, -12.9092, -121.01, 6.77628 ) + +[node name="bridge4" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.594432, -0.0912063, 0.798957, -0.0976132, 0.978016, 0.184272, -0.7982, -0.187526, 0.572461, -4.49346, -166.722, 3.61228 ) + +[node name="bridge8" parent="." instance=ExtResource( 4 )] +transform = Transform( -0.980285, -0.0723916, -0.183849, -0.0642446, 0.996686, -0.0498979, 0.186852, -0.0371028, -0.981687, -4.49346, -196.633, 3.61228 ) + +[node name="bridge9" parent="." instance=ExtResource( 4 )] +transform = Transform( -0.814283, 0.0392153, 0.579142, 0.120736, 0.987337, 0.102901, -0.567773, 0.153714, -0.808706, 10.794, -213.404, 3.61228 ) + +[node name="bridge10" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.265169, -0.267254, 0.926423, -0.074449, 0.952275, 0.296022, -0.961323, -0.147467, 0.232617, 2.97705, -230.958, 3.61228 ) + +[node name="bridge5" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.860266, -0.216334, -0.461673, -0.00661062, 0.900707, -0.434378, 0.509803, 0.376732, 0.773417, -9.9336, -156.947, -1.55905 ) + +[node name="bridge6" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.973561, 0.0591417, 0.220639, 0.0178192, 0.943296, -0.331474, -0.227732, 0.326642, 0.917302, 11.0429, -149.799, -1.55905 ) diff --git a/godot/assets/meat_bore/meat_module/level_jackie.tscn b/godot/assets/meat_bore/meat_module/level_jackie.tscn index 4849ffa..9c07b8a 100644 --- a/godot/assets/meat_bore/meat_module/level_jackie.tscn +++ b/godot/assets/meat_bore/meat_module/level_jackie.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=16 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/meat_module/meat_module_outside_walls_5.png" type="Texture" id=2] @@ -10,6 +10,9 @@ [ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=8] [ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=9] [ext_resource path="res://assets/meat_bore/meat_module/Area.gd" type="Script" id=10] +[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=11] +[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=12] +[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=13] [sub_resource type="BoxShape" id=1] @@ -24,6 +27,12 @@ texture = ExtResource( 2 ) [node name="jackie" parent="meat_module_5" instance=ExtResource( 3 )] transform = Transform( 0.222672, 0, -0.974894, 0, 1, 0, 0.974894, 0, 0.222672, 35.8107, -60.7196, 0.261785 ) +[node name="OmniLight" type="OmniLight" parent="meat_module_5/jackie"] +transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, -0.0784998, 0.313354, 0.331421 ) +light_color = Color( 0.768627, 0.0941176, 0.0941176, 1 ) +light_energy = 2.0 +shadow_enabled = true + [node name="dialogue_platform" parent="." instance=ExtResource( 4 )] transform = Transform( 0.293757, 0, 0.95588, 0, 1, 0, -0.95588, 0, 0.293757, -33.8926, -520.031, -8.76617 ) @@ -58,5 +67,20 @@ script = ExtResource( 10 ) transform = Transform( 500, 0, 0, 0, 13, 0, 0, 0, 500, 0, -3.39966, 0 ) shape = SubResource( 2 ) +[node name="meatcircle" parent="." instance=ExtResource( 11 )] +transform = Transform( 0.249951, 4.5527, -1.22279, -5.2645, 0.082006, -0.0468753, -0.0154625, 0.881434, 4.72644, -20.5736, -518.932, -4.71894 ) + +[node name="meat_tentacle" parent="meatcircle" instance=ExtResource( 12 )] +transform = Transform( 0.461622, -0.00497676, 0.000402718, -0.0138762, 0.183026, -0.0365338, 0.00506133, 0.0710867, 0.352741, -0.62188, 0.144679, 1.02698 ) + +[node name="meat_tentacle2" parent="meatcircle" instance=ExtResource( 12 )] +transform = Transform( -0.352401, 0.0165807, -0.201815, -0.313878, 0.0789187, 0.328248, 0.0726001, 0.341773, 0.180575, 0.0853882, -0.991125, -1.30282 ) + +[node name="meat_tentacle_small" parent="meatcircle" instance=ExtResource( 13 )] +transform = Transform( 0.444682, -0.125374, 0.080701, 0.401719, 0.345381, 0.0301679, -0.175683, 0.0961759, 0.404797, 0.852348, 0.145765, 1.0316 ) + +[node name="meat_tentacle_small2" parent="meatcircle" instance=ExtResource( 13 )] +transform = Transform( 0.420714, -0.183205, -0.138196, 0.48098, 0.317142, 0.0738042, 0.0560773, -0.0345605, 0.383119, -0.298241, 0.158634, -1.51411 ) + [connection signal="body_entered" from="Heart_2/Area" to="Heart_2/Area" method="_on_Area_body_entered"] [connection signal="body_entered" from="Area" to="Area" method="_on_Area_body_entered"] diff --git a/godot/assets/meat_bore/meat_module/level_lee.tscn b/godot/assets/meat_bore/meat_module/level_lee.tscn index 65e88c4..730347d 100644 --- a/godot/assets/meat_bore/meat_module/level_lee.tscn +++ b/godot/assets/meat_bore/meat_module/level_lee.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 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/meat_module/meat_module_outside_walls_1.png" type="Texture" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=4] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=7] +[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9] [node name="level_lee" type="Spatial"] @@ -13,7 +15,7 @@ texture = ExtResource( 2 ) [node name="meat_spiral" parent="." instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1.1, 0, 1, -4.80825e-08, 0, -123.038, 0 ) +transform = Transform( 0.989982, 0, 0, 0, -4.37114e-08, -1.1, 0, 1.02073, -4.90795e-08, 0, -123.038, 0 ) [node name="meat_tentacle_small" parent="." instance=ExtResource( 4 )] transform = Transform( 0.610078, -1.34791, 0.0948543, 1.1801, 0.534126, 0, -0.0493349, 0.109001, 1.5841, 21.156, -62.2669, -4.52192 ) @@ -24,6 +26,15 @@ transform = Transform( 1.11741, -1.86942, -1.37543, 1.43383, 1.00387, 0.0843201, [node name="meat_tentacle_small2" parent="." instance=ExtResource( 4 )] transform = Transform( 0.957609, -1.00003, 0.472208, 0.88533, 0.97582, -0.0933872, -0.257771, 0.402179, 1.51218, 20.8083, -60.6792, -7.06809 ) +[node name="meat_tentacle_small4" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.957609, -1.00003, 0.472208, 0.88533, 0.97582, -0.0933872, -0.257771, 0.402179, 1.51218, 35.2909, -60.6792, -2.69194 ) + +[node name="meat_tentacle_small5" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.498378, -1.16606, 0.796226, 1.2567, 0.117936, -0.672569, 0.416007, 1.23886, 1.74605, 35.2909, -60.6792, -2.69194 ) + +[node name="meat_tentacle_small6" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.499228, -1.12549, 0.564374, 0.839978, 0.422113, 0.113724, -0.189107, 0.252698, 0.737731, 35.2909, -60.6792, -2.69194 ) + [node name="meat_tentacle" parent="." instance=ExtResource( 5 )] transform = Transform( 0.155288, -1.26747, 0.285992, 1.13234, 0.138733, 0, -0.0412663, 0.336816, 1.51512, 21.0128, -55.2078, 4.60008 ) @@ -32,3 +43,20 @@ transform = Transform( -0.0820203, -1.37205, 0.747237, 1.03682, 0.378031, 1.1123 [node name="meatcircle" parent="." instance=ExtResource( 6 )] transform = Transform( 0.095217, -5.53714, 0, 3.81474, 0.875616, 0, 0, 0, 5.43642, 21.2893, -59.4721, 0 ) + +[node name="lee" parent="." instance=ExtResource( 7 )] +transform = Transform( 0.899565, 0, -0.436786, 0, 1, 0, 0.436786, 0, 0.899565, 28.0628, -61.9719, -3.01394 ) + +[node name="dialogue_platform" parent="lee" instance=ExtResource( 9 )] +transform = Transform( 0.932718, 0.233958, -0.274408, -0.358633, 0.522342, -0.773655, -0.0376677, 0.820013, 0.571103, -0.58202, 0, 0.0505943 ) + +[node name="dialogue_platform2" parent="lee" instance=ExtResource( 9 )] +transform = Transform( 0.993062, -0.0918569, -0.0734214, 0.164162, 2.03195, -0.321783, 0.0866099, 0.148994, 0.985038, -0.582026, -0.267639, 0.0505934 ) + +[node name="dialogue_platform3" parent="lee" instance=ExtResource( 9 )] +transform = Transform( 2.31384, -0.249626, -0.395868, 0.079543, 0.984562, -0.155916, -0.0525585, 0.317759, 1.97973, 1.10797, -1.2313, 3.53116 ) + +[node name="OmniLight" type="OmniLight" parent="lee"] +transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, -0.247002, 0.73962, 0.499458 ) +light_color = Color( 0.631373, 0.00784314, 0.00784314, 1 ) +shadow_enabled = true diff --git a/godot/assets/meat_bore/meat_module/level_wally.tscn b/godot/assets/meat_bore/meat_module/level_wally.tscn index bc0298d..1723b64 100644 --- a/godot/assets/meat_bore/meat_module/level_wally.tscn +++ b/godot/assets/meat_bore/meat_module/level_wally.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=11 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/meat_module/meat_module_outside_walls_4.png" type="Texture" id=2] @@ -6,9 +6,25 @@ [ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4] [ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/models/gj/squirrel_model.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=7] +[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=9] +[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=10] [node name="level_wally" type="Spatial"] +[node name="creek_platform" parent="." instance=ExtResource( 9 )] +transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 1.81008, -7.71627, -383.937, -17.1182 ) + +[node name="creek_platform2" parent="." instance=ExtResource( 9 )] +transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 1.68346, -5.58355, -391.263, -11.7662 ) + +[node name="creek_platform3" parent="." instance=ExtResource( 9 )] +transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 2.03711, -3.72776, -398.987, -4.28549 ) + +[node name="creek_platform4" parent="." instance=ExtResource( 9 )] +transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 1.93413, 4.80014, -404.599, 0.276879 ) + [node name="meat_module_4" parent="." instance=ExtResource( 1 )] transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 ) texture = ExtResource( 2 ) @@ -16,11 +32,61 @@ texture = ExtResource( 2 ) [node name="bridge" parent="." instance=ExtResource( 5 )] transform = Transform( 0.930046, 0, -0.367443, 0, 1, 0, 0.367443, 0, 0.930046, 7.31136, -410.338, 21.682 ) +[node name="bridge2" parent="." instance=ExtResource( 5 )] +transform = Transform( 0.854821, 0, 0.518922, 0, 1, 0, -0.518922, 0, 0.854821, 7.31136, -383.894, 21.682 ) + +[node name="bridge3" parent="." instance=ExtResource( 5 )] +transform = Transform( 0.90548, 0, -0.424389, 0, 1, 0, 0.424389, 0, 0.90548, -6.26615, -358.798, 21.682 ) + [node name="wally" parent="." instance=ExtResource( 3 )] transform = Transform( 0.0286718, 0, -0.999589, 0, 1, 0, 0.999589, 0, 0.0286718, 23.155, -406.953, -12.1973 ) +[node name="OmniLight" type="OmniLight" parent="wally"] +transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, 0.136887, -0.715088, 0.453819 ) +light_color = Color( 0.631373, 0.00784314, 0.00784314, 1 ) +shadow_enabled = true + +[node name="meatcircle" parent="." instance=ExtResource( 7 )] +transform = Transform( -0.0965804, 5.61643, -2.90349, 4.78081, 1.09736, 0, 0.0438853, -2.55206, -4.82496, 18.5569, -403.939, -9.70455 ) + +[node name="meat_tentacle_small" parent="meatcircle" instance=ExtResource( 8 )] +transform = Transform( -0.368328, 0.00909123, 0.33852, -0.00454531, -0.311769, 0.161994, 0.249993, 0.109033, 0.131983, -1.08878, 0.106129, 0.806028 ) + +[node name="meat_tentacle_small5" parent="meatcircle" instance=ExtResource( 8 )] +transform = Transform( -0.0727569, 0.124753, 0.341146, -0.259949, -0.311976, 0.175827, 0.229772, -0.184977, 0.085608, 0.935356, 0.21675, 0.952681 ) + +[node name="meat_tentacle_small2" parent="meatcircle" instance=ExtResource( 8 )] +transform = Transform( -0.601106, -0.490628, -0.735103, 0.176307, 0.867382, -0.406351, 0.977292, -0.0424141, -0.382068, 9.19559, -6.97956, 1.854 ) + +[node name="meat_tentacle_small3" parent="meatcircle" instance=ExtResource( 8 )] +transform = Transform( -0.240367, -0.495153, -0.834891, -0.91951, -0.159422, 0.359277, -0.310998, 0.854053, -0.41698, -4.22367, -2.80844, -4.18804 ) + +[node name="meat_tentacle_small4" parent="meatcircle" instance=ExtResource( 8 )] +transform = Transform( -0.150011, 0.100462, -1.03498, 0.508993, -0.702549, 0.113676, -0.866585, -0.723459, 0.202575, -1.8905, -1.31832, 3.99719 ) + +[node name="meat_tentacle" parent="meatcircle" instance=ExtResource( 10 )] +transform = Transform( 0.110451, -0.323683, -1.09822, 0.172568, 1.01281, -0.175434, 0.840275, 0.0657654, 0.171968, -2.70087, -6.96935, 0.648325 ) + +[node name="meat_tentacle2" parent="meatcircle" instance=ExtResource( 10 )] +transform = Transform( -0.0267641, -0.119914, -1.16716, 0.770362, 0.125066, 0.124957, 0.0620145, -1.08534, 0.220396, -8.91709, -2.52741, 3.65171 ) + [node name="dialogue_platform" parent="." instance=ExtResource( 4 )] transform = Transform( -4.24089e-08, -0.970203, 0.242294, 1, -4.37114e-08, 0, 1.0591e-08, 0.242294, 0.970203, 23.5906, -407.725, -12.33 ) +[node name="dialogue_platform2" parent="." instance=ExtResource( 4 )] +transform = Transform( -2.61702, -0.0444567, -0.58653, -0.0298532, -0.765791, 0.191245, -0.497661, 0.757038, 2.95367, 4.66791, -382.009, -19.1373 ) + +[node name="dialogue_platform3" parent="." instance=ExtResource( 4 )] +transform = Transform( -1.8885, -0.46109, -2.14111, -0.0298532, -0.765791, 0.191245, -1.87884, 0.602061, 2.11751, 17.5209, -373.825, -10.7125 ) + +[node name="dialogue_platform4" parent="." instance=ExtResource( 4 )] +transform = Transform( 0.437564, -0.757857, -2.96634, -0.0298532, -0.765791, 0.191245, -2.62774, -0.0270981, -0.518695, 21.0226, -364.59, 1.57973 ) + +[node name="dialogue_platform5" parent="." instance=ExtResource( 4 )] +transform = Transform( 1.83507, -0.612469, -2.16602, -0.0298532, -0.765791, 0.191245, -1.93106, -0.447174, -2.09203, 12.8945, -356.406, 14.6224 ) + +[node name="meatcircle2" parent="." instance=ExtResource( 7 )] +transform = Transform( 21.7245, 0, 0, 0, 12.5898, 0, 0, 0, 21.8237, 0, -460.114, 0 ) + [node name="egg" parent="." instance=ExtResource( 6 )] transform = Transform( -0.00222995, 0, 0.0097482, 0, 0.01, 0, -0.0097482, 0, -0.00222995, 23.9331, -407.714, -12.5777 ) diff --git a/godot/assets/models/meat_tentacle.tscn b/godot/assets/models/meat_tentacle.tscn index d9fde8c..02ee56f 100644 --- a/godot/assets/models/meat_tentacle.tscn +++ b/godot/assets/models/meat_tentacle.tscn @@ -118,9 +118,7 @@ tracks/5/keys = { "times": PoolRealArray( 0, 1.76, 2.1, 3.8, 4.2 ) } -[sub_resource type="CapsuleShape" id=1] -radius = 0.997672 -height = 0.947179 +[sub_resource type="CylinderShape" id=5] [node name="meat_tentacle" instance=ExtResource( 1 )] @@ -151,5 +149,5 @@ max_distance = 50.0 transform = Transform( 1.29603, 0.396787, 0.0456263, -0.180669, 2.84635, 0.327301, 0, -0.581511, 1.63319, -0.459882, 0, -0.0209413 ) [node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"] -transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.032101, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 ) -shape = SubResource( 1 ) +transform = Transform( 0.258024, -0.00596566, 0.0518797, -0.0652444, 0.073474, -0.94157, -0.0232309, 0.32877, -0.227508, 0.192927, 0.601635, 0.172947 ) +shape = SubResource( 5 ) diff --git a/godot/assets/models/meat_tentacle_small.tscn b/godot/assets/models/meat_tentacle_small.tscn index d27fdeb..9b3b75b 100644 --- a/godot/assets/models/meat_tentacle_small.tscn +++ b/godot/assets/models/meat_tentacle_small.tscn @@ -43,9 +43,7 @@ tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2.5, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ) -[sub_resource type="CapsuleShape" id=1] -radius = 0.997672 -height = 0.947179 +[sub_resource type="CylinderShape" id=5] [sub_resource type="Animation" id=4] resource_name = "ArmatureAction-loop" @@ -103,8 +101,8 @@ anims/ArmatureAction-loop = SubResource( 3 ) transform = Transform( 1.30828, 0.0600859, 0.00690913, -0.0271908, 2.91994, 0.147704, -0.00302639, -0.260107, 1.65971, -0.459882, 0, -0.0209413 ) [node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"] -transform = Transform( 0.222041, 0.00571365, -0.0496885, -0.032101, 0.0306116, -0.539539, -0.0114299, 0.284227, -0.0947877, 0.181285, 0.638165, 0.185954 ) -shape = SubResource( 1 ) +transform = Transform( 0.289074, 0.0076098, -0.0637827, -0.043123, 0.045676, -0.721785, -0.013035, 0.286591, -0.123375, 0.258357, 0.681018, 0.0430889 ) +shape = SubResource( 5 ) [node name="meat_tentacle_small_animation" type="AnimationPlayer" parent="." index="3"] autoplay = "ArmatureAction-loop" diff --git a/godot/dialogic/timelines/timeline-1667671061.json b/godot/dialogic/timelines/timeline-1667671061.json index 2702400..c16d9b9 100644 --- a/godot/dialogic/timelines/timeline-1667671061.json +++ b/godot/dialogic/timelines/timeline-1667671061.json @@ -1,5 +1,9 @@ { "events": [ + { + "event_id": "dialogic_024", + "set_theme": "default-theme.cfg" + }, { "audio": "play", "audio_bus": "Master",