Aura dialog

Action changes

Action changes

Action changes

Actions work

Delete error?

update addons

Test

Test

Fix exports

.github/workflows/release.yml

@@ -16,7 +16,9 @@ jobs:
         uses: actions/checkout@v2.1.0
         with:
           submodules: 'true'
+          lfs: 'true'
           token: ${{ secrets.GH_SECRET }}
+          fetch-depth: 0
       - name: Configure
         env:
           PLATFORM: ${{ matrix.platform }}
@@ -26,13 +28,6 @@ jobs:
           else
             echo "::set-env name=EXPORT_NAME::the-connection" 
           fi
-      - name: Build
-        id: build
-        uses: josephbmanley/build-godot-action@v1.4.0
-        with:
-          name: ${{ env.EXPORT_NAME }}
-          preset: ${{ matrix.platform }}
-          projectDir: client
       - id: get_tag
         name: Get Tag
         env:
@@ -41,6 +36,17 @@ jobs:
         run: |
           TAG=$(jq --raw-output '.release.tag_name' $GITHUB_EVENT_PATH)
           echo ::set-output name=TAG::$TAG
+
+          cd $GITHUB_WORKSPACE/client
+          echo $TAG > VERSION.txt
+      - name: Build
+        id: build
+        uses: josephbmanley/build-godot-action@v1.4.0
+        with:
+          name: ${{ env.EXPORT_NAME }}
+          preset: ${{ matrix.platform }}
+          projectDir: client
+          debugMode: 'true'
       - name: Push to Itch
         uses: josephbmanley/butler-publish-itchio-action@v1.0.1
         env:

client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.md5

@@ -0,0 +1,3 @@
+source_md5="29f28fa741ffa711826400e7fea90a27"
+dest_md5="2fe6ef3f4c5624748dc861a0b95a251b"
+

client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.md5

@@ -0,0 +1,3 @@
+source_md5="a2e5738b2c3c72b7747d4619c999f663"
+dest_md5="52ebec391e52938a37545ccc6f79cf74"
+

client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.md5

@@ -0,0 +1,3 @@
+source_md5="66ca8a87ea50ca711ae82b664f60a2a4"
+dest_md5="369b1a9c914d86a94dc9b0795e76649f"
+

client/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5

@@ -1,3 +1,3 @@
-source_md5="47313fa4c47a9963fddd764e1ec6e4a8"
-dest_md5="2ded9e7f9060e2b530aab678b135fc5b"
+source_md5="6e103468c0ac9e27a0bd095c017a88fe"
+dest_md5="369df4dc1fce005b32f634b984bb3ad7"
 

client/.import/wallpaper.png-86c4487027ea12d352559cb034241ff5.md5

@@ -0,0 +1,3 @@
+source_md5="91f5d4eea59932d76e700385fdb07f7c"
+dest_md5="b993fb99d8dba17607022d8f7269597a"
+

client/Assets/Art/Characters/aura.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Art/Characters/aura.png"
+dest_files=[ "res://.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

client/Assets/Art/Objects/flashlight.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Art/Objects/flashlight.png"
+dest_files=[ "res://.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

client/Assets/Art/flashlight_map.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Art/flashlight_map.png"
+dest_files=[ "res://.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

client/Assets/Stories/english_story.tres

@@ -6,6 +6,8 @@
 script = ExtResource( 1 )
 TYPE = "EXP_Story_editor"
 names = {
+"aura_meeting": 12,
+"aura_meeting_gun": 13,
 "into_speak_ceo": 5,
 "intro_major_worker": 11,
 "intro_meet_ceo": 4,
@@ -916,6 +918,264 @@ Ravenwork staff!",
 "type": "line"
 }
 }
+},
+12: {
+"available_nid": [  ],
+"groups": [  ],
+"human_readable_description": "Meeting your clone for the first time",
+"name": "aura_meeting",
+"nodes": {
+1: {
+"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": "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"
+}
+}
+},
+13: {
+"available_nid": [  ],
+"groups": [  ],
+"human_readable_description": "Getting shot by your clone",
+"name": "aura_meeting_gun",
+"nodes": {
+1: {
+"graph_offset": Vector2( 40, 40 ),
+"links": {
+
+},
+"rect_size": Vector2( 324, 137 ),
+"slot_amount": 1,
+"text": "I'm sorry Veronica.",
+"type": "line"
+}
+}
 }
 }
 available_dids = [  ]

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

