From 2bca81595009c3840db8a6cde154a7f6e011a9fb Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Tue, 3 Jan 2023 18:45:00 -0700 Subject: [PATCH] aaa --- godot/assets/meat_creek/side_tunnel_1.tscn | 13 +- godot/dialogic/definitions.json | 12 +- .../timelines/timeline-1667667789.json | 129 ++---------------- godot/project.godot | 1 - godot/saved_dialogue_progress.gd | 1 + 5 files changed, 33 insertions(+), 123 deletions(-) diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index ffdc141..7f24bb2 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1] [ext_resource path="res://player/player.tscn" type="PackedScene" id=2] @@ -23,6 +23,8 @@ [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=21] [ext_resource path="res://assets/meat_creek/DialogTrigger.gd" type="Script" id=22] [ext_resource path="res://assets/meat_creek/DialogTriggerObelisk.gd" type="Script" id=23] +[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.tscn" type="PackedScene" id=24] +[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=25] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400] [sub_resource type="Environment" id=3] @@ -307,7 +309,7 @@ transform = Transform( -2.49779e-08, 0, -0.571429, 4.44089e-16, 1, 0, 1, -1.7763 script = ExtResource( 23 ) [node name="CollisionShape" type="CollisionShape" parent="decorations/obelisk/DialogTrigger" index="0"] -transform = Transform( 5, 0, 0, 0, 1, 0, 0, 0, 12, 0, 4.79635, 0 ) +transform = Transform( 5, 0, 0, 0, 7.121, 0, 0, 0, 12, 0, 4.79635, 0 ) shape = SubResource( 5 ) [node name="OmniLight" type="OmniLight" parent="decorations/obelisk" index="2"] @@ -386,6 +388,13 @@ max_wait = 30.0 [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"] one_shot = true +[node name="guy" parent="." index="15" instance=ExtResource( 24 )] +transform = Transform( -0.99998, 0, -0.00631814, 0, 1, 0, 0.00631814, 0, -0.99998, -65.889, 1.74389, -97.945 ) +initial_dialogic_timeline = "guy_creek" + +[node name="dialogue_platform" parent="guy" index="4" instance=ExtResource( 25 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -93.1114, 0.735646, -16.5711 ) + [connection signal="body_entered" from="decorations/obelisk/DialogTrigger" to="decorations/obelisk/DialogTrigger" method="_on_DialogTrigger_body_entered"] [connection signal="body_exited" from="decorations/obelisk/DialogTrigger" to="decorations/obelisk/DialogTrigger" method="_on_DialogTrigger_body_exited"] [connection signal="body_entered" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_entered"] diff --git a/godot/dialogic/definitions.json b/godot/dialogic/definitions.json index a0e386c..ed5043b 100644 --- a/godot/dialogic/definitions.json +++ b/godot/dialogic/definitions.json @@ -39,12 +39,6 @@ "type": 0, "value": "false" }, - { - "id": "1672699872-250", - "name": "meat_creek_tutorial_given", - "type": 0, - "value": "false" - }, { "id": "1672784130-787", "name": "meat_bore_tutorial_given", @@ -62,6 +56,12 @@ "name": "flashlight_seconds", "type": 0, "value": "0.0" + }, + { + "id": "1672699872-250", + "name": "meat_creek_tutorial_given", + "type": 0, + "value": "false" } ] } diff --git a/godot/dialogic/timelines/timeline-1667667789.json b/godot/dialogic/timelines/timeline-1667667789.json index d3f9a96..0daf56a 100644 --- a/godot/dialogic/timelines/timeline-1667667789.json +++ b/godot/dialogic/timelines/timeline-1667667789.json @@ -4,19 +4,6 @@ "event_id": "dialogic_024", "set_theme": "default-theme.cfg" }, - { - "condition": "", - "definition": "1672784130-787", - "event_id": "dialogic_012", - "value": "true" - }, - { - "anchor_id": "anchor-1634488067", - "event_id": "dialogic_016" - }, - { - "event_id": "dialogic_013" - }, { "condition": "!=", "definition": "1667755202-648", @@ -35,7 +22,7 @@ "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)" + "text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)" }, { "character": "character-1667667572.json", @@ -59,7 +46,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh" + "text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh." }, { "event_id": "dialogic_013" @@ -82,13 +69,13 @@ "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)" + "text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh" + "text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh." }, { "character": "character-1667667572.json", @@ -119,31 +106,31 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples" + "text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": " Just walk up to a crew member to collect a neural scan. The lab rats will use it to clone them back on the homeworld" + "text": " Just walk up to a crew member to collect a neural scan. The lab rats will use it to clone them back on the homeworld." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too" + "text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "That's what the lab rats tell me, anyway" + "text": "That's what the lab rats tell me, anyway." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": " Be careful climbing down. Recovery Specialists have augmented joints for heavy impact but they won't save you from a long fall." + "text": " Be careful climbing down. Recovery Specialists have augmented joints for heavy impact but they won't save you from a long fall. " }, { "character": "character-1667667572.json", @@ -174,108 +161,22 @@ "event_id": "dialogic_013" }, { - "definition": "1672784130-787", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "true" + "character": "character-1667667572.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "There's one last thing..." + "text": "Word is IngestiCorp will pay top dollar to get her back." }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "Well rookie, do you want me to enable the gliding function on your suit? " - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though" - }, - { - "event_id": "dialogic_015", - "id": "anchor-1634488067", - "index": 0, - "name": "glider/briefing" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_010", - "options": [ - - ], - "portrait": "", - "question": "Still want the glider? The costs are coming out of your end" - }, - { - "choice": "Yes", - "condition": "", - "definition": "", - "event_id": "dialogic_011", - "value": "" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Fine. Hold (Space)/(R1) to slow your fall. Should make climbing down easier" - }, - { - "definition": "1672783730-648", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "true" - }, - { - "choice": "No", - "condition": "", - "definition": "", - "event_id": "dialogic_011", - "value": "" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Brave. Heh. Well, suit yourself" - }, - { - "definition": "1672783730-648", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "false" - }, - { - "event_id": "dialogic_013" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Word is IngestiCorp will pay top dollar to get her back" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Don’t make me wait for too long, Stuart. This place gives me the creeps" + "text": "Don’t make me wait for too long, Stuart. This place gives me the creeps." }, { "event_id": "dialogic_022", diff --git a/godot/project.godot b/godot/project.godot index 40d2760..9c7af08 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -100,7 +100,6 @@ config/icon="res://meat_madness_icon.png" Util="*res://util.gd" GlobalEventBus="*res://global_event_bus.gd" SavedDialogueProgress="*res://saved_dialogue_progress.gd" -DebugTools="*res://DebugTools.tscn" [display] diff --git a/godot/saved_dialogue_progress.gd b/godot/saved_dialogue_progress.gd index 23f680f..f8a3dd4 100644 --- a/godot/saved_dialogue_progress.gd +++ b/godot/saved_dialogue_progress.gd @@ -11,6 +11,7 @@ func find_blackbox(id: int): if not found_blackboxes[id]: found_blackboxes[id] = true found_blackbox_count += 1 + Dialogic.set_variable("meat_creek_tutorial_given", true) var dialog if blackbox_dialogues[id] == null or blackbox_dialogues[id].get_ref() == null: