From 86637e395f044029f64971e2c217d5aeafbac8eb Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Sat, 16 May 2020 09:20:41 -0400 Subject: [PATCH] Added Grant Blevins --- ...m.png-fa6c1000359a082b3ed63552d71e9023.md5 | 3 + ....png-fa6c1000359a082b3ed63552d71e9023.stex | Bin 0 -> 161 bytes ...s.png-f69e345f37ad405be3288ca78a4b7531.md5 | 2 +- ....png-f69e345f37ad405be3288ca78a4b7531.stex | Bin 333 -> 333 bytes .../Art/Characters/player_parts.png.import | 2 +- client/Assets/Art/platform.aseprite | Bin 0 -> 573 bytes client/Assets/Art/platform.png | Bin 0 -> 112 bytes client/Assets/Art/platform.png.import | 34 ++ client/Assets/Stories/english_story.tres | 350 +++++++++++++++++- client/Nodes/NPCs/CEO.tscn | 20 + client/Nodes/NPCs/Scientist.tscn | 21 ++ client/Nodes/Player.tscn | 32 +- client/Nodes/Tiles/tileset_science_lab.tres | 36 +- client/Scenes/World.scn | Bin 17089 -> 17794 bytes client/Scripts/Component/Interactable.gd | 18 + client/Scripts/Component/StorySpeaker.gd | 10 +- client/Scripts/Entities/MusicZone.gd | 11 + client/Scripts/Entities/NPCs/CEO.gd | 9 + .../Scripts/Entities/NPCs/IntroScientist.gd | 9 +- client/Scripts/Entities/Player.gd | 23 +- client/Scripts/Singletons/MusicManager.gd | 6 + client/Scripts/Systems/GameGui.gd | 13 +- client/project.godot | 10 + 23 files changed, 569 insertions(+), 40 deletions(-) create mode 100644 client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 create mode 100644 client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.stex create mode 100644 client/Assets/Art/platform.aseprite create mode 100644 client/Assets/Art/platform.png create mode 100644 client/Assets/Art/platform.png.import create mode 100644 client/Nodes/NPCs/CEO.tscn create mode 100644 client/Nodes/NPCs/Scientist.tscn create mode 100644 client/Scripts/Component/Interactable.gd create mode 100644 client/Scripts/Entities/MusicZone.gd create mode 100644 client/Scripts/Entities/NPCs/CEO.gd diff --git a/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 new file mode 100644 index 0000000..5d656fb --- /dev/null +++ b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.md5 @@ -0,0 +1,3 @@ +source_md5="02860f21d0b06f5acf9d6f81718d443a" +dest_md5="29b11c828e308d1479c7681a6d77bbda" + diff --git a/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.stex b/client/.import/platform.png-fa6c1000359a082b3ed63552d71e9023.stex new file mode 100644 index 0000000000000000000000000000000000000000..1a19a983b761e01fcca366d1c5fdb08c1cc9b662 GIT binary patch literal 161 zcmZ>F2@VlpU|;}Y2oPXr1TtEIIKaUZL8*s)tJ(y4-Qs3#25AwMj|`{C_;H>~cZ z;q%1~{Cw?&+mB<=JU3w9W)?;>J{XI3!9X|!BasDYB-Y?$_8un78ctOn;AQO#YD%Ph zcm&rA8!%&Of course not! +I will do my best", +"type": "line" +}, +4: { +"graph_offset": Vector2( 1500, 100 ), +"links": { +0: 5 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Ha! Such a 21st century phrase.", +"type": "line" +}, +5: { +"graph_offset": Vector2( 1980, 100 ), +"links": { +0: 6 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "You will need more than just your wits to defeat this +traitor.", +"type": "line" +}, +6: { +"graph_offset": Vector2( 2460, 20 ), +"links": { +0: 8 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "So much lost...", +"type": "line" +}, +7: { +"graph_offset": Vector2( 1760, -80 ), +"links": { +0: 6 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "We will see. You had a great track record in the 21st century, +but we both remeber how your final job went.", +"type": "line" +}, +8: { +"graph_offset": Vector2( 2940, 20 ), +"links": { +0: 9, +1: 10 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 2, +"text": "What do you think of our facility here so far? +It's amazing! +I haven't seen much yet.", +"type": "line" +}, +9: { +"graph_offset": Vector2( 3760, 20 ), +"links": { +0: 11 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "It's always interesting hearing the perspectives of those from the past.", +"type": "line" +}, +10: { +"graph_offset": Vector2( 3380, 240 ), +"links": { +0: 9 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Unfortunate.", +"type": "line" +}, +11: { +"graph_offset": Vector2( 4240, 20 ), +"links": { +0: 12 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Now away with the pleasantries.", +"type": "line" +}, +12: { +"graph_offset": Vector2( 4720, 20 ), +"links": { +0: 13 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "There has been a concerning amount of leaks of secret projects +and internal data to our competitor Duke Enterprises.", +"type": "line" +}, +13: { +"graph_offset": Vector2( 5200, 20 ), +"links": { +0: 14 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Due the volume and nature of the data, the one conspiring with +the Dukes must have extremely high security clearance.", +"type": "line" +}, +14: { +"graph_offset": Vector2( 5680, 20 ), +"links": { +0: 16 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "That is why I have given you nearly full access to our facilities. +This traitor could be anyone.", +"type": "line" +}, +15: { +"graph_offset": Vector2( 6660, 20 ), +"links": { +0: 17, +1: 19, +2: 20 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 3, +"text": "Do you have any questions before we get started? +Why me? +What year is it? +Where do I start?", +"type": "line" +}, +16: { +"graph_offset": Vector2( 6160, 20 ), +"links": { +0: 15 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "I'm trusting you Scene. It's not a common thing in our time, but I have +little choice.", +"type": "line" +}, +17: { +"graph_offset": Vector2( 7140, -100 ), +"links": { +0: 18 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "I have always been sympathatic to societies of the past. Things were done... +different than they are now.", +"type": "line" +}, +18: { +"graph_offset": Vector2( 7620, -100 ), +"links": { +0: 15 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "You were one of the best investigators of your time! It was sad +you got caught up in the events of the old capital.", +"type": "line" +}, +19: { +"graph_offset": Vector2( 7140, 80 ), +"links": { +0: 15 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "It 3024, making it around 1000 years since your death.", +"type": "line" +}, +20: { +"graph_offset": Vector2( 7140, 260 ), +"links": { +0: 28, +1: 21, +2: 22 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 3, +"text": "We have a shipment of biological materials coming in today. It seems +like the sort of thing we have had troubles with recently. +Okay, where? +What sort of troubles? +Biological materials?", +"type": "line" +}, +21: { +"graph_offset": Vector2( 7620, 300 ), +"links": { +0: 24 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Some of the data ending up in the Duke's hands is shipping information.", +"type": "line" +}, +22: { +"graph_offset": Vector2( 7620, 500 ), +"links": { +0: 23 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Yes, for our cloning facilities among other things.", +"type": "line" +}, +23: { +"graph_offset": Vector2( 8100, 500 ), +"links": { +0: 27 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Without such shipments, you wouldn't be standing here.", +"type": "line" +}, +24: { +"graph_offset": Vector2( 8100, 300 ), +"links": { +0: 25, +1: 26 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 2, +"text": "We have had too many missing shipments stopped by the coporate police. +Coporate police? +Why would they stop the shipments?", +"type": "line" +}, +25: { +"graph_offset": Vector2( 8580, 260 ), +"links": { +0: 27 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Once democratic powers fell, enforcement was placed in the hand of the Corporate Collective, +the closest thing to a centralized government.", +"type": "line" +}, +26: { +"graph_offset": Vector2( 8580, 420 ), +"links": { +0: 27 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "In corporate politics, our opposition likes to put in place agreements that +hinder our success. We are not alone in ignoring many of these agreements.", +"type": "line" +}, +27: { +"graph_offset": Vector2( 9060, 260 ), +"links": { +0: 28 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Anyway,", +"type": "line" +}, +28: { +"graph_offset": Vector2( 9580, 100 ), +"links": { +0: 29 +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "This building's shipping facility is located on mid levels. They should +not be too far out of reach.", +"type": "line" +}, +29: { +"graph_offset": Vector2( 10060, 100 ), +"links": { + +}, +"rect_size": Vector2( 324, 137 ), +"slot_amount": 1, +"text": "Keep me up to date on your progress.", +"type": "line" } } } diff --git a/client/Nodes/NPCs/CEO.tscn b/client/Nodes/NPCs/CEO.tscn new file mode 100644 index 0000000..6c8f273 --- /dev/null +++ b/client/Nodes/NPCs/CEO.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://Scripts/Entities/NPCs/CEO.gd" type="Script" id=1] +[ext_resource path="res://Scripts/Component/StorySpeaker.gd" type="Script" id=2] +[ext_resource path="res://Assets/Art/Characters/business.png" type="Texture" id=3] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 5, 8 ) + +[node name="Scientist" type="Area2D"] +script = ExtResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) + +[node name="Speaker" type="Node" parent="."] +script = ExtResource( 2 ) diff --git a/client/Nodes/NPCs/Scientist.tscn b/client/Nodes/NPCs/Scientist.tscn new file mode 100644 index 0000000..17317be --- /dev/null +++ b/client/Nodes/NPCs/Scientist.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://Scripts/Entities/NPCs/IntroScientist.gd" type="Script" id=1] +[ext_resource path="res://Scripts/Component/StorySpeaker.gd" type="Script" id=2] +[ext_resource path="res://Assets/Art/Characters/scientist.png" type="Texture" id=3] + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 5, 8 ) + +[node name="Scientist" type="Area2D"] +position = Vector2( 167.084, 231.933 ) +script = ExtResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 3 ) + +[node name="Speaker" type="Node" parent="."] +script = ExtResource( 2 ) diff --git a/client/Nodes/Player.tscn b/client/Nodes/Player.tscn index 28bbfe4..fc584cd 100644 --- a/client/Nodes/Player.tscn +++ b/client/Nodes/Player.tscn @@ -6,82 +6,82 @@ [ext_resource path="res://Scripts/Entities/Player.gd" type="Script" id=4] [sub_resource type="AtlasTexture" id=1] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 7, 3, 4 ) [sub_resource type="AtlasTexture" id=2] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 2, 6, 1, 1 ) [sub_resource type="AtlasTexture" id=3] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 1, 3, 4 ) [sub_resource type="AtlasTexture" id=4] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 7, 8, 1, 2 ) [sub_resource type="AtlasTexture" id=5] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 6, 10, 1, 2 ) [sub_resource type="AtlasTexture" id=6] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 6, 12, 1, 1 ) [sub_resource type="AtlasTexture" id=7] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 9, 8, 1, 2 ) [sub_resource type="AtlasTexture" id=8] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 10, 10, 1, 2 ) [sub_resource type="AtlasTexture" id=9] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 11, 3, 2 ) [sub_resource type="AtlasTexture" id=10] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 13, 3, 1 ) [sub_resource type="AtlasTexture" id=11] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 14, 3, 1 ) [sub_resource type="AtlasTexture" id=12] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 15, 3, 1 ) [sub_resource type="AtlasTexture" id=13] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 17, 1, 2 ) [sub_resource type="AtlasTexture" id=14] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 1, 19, 1, 2 ) [sub_resource type="AtlasTexture" id=15] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 3, 17, 1, 2 ) [sub_resource type="AtlasTexture" id=16] -flags = 12 +flags = 8 atlas = ExtResource( 2 ) region = Rect2( 3, 19, 1, 2 ) diff --git a/client/Nodes/Tiles/tileset_science_lab.tres b/client/Nodes/Tiles/tileset_science_lab.tres index 4682400..c535502 100644 --- a/client/Nodes/Tiles/tileset_science_lab.tres +++ b/client/Nodes/Tiles/tileset_science_lab.tres @@ -1,6 +1,7 @@ -[gd_resource type="TileSet" load_steps=96 format=2] +[gd_resource type="TileSet" load_steps=98 format=2] [ext_resource path="res://Nodes/Tiles/tileset_science_lab.png" type="Texture" id=1] +[ext_resource path="res://Assets/Art/platform.png" type="Texture" id=2] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) @@ -284,6 +285,9 @@ points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) [sub_resource type="ConvexPolygonShape2D" id=94] points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=95] +points = PoolVector2Array( 16, 9, 0, 9, 0, 7, 16, 7 ) + [resource] 47/name = "tileset_science_lab.png 47" 47/texture = ExtResource( 1 ) @@ -591,3 +595,33 @@ points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 47/z_index = 0 +48/name = "platform.png 48" +48/texture = ExtResource( 2 ) +48/tex_offset = Vector2( 0, 0 ) +48/modulate = Color( 1, 1, 1, 1 ) +48/region = Rect2( 0, 0, 16, 16 ) +48/tile_mode = 1 +48/autotile/bitmask_mode = 0 +48/autotile/bitmask_flags = [ ] +48/autotile/icon_coordinate = Vector2( 0, 0 ) +48/autotile/tile_size = Vector2( 16, 16 ) +48/autotile/spacing = 0 +48/autotile/occluder_map = [ ] +48/autotile/navpoly_map = [ ] +48/autotile/priority_map = [ ] +48/autotile/z_index_map = [ ] +48/occluder_offset = Vector2( 0, 0 ) +48/navigation_offset = Vector2( 0, 0 ) +48/shape_offset = Vector2( 0, 0 ) +48/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +48/shape = SubResource( 95 ) +48/shape_one_way = true +48/shape_one_way_margin = 1.0 +48/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": true, +"one_way_margin": 1.0, +"shape": SubResource( 95 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +48/z_index = 0 diff --git a/client/Scenes/World.scn b/client/Scenes/World.scn index a3872abd9cee0ab4a1651497d4bf8b24287f8a92..2c8ec3322ea5ff58ad5bfbcd9e236235f513b40c 100644 GIT binary patch literal 17794 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 diff --git a/client/Scripts/Component/Interactable.gd b/client/Scripts/Component/Interactable.gd new file mode 100644 index 0000000..bfec2fa --- /dev/null +++ b/client/Scripts/Component/Interactable.gd @@ -0,0 +1,18 @@ +extends Area2D + +signal interacted + +func _ready(): + connect("body_entered", self, "_on_body_enter") + connect("body_exited", self, "_on_body_exit") + +func _on_body_enter(body): + if body.has_method("add_interactable"): + body.add_interactable(self) + +func _on_body_exit(body): + if body.has_method("remove_interactable"): + body.remove_interactable(self) + +func interact(): + emit_signal("interacted") diff --git a/client/Scripts/Component/StorySpeaker.gd b/client/Scripts/Component/StorySpeaker.gd index 536ac4b..635d727 100644 --- a/client/Scripts/Component/StorySpeaker.gd +++ b/client/Scripts/Component/StorySpeaker.gd @@ -30,11 +30,11 @@ func start_dialog(record : String): func start_dialog_did(dialog_id : int): gui = get_node("/root/World/GUI") - - nid = 1 - did = dialog_id - - process_message(story_reader.get_text(did, nid)) + if not gui.is_in_dialog(): + nid = 1 + did = dialog_id + + process_message(story_reader.get_text(did, nid)) func has_next_node(): return story_reader.has_slot(did, nid, 0) diff --git a/client/Scripts/Entities/MusicZone.gd b/client/Scripts/Entities/MusicZone.gd new file mode 100644 index 0000000..b3d6d4d --- /dev/null +++ b/client/Scripts/Entities/MusicZone.gd @@ -0,0 +1,11 @@ +extends Area2D + +export var music : AudioStream + +func _ready(): + connect("body_entered", self, "_on_body_entered") + +func _on_body_entered(body): + if body.has_method("user_input"): + if $"/root/MusicManager".stream != music: + $"/root/MusicManager".play_stream(music) diff --git a/client/Scripts/Entities/NPCs/CEO.gd b/client/Scripts/Entities/NPCs/CEO.gd new file mode 100644 index 0000000..2b83acb --- /dev/null +++ b/client/Scripts/Entities/NPCs/CEO.gd @@ -0,0 +1,9 @@ +extends "res://Scripts/Component/Interactable.gd" + +func _ready(): + connect("interacted", self, "_on_interact") + $Speaker.speaker_name = "CEO Grant Blevins" + #$Speaker.start_dialog("intro_science") + +func _on_interact(): + $Speaker.start_dialog("intro_meet_ceo") diff --git a/client/Scripts/Entities/NPCs/IntroScientist.gd b/client/Scripts/Entities/NPCs/IntroScientist.gd index 93052ea..1544d1d 100644 --- a/client/Scripts/Entities/NPCs/IntroScientist.gd +++ b/client/Scripts/Entities/NPCs/IntroScientist.gd @@ -1,7 +1,10 @@ -extends "res://Scripts/Component/StorySpeaker.gd" +extends "res://Scripts/Component/Interactable.gd" func _ready(): - start_dialog("intro_science") + connect("interacted", self, "_on_interact") + $Speaker.speaker_name = "Dr.Thadd" + $Speaker.start_dialog("intro_science") func _on_interact(): - start_dialog("intro_science_followup") + $Speaker.start_dialog("intro_science_followup") + diff --git a/client/Scripts/Entities/Player.gd b/client/Scripts/Entities/Player.gd index 74cdf19..fa5138d 100644 --- a/client/Scripts/Entities/Player.gd +++ b/client/Scripts/Entities/Player.gd @@ -12,6 +12,20 @@ export var jumpVelocity : float = -150 var moveMotion : float = 0 # Player Input ( <- & -> ) var motion : Vector2 = Vector2(0,0) # Player's current velocity +var gui + +var interactables = [] + +func add_interactable(interactable): + interactables.append(interactable) +func remove_interactable(interactable): + var loc = interactables.find(interactable) + if loc >= 0: + interactables.remove(loc) + +func _process(delta): + if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0: + interactables[0].interact() func _physics_process(delta): @@ -20,7 +34,10 @@ func _physics_process(delta): if is_on_floor(): motion.y = 0 - user_input() + if not gui: + gui = get_node("/root/World/GUI") + elif not gui.is_in_dialog(): + user_input() # Apply velocity limits moveMotion = clamp(moveMotion, -maxMoveVelocity, maxMoveVelocity) @@ -32,6 +49,10 @@ func _physics_process(delta): func user_input(): + if is_on_floor() and Input.is_action_just_pressed("ui_up") and Input.is_action_pressed("ui_down"): + position.y = position.y + 2 + return + if(Input.is_action_pressed("ui_left")): moveMotion -= moveAcceleration if(Input.is_action_pressed("ui_right")): diff --git a/client/Scripts/Singletons/MusicManager.gd b/client/Scripts/Singletons/MusicManager.gd index 167a6ef..f8a3570 100644 --- a/client/Scripts/Singletons/MusicManager.gd +++ b/client/Scripts/Singletons/MusicManager.gd @@ -14,5 +14,11 @@ func play_music(song, loop=true): main_player.stream = track main_player.play() +func play_stream(track, loop = true): + looping = loop + main_player.stream = track + main_player.play() + func stop_music(): main_player.stop() + diff --git a/client/Scripts/Systems/GameGui.gd b/client/Scripts/Systems/GameGui.gd index d72d9a1..bf759d6 100644 --- a/client/Scripts/Systems/GameGui.gd +++ b/client/Scripts/Systems/GameGui.gd @@ -1,21 +1,18 @@ extends CanvasLayer +func is_in_dialog(): + return in_dialog -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. +var in_dialog = false func set_dialog(message, speaker=""): $Dialog.show() + in_dialog = true $Dialog/Textbox/Speaker.text = speaker $Dialog/Textbox/Body.text = message func finish_dialog(): + in_dialog = false $Dialog.hide() func clear_choices(): diff --git a/client/project.godot b/client/project.godot index f39137e..9f9b54a 100644 --- a/client/project.godot +++ b/client/project.godot @@ -27,6 +27,16 @@ MusicManager="*res://Scripts/Singletons/MusicManager.gd" enabled=PoolStringArray( "EXP-System-Dialog" ) +[input] + +ui_up={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) + ] +} + [rendering] environment/default_environment="res://default_env.tres"