@@ -1,9 +1,12 @@
-[gd_scene load_steps=25 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://Assets/Materials/SmoothScaling.tres" type="Material" id=1]
 [ext_resource path="res://Assets/Art/Characters/player_parts.png" type="Texture" id=2]
 [ext_resource path="res://Assets/Art/basic_light.png" type="Texture" id=3]
 [ext_resource path="res://Scripts/Entities/Player.gd" type="Script" id=4]
+[ext_resource path="res://Assets/Art/flashlight_map.png" type="Texture" id=5]
+[ext_resource path="res://Assets/Art/Objects/flashlight.png" type="Texture" id=6]
+[ext_resource path="res://Scripts/Entities/Flashlight.gd" type="Script" id=7]
 
 [sub_resource type="AtlasTexture" id=1]
 flags = 8
@@ -18,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
@@ -696,6 +699,7 @@ __meta__ = {
 material = ExtResource( 1 )
 position = Vector2( 0, -2.25 )
 texture = SubResource( 3 )
+offset = Vector2( 0.5, 0 )
 __meta__ = {
 "_edit_bone_": true
 }
@@ -766,6 +770,31 @@ __meta__ = {
 "_edit_bone_": true
 }
 
+[node name="flashlight" type="Node2D" parent="Torso/RightArm/RightForearm/LeftHand/Node2D"]
+visible = false
+rotation = -0.0242677
+script = ExtResource( 7 )
+__meta__ = {
+"_edit_group_": true
+}
+
+[node name="flashlight" type="Sprite" parent="Torso/RightArm/RightForearm/LeftHand/Node2D/flashlight"]
+z_index = 10
+texture = ExtResource( 6 )
+
+[node name="Light2D" type="Light2D" parent="Torso/RightArm/RightForearm/LeftHand/Node2D/flashlight"]
+enabled = false
+texture = ExtResource( 5 )
+offset = Vector2( 46, 0 )
+texture_scale = 0.35
+shadow_enabled = true
+shadow_gradient_length = 0.1
+
+[node name="Glow" type="Light2D" parent="Torso/RightArm/RightForearm/LeftHand/Node2D/flashlight"]
+enabled = false
+texture = ExtResource( 3 )
+energy = 0.5
+
 [node name="Hips" type="Sprite" parent="Torso"]
 material = ExtResource( 1 )
 position = Vector2( 0, 2.75 )
@@ -871,6 +900,7 @@ anims/RunLeft = SubResource( 18 )
 anims/RunRight = SubResource( 19 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+visible = false
 shape = SubResource( 20 )
 
 [node name="Light2D" type="Light2D" parent="."]

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/Pickup.gd

@@ -0,0 +1,14 @@
+extends "res://Scripts/Component/Interactable.gd"
+
+export var item : String
+export var tip : String = ""
+
+func _ready():
+	connect("interacted", self, "_on_interact")
+
+func _on_interact():
+	player.add_item(item)
+	if len(tip) >= 1:
+		var gui = get_tree().root.get_node("World").get_node("GUI")
+		gui.display_tip(tip)
+	queue_free()

client/Scripts/Component/Speaker.gd

@@ -47,14 +47,13 @@ func play_audio():
 		
 		spoken_text = spoken_text + letter
 		emit_signal("updated_text")
-		
 		if letter in " ,-'\"\n":
 			speaking_timer.start(0.05)
 			return
 		elif letter in ".!":
 			speaking_timer.start(0.15)
 			return
-		elif File.new().file_exists(audio_file):
+		elif load(audio_file):
 			track = load(audio_file)
 			audio_player.stream = track
 			audio_player.play()
@@ -64,6 +63,7 @@ func play_audio():
 	else:
 		playing_speech = false
 		if len(soundQueue) == 0:
+			if not done:
 				emit_signal("finished_text")
 				done = true
 			

client/Scripts/Component/TipArea.gd

@@ -0,0 +1,12 @@
+extends Area2D
+
+export var tip = ""
+
+func _ready():
+	connect("body_entered", self, "_on_body_enter")
+
+func _on_body_enter(body):
+	if body.has_method("add_interactable"):
+		var gui = get_tree().root.get_node("World").get_node("GUI")
+		gui.display_tip(tip)
+		queue_free()

client/Scripts/Component/VersionDisplay.gd

@@ -0,0 +1,13 @@
+extends Label
+
+onready var file = 'res://VERSION.txt'
+
+func _ready():
+	var f = File.new()
+	if f.file_exists(file):
+		f.open(file, File.READ)
+		if not f.eof_reached():
+			text = f.get_line()
+		f.close()
+	else:
+		text = "Custom Build"

client/Scripts/Entities/Flashlight.gd

@@ -0,0 +1,19 @@
+extends Node2D
+
+
+# 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.
+
+func _process(delta):
+	var rot = global_position.angle_to_point(get_global_mouse_position())
+	rotation = rot + PI - get_parent().global_rotation
+
+	if Input.is_action_just_pressed("toggle_flashlight"):
+		$Light2D.enabled = !$Light2D.enabled
+		$Glow.enabled = !$Glow.enabled

client/Scripts/Entities/NPCs/Aura.gd

@@ -0,0 +1,46 @@
+extends Area2D
+
+var state = 0
+var timer : Timer
+
+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"):
+		state = 1
+		$Speaker.start_dialog("aura_meeting")
+		
+func _process(delta):
+	if state == 1 and not $Speaker.gui.is_in_dialog():
+		$Sprite.frame = 0
+		$Speaker.start_dialog("aura_meeting_gun")
+		state = 2
+	elif state == 2 and not $Speaker.gui.is_in_dialog():
+		$"/root/MusicManager".stop()
+		if not timer:
+			timer = Timer.new()
+			add_child(timer)
+			timer.connect("timeout", self, "shoot_scene")
+			timer.start(0.5)
+		
+
+func shoot_scene():
+	$AudioStreamPlayer.play()
+	$CanvasLayer/Blood.show()
+	timer.disconnect("timeout", self, "shoot_scene")
+	timer.stop()
+	timer.connect("timeout", self, "start_fade")
+	timer.start(0.5)
+	
+func start_fade():
+	timer.stop()
+	var fader = get_tree().root.get_node("World").get_node("Fader").get_child(0)
+	fader.connect("fade_complete", self, "go_to_credits")
+	fader.fade(2, false)
+
+func go_to_credits():
+	get_tree().change_scene("res://Scenes/Credits.scn")

client/Scripts/Entities/NPCs/CEO.gd

@@ -19,3 +19,4 @@ func _on_interact():
 func _on_dialog_exit():
 	if state == 0:
 		state = 1
+		$Speaker.gui.display_tip("Press S and then SPACE\nto go down platforms")

client/Scripts/Entities/NPCs/IntroScientist.gd

@@ -1,11 +1,18 @@
 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")
+	if start_on_play:
 		$Speaker.start_dialog("intro_science")
 
 func _on_interact():
 	$Speaker.start_dialog("intro_science_followup")
 
+func give_tip():
+	$Speaker.gui.display_tip("Used A & D to move\nleft and right")
+	$Speaker.disconnect("dialog_exited", self, "give_tip")

client/Scripts/Entities/Player.gd

@@ -17,6 +17,20 @@ var motion : Vector2 = Vector2(0,0) # Player's current velocity
 var gui
 
 var interactables = []
+var items = []
+var equiped = null
+
+func add_item(item):
+	items.append(item)
+	equip_item(item)
+
+func equip_item(item):
+	var node = get_node_or_null("Torso/RightArm/RightForearm/LeftHand/Node2D/" + item)
+	if node:
+		equiped = item
+		node.show()
+	else:
+		print("Tried to equip: " + item + " but item was missing!")
 
 func add_interactable(interactable):
 	interactables.append(interactable)
@@ -49,7 +63,7 @@ func _physics_process(delta):
 	
 
 func user_input():
-	if Input.is_action_just_pressed("ui_accept") and len(interactables) > 0 and not gui.is_in_dialog():
+	if Input.is_action_just_pressed("interact") and len(interactables) > 0 and not gui.is_in_dialog():
 		interactables[0].interact()
 	
 	if is_on_floor() and Input.is_action_just_pressed("ui_up") and Input.is_action_pressed("ui_down"):

client/Scripts/Entities/Zone.gd

@@ -1,8 +1,14 @@
 extends Node2D
 
+export var display_name = "Untitled"
 export var load_on_start = false
 export var music : AudioStream
 
+var loaded = false
+
+func is_loaded():
+	return loaded
+
 func _ready():
 	if load_on_start:
 		load_zone()
@@ -13,7 +19,9 @@ func load_zone():
 	if $"/root/MusicManager".stream != music:
 		$"/root/MusicManager".play_stream(music)
 	show()
+	loaded = true
 	
 func unload_zone():
 	hide()
+	loaded = false
 

client/Scripts/Entities/ZoneLoader.gd

@@ -12,6 +12,9 @@ func _on_body_entered(body):
 			var child = parent.get_child(i)
 			if child.has_method("load_zone"):
 				if child.name == load_zone + "Zone":
+					if not child.is_loaded():
 						child.load_zone()
+						var gui = get_tree().root.get_node("World").get_node("GUI")
+						gui.display_zone(child.display_name)
 				else:
 					child.unload_zone()

client/Scripts/Singletons/MusicManager.gd

@@ -9,7 +9,7 @@ func _ready():
 
 func play_music(song, loop=true):
 	var audio_file = "res://Assets/Music/" + song + ".ogg"
-	if File.new().file_exists(audio_file):
+	if load(audio_file):
 		var track = load(audio_file)
 		looping = loop
 		main_player.stream = track

client/Scripts/Singletons/WorldManager.gd

@@ -14,4 +14,4 @@ func _ready():
 
 func play_sound(audio_stream):
 	audio_player.stream = audio_stream
-	audio_player.play()
+	#audio_player.play()

client/Scripts/Systems/GameGui.gd

@@ -1,10 +1,23 @@
 extends CanvasLayer
 
+var in_dialog = false
+var tip_timer : Timer
+var zone_timer : Timer
+
+const TIP_FADE_RATE = 0.1
+const SHOW_TIP_TIME = 3
+
+const ZONE_FADE_RATE = 0.05
+const SHOW_ZONE_TIME = 3
+
+func _ready():
+	$Dialog.hide()
+	$Tip.hide()
+	$ZoneLabel.hide()
+
 func is_in_dialog():
 	return in_dialog or $Dialog.is_visible_in_tree()
 
-var in_dialog = false
-
 func current_dialog():
 	return $Dialog/Textbox/Body.text
 
@@ -32,3 +45,65 @@ func add_choice(speaker : Node, choice_id : int, choice_text : String):
 
 func show_choices():
 	$Dialog/Choices.show()
+
+func display_tip(tip):
+	$Tip.modulate.a = 0
+	$Tip.text = tip
+	$Tip.show()
+	if not tip_timer:
+		tip_timer = Timer.new()
+		add_child(tip_timer)
+	tip_timer.disconnect("timeout", self, "fade_tip_out")
+	tip_timer.disconnect("timeout", self, "start_fade_tip_out")
+	tip_timer.connect("timeout", self, "fade_tip_in")
+	tip_timer.start(TIP_FADE_RATE)
+		
+func start_fade_tip_out():
+	tip_timer.disconnect("timeout", self, "fade_tip_in")
+	tip_timer.disconnect("timeout", self, "start_fade_tip_out")
+	tip_timer.connect("timeout", self, "fade_tip_out")
+	tip_timer.start(TIP_FADE_RATE)
+	
+func fade_tip_in():
+	$Tip.modulate.a = clamp($Tip.modulate.a + 0.1, 0, 1)
+	if $Tip.modulate.a == 1:
+		tip_timer.disconnect("timeout", self, "fade_tip_out")
+		tip_timer.disconnect("timeout", self, "fade_tip_in")
+		tip_timer.connect("timeout", self, "start_fade_tip_out")
+		tip_timer.start(SHOW_TIP_TIME)
+		
+func fade_tip_out():
+	$Tip.modulate.a = clamp($Tip.modulate.a - 0.1, 0, 1)
+	if $Tip.modulate.a == 0:
+		tip_timer.stop()
+
+func display_zone(zone):
+	$ZoneLabel.modulate.a = 0
+	$ZoneLabel.text = "Entering: " + zone
+	$ZoneLabel.show()
+	if not zone_timer:
+		zone_timer = Timer.new()
+		add_child(zone_timer)
+	zone_timer.disconnect("timeout", self, "fade_zone_out")
+	zone_timer.disconnect("timeout", self, "start_fade_zone_out")
+	zone_timer.connect("timeout", self, "fade_zone_in")
+	zone_timer.start(ZONE_FADE_RATE)
+		
+func start_fade_zone_out():
+	zone_timer.disconnect("timeout", self, "fade_zone_in")
+	zone_timer.disconnect("timeout", self, "start_fade_zone_out")
+	zone_timer.connect("timeout", self, "fade_zone_out")
+	zone_timer.start(ZONE_FADE_RATE)
+	
+func fade_zone_in():
+	$ZoneLabel.modulate.a = clamp($ZoneLabel.modulate.a + 0.1, 0, 1)
+	if $ZoneLabel.modulate.a == 1:
+		zone_timer.disconnect("timeout", self, "fade_zone_out")
+		zone_timer.disconnect("timeout", self, "fade_zone_in")
+		zone_timer.connect("timeout", self, "start_fade_zone_out")
+		zone_timer.start(SHOW_ZONE_TIME)
+		
+func fade_zone_out():
+	$ZoneLabel.modulate.a = clamp($ZoneLabel.modulate.a - 0.1, 0, 1)
+	if $ZoneLabel.modulate.a == 0:
+		zone_timer.stop()

client/addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/Line_Node.tscn

@@ -1,8 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/line_node.gd" type="Script" id=1]
-[ext_resource path="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg" type="Texture" id=2]
-
 
 [node name="Line" type="GraphNode"]
 margin_right = 324.0
@@ -52,15 +50,6 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 smooth_scrolling = true
 
-[node name="Editor_BTN" type="Button" parent="VBoxContainer/HBoxContainer2"]
-margin_left = 332.0
-margin_right = 364.0
-margin_bottom = 64.0
-rect_min_size = Vector2( 32, 0 )
-hint_tooltip = "Expand this node's text editor."
-icon = ExtResource( 2 )
-expand_icon = true
-
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 margin_top = 68.0
 margin_right = 364.0

client/addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg

@@ -1 +0,0 @@
-<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m1 1v5l1.793-1.793 2.5 2.5 1.4141-1.4141-2.5-2.5 1.793-1.793h-5zm9 0 1.793 1.793-2.5 2.5 1.4141 1.4141 2.5-2.5 1.793 1.793v-5h-5zm-4.707 8.293-2.5 2.5-1.793-1.793v5h5l-1.793-1.793 2.5-2.5-1.4141-1.4141zm5.4141 0-1.4141 1.4141 2.5 2.5-1.793 1.793h5v-5l-1.793 1.793-2.5-2.5z" fill="#e0e0e0"/></svg>

client/export_presets.cfg

@@ -5,7 +5,7 @@ platform="Windows Desktop"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*"
 exclude_filter=""
 export_path=""
 patch_list=PoolStringArray(  )
@@ -47,7 +47,7 @@ platform="Windows Desktop"
 runnable=false
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*"
 exclude_filter=""
 export_path=""
 patch_list=PoolStringArray(  )
@@ -89,7 +89,7 @@ platform="Linux/X11"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*"
 exclude_filter=""
 export_path=""
 patch_list=PoolStringArray(  )
@@ -115,7 +115,7 @@ platform="HTML5"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*"
 exclude_filter=""
 export_path=""
 patch_list=PoolStringArray(  )
@@ -138,7 +138,7 @@ platform="Mac OSX"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*"
 exclude_filter=""
 export_path=""
 patch_list=PoolStringArray(  )

client/project.godot

@@ -15,8 +15,9 @@ _global_script_class_icons={
 
 [application]
 
-config/name="the-connection"
+config/name="The Connection"
 run/main_scene="res://Scenes/Title.scn"
+boot_splash/image="res://wallpaper.png"
 config/icon="res://icon.png"
 
 [autoload]
@@ -64,7 +65,19 @@ ui_down={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
  ]
 }
+toggle_flashlight={
+"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":70,"unicode":0,"echo":false,"script":null)
+ ]
+}
+interact={
+"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":69,"unicode":0,"echo":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":88,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [rendering]
 
+threads/thread_model=2
 environment/default_environment="res://default_env.tres"

client/wallpaper.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex"
+path="res://.import/wallpaper.png-86c4487027ea12d352559cb034241ff5.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg"
-dest_files=[ "res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex" ]
+source_file="res://wallpaper.png"
+dest_files=[ "res://.import/wallpaper.png-86c4487027ea12d352559cb034241ff5.stex" ]
 
 [params]