Compare commits

..

11 Commits

Author SHA1 Message Date
Spencer Killen 1ac954e290
obelisk 2023-01-03 02:13:18 -07:00
Spencer Killen 6634319a8d
Merge branch 'spencer' 2023-01-03 01:55:13 -07:00
dukegoobler d0ae692a72 updated credits 2023-01-03 01:18:38 -07:00
dukegoobler 16b04d4b3c final obelisk 2023-01-03 01:09:35 -07:00
dukegoobler 720f010b61 obelisk drone 2023-01-03 01:08:11 -07:00
dukegoobler 84d97e8ae5 obelisk theme 2023-01-03 00:32:44 -07:00
dukegoobler 6010118331 obelisk theme update 2023-01-03 00:32:05 -07:00
dukegoobler c271f98cc6 more dialog box tweaks 2023-01-03 00:26:38 -07:00
dukegoobler d6547d5d1f tweak dialog trigger box sizes 2023-01-03 00:24:30 -07:00
dukegoobler be54919d93 dialog trigger tweak 2023-01-03 00:20:41 -07:00
dukegoobler b7ebc03b0a dialog trigger fix 2023-01-03 00:16:38 -07:00
16 changed files with 116 additions and 33 deletions

View File

@ -0,0 +1,3 @@
source_md5="cd0239125589bbed7154e4c37d3df269"
dest_md5="1343865a40c52a07aee54914c1cfe8ee"

BIN
godot/assets/audio/sicky_drone.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/sicky_drone.ogg-bf1e0d419cbb74f272e345e086ba6afd.oggstr"
[deps]
source_file="res://assets/audio/sicky_drone.ogg"
dest_files=[ "res://.import/sicky_drone.ogg-bf1e0d419cbb74f272e345e086ba6afd.oggstr" ]
[params]
loop=true
loop_offset=0

View File

@ -6,6 +6,8 @@ func _ready():
pass # Replace with function body. pass # Replace with function body.
func _on_DialogTrigger_body_entered(body): func _on_DialogTrigger_body_entered(body):
if body.get_parent() != Util.player:
return
dialog = Dialogic.start("elevator") dialog = Dialogic.start("elevator")
add_child(dialog) add_child(dialog)

View File

@ -6,9 +6,13 @@ func _ready():
pass # Replace with function body. pass # Replace with function body.
func _on_DialogTrigger_body_entered(body): func _on_DialogTrigger_body_entered(body):
if body.get_parent() != Util.player:
return
dialog = Dialogic.start("obelisk") dialog = Dialogic.start("obelisk")
add_child(dialog) add_child(dialog)
func _on_DialogTrigger_body_exited(body): func _on_DialogTrigger_body_exited(body):
if dialog != null: if dialog != null:
if is_a_parent_of(dialog):
call_deferred("remove_child", dialog)
dialog = null dialog = null

View File

@ -1,9 +1,8 @@
[gd_scene load_steps=28 format=2] [gd_scene load_steps=26 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]
[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=3] [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/Starbox3.png" type="Texture" id=4]
[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5] [ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=6] [ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=6]
[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=7] [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=7]
@ -25,12 +24,8 @@
[ext_resource path="res://assets/meat_creek/DialogTriggerObelisk.gd" type="Script" id=23] [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]
panorama = ExtResource( 4 )
[sub_resource type="Environment" id=3] [sub_resource type="Environment" id=3]
background_mode = 2 background_mode = 2
background_sky = SubResource( 4 )
ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 ) ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 )
ambient_light_energy = 1.5 ambient_light_energy = 1.5
ambient_light_sky_contribution = 0.0 ambient_light_sky_contribution = 0.0
@ -301,16 +296,22 @@ 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( -4.51923e-08, -4.03126e-10, 1, -0.262661, 0.964888, -1.14813e-08, -0.964888, -0.262661, -4.37114e-08, 0.485556, -113.83, 13.3311 )
[node name="DialogTrigger" type="Area" parent="decorations/obelisk" index="1"] [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 ) transform = Transform( -2.49779e-08, 0, -0.571429, 4.44089e-16, 1, 0, 1, -1.77636e-15, -4.37114e-08, 0.135639, -1.45077, -0.914494 )
script = ExtResource( 23 ) script = ExtResource( 23 )
[node name="CollisionShape" type="CollisionShape" parent="decorations/obelisk/DialogTrigger" index="0"] [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 ) transform = Transform( 5, 0, 0, 0, 1, 0, 0, 0, 12, 0, 4.79635, 0 )
shape = SubResource( 5 ) shape = SubResource( 5 )
[node name="OmniLight" type="OmniLight" parent="decorations/obelisk" index="2"]
transform = Transform( 1, 0, 0, 0, 1, 1.24345e-14, 0, -1.33227e-14, 1, -1.34868, 3.40622, -1.19209e-07 )
light_color = Color( 0.470588, 0.054902, 0.054902, 1 )
light_energy = 12.0
shadow_enabled = true
[node name="blackboxes" type="Spatial" parent="." index="7"] [node name="blackboxes" type="Spatial" parent="." index="7"]
[node name="black_box0" parent="blackboxes" index="0" instance=ExtResource( 19 )] [node name="black_box0" parent="blackboxes" index="0" instance=ExtResource( 19 )]
@ -344,7 +345,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.44246, 0 )
script = ExtResource( 22 ) script = ExtResource( 22 )
[node name="CollisionShape" type="CollisionShape" parent="elevator/DialogTrigger" index="0"] [node name="CollisionShape" type="CollisionShape" parent="elevator/DialogTrigger" index="0"]
transform = Transform( 1e+06, 0, 0, 0, 0, 0, 0, 0, 1e+06, 0, 0, 0 ) transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
shape = SubResource( 5 ) shape = SubResource( 5 )
[node name="SignalGenerator" parent="." index="11" instance=ExtResource( 12 )] [node name="SignalGenerator" parent="." index="11" instance=ExtResource( 12 )]
@ -381,9 +382,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_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_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"]

