rename timelines and stuff

Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux
obelisk
2023-01-03 01:54:59 -07:00 · 2023-01-03 00:12:05 -07:00 · 2023-01-03 00:07:33 -07:00 · 2023-01-03 00:07:23 -07:00
31 changed files with 524 additions and 24 deletions
--- a/godot/assets/AlphacodeBeyond-Regular.ttf
+++ b/godot/assets/AlphacodeBeyond-Regular.ttf
--- a/godot/assets/alien_font.tres
+++ b/godot/assets/alien_font.tres
@ -0,0 +1,13 @@
+[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 )
--- a/godot/assets/meat_bore/npcs/female.tscn
+++ b/godot/assets/meat_bore/npcs/female.tscn
@ -1,7 +1,10 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/female.glb" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/npc.gd" type="Script" id=2]
+[ext_resource path="res://assets/meat_bore/npcs/npc_common.tscn" type="PackedScene" id=3]

 [node name="female" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
+
+[node name="npc_common" parent="." index="2" instance=ExtResource( 3 )]
--- a/godot/assets/meat_bore/npcs/inherited/alexis.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/alexis.tscn
@ -1,12 +1,37 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=10 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/female.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.gd" type="Script" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/alexis_face.png" type="Texture" id=3]
 [ext_resource path="res://assets/meat_bore/npcs/alexis_body.png" type="Texture" id=4]

+[sub_resource type="AnimationNodeAnimation" id=3]
+animation = "NPC_Alexis_Awaken"
+
+[sub_resource type="AnimationNodeAnimation" id=4]
+animation = "NPC_Alexis_Dead"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=5]
+
+[sub_resource type="AnimationNodeStateMachine" id=1]
+states/awaken/node = SubResource( 3 )
+states/awaken/position = Vector2( 717, 197 )
+states/idle/node = SubResource( 4 )
+states/idle/position = Vector2( 363, 205 )
+transitions = [ "idle", "awaken", SubResource( 5 ) ]
+start_node = "idle"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=2]
+
 [node name="alexis" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
 who = 5
 body_texture = ExtResource( 4 )
 face_texture = ExtResource( 3 )
+initial_dialogic_timeline = "alexis"
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 1 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 2 )
--- a/godot/assets/meat_bore/npcs/inherited/clark.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/clark.tscn
@ -1,17 +1,49 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=13 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/clark.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/clark.gd" type="Script" id=3]

+[sub_resource type="AnimationNodeAnimation" id=3]
+animation = "ClarkDeath"
+
+[sub_resource type="AnimationNodeAnimation" id=4]
+animation = "clark_idle"
+
+[sub_resource type="AnimationNodeAnimation" id=5]
+animation = "clark_idle"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=6]
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=7]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=8]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=9]
+
 [sub_resource type="AnimationNodeStateMachine" id=1]
+states/death/node = SubResource( 3 )
+states/death/position = Vector2( 797, 197 )
+states/idle/node = SubResource( 4 )
+states/idle/position = Vector2( 410, 179 )
+states/idle2/node = SubResource( 5 )
+states/idle2/position = Vector2( 471, 85 )
+transitions = [ "idle", "death", SubResource( 6 ), "idle", "idle2", SubResource( 7 ), "idle2", "idle", SubResource( 8 ), "idle2", "death", SubResource( 9 ) ]
+start_node = "idle"

 [sub_resource type="AnimationNodeStateMachinePlayback" id=2]

 [node name="clark" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
 body_texture = ExtResource( 2 )
+initial_dialogic_timeline = "clark"

 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource( 1 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
 parameters/playback = SubResource( 2 )
--- a/godot/assets/meat_bore/npcs/inherited/guy.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/guy.tscn
@ -1,10 +1,27 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/guy.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/guy.gd" type="Script" id=3]

+[sub_resource type="AnimationNodeAnimation" id=1]
+animation = "guy_idle"
+
+[sub_resource type="AnimationNodeStateMachine" id=2]
+states/idle/node = SubResource( 1 )
+states/idle/position = Vector2( 460, 174 )
+start_node = "idle"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=3]
+
 [node name="guy" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
 who = 1
 body_texture = ExtResource( 2 )
+initial_dialogic_timeline = "guy"
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 2 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 3 )
--- a/godot/assets/meat_bore/npcs/inherited/jackie.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/jackie.tscn
@ -1,12 +1,52 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=14 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/female.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.gd" type="Script" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/jackie_face.png" type="Texture" id=3]
 [ext_resource path="res://assets/meat_bore/npcs/jackie_body.png" type="Texture" id=4]

