From 65e4fc6a483aad5c615ece054a4be808d2ea75e7 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Sun, 17 May 2020 08:30:31 -0400 Subject: [PATCH] Dev env & bugfixes --- client/Nodes/GUI.tscn | 139 ++++++++++++++++++ client/Nodes/Player.tscn | 3 +- client/Scenes/Dev.tscn | 27 ++++ client/Scenes/World.scn | Bin 10955 -> 10407 bytes client/Scripts/Component/Speaker.gd | 5 +- .../Scripts/Entities/NPCs/IntroScientist.gd | 5 +- 6 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 client/Nodes/GUI.tscn create mode 100644 client/Scenes/Dev.tscn diff --git a/client/Nodes/GUI.tscn b/client/Nodes/GUI.tscn new file mode 100644 index 0000000..4b00395 --- /dev/null +++ b/client/Nodes/GUI.tscn @@ -0,0 +1,139 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Assets/Themes/default.tres" type="Theme" id=1] +[ext_resource path="res://Scripts/Systems/GameGui.gd" type="Script" id=2] +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/zapper-v1.1/Zapper.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/zapper-v1.1/Zapper.otf" type="DynamicFontData" id=4] +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/targets-v3.1/Targets.ttf" type="DynamicFontData" id=5] + +[sub_resource type="DynamicFont" id=2] +size = 18 +font_data = ExtResource( 5 ) + +[sub_resource type="DynamicFont" id=17] +size = 48 +font_data = ExtResource( 3 ) + +[sub_resource type="DynamicFont" id=18] +size = 32 +outline_size = 1 +outline_color = Color( 0, 0, 0, 1 ) +font_data = ExtResource( 4 ) + +[node name="GUI" type="CanvasLayer"] +script = ExtResource( 2 ) + +[node name="Dialog" type="Control" parent="."] +visible = false +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -512.0 +margin_top = -173.0 +margin_right = 512.0 +theme = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Textbox" type="ColorRect" parent="Dialog"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -475.0 +margin_top = -143.0 +margin_right = 475.0 +margin_bottom = -20.0 +color = Color( 0.254902, 0.513726, 0.505882, 0.870588 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Speaker" type="Label" parent="Dialog/Textbox"] +margin_left = 12.0 +margin_top = 8.0 +margin_right = 594.0 +margin_bottom = 34.0 +text = "Speaker" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Body" type="Label" parent="Dialog/Textbox"] +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = 12.0 +margin_top = -16.5 +margin_right = -39.0 +margin_bottom = 49.5 +custom_fonts/font = SubResource( 2 ) +text = "Hello world!" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Choices" type="HBoxContainer" parent="Dialog"] +visible = false +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -472.0 +margin_top = -172.0 +margin_right = 472.0 +margin_bottom = -148.0 +alignment = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Button" type="Button" parent="Dialog/Choices"] +margin_left = 297.0 +margin_right = 371.0 +margin_bottom = 26.0 +text = "Choice" + +[node name="Button2" type="Button" parent="Dialog/Choices"] +margin_left = 435.0 +margin_right = 509.0 +margin_bottom = 26.0 +text = "Choice" + +[node name="Button3" type="Button" parent="Dialog/Choices"] +margin_left = 573.0 +margin_right = 647.0 +margin_bottom = 26.0 +text = "Choice" + +[node name="ZoneLabel" type="Label" parent="."] +anchor_top = 1.0 +anchor_bottom = 1.0 +margin_left = 12.0 +margin_top = -59.0 +margin_right = 1257.0 +margin_bottom = -8.0 +custom_fonts/font = SubResource( 17 ) +text = "Entering: Depths" +valign = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Tip" type="Label" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -386.0 +margin_top = -110.5 +margin_right = 386.0 +margin_bottom = 110.5 +custom_fonts/font = SubResource( 18 ) +text = "Press WASD to move" +align = 1 +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/client/Nodes/Player.tscn b/client/Nodes/Player.tscn index 7f4b2d4..f387948 100644 --- a/client/Nodes/Player.tscn +++ b/client/Nodes/Player.tscn @@ -21,7 +21,7 @@ region = Rect2( 2, 6, 1, 1 ) [sub_resource type="AtlasTexture" id=3] flags = 8 atlas = ExtResource( 2 ) -region = Rect2( 1, 1, 3, 4 ) +region = Rect2( 1, 1, 4, 4 ) [sub_resource type="AtlasTexture" id=4] flags = 8 @@ -699,6 +699,7 @@ __meta__ = { material = ExtResource( 1 ) position = Vector2( 0, -2.25 ) texture = SubResource( 3 ) +offset = Vector2( 0.5, 0 ) __meta__ = { "_edit_bone_": true } diff --git a/client/Scenes/Dev.tscn b/client/Scenes/Dev.tscn new file mode 100644 index 0000000..430b77e --- /dev/null +++ b/client/Scenes/Dev.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://Nodes/Tiles/tileset_science_lab.tres" type="TileSet" id=1] +[ext_resource path="res://Nodes/NPCs/CEO.tscn" type="PackedScene" id=2] +[ext_resource path="res://Nodes/Player.tscn" type="PackedScene" id=3] +[ext_resource path="res://Nodes/GUI.tscn" type="PackedScene" id=4] +[ext_resource path="res://Nodes/NPCs/Thadd.tscn" type="PackedScene" id=5] + +[node name="World" type="Node2D"] + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 16, 16 ) +format = 1 +tile_data = PoolIntArray( 720897, 47, 0, 720898, 47, 1, 720899, 47, 1, 720900, 47, 1, 720901, 47, 1, 720902, 47, 1, 720903, 47, 1, 720904, 47, 1, 720905, 47, 1, 720906, 47, 1, 720907, 47, 1, 720908, 47, 1, 720909, 47, 1, 720910, 47, 1, 720911, 47, 1, 720912, 47, 1, 720913, 47, 1, 720914, 47, 1, 720915, 47, 1, 720916, 47, 1, 720917, 47, 1, 720918, 47, 1, 720919, 47, 1, 720920, 47, 1, 720921, 47, 1, 720922, 47, 1, 720923, 47, 1, 720924, 47, 1, 720925, 47, 1, 720926, 47, 1, 720927, 47, 2, 786433, 47, 65536, 786434, 47, 65537, 786435, 47, 65537, 786436, 47, 65537, 786437, 47, 65537, 786438, 47, 65537, 786439, 47, 65537, 786440, 47, 65537, 786441, 47, 65537, 786442, 47, 65537, 786443, 47, 65537, 786444, 47, 65537, 786445, 47, 65537, 786446, 47, 65537, 786447, 47, 65537, 786448, 47, 65537, 786449, 47, 65537, 786450, 47, 65537, 786451, 47, 65537, 786452, 47, 65537, 786453, 47, 65537, 786454, 47, 65537, 786455, 47, 65537, 786456, 47, 65537, 786457, 47, 65537, 786458, 47, 65537, 786459, 47, 65537, 786460, 47, 65537, 786461, 47, 65537, 786462, 47, 65537, 786463, 47, 65538, 851969, 47, 131072, 851970, 47, 131073, 851971, 47, 131073, 851972, 47, 131073, 851973, 47, 131073, 851974, 47, 131073, 851975, 47, 131073, 851976, 47, 131073, 851977, 47, 131073, 851978, 47, 131073, 851979, 47, 131073, 851980, 47, 131073, 851981, 47, 131073, 851982, 47, 131073, 851983, 47, 131073, 851984, 47, 131073, 851985, 47, 131073, 851986, 47, 131073, 851987, 47, 131073, 851988, 47, 131073, 851989, 47, 131073, 851990, 47, 131073, 851991, 47, 131073, 851992, 47, 131073, 851993, 47, 131073, 851994, 47, 131073, 851995, 47, 131073, 851996, 47, 131073, 851997, 47, 131073, 851998, 47, 131073, 851999, 47, 131074 ) + +[node name="Scientist" parent="." instance=ExtResource( 2 )] +position = Vector2( 182.674, 166.939 ) + +[node name="Player" parent="." instance=ExtResource( 3 )] +position = Vector2( 90.0225, 142.418 ) + +[node name="GUI" parent="." instance=ExtResource( 4 )] + +[node name="Scientist2" parent="." instance=ExtResource( 5 )] +position = Vector2( 139.806, 168.653 ) +start_on_play = false diff --git a/client/Scenes/World.scn b/client/Scenes/World.scn index 45cb7d3ee3b8e07fecfc8a127603a772044253d1..b2d5cefb345bdf73a9b986f4305598ccff00c378 100644 GIT binary patch literal 10407 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 Dtl?|w literal 10955 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 J2LFup{{Vx7OjG~> diff --git a/client/Scripts/Component/Speaker.gd b/client/Scripts/Component/Speaker.gd index f58c0d8..01f0085 100644 --- a/client/Scripts/Component/Speaker.gd +++ b/client/Scripts/Component/Speaker.gd @@ -63,8 +63,9 @@ func play_audio(): else: playing_speech = false if len(soundQueue) == 0: - emit_signal("finished_text") - done = true + if not done: + emit_signal("finished_text") + done = true func del_obj(obj): obj.queue_free() diff --git a/client/Scripts/Entities/NPCs/IntroScientist.gd b/client/Scripts/Entities/NPCs/IntroScientist.gd index 15b493d..9f39517 100644 --- a/client/Scripts/Entities/NPCs/IntroScientist.gd +++ b/client/Scripts/Entities/NPCs/IntroScientist.gd @@ -1,11 +1,14 @@ extends "res://Scripts/Component/Interactable.gd" +export var start_on_play = true + func _ready(): connect("interacted", self, "_on_interact") $Speaker.speaker = "fast_talker" $Speaker.speaker_name = "Dr.Thadd" $Speaker.connect("dialog_exited", self, "give_tip") - $Speaker.start_dialog("intro_science") + if start_on_play: + $Speaker.start_dialog("intro_science") func _on_interact(): $Speaker.start_dialog("intro_science_followup")