From b54053507ab99721358ef8f223ae0b5755a9f1dc Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Wed, 4 Jan 2023 19:24:53 -0700 Subject: [PATCH] level tweaks --- .../meat_bore/meat_module/level_alexis.tscn | 14 ++++-- .../meat_bore/meat_module/level_clark.tscn | 6 +++ .../meat_bore/meat_module/level_jackie.tscn | 18 +++++-- .../timelines/timeline-1667671038.json | 4 ++ .../timelines/timeline-1672812380.json | 50 ++++++++++++++++++- 5 files changed, 85 insertions(+), 7 deletions(-) diff --git a/godot/assets/meat_bore/meat_module/level_alexis.tscn b/godot/assets/meat_bore/meat_module/level_alexis.tscn index c8f2c60..3ba7185 100644 --- a/godot/assets/meat_bore/meat_module/level_alexis.tscn +++ b/godot/assets/meat_bore/meat_module/level_alexis.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=10 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] @@ -7,6 +7,8 @@ [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] [ext_resource path="res://assets/audio/drones/level3.ogg" type="AudioStream" id=7] +[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=9] [node name="level_alexis" type="Spatial"] @@ -28,10 +30,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.14428, -273.779, 0 ) 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 ) +transform = Transform( 0.998181, 0, 0.060282, 0, 1, 0, -0.060282, 0, 0.998181, 4.48443, -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 ) +transform = Transform( 0.998181, 0, 0.060282, 0, 1, 0, -0.060282, 0, 0.998181, 4.48443, -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 ) @@ -41,3 +43,9 @@ transform = Transform( -0.00622234, 0.26132, -0.965232, 0.984724, -0.166367, -0. [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 ) + +[node name="meatcircle" parent="alexis" instance=ExtResource( 8 )] +transform = Transform( -0.0983844, 2.98061, 5.76833, 4.72262, 0.154299, -0.0388896, 0.00299956, 5.2907, -0.579473, -1.70829, 3.38397, 5.07203 ) + +[node name="creek_platform" parent="." instance=ExtResource( 9 )] +transform = Transform( 3.74529, 0, 0.111503, 0, 1, 0, 0.865761, 0, 2.4009, -5.52073, -297.308, 18.7745 ) diff --git a/godot/assets/meat_bore/meat_module/level_clark.tscn b/godot/assets/meat_bore/meat_module/level_clark.tscn index a8f0ddd..4fe2fb4 100644 --- a/godot/assets/meat_bore/meat_module/level_clark.tscn +++ b/godot/assets/meat_bore/meat_module/level_clark.tscn @@ -26,6 +26,12 @@ transform = Transform( 1, 0, -4.17233e-07, 0, 1, 0, 4.17233e-07, 0, 1, -0.235702 light_color = Color( 0.631373, 0.00784314, 0.00784314, 1 ) shadow_enabled = true +[node name="OmniLight2" type="OmniLight" parent="clark"] +transform = Transform( 0.994598, 0, -0.1038, 0, 1, 0, 0.1038, 0, 0.994598, -1.88938, 3.85402, 17.314 ) +light_color = Color( 0.631373, 0.00784314, 0.00784314, 1 ) +shadow_enabled = true +omni_range = 10.0 + [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 ) diff --git a/godot/assets/meat_bore/meat_module/level_jackie.tscn b/godot/assets/meat_bore/meat_module/level_jackie.tscn index c3dd59c..3a4ae22 100644 --- a/godot/assets/meat_bore/meat_module/level_jackie.tscn +++ b/godot/assets/meat_bore/meat_module/level_jackie.tscn @@ -34,10 +34,10 @@ 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 ) +transform = Transform( 0.293757, 0, 0.95588, 0, 2.76592, 0, -0.95588, 0, 0.293757, -33.8926, -520.389, -8.76617 ) [node name="dialogue_platform2" parent="." instance=ExtResource( 4 )] -transform = Transform( 0.957214, 0.289383, 0, -0.289383, 0.957214, 0, 0, 0, 1, -30.7244, -520.836, -8.76617 ) +transform = Transform( 0.957214, 0.289383, 0, -0.705992, 2.33526, 0, 0, 0, 1, -30.1093, -522.019, -8.76617 ) [node name="SinkBlock" parent="." instance=ExtResource( 5 )] transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, -0.004, -469.575, 0.012 ) @@ -74,13 +74,25 @@ transform = Transform( 0.249951, 4.5527, -1.22279, -5.2645, 0.082006, -0.0468753 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 ) +transform = Transform( -0.352401, 0.0165807, -0.201815, -0.313878, 0.0789187, 0.328248, 0.0726001, 0.341773, 0.180575, -1.11423, 2.56048, -4.1824 ) [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_small5" parent="meatcircle" instance=ExtResource( 13 )] +transform = Transform( 0.163629, 0.122014, 0.543634, 0.515636, 0.655597, -0.104487, -1.24963, 0.350085, 0.223689, 6.50235, -0.27368, 1.12831 ) + +[node name="meat_tentacle_small3" parent="meatcircle" instance=ExtResource( 13 )] +transform = Transform( -0.0820616, -0.297091, 0.346804, -1.28526, 0.0750473, 0.229502, -0.306729, -0.463875, -0.50188, 0.93557, 6.9718, 3.60281 ) + +[node name="meat_tentacle_small4" parent="meatcircle" instance=ExtResource( 13 )] +transform = Transform( 0.231598, -0.0838826, 0.474934, -0.360379, -0.583113, -0.302262, 1.15374, -0.122744, -0.365858, -1.46094, 7.84201, -2.55475 ) + [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 ) +[node name="meatcircle2" parent="." instance=ExtResource( 11 )] +transform = Transform( 18.663, 3.18275, 17.2051, 0.806556, 35.5344, 6.25988, -13.1831, 4.68003, 20.2125, -0.38446, -578.121, 1.18818 ) + [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/dialogic/timelines/timeline-1667671038.json b/godot/dialogic/timelines/timeline-1667671038.json index 7dd1281..956b162 100644 --- a/godot/dialogic/timelines/timeline-1667671038.json +++ b/godot/dialogic/timelines/timeline-1667671038.json @@ -170,6 +170,10 @@ "event_id": "dialogic_001", "portrait": "", "text": "(The ringing stops, and you stand up groggily. You feel hungover)" + }, + { + "event_id": "dialogic_022", + "transition_duration": 1 } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672812380.json b/godot/dialogic/timelines/timeline-1672812380.json index 3174cd5..bf1105e 100644 --- a/godot/dialogic/timelines/timeline-1672812380.json +++ b/godot/dialogic/timelines/timeline-1672812380.json @@ -4,11 +4,59 @@ "event_id": "dialogic_024", "set_theme": "theme-1671745159.cfg" }, + { + "character": "character-1672267793.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "APPROACHING\n\nCORE OF\n\n[color=yellow][data corrupted] [/color]\n\n\t\t[color=blue][shake rate=5 level=10]EIGHT EIGht- E- E-[/shake][/color]\n\n[color=green](CLICK)[/color]" + }, + { + "character": "character-1672267793.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "[color=yellow][data corrupted][/color] \n\n[color=red][shake rate=5 level=10]GOTO\n\nHEAVENHEAVENHEAVENHEAVEN\nHEAVENHEAVENHEAVENHEAVEN\nHEAVENHEAVENHEAVENHEAVEN\nHEAVENHEAVENHEAVENHEAVEN\n[/shake][/color]" + }, + { + "event_id": "dialogic_024", + "set_theme": "theme-1671748561.cfg" + }, { "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "[data corrupted]" + "text": "[color=yellow]ERRORERROR[/color]" + }, + { + "event_id": "dialogic_024", + "set_theme": "theme-1672728448.cfg" + }, + { + "audio": "play", + "audio_bus": "Master", + "event_id": "dialogic_030", + "event_name": "AudioEvent", + "file": "res://assets/audio/sicky_drone.ogg", + "volume": 0 + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "FIND US \n\n\n\tAT THE CENTER OF [color=blue]NEPTUNE[/color]\n\t\n\t\tYOU WILL NEVER LEAVE \n\t\t\n\t\t\t\tYOU WILL OBEY \n\t\t\t\tOUR COMMAND" + }, + { + "event_id": "dialogic_024", + "set_theme": "theme-1671748561.cfg" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "[color=red]SHUTDOWN[/color]" + }, + { + "event_id": "dialogic_022", + "transition_duration": 1 } ], "metadata": {