+[sub_resource type="AnimationNodeAnimation" id=1]
+animation = "NPC_jackie_Death"
+
+[sub_resource type="AnimationNodeAnimation" id=2]
+animation = "NPC_Jackie_struggle"
+
+[sub_resource type="AnimationNodeAnimation" id=3]
+animation = "NPC_Jackie_struggle"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=4]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=5]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=6]
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=7]
+
+[sub_resource type="AnimationNodeStateMachine" id=8]
+states/death/node = SubResource( 1 )
+states/death/position = Vector2( 778, 177 )
+states/idle/node = SubResource( 2 )
+states/idle/position = Vector2( 529, 203 )
+states/idle2/node = SubResource( 3 )
+states/idle2/position = Vector2( 529, 104 )
+transitions = [ "idle", "idle2", SubResource( 4 ), "idle2", "idle", SubResource( 5 ), "idle2", "death", SubResource( 6 ), "idle", "death", SubResource( 7 ) ]
+start_node = "idle"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=9]
+
 [node name="jackie" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
 who = 4
 body_texture = ExtResource( 4 )
 face_texture = ExtResource( 3 )
+initial_dialogic_timeline = "jackie"
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 8 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 9 )
--- a/godot/assets/meat_bore/npcs/inherited/lee.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/lee.tscn
@ -1,10 +1,50 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=13 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/lee.gd" type="Script" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/lee.png" type="Texture" id=3]

+[sub_resource type="AnimationNodeAnimation" id=1]
+animation = "NPC_Lee_Death"
+
+[sub_resource type="AnimationNodeAnimation" id=2]
+animation = "lee_idle"
+
+[sub_resource type="AnimationNodeAnimation" id=3]
+animation = "lee_idle"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=4]
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=5]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=6]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=7]
+
+[sub_resource type="AnimationNodeStateMachine" id=8]
+states/death/node = SubResource( 1 )
+states/death/position = Vector2( 675, 208 )
+states/idle/node = SubResource( 2 )
+states/idle/position = Vector2( 448, 208 )
+states/idle2/node = SubResource( 3 )
+states/idle2/position = Vector2( 462, 103 )
+transitions = [ "idle", "death", SubResource( 4 ), "idle2", "idle", SubResource( 5 ), "idle", "idle2", SubResource( 6 ), "idle2", "death", SubResource( 7 ) ]
+start_node = "idle"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=9]
+
 [node name="lee" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
 who = 2
 body_texture = ExtResource( 3 )
+initial_dialogic_timeline = "lee"
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 8 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 9 )
--- a/godot/assets/meat_bore/npcs/inherited/wally.tscn
+++ b/godot/assets/meat_bore/npcs/inherited/wally.tscn
@ -1,10 +1,41 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=10 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/male.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/wally.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/wally.gd" type="Script" id=3]

