From a76c0175758e88c1d8bbea18f1fe9d8b57b52540 Mon Sep 17 00:00:00 2001 From: as4s4hetic Date: Wed, 19 Jan 2022 16:09:12 +1100 Subject: [PATCH] added dialogue to all living room characters --- Scenes/UI.tscn | 4 - Story/Ch1S2.tscn | 35 ++++++- dialogic/characters/character-1642498039.json | 12 +-- dialogic/characters/character-1642550408.json | 8 +- dialogic/characters/character-1642564359.json | 20 ++++ dialogic/characters/character-1642567013.json | 20 ++++ dialogic/characters/character-1642567840.json | 20 ++++ dialogic/characters/character-1642568285.json | 20 ++++ dialogic/definitions.json | 9 +- dialogic/folder_structure.json | 13 ++- dialogic/themes/default-theme.cfg | 17 ++++ dialogic/timelines/timeline-1642498159.json | 80 ++++++++++++++- dialogic/timelines/timeline-1642563748.json | 79 +++++++++++++++ dialogic/timelines/timeline-1642568031.json | 97 +++++++++++++++++++ dialogic/timelines/timeline-1642568183.json | 59 +++++++++++ 15 files changed, 471 insertions(+), 22 deletions(-) create mode 100644 dialogic/characters/character-1642564359.json create mode 100644 dialogic/characters/character-1642567013.json create mode 100644 dialogic/characters/character-1642567840.json create mode 100644 dialogic/characters/character-1642568285.json create mode 100644 dialogic/timelines/timeline-1642563748.json create mode 100644 dialogic/timelines/timeline-1642568031.json create mode 100644 dialogic/timelines/timeline-1642568183.json diff --git a/Scenes/UI.tscn b/Scenes/UI.tscn index 615f16c..dc68a37 100644 --- a/Scenes/UI.tscn +++ b/Scenes/UI.tscn @@ -1,10 +1,6 @@ [gd_scene format=2] [node name="UI" type="Control"] -margin_right = 960.0 -margin_bottom = 480.0 -rect_clip_content = true __meta__ = { -"_edit_lock_": true, "_edit_use_anchors_": false } diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index 1068258..28cb922 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -85,15 +85,44 @@ tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 3 [node name="Richal" parent="FG" instance=ExtResource( 11 )] position = Vector2( 600, 180 ) +[node name="Node2D" parent="FG/Richal" instance=ExtResource( 13 )] +position = Vector2( 0, 4 ) + +[node name="Area2D" parent="FG/Richal/Node2D" index="0"] +position = Vector2( 0, -30 ) +scale = Vector2( 5, 3 ) +timeline = "timeline-1642568031.json" + +[node name="CollisionShape2D" parent="FG/Richal/Node2D/Area2D" index="0"] +position = Vector2( 0, 18 ) + [node name="James" parent="FG" instance=ExtResource( 9 )] position = Vector2( 840, 190 ) +[node name="Node2D" parent="FG/James" instance=ExtResource( 13 )] + +[node name="Area2D" parent="FG/James/Node2D" index="0"] +position = Vector2( 30, 50 ) +scale = Vector2( 8, 5 ) +timeline = "timeline-1642563748.json" + [node name="Sak" parent="FG" instance=ExtResource( 2 )] position = Vector2( 900, 230 ) [node name="Charlene" parent="FG" instance=ExtResource( 6 )] position = Vector2( 380, 380 ) +[node name="Node2D" parent="FG/Charlene" instance=ExtResource( 13 )] +position = Vector2( 0, 4 ) + +[node name="Area2D" parent="FG/Charlene/Node2D" index="0"] +position = Vector2( 0, -30 ) +scale = Vector2( 5, 3 ) +timeline = "timeline-1642568183.json" + +[node name="CollisionShape2D" parent="FG/Charlene/Node2D/Area2D" index="0"] +position = Vector2( 0, 18 ) + [node name="Alistair" parent="FG" instance=ExtResource( 3 )] position = Vector2( 165, 150 ) @@ -101,7 +130,8 @@ position = Vector2( 165, 150 ) position = Vector2( 0, 4 ) [node name="Area2D" parent="FG/Alistair/Node2D" index="0"] -scale = Vector2( 3, 1.5 ) +position = Vector2( 0, -30 ) +scale = Vector2( 5, 3 ) timeline = "timeline-1642498159.json" [node name="CollisionShape2D" parent="FG/Alistair/Node2D/Area2D" index="0"] @@ -125,4 +155,7 @@ cell_size = Vector2( 30, 30 ) format = 1 tile_data = PoolIntArray( 458755, 52, 0 ) +[editable path="FG/Richal/Node2D"] +[editable path="FG/James/Node2D"] +[editable path="FG/Charlene/Node2D"] [editable path="FG/Alistair/Node2D"] diff --git a/dialogic/characters/character-1642498039.json b/dialogic/characters/character-1642498039.json index fea1bbf..b0b69e5 100644 --- a/dialogic/characters/character-1642498039.json +++ b/dialogic/characters/character-1642498039.json @@ -1,12 +1,12 @@ { "color": "#fff7f29f", "description": "", - "display_name": "", - "display_name_bool": false, + "display_name": " ", + "display_name_bool": true, "id": "character-1642498039.json", "mirror_portraits": false, "name": "alistair", - "nickname": "", + "nickname": "hawaiian shirt", "nickname_bool": false, "offset_x": 0, "offset_y": 0, @@ -14,11 +14,7 @@ { "name": "Default", "path": "res://Sprites/alistair/front.png" - }, - { - "name": "", - "path": "" } ], - "scale": 50 + "scale": 400 } diff --git a/dialogic/characters/character-1642550408.json b/dialogic/characters/character-1642550408.json index 3bcc128..fa41e28 100644 --- a/dialogic/characters/character-1642550408.json +++ b/dialogic/characters/character-1642550408.json @@ -1,8 +1,8 @@ { "color": "#ffce915b", "description": "", - "display_name": "", - "display_name_bool": false, + "display_name": " ", + "display_name_bool": true, "id": "character-1642550408.json", "mirror_portraits": false, "name": "james", @@ -13,8 +13,8 @@ "portraits": [ { "name": "Default", - "path": "" + "path": "res://Sprites/jame/front.png" } ], - "scale": 100 + "scale": 400 } diff --git a/dialogic/characters/character-1642564359.json b/dialogic/characters/character-1642564359.json new file mode 100644 index 0000000..05eb1fe --- /dev/null +++ b/dialogic/characters/character-1642564359.json @@ -0,0 +1,20 @@ +{ + "color": "#ff00fff9", + "description": "", + "display_name": " ", + "display_name_bool": true, + "id": "character-1642564359.json", + "mirror_portraits": false, + "name": "charlene", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "res://Sprites/charlene/front.png" + } + ], + "scale": 400 +} diff --git a/dialogic/characters/character-1642567013.json b/dialogic/characters/character-1642567013.json new file mode 100644 index 0000000..3f0ca37 --- /dev/null +++ b/dialogic/characters/character-1642567013.json @@ -0,0 +1,20 @@ +{ + "color": "#ffa0045c", + "description": "", + "display_name": " ", + "display_name_bool": true, + "id": "character-1642567013.json", + "mirror_portraits": false, + "name": "sak", + "nickname": "", + "nickname_bool": true, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "res://Sprites/sak/front.png" + } + ], + "scale": 400 +} diff --git a/dialogic/characters/character-1642567840.json b/dialogic/characters/character-1642567840.json new file mode 100644 index 0000000..5617af0 --- /dev/null +++ b/dialogic/characters/character-1642567840.json @@ -0,0 +1,20 @@ +{ + "color": "#fff797ff", + "description": "", + "display_name": " ", + "display_name_bool": true, + "id": "character-1642567840.json", + "mirror_portraits": false, + "name": "richal", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "res://Sprites/richal/front.png" + } + ], + "scale": 400 +} diff --git a/dialogic/characters/character-1642568285.json b/dialogic/characters/character-1642568285.json new file mode 100644 index 0000000..a75a54f --- /dev/null +++ b/dialogic/characters/character-1642568285.json @@ -0,0 +1,20 @@ +{ + "color": "#ffffffff", + "description": "", + "display_name": " ", + "display_name_bool": true, + "id": "character-1642568285.json", + "mirror_portraits": false, + "name": "mc", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "res://Sprites/mc/front.png" + } + ], + "scale": 400 +} diff --git a/dialogic/definitions.json b/dialogic/definitions.json index b2d5653..aa63fcb 100644 --- a/dialogic/definitions.json +++ b/dialogic/definitions.json @@ -1,6 +1,13 @@ { "glossary": [ - + { + "extra": "", + "id": "1642564880-364", + "name": "New glossary entry", + "text": "", + "title": "", + "type": 1 + } ], "variables": [ diff --git a/dialogic/folder_structure.json b/dialogic/folder_structure.json index 82bb25e..27e162f 100644 --- a/dialogic/folder_structure.json +++ b/dialogic/folder_structure.json @@ -6,7 +6,11 @@ "Characters": { "files": [ "character-1642498039.json", - "character-1642550408.json" + "character-1642550408.json", + "character-1642564359.json", + "character-1642567013.json", + "character-1642567840.json", + "character-1642568285.json" ], "folders": { @@ -18,7 +22,7 @@ }, "Definitions": { "files": [ - + "1642564880-364" ], "folders": { @@ -47,7 +51,10 @@ "folders": { "Ch1S2": { "files": [ - "timeline-1642498159.json" + "timeline-1642498159.json", + "timeline-1642563748.json", + "timeline-1642568031.json", + "timeline-1642568183.json" ], "folders": { diff --git a/dialogic/themes/default-theme.cfg b/dialogic/themes/default-theme.cfg index 7068d11..5ce4a1a 100644 --- a/dialogic/themes/default-theme.cfg +++ b/dialogic/themes/default-theme.cfg @@ -8,6 +8,9 @@ normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://ad hover=[ 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 ) ] 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 ) ] +anchor=9 +layout=1 +offset=Vector2( 0, -30 ) [audio] @@ -61,3 +64,17 @@ selecting={ "volume": 0.0, "volume_rand_range": 0.0 } + +[next_indicator] + +offset=Vector2( 13, 10 ) + +[background] + +color="#ff555555" +use_color=false +use_image=true + +[name] + +background_visible=false diff --git a/dialogic/timelines/timeline-1642498159.json b/dialogic/timelines/timeline-1642498159.json index 8d3773d..065fd67 100644 --- a/dialogic/timelines/timeline-1642498159.json +++ b/dialogic/timelines/timeline-1642498159.json @@ -1,10 +1,88 @@ { "events": [ + { + "action": "join", + "character": "character-1642498039.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": true, + "1": false, + "2": false, + "3": false, + "4": false + } + }, + { + "action": "join", + "character": "character-1642568285.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": false, + "1": false, + "2": false, + "3": false, + "4": true + } + }, { "character": "character-1642498039.json", "event_id": "dialogic_001", "portrait": "Default", - "text": "Why do I feel empty inside" + "text": "Being out here should make me feel happy...\nSo why do I still feel dead inside?" + }, + { + "character": "character-1642498039.json", + "event_id": "dialogic_010", + "options": [ + + ], + "portrait": "", + "question": "What is wrong with me?" + }, + { + "choice": "It'll get better", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "character": "character-1642568285.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "I'm sure you'll settle in soon, we've only just arrived." + }, + { + "character": "character-1642498039.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "I hope so, thanks." + }, + { + "choice": "Chin up, buttercup", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "character": "character-1642568285.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Hey! turn that frown upside down, buddy!" + }, + { + "character": "character-1642498039.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Sorry I'm like this, you'd better leave me to myself." + }, + { + "event_id": "dialogic_013" }, { "event_id": "dialogic_022", diff --git a/dialogic/timelines/timeline-1642563748.json b/dialogic/timelines/timeline-1642563748.json new file mode 100644 index 0000000..a1e8b3e --- /dev/null +++ b/dialogic/timelines/timeline-1642563748.json @@ -0,0 +1,79 @@ +{ + "events": [ + { + "action": "join", + "character": "character-1642550408.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": true, + "1": false, + "2": false, + "3": false, + "4": false + } + }, + { + "action": "join", + "character": "character-1642568285.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": false, + "1": false, + "2": false, + "3": false, + "4": true + } + }, + { + "action": "join", + "character": "character-1642567013.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": false, + "1": true, + "2": false, + "3": false, + "4": false + } + }, + { + "character": "character-1642550408.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "This is ridiculous.\nThey expect us to share this kitchen between sixteen people?" + }, + { + "character": "character-1642567013.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "I don't mind cooking for everyone if there's so little space." + }, + { + "character": "character-1642550408.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "hmm..\nI'd also like to cook.... plus, should't we discuss this with the others?" + }, + { + "character": "character-1642567013.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Yeah, let's make a roster then." + }, + { + "event_id": "dialogic_022", + "transition_duration": 0.3 + } + ], + "metadata": { + "dialogic-version": "1.3", + "file": "timeline-1642563748.json", + "name": "cooking" + } +} diff --git a/dialogic/timelines/timeline-1642568031.json b/dialogic/timelines/timeline-1642568031.json new file mode 100644 index 0000000..79e6368 --- /dev/null +++ b/dialogic/timelines/timeline-1642568031.json @@ -0,0 +1,97 @@ +{ + "events": [ + { + "action": "join", + "character": "character-1642567840.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": true, + "1": false, + "2": false, + "3": false, + "4": false + } + }, + { + "action": "join", + "character": "character-1642568285.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": false, + "1": false, + "2": false, + "3": false, + "4": true + } + }, + { + "character": "character-1642567840.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "I'm making tea." + }, + { + "character": "character-1642567840.json", + "event_id": "dialogic_010", + "options": [ + + ], + "portrait": "", + "question": "Would you like some?" + }, + { + "choice": "yes", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "character": "character-1642568285.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Yes please." + }, + { + "character": "character-1642567840.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Of course." + }, + { + "choice": "no", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "No, thank you." + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "Alright." + }, + { + "event_id": "dialogic_013" + }, + { + "event_id": "dialogic_022", + "transition_duration": 0.3 + } + ], + "metadata": { + "dialogic-version": "1.3", + "file": "timeline-1642568031.json", + "name": "richal" + } +} diff --git a/dialogic/timelines/timeline-1642568183.json b/dialogic/timelines/timeline-1642568183.json new file mode 100644 index 0000000..881e613 --- /dev/null +++ b/dialogic/timelines/timeline-1642568183.json @@ -0,0 +1,59 @@ +{ + "events": [ + { + "action": "join", + "character": "character-1642564359.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": true, + "1": false, + "2": false, + "3": false, + "4": false + } + }, + { + "action": "join", + "character": "character-1642568285.json", + "event_id": "dialogic_002", + "mirror": false, + "portrait": "", + "position": { + "0": false, + "1": false, + "2": false, + "3": false, + "4": true + } + }, + { + "character": "character-1642564359.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "I can't believe people are fighting over who gets to cook." + }, + { + "character": "character-1642568285.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "What were you going to eat if they didn't?" + }, + { + "character": "character-1642564359.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Well, I packed two boxes of emergency cereal just in case." + }, + { + "event_id": "dialogic_022", + "transition_duration": 0.3 + } + ], + "metadata": { + "dialogic-version": "1.3", + "file": "timeline-1642568183.json", + "name": "charlene" + } +}