Compare commits

..

No commits in common. "bbcb4140bfc819ed0b4fed9e15940038817f603b" and "d795e6efd8297b349b10c993833bde4957a7cdb4" have entirely different histories.

14 changed files with 9 additions and 277 deletions

View File

@ -1,13 +0,0 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]
[ext_resource path="res://assets/AlphacodeBeyond-Regular.ttf" type="DynamicFontData" id=1]
[resource]
size = 40
outline_size = 1
outline_color = Color( 0.333333, 0.0627451, 0.0627451, 1 )
extra_spacing_top = 4
extra_spacing_bottom = 3
extra_spacing_char = 1
extra_spacing_space = 1
font_data = ExtResource( 1 )

View File

@ -1,5 +1,6 @@
extends Area extends Area
var phase = 0
var dialog = null var dialog = null
func _ready(): func _ready():

View File

@ -1,14 +0,0 @@
extends Area
var dialog = null
func _ready():
pass # Replace with function body.
func _on_DialogTrigger_body_entered(body):
dialog = Dialogic.start("obelisk")
add_child(dialog)
func _on_DialogTrigger_body_exited(body):
if dialog != null:
dialog = null

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=28 format=2] [gd_scene load_steps=27 format=2]
[ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1] [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] [ext_resource path="res://player/player.tscn" type="PackedScene" id=2]
@ -22,7 +22,6 @@
[ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20] [ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20]
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=21] [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/DialogTrigger.gd" type="Script" id=22]
[ext_resource path="res://assets/meat_creek/DialogTriggerObelisk.gd" type="Script" id=23]
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400]
[sub_resource type="PanoramaSky" id=4] [sub_resource type="PanoramaSky" id=4]
@ -301,15 +300,7 @@ transform = Transform( -0.449096, 0.167882, 0.254066, 0.12168, 0.619619, -0.0688
transform = Transform( -0.451285, 0.168114, 0.250056, -0.00507374, 0.56347, -0.271243, -0.30563, -0.257587, -0.430144, -1.93217, -0.560821, -0.363808 ) transform = Transform( -0.451285, 0.168114, 0.250056, -0.00507374, 0.56347, -0.271243, -0.30563, -0.257587, -0.430144, -1.93217, -0.560821, -0.363808 )
[node name="obelisk" parent="decorations" index="10" instance=ExtResource( 20 )] [node name="obelisk" parent="decorations" index="10" instance=ExtResource( 20 )]
transform = Transform( -7.64949e-08, 0, 1, 0, 1, 0, -1.75, 0, -4.37114e-08, 0.485556, -114.994, 8.64844 ) transform = Transform( 1.75, 0, 0, 0, 1, 0, 0, 0, 1.25, 58.9486, 6.79926, -57.7791 )
[node name="DialogTrigger" type="Area" parent="decorations/obelisk" index="1"]
transform = Transform( -2.49779e-08, 0, -0.571429, 0, 1, 0, 1, 0, -4.37114e-08, -2.91174, -2.28032, -0.914494 )
script = ExtResource( 23 )
[node name="CollisionShape" type="CollisionShape" parent="decorations/obelisk/DialogTrigger" index="0"]
transform = Transform( 20, 0, 0, 0, 0, 0, 0, 0, 20, 0, 2.63103, 0 )
shape = SubResource( 5 )
[node name="blackboxes" type="Spatial" parent="." index="7"] [node name="blackboxes" type="Spatial" parent="." index="7"]
@ -381,11 +372,6 @@ max_wait = 30.0
[node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"] [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"]
one_shot = true one_shot = true
[node name="mothers voice" type="Spatial" parent="." index="14"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.428938, -102.191, 13.744 )
[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"] [connection signal="body_entered" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_entered"]
[connection signal="body_exited" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_exited"] [connection signal="body_exited" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_exited"]
[connection signal="finished" from="AmbientSounds/BottomWhale1" to="AmbientSounds/BottomWhale1" method="_on_sound_finished"] [connection signal="finished" from="AmbientSounds/BottomWhale1" to="AmbientSounds/BottomWhale1" method="_on_sound_finished"]

View File

@ -1,21 +0,0 @@
{
"color": "#ffffffff",
"description": "",
"display_name": "The Obelisk",
"display_name_bool": true,
"id": "character-1672728520.json",
"mirror_portraits": false,
"name": "The Obelisk",
"nickname": "",
"nickname_bool": false,
"offset_x": 0,
"offset_y": 0,
"portraits": [
{
"name": "Default",
"path": ""
}
],
"scale": 100,
"theme": "theme-1672728448.cfg"
}

View File

@ -12,8 +12,7 @@
"character-1667667693.json", "character-1667667693.json",
"character-1667667711.json", "character-1667667711.json",
"character-1667767751.json", "character-1667767751.json",
"character-1672267793.json", "character-1672267793.json"
"character-1672728520.json"
], ],
"folders": { "folders": {
@ -46,8 +45,7 @@
"default-theme.cfg", "default-theme.cfg",
"theme-1671745159.cfg", "theme-1671745159.cfg",
"theme-1671748561.cfg", "theme-1671748561.cfg",
"theme-1672721557.cfg", "theme-1672721557.cfg"
"theme-1672728448.cfg"
], ],
"folders": { "folders": {
@ -76,8 +74,7 @@
"timeline-1672267892.json", "timeline-1672267892.json",
"timeline-1672623960.json", "timeline-1672623960.json",
"timeline-1672719153.json", "timeline-1672719153.json",
"timeline-1672725696.json", "timeline-1672725696.json"
"timeline-1672727997.json"
], ],
"folders": { "folders": {

View File

@ -26,4 +26,4 @@ canvas_layer=50.0
[QuickTimelineTest] [QuickTimelineTest]
timeline_file="timeline-1672727997.json" timeline_file="timeline-1667668097.json"

View File

@ -65,7 +65,7 @@ animation="Up and down"
[buttons] [buttons]
normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button01.png", false, Color( 1, 1, 1, 1 ) ] normal=[ false, Color( 0.521569, 0.521569, 0.521569, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
layout=1 layout=1
fixed=true fixed=true
fixed_size=Vector2( 200, 80 ) fixed_size=Vector2( 200, 80 )

View File

@ -1,77 +0,0 @@
[settings]
name="Obelisk Theme"
[background]
image="res://assets/MainPanel01.png"
full_width=false
modulation=false
[box]
size=Vector2( 1080, 600 )
anchor=5
portraits_behind_dialog_box=false
[text]
font="res://assets/alien_font.tres"
text_margin_left=50.0
text_margin_top=60.0
text_margin_right=-50.0
text_margin_bottom=-80.0
shadow=true
speed=2.0
preview="This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]
This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it.
[wave amp=50 freq=2]You can even use effects![/wave]"
shadow_color="#9e000000"
shadow_offset=Vector2( 5, 8 )
[name]
font="res://assets/title_font.tres"
position=1
auto_color=false
shadow_visible=true
is_hidden=false
[audio]
typing={
"allow_interrupt": true,
"audio_bus": "Master",
"enable": true,
"path": "res://assets/audio/typing.ogg",
"pitch": 1.0,
"pitch_rand_range": 0.0,
"volume": 0.0,
"volume_rand_range": 0.0
}
[next_indicator]
animation="Up and down"
[buttons]
normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button01.png", false, Color( 1, 1, 1, 1 ) ]
layout=1
fixed=true
fixed_size=Vector2( 200, 80 )
hover=[ true, Color( 0.698039, 0.698039, 0.698039, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
focus=[ true, Color( 0.698039, 0.698039, 0.698039, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]

View File

@ -8,13 +8,7 @@
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "Where is this place?)" "text": "(Where am I?)"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "(Can Recovery even reach this deep below the surface?)"
}, },
{ {
"character": "", "character": "",

View File

@ -1,120 +0,0 @@
{
"events": [
{
"event_id": "dialogic_024",
"set_theme": "theme-1672728448.cfg"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "MOTHER CONTROL PANEL\n\n\t[*] SEED MOTHER [color=green]CERES[/color]"
},
{
"event_id": "dialogic_015",
"id": "anchor-1634488067",
"index": 0,
"name": "Commands"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_010",
"options": [
],
"portrait": "",
"question": "What is your command?"
},
{
"choice": "View Cipher",
"condition": "",
"definition": "",
"event_id": "dialogic_011",
"value": ""
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "CIPHER\n\n1A\n2B\n3C\n4D\n5E\n6F"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "CIPHER\n\n7G\n8H\n9I\n0J\n1K\n2L"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "CIPHER\n\n3M\n4N\n5O\n6P\n7Q\n8R"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "CIPHER\n\n9S\n0T\n1U\n2V\n3W\n4X"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "CIPHER\n\n5Y\n6Z"
},
{
"anchor_id": "anchor-1634488067",
"event_id": "dialogic_016"
},
{
"choice": "Seed Status",
"condition": "",
"definition": "",
"event_id": "dialogic_011",
"value": ""
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "LAST OBELISK TERMINAL ACCESS:\n\n\t[/color=green]Ten thousand years ago[/color]\n\t\nLAST STATUS:\n\n\t[/color=green]Seed ripening[/color]"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "SEED PLANET:\n\t\n\t[color=green]EARTH[/color]\n\nAGE:\n\t\n\t[color=green]three point seven billion Earth years[/color]"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "POPULATION:\n\n\t[color=green]TEN BILLION[/color]\n\t\nCIVILIZATION STATUS:\n\t\n\t\t[color=green]SPACEFLIGHT[/color]"
},
{
"character": "character-1672728520.json",
"event_id": "dialogic_001",
"portrait": "",
"text": "COLLECTION STATUS:\n\n\t[color=green]IMMINENT[/color]\n\t\n\t[color=red]CONTAINMENT[/color] ADVISED"
},
{
"choice": "EXIT",
"condition": "",
"definition": "",
"event_id": "dialogic_011",
"value": ""
},
{
"event_id": "dialogic_013"
},
{
"event_id": "dialogic_022",
"transition_duration": 1
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672727997.json",
"name": "obelisk"
}
}

View File

@ -170,7 +170,6 @@ shader_param/texture_albedo = ExtResource( 22 )
[node name="Player" type="Spatial"] [node name="Player" type="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.750395, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.750395, 0 )
script = ExtResource( 3 ) script = ExtResource( 3 )
can_glide = true
[node name="Smoothing" type="Spatial" parent="."] [node name="Smoothing" type="Spatial" parent="."]
script = ExtResource( 5 ) script = ExtResource( 5 )