+[sub_resource type="AnimationNodeAnimation" id=1]
+animation = "wally_idle"
+
+[sub_resource type="AnimationNodeAnimation" id=2]
+animation = "wally_idle"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=3]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachineTransition" id=4]
+switch_mode = 2
+auto_advance = true
+
+[sub_resource type="AnimationNodeStateMachine" id=5]
+states/idle/node = SubResource( 1 )
+states/idle/position = Vector2( 460, 192 )
+states/idle2/node = SubResource( 2 )
+states/idle2/position = Vector2( 460, 82 )
+transitions = [ "idle2", "idle", SubResource( 3 ), "idle", "idle2", SubResource( 4 ) ]
+start_node = "idle"
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=6]
+
 [node name="wally" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
 who = 3
 body_texture = ExtResource( 2 )
+initial_dialogic_timeline = "wally"
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+tree_root = SubResource( 5 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 6 )
--- a/godot/assets/meat_bore/npcs/male.tscn
+++ b/godot/assets/meat_bore/npcs/male.tscn
@ -1,7 +1,10 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://assets/meat_bore/npcs/male.glb" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/npcs/npc.gd" type="Script" id=2]
+[ext_resource path="res://assets/meat_bore/npcs/npc_common.tscn" type="PackedScene" id=3]

 [node name="male" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
+
+[node name="npc_common" parent="." index="2" instance=ExtResource( 3 )]
--- a/godot/assets/meat_bore/npcs/npc.gd
+++ b/godot/assets/meat_bore/npcs/npc.gd
@ -7,6 +7,7 @@ enum Name {Clark, Guy, Lee, Wally, Jackie, Alexis}
 export(Name) var who
 export var body_texture: StreamTexture
 export var face_texture: StreamTexture
+export var initial_dialogic_timeline: String

 func is_male() -> bool:
 	return not (who == Name.Jackie or who == Name.Alexis)
@ -28,3 +29,27 @@ func set_material():
 	
 func _ready():
 	set_material()
+	var _err = $npc_common/Area.connect("body_entered", self, "body_entered")
+	_err = $npc_common/Area.connect("body_exited", self, "body_exited")
+
+func body_entered(body):
+	if body.get_parent() == Util.player:
+		player_entered()
+
+func body_exited(body):
+	if body.get_parent() == Util.player:
+		player_exited()
+
+var dialog = weakref(null)
+
+func player_entered():
+	if dialog.get_ref() == null:
+		dialog = weakref(Dialogic.start(initial_dialogic_timeline))
+	add_child(dialog.get_ref())
+	
+func player_exited():
+	if dialog.get_ref() == null:
+		return
+	if is_a_parent_of(dialog.get_ref()):
+		call_deferred("remove_child", dialog.get_ref())
+
--- a/godot/assets/meat_bore/npcs/npc_common.tscn
+++ b/godot/assets/meat_bore/npcs/npc_common.tscn
@ -0,0 +1,16 @@
+[gd_scene load_steps=2 format=2]
+
+[sub_resource type="SphereShape" id=1]
+
+[node name="npc_common" type="Spatial"]
+
+[node name="Area" type="Area" parent="."]
+
+[node name="CollisionShape" type="CollisionShape" parent="Area"]
+shape = SubResource( 1 )
+
+[node name="StaticBody" type="StaticBody" parent="."]
+
+[node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
+transform = Transform( 1, 0, 0, 0, 9.98379, 0, 0, 0, 1, 0, 0, 0 )
+shape = SubResource( 1 )
--- a/godot/assets/meat_creek/DialogTrigger.gd
+++ b/godot/assets/meat_creek/DialogTrigger.gd
@ -1,6 +1,5 @@
 extends Area

-var phase = 0
 var dialog = null

 func _ready():
--- a/godot/assets/meat_creek/DialogTriggerObelisk.gd
+++ b/godot/assets/meat_creek/DialogTriggerObelisk.gd
@ -0,0 +1,14 @@
+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
--- 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=28 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]
@ -22,6 +22,7 @@
 [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/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]

 [sub_resource type="PanoramaSky" id=4]
@ -300,7 +301,15 @@ 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 )

 [node name="obelisk" parent="decorations" index="10" instance=ExtResource( 20 )]
-transform = Transform( 1.75, 0, 0, 0, 1, 0, 0, 0, 1.25, 58.9486, 6.79926, -57.7791 )
+transform = Transform( -7.64949e-08, 0, 1, 0, 1, 0, -1.75, 0, -4.37114e-08, 0.485556, -114.994, 8.64844 )
+
+[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"]

@ -372,6 +381,11 @@ max_wait = 30.0
 [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"]
 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_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"]
--- a/godot/assets/models/Material_003.material.tmp
+++ b/godot/assets/models/Material_003.material.tmp
--- a/godot/dialogic/characters/character-1672728520.json
+++ b/godot/dialogic/characters/character-1672728520.json
@ -0,0 +1,21 @@
+{
+	"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"
+}
--- a/godot/dialogic/folder_structure.json
+++ b/godot/dialogic/folder_structure.json
@ -12,7 +12,8 @@
 				"character-1667667693.json",
 				"character-1667667711.json",
 				"character-1667767751.json",
-				"character-1672267793.json"
+				"character-1672267793.json",
+				"character-1672728520.json"
 			],
 			"folders": {

@ -45,7 +46,8 @@
 				"default-theme.cfg",
 				"theme-1671745159.cfg",
 				"theme-1671748561.cfg",
-				"theme-1672721557.cfg"
+				"theme-1672721557.cfg",
+				"theme-1672728448.cfg"
 			],
 			"folders": {

@ -74,7 +76,8 @@
 				"timeline-1672267892.json",
 				"timeline-1672623960.json",
 				"timeline-1672719153.json",
-				"timeline-1672725696.json"
+				"timeline-1672725696.json",
+				"timeline-1672727997.json"
 			],
 			"folders": {

--- a/godot/dialogic/settings.cfg
+++ b/godot/dialogic/settings.cfg
@ -26,4 +26,4 @@ canvas_layer=50.0

 [QuickTimelineTest]

-timeline_file="timeline-1667668097.json"
+timeline_file="timeline-1672727997.json"
--- a/godot/dialogic/themes/theme-1671745159.cfg
+++ b/godot/dialogic/themes/theme-1671745159.cfg
@ -65,7 +65,7 @@ animation="Up and down"

 [buttons]

-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 ) ]
+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 )
--- a/godot/dialogic/themes/theme-1672728448.cfg
+++ b/godot/dialogic/themes/theme-1672728448.cfg
@ -0,0 +1,77 @@
+[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 ) ]
--- a/godot/dialogic/timelines/timeline-1667667789.json
+++ b/godot/dialogic/timelines/timeline-1667667789.json
@ -186,6 +186,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667667789.json",
-		"name": "Guy Brimley"
+		"name": "guy_bore"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1667671027.json
+++ b/godot/dialogic/timelines/timeline-1667671027.json
@ -188,6 +188,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667671027.json",
-		"name": "Lee Yi Chen"
+		"name": "lee"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1667671033.json
+++ b/godot/dialogic/timelines/timeline-1667671033.json
@ -158,6 +158,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667671033.json",
-		"name": "Clark Lambert"
+		"name": "clark"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1667671038.json
+++ b/godot/dialogic/timelines/timeline-1667671038.json
@ -171,6 +171,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667671038.json",
-		"name": "Alexis Manos"
+		"name": "alexis"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1667671056.json
+++ b/godot/dialogic/timelines/timeline-1667671056.json
@ -142,6 +142,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667671056.json",
-		"name": "Wally Gravin"
+		"name": "wally"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1667671061.json
+++ b/godot/dialogic/timelines/timeline-1667671061.json
@ -283,6 +283,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1667671061.json",
-		"name": "Jackie Voss"
+		"name": "jackie"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1672623960.json
+++ b/godot/dialogic/timelines/timeline-1672623960.json
@ -324,6 +324,6 @@
 	"metadata": {
 		"dialogic-version": "1.4.5",
 		"file": "timeline-1672623960.json",
-		"name": "Guy Brimley (Meat Creek)"
+		"name": "guy_creek"
 	}
 }
