Aura dialog

Action changes

Action changes

Action changes

Actions work

Delete error?

update addons

Test

Test

Fix exports

client/Assets/Stories/english_story.tres

@@ -926,13 +926,235 @@ Ravenwork staff!",
 "name": "aura_meeting",
 "nodes": {
 1: {
-"graph_offset": Vector2( 40, 40 ),
+"graph_offset": Vector2( 20, 40 ),
+"links": {
+0: 5,
+1: 2,
+2: 4
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 3,
+"text": "Hello Veronica.
+<choice>...</choice>
+<choice>Who are you?</choice>
+<choice>Stop!</choice>",
+"type": "line"
+},
+2: {
+"graph_offset": Vector2( 520, 60 ),
+"links": {
+0: 3
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "I am you.",
+"type": "line"
+},
+3: {
+"graph_offset": Vector2( 1000, 80 ),
+"links": {
+0: 6,
+1: 7
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 2,
+"text": "Well, I am Veronica Gilmore. Designation: Aura.
+<choice>Explain</choice>
+<choice>You are lying!</choice>",
+"type": "line"
+},
+4: {
+"graph_offset": Vector2( 460, 300 ),
+"links": {
+0: 8,
+1: 11,
+2: 12
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 3,
+"text": "As you can see now, you are not the first person cloned for Ravenworks profit
+margins.
+<choice>Are you the traitor?</choice>
+<choice>Return the shipment!</choice>
+<choice>We can talk</choice>",
+"type": "line"
+},
+5: {
+"graph_offset": Vector2( 520, -120 ),
 "links": {
 
 },
 "rect_size": Vector2( 324, 137 ),
 "slot_amount": 1,
-"text": "Hello Veronica.",
+"text": "Oh... They truely had you didn't they.",
+"type": "line"
+},
+6: {
+"graph_offset": Vector2( 1480, -100 ),
+"links": {
+0: 17,
+1: 19
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 2,
+"text": "You were not created to stop Duke Enterprises. You were created to
+surpress democratic sympathizers.
+<choice>Democratic Symathizers?</choice>
+<choice>What about the leaks?</choice>",
+"type": "line"
+},
+7: {
+"graph_offset": Vector2( 1480, 100 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "Then you will die in ignorance.",
+"type": "line"
+},
+8: {
+"graph_offset": Vector2( 1000, 280 ),
+"links": {
+0: 9
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "No, Grant is very much aware of my loyalties.",
+"type": "line"
+},
+9: {
+"graph_offset": Vector2( 1480, 280 ),
+"links": {
+0: 10
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "I am Commander Veronic Gilmore of the Resitance Forces.",
+"type": "line"
+},
+10: {
+"graph_offset": Vector2( 1960, 280 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "Grant is a cruel man...",
+"type": "line"
+},
+11: {
+"graph_offset": Vector2( 1000, 460 ),
+"links": {
+0: 15
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "This shipment is being delivered to Resistance medical facilities. It's going to save
+lives, not be used for creating slaves.",
+"type": "line"
+},
+12: {
+"graph_offset": Vector2( 1000, 640 ),
+"links": {
+0: 13
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "There isn't much we can do sadly. I'm presuming you still have
+your implant.",
+"type": "line"
+},
+13: {
+"graph_offset": Vector2( 1480, 640 ),
+"links": {
+0: 14
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "Do you want to discuss terms of peace with us?
+<choice>No</choice>",
+"type": "line"
+},
+14: {
+"graph_offset": Vector2( 1960, 640 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "You weren't even given the choice. They programmed you to respond that way.",
+"type": "line"
+},
+15: {
+"graph_offset": Vector2( 1480, 460 ),
+"links": {
+0: 16
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "Ravenworks and Duke Enterprises were the ones in the old capitial the day you died.",
+"type": "line"
+},
+16: {
+"graph_offset": Vector2( 1960, 460 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "They're the ones who took advantage of all the death...",
+"type": "line"
+},
+17: {
+"graph_offset": Vector2( 1980, -100 ),
+"links": {
+0: 18
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "The Corporate Collective does not care about human lives. They aren't looking
+out for anyone but their executives.",
+"type": "line"
+},
+18: {
+"graph_offset": Vector2( 2460, -100 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "That leaves those who were automated away to die.",
+"type": "line"
+},
+19: {
+"graph_offset": Vector2( 1980, 60 ),
+"links": {
+0: 20
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "All the leaks came from the resistance.",
+"type": "line"
+},
+20: {
+"graph_offset": Vector2( 2460, 60 ),
+"links": {
+0: 21
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "Grant has the foolish idea that he can convince me to work for Ravenworks again.",
+"type": "line"
+},
+21: {
+"graph_offset": Vector2( 2940, 60 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "But after what I learned about the old capital... Never again.",
 "type": "line"
 }
 }

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
+}

client/Nodes/NPCs/Aura.tscn

@@ -0,0 +1,47 @@
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://Assets/Sfx/intro/processed.wav" type="AudioStream" id=1]
+[ext_resource path="res://Scripts/Component/StorySpeaker.gd" type="Script" id=2]
+[ext_resource path="res://Scripts/Entities/NPCs/Aura.gd" type="Script" id=3]
+[ext_resource path="res://Assets/Art/Characters/aura.png" type="Texture" id=4]
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 4 )
+region = Rect2( 0, 0, 32, 16 )
+
+[sub_resource type="RectangleShape2D" id=15]
+extents = Vector2( 62.9439, 20.084 )
+
+[node name="Aura" type="Area2D"]
+position = Vector2( 830.805, 1176.02 )
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_group_": true
+}
+
+[node name="Sprite" type="Sprite" parent="."]
+texture = SubResource( 14 )
+hframes = 2
+frame = 1
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource( 15 )
+
+[node name="Speaker" type="Node" parent="."]
+script = ExtResource( 2 )
+speaker_name = "Aura"
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 1 )
+
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+layer = 19
+
+[node name="Blood" type="ColorRect" parent="CanvasLayer"]
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+color = Color( 0.54902, 0.105882, 0.105882, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

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
 }

client/Scenes/Dev.tscn

@@ -0,0 +1,31 @@
+[gd_scene load_steps=7 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]
+[ext_resource path="res://Nodes/NPCs/Aura.tscn" type="PackedScene" id=6]
+
+[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
+
+[node name="Aura" parent="Scientist2" instance=ExtResource( 6 )]
+position = Vector2( 133.095, -0.638016 )

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()

client/Scripts/Entities/NPCs/Aura.gd

@@ -7,6 +7,7 @@ func _ready():
 	$Speaker.speaker_name = "Aura"
 	connect("body_entered", self, "_on_body_enter")
 	connect("body_exited", self, "_on_body_exit")
+	#$Speaker.connect("dialog_exited", self, "_next")
 
 func _on_body_enter(body):
 	if body.has_method("add_interactable"):

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")