From ef7a22a980c32a2cdcb6afcf533fad95e9e1f1f3 Mon Sep 17 00:00:00 2001 From: akshay Date: Sun, 21 Aug 2022 11:33:03 -0400 Subject: [PATCH] Added new intro and adjusted camera to start in the bedroom --- dialogic/characters/character-1660444172.json | 2 +- dialogic/characters/character-1661095243.json | 21 +++++++++++++++++++ dialogic/folder_structure.json | 3 ++- dialogic/timelines/timeline-1660443870.json | 14 +++++++++---- scenes/main.tscn | 2 +- scenes/player.tscn | 7 ++----- scripts/cameras.gd | 4 ++-- scripts/game_manager.gd | 8 +++++-- 8 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 dialogic/characters/character-1661095243.json diff --git a/dialogic/characters/character-1660444172.json b/dialogic/characters/character-1660444172.json index 558db59..3918d3b 100644 --- a/dialogic/characters/character-1660444172.json +++ b/dialogic/characters/character-1660444172.json @@ -13,7 +13,7 @@ "portraits": [ { "name": "Default", - "path": "res://icon.png" + "path": "res://assets/icons/icon.png" } ], "scale": 100, diff --git a/dialogic/characters/character-1661095243.json b/dialogic/characters/character-1661095243.json new file mode 100644 index 0000000..299136e --- /dev/null +++ b/dialogic/characters/character-1661095243.json @@ -0,0 +1,21 @@ +{ + "color": "#ffffffff", + "description": "", + "display_name": "", + "display_name_bool": false, + "id": "character-1661095243.json", + "mirror_portraits": false, + "name": "Computer", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "" + } + ], + "scale": 100, + "theme": "" +} diff --git a/dialogic/folder_structure.json b/dialogic/folder_structure.json index 23c6aa9..603269f 100644 --- a/dialogic/folder_structure.json +++ b/dialogic/folder_structure.json @@ -5,7 +5,8 @@ "folders": { "Characters": { "files": [ - "character-1660444172.json" + "character-1660444172.json", + "character-1661095243.json" ], "folders": { diff --git a/dialogic/timelines/timeline-1660443870.json b/dialogic/timelines/timeline-1660443870.json index 5eeaa49..f244a61 100644 --- a/dialogic/timelines/timeline-1660443870.json +++ b/dialogic/timelines/timeline-1660443870.json @@ -1,16 +1,22 @@ { "events": [ { - "character": "", + "character": "character-1661095243.json", "event_id": "dialogic_001", "portrait": "", - "text": "You've awoken after a long hiberation." + "text": "Alert! DungBase power levels critical. All systems offline." }, { - "character": "", + "character": "character-1661095243.json", "event_id": "dialogic_001", "portrait": "", - "text": "Try to survive" + "text": "Asteroid impact on Earth in 5 days" + }, + { + "character": "character-1660444172.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Oh jeez! I better figure out how to fix the Communications Array" } ], "metadata": { diff --git a/scenes/main.tscn b/scenes/main.tscn index 72b202c..0114466 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -99,7 +99,7 @@ transform = Transform( 1, 0, -7.45058e-09, 0, 1, 0, 0, 0, 1, -0.0327864, -5.7220 transform = Transform( 1, 0, -7.45058e-09, 0, 1, 0, 0, 0, 0.2, 0, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.35996 ) +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1.39596e-08, 0, 29.1651 ) hunger_tick_time = 75.0 [node name="cameras" type="Spatial" parent="."] diff --git a/scenes/player.tscn b/scenes/player.tscn index 37ddfa6..1ba0c00 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -699,7 +699,7 @@ shader_param/percent = 0.0 [sub_resource type="ShaderMaterial" id=31] shader = ExtResource( 5 ) -shader_param/percent = 0.31 +shader_param/percent = 0.0 [sub_resource type="DynamicFont" id=34] size = 30 @@ -714,15 +714,12 @@ script = ExtResource( 1 ) [node name="DungMan" parent="model_transform" instance=ExtResource( 2 )] -[node name="Skeleton" parent="model_transform/DungMan/Armature" index="0"] -bones/7/bound_children = [ NodePath("head_bone") ] - [node name="Dungee" parent="model_transform/DungMan/Armature/Skeleton" index="0"] mesh = SubResource( 1 ) skin = SubResource( 2 ) [node name="head_bone" type="BoneAttachment" parent="model_transform/DungMan/Armature/Skeleton" index="1"] -transform = Transform( 1, -2.2206e-16, -1.42702e-19, -4.51773e-20, -0.000846088, 1, -2.2206e-16, -1, -0.000846088, -3.33339e-16, 0.00914785, -1.49698 ) +transform = Transform( 1, -2.22125e-16, -1.00618e-18, -2.21397e-19, -0.00552645, 0.999985, -2.22127e-16, -0.999985, -0.00552645, -3.33269e-16, 0.0081066, -1.50005 ) bone_name = "Item" [node name="ItemSpawn" type="Spatial" parent="model_transform/DungMan/Armature/Skeleton/head_bone"] diff --git a/scripts/cameras.gd b/scripts/cameras.gd index acd2523..fe1a417 100644 --- a/scripts/cameras.gd +++ b/scripts/cameras.gd @@ -5,8 +5,8 @@ onready var target_node: Spatial = get_node(target) export var camera_lerp := 1.0 var tracking_cameras = [] -onready var prev_camera: Camera = $camera_room_center/camera -onready var current_camera: Camera = $camera_room_center/camera setget set_current_camera +onready var prev_camera: Camera = $camera_room_bedroom/camera +onready var current_camera: Camera = $camera_room_bedroom/camera setget set_current_camera func set_current_camera(new_value: Camera): prev_camera = current_camera diff --git a/scripts/game_manager.gd b/scripts/game_manager.gd index 8e1803e..873fd06 100644 --- a/scripts/game_manager.gd +++ b/scripts/game_manager.gd @@ -12,6 +12,7 @@ onready var pause_menu = $"%pause_menu" func _ready(): player.connect("starved_to_death", self, "_on_player_starved_to_death") day_timer.wait_time = time_per_day + play_simple_dialog("intro") day_timer.start() func _process(delta): @@ -26,13 +27,16 @@ func _unhandled_input(event): toggle_pause_menu() func _on_player_starved_to_death(): - var node = Dialogic.start("starve") + play_simple_dialog("starve") + get_tree().change_scene(MainMenuScenePath) + +func play_simple_dialog(var dialog_name : String): + var node = Dialogic.start(dialog_name) node.pause_mode = PAUSE_MODE_PROCESS add_child(node) get_tree().paused = true yield(node, "timeline_end") get_tree().paused = false - get_tree().change_scene(MainMenuScenePath) func reset_day_timer(): day_timer.start()