--- a/godot/dialogic/timelines/timeline-1672725696.json
+++ b/godot/dialogic/timelines/timeline-1672725696.json
@ -8,7 +8,13 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Where am I?)"
+			"text": "Where is this place?)"
+		},
+		{
+			"character": "",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "(Can Recovery even reach this deep below the surface?)"
 		},
 		{
 			"character": "",
--- a/godot/dialogic/timelines/timeline-1672727997.json
+++ b/godot/dialogic/timelines/timeline-1672727997.json
@ -0,0 +1,120 @@
+{
+	"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"
+	}
+}
--- a/godot/player/player.tscn
+++ b/godot/player/player.tscn
@ -170,6 +170,7 @@ shader_param/texture_albedo = ExtResource( 22 )
 [node name="Player" type="Spatial"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.750395, 0 )
 script = ExtResource( 3 )
+can_glide = true

 [node name="Smoothing" type="Spatial" parent="."]
 script = ExtResource( 5 )
Author	SHA1	Message	Date
Spencer Killen	d0405f4ef1	rename timelines and stuff	2023-01-03 01:54:59 -07:00
Spencer Killen	ce3f9dd5e5	Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux	2023-01-03 00:12:05 -07:00
dukegoobler	bbcb4140bf	obelisk	2023-01-03 00:07:33 -07:00
dukegoobler	2ef1742dc6	obelisk	2023-01-03 00:07:23 -07:00