File diff suppressed because one or more lines are too long

View File

@ -44,6 +44,12 @@
"name": "flashlight_seconds", "name": "flashlight_seconds",
"type": 0, "type": 0,
"value": "0.0" "value": "0.0"
},
{
"id": "1672730872-648",
"name": "have seen elevator",
"type": 0,
"value": "false"
} }
] ]
} }

View File

@ -31,7 +31,8 @@
"1667770005-207", "1667770005-207",
"1672699752-574", "1672699752-574",
"1672699872-250", "1672699872-250",
"1672728461-648" "1672728461-648",
"1672730872-648"
], ],
"folders": { "folders": {

View File

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

View File

@ -6,7 +6,8 @@ name="Obelisk Theme"
image="res://assets/MainPanel01.png" image="res://assets/MainPanel01.png"
full_width=false full_width=false
modulation=false modulation=true
modulation_color="#ffff3a00"
[box] [box]
@ -24,21 +25,10 @@ text_margin_bottom=-80.0
shadow=true shadow=true
speed=2.0 speed=2.0
preview="This is preview text. You can use [color=#A5EFAC]BBCode[/color] to style it. 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]" [wave amp=50 freq=2]You can even use effects![/wave]"
shadow_color="#9e000000" shadow_color="#9e000000"
shadow_offset=Vector2( 5, 8 ) shadow_offset=Vector2( 5, 8 )
color="#ffe4e4e4"
[name] [name]
@ -47,6 +37,7 @@ position=1
auto_color=false auto_color=false
shadow_visible=true shadow_visible=true
is_hidden=false is_hidden=false
shadow_offset=Vector2( 4, 5 )
[audio] [audio]
@ -55,6 +46,16 @@ typing={
"audio_bus": "Master", "audio_bus": "Master",
"enable": true, "enable": true,
"path": "res://assets/audio/typing.ogg", "path": "res://assets/audio/typing.ogg",
"pitch": 0.3,
"pitch_rand_range": 0.0,
"volume": 10.0,
"volume_rand_range": 0.26
}
waiting={
"allow_interrupt": true,
"audio_bus": "Master",
"enable": false,
"path": "res://addons/dialogic/Example Assets/Sound Effects/Beep.wav",
"pitch": 1.0, "pitch": 1.0,
"pitch_rand_range": 0.0, "pitch_rand_range": 0.0,
"volume": 0.0, "volume": 0.0,
@ -67,7 +68,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( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", true, 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

@ -8,7 +8,7 @@
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "[speed=0]Created for Gamesden Done Quicker 2022\n\nUser interface elements courtesy of John Watson, Wenrexa, and Sunfire Interactive\n\nOverlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com\n\nSounds courtesy of Dryoma and VOiD1 Gaming" "text": "[speed=0]Developed by dukegoobler, km__k, and Noodle1234 \n\nOriginal concept created for the Gamesden Done Quicker 2022 Game Jam\n\nUser interface elements courtesy of John Watson, S. Evans, Wenrexa, and Sunfire Interactive\n\nOverlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com\n\nSounds courtesy of Dryoma and VOiD1 Gaming"
}, },
{ {
"event_id": "dialogic_022", "event_id": "dialogic_022",

View File

@ -4,11 +4,17 @@
"event_id": "dialogic_024", "event_id": "dialogic_024",
"set_theme": "default-theme.cfg" "set_theme": "default-theme.cfg"
}, },
{
"condition": "!=",
"definition": "1672730872-648",
"event_id": "dialogic_012",
"value": "true"
},
{ {
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "Where is this place?)" "text": "(Where is this place?)"
}, },
{ {
"character": "", "character": "",
@ -21,6 +27,33 @@
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "(Looks the the only way out is down...)" "text": "(Looks the the only way out is down...)"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "..."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "(Why do I feel that light in the distance pushing me away?)"
},
{
"event_id": "dialogic_013"
},
{
"definition": "1672730872-648",
"event_id": "dialogic_014",
"operation": "=",
"random_upper_limit": 100,
"set_random": false,
"set_value": "true"
},
{
"event_id": "dialogic_022",
"transition_duration": 1
} }
], ],
"metadata": { "metadata": {

View File

@ -4,6 +4,15 @@
"event_id": "dialogic_024", "event_id": "dialogic_024",
"set_theme": "theme-1672728448.cfg" "set_theme": "theme-1672728448.cfg"
}, },
{
"audio_bus": "Master",
"background-music": "play",
"event_id": "dialogic_031",
"event_name": "BackgroundMusic",
"fade_length": 2,
"file": "res://assets/audio/sicky_drone.ogg",
"volume": -5
},
{ {
"character": "character-1672728520.json", "character": "character-1672728520.json",
"event_id": "dialogic_001", "event_id": "dialogic_001",
@ -74,7 +83,7 @@
"value": "" "value": ""
}, },
{ {
"character": "", "character": "character-1672728520.json",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "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]" "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]"
@ -97,6 +106,10 @@
"portrait": "", "portrait": "",
"text": "COLLECTION STATUS:\n\n\t[color=green]IMMINENT[/color]\n\t\n\t[color=red]CONTAINMENT[/color] ADVISED" "text": "COLLECTION STATUS:\n\n\t[color=green]IMMINENT[/color]\n\t\n\t[color=red]CONTAINMENT[/color] ADVISED"
}, },
{
"anchor_id": "anchor-1634488067",
"event_id": "dialogic_016"
},
{ {
"choice": "EXIT", "choice": "EXIT",
"condition": "", "condition": "",