Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
80ae6f8785 | |||
799f61f8f9 | |||
922d8fdbc7 | |||
3da10e69f1 | |||
175e12e684 | |||
6aa3f0b205 | |||
a3d2018a36 | |||
053bc0dcd1 | |||
4932b3430b | |||
649a365f5e | |||
3dfff8793c | |||
8b93f60aa0 | |||
bea02afbc5 |
20
.github/workflows/release.yml
vendored
@ -16,7 +16,9 @@ jobs:
|
|||||||
uses: actions/checkout@v2.1.0
|
uses: actions/checkout@v2.1.0
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
|
lfs: 'true'
|
||||||
token: ${{ secrets.GH_SECRET }}
|
token: ${{ secrets.GH_SECRET }}
|
||||||
|
fetch-depth: 0
|
||||||
- name: Configure
|
- name: Configure
|
||||||
env:
|
env:
|
||||||
PLATFORM: ${{ matrix.platform }}
|
PLATFORM: ${{ matrix.platform }}
|
||||||
@ -26,13 +28,6 @@ jobs:
|
|||||||
else
|
else
|
||||||
echo "::set-env name=EXPORT_NAME::the-connection"
|
echo "::set-env name=EXPORT_NAME::the-connection"
|
||||||
fi
|
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
|
- id: get_tag
|
||||||
name: Get Tag
|
name: Get Tag
|
||||||
env:
|
env:
|
||||||
@ -41,6 +36,17 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
TAG=$(jq --raw-output '.release.tag_name' $GITHUB_EVENT_PATH)
|
TAG=$(jq --raw-output '.release.tag_name' $GITHUB_EVENT_PATH)
|
||||||
echo ::set-output name=TAG::$TAG
|
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
|
- name: Push to Itch
|
||||||
uses: josephbmanley/butler-publish-itchio-action@v1.0.1
|
uses: josephbmanley/butler-publish-itchio-action@v1.0.1
|
||||||
env:
|
env:
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
source_md5="29f28fa741ffa711826400e7fea90a27"
|
||||||
|
dest_md5="2fe6ef3f4c5624748dc861a0b95a251b"
|
||||||
|
|
BIN
client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
source_md5="a2e5738b2c3c72b7747d4619c999f663"
|
||||||
|
dest_md5="52ebec391e52938a37545ccc6f79cf74"
|
||||||
|
|
@ -0,0 +1,3 @@
|
|||||||
|
source_md5="66ca8a87ea50ca711ae82b664f60a2a4"
|
||||||
|
dest_md5="369b1a9c914d86a94dc9b0795e76649f"
|
||||||
|
|
@ -1,3 +1,3 @@
|
|||||||
source_md5="47313fa4c47a9963fddd764e1ec6e4a8"
|
source_md5="6e103468c0ac9e27a0bd095c017a88fe"
|
||||||
dest_md5="2ded9e7f9060e2b530aab678b135fc5b"
|
dest_md5="369df4dc1fce005b32f634b984bb3ad7"
|
||||||
|
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
source_md5="91f5d4eea59932d76e700385fdb07f7c"
|
||||||
|
dest_md5="b993fb99d8dba17607022d8f7269597a"
|
||||||
|
|
BIN
client/Assets/Art/Characters/aura.aseprite
Normal file
BIN
client/Assets/Art/Characters/aura.png
Normal file
After Width: | Height: | Size: 362 B |
34
client/Assets/Art/Characters/aura.png.import
Normal file
@ -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
|
BIN
client/Assets/Art/Objects/flashlight.aseprite
Normal file
BIN
client/Assets/Art/Objects/flashlight.png
Normal file
After Width: | Height: | Size: 91 B |
34
client/Assets/Art/Objects/flashlight.png.import
Normal file
@ -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
|
BIN
client/Assets/Art/flashlight_map.aseprite
Normal file
BIN
client/Assets/Art/flashlight_map.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
34
client/Assets/Art/flashlight_map.png.import
Normal file
@ -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
|
@ -6,6 +6,8 @@
|
|||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
TYPE = "EXP_Story_editor"
|
TYPE = "EXP_Story_editor"
|
||||||
names = {
|
names = {
|
||||||
|
"aura_meeting": 12,
|
||||||
|
"aura_meeting_gun": 13,
|
||||||
"into_speak_ceo": 5,
|
"into_speak_ceo": 5,
|
||||||
"intro_major_worker": 11,
|
"intro_major_worker": 11,
|
||||||
"intro_meet_ceo": 4,
|
"intro_meet_ceo": 4,
|
||||||
@ -916,6 +918,42 @@ Ravenwork staff!",
|
|||||||
"type": "line"
|
"type": "line"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
12: {
|
||||||
|
"available_nid": [ ],
|
||||||
|
"groups": [ ],
|
||||||
|
"human_readable_description": "Meeting your clone for the first time",
|
||||||
|
"name": "aura_meeting",
|
||||||
|
"nodes": {
|
||||||
|
1: {
|
||||||
|
"graph_offset": Vector2( 40, 40 ),
|
||||||
|
"links": {
|
||||||
|
|
||||||
|
},
|
||||||
|
"rect_size": Vector2( 324, 137 ),
|
||||||
|
"slot_amount": 1,
|
||||||
|
"text": "Hello Veronica.",
|
||||||
|
"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 = [ ]
|
available_dids = [ ]
|
||||||
|
@ -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/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/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://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://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]
|
[sub_resource type="AtlasTexture" id=1]
|
||||||
flags = 8
|
flags = 8
|
||||||
@ -766,6 +769,31 @@ __meta__ = {
|
|||||||
"_edit_bone_": true
|
"_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"]
|
[node name="Hips" type="Sprite" parent="Torso"]
|
||||||
material = ExtResource( 1 )
|
material = ExtResource( 1 )
|
||||||
position = Vector2( 0, 2.75 )
|
position = Vector2( 0, 2.75 )
|
||||||
@ -871,6 +899,7 @@ anims/RunLeft = SubResource( 18 )
|
|||||||
anims/RunRight = SubResource( 19 )
|
anims/RunRight = SubResource( 19 )
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||||
|
visible = false
|
||||||
shape = SubResource( 20 )
|
shape = SubResource( 20 )
|
||||||
|
|
||||||
[node name="Light2D" type="Light2D" parent="."]
|
[node name="Light2D" type="Light2D" parent="."]
|
||||||
|
14
client/Scripts/Component/Pickup.gd
Normal file
@ -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()
|
@ -47,14 +47,13 @@ func play_audio():
|
|||||||
|
|
||||||
spoken_text = spoken_text + letter
|
spoken_text = spoken_text + letter
|
||||||
emit_signal("updated_text")
|
emit_signal("updated_text")
|
||||||
|
|
||||||
if letter in " ,-'\"\n":
|
if letter in " ,-'\"\n":
|
||||||
speaking_timer.start(0.05)
|
speaking_timer.start(0.05)
|
||||||
return
|
return
|
||||||
elif letter in ".!":
|
elif letter in ".!":
|
||||||
speaking_timer.start(0.15)
|
speaking_timer.start(0.15)
|
||||||
return
|
return
|
||||||
elif File.new().file_exists(audio_file):
|
elif load(audio_file):
|
||||||
track = load(audio_file)
|
track = load(audio_file)
|
||||||
audio_player.stream = track
|
audio_player.stream = track
|
||||||
audio_player.play()
|
audio_player.play()
|
||||||
|
12
client/Scripts/Component/TipArea.gd
Normal file
@ -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()
|
13
client/Scripts/Component/VersionDisplay.gd
Normal file
@ -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"
|
19
client/Scripts/Entities/Flashlight.gd
Normal file
@ -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
|
45
client/Scripts/Entities/NPCs/Aura.gd
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
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")
|
||||||
|
|
||||||
|
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")
|
@ -19,3 +19,4 @@ func _on_interact():
|
|||||||
func _on_dialog_exit():
|
func _on_dialog_exit():
|
||||||
if state == 0:
|
if state == 0:
|
||||||
state = 1
|
state = 1
|
||||||
|
$Speaker.gui.display_tip("Press S and then SPACE\nto go down platforms")
|
||||||
|
@ -4,8 +4,12 @@ func _ready():
|
|||||||
connect("interacted", self, "_on_interact")
|
connect("interacted", self, "_on_interact")
|
||||||
$Speaker.speaker = "fast_talker"
|
$Speaker.speaker = "fast_talker"
|
||||||
$Speaker.speaker_name = "Dr.Thadd"
|
$Speaker.speaker_name = "Dr.Thadd"
|
||||||
|
$Speaker.connect("dialog_exited", self, "give_tip")
|
||||||
$Speaker.start_dialog("intro_science")
|
$Speaker.start_dialog("intro_science")
|
||||||
|
|
||||||
func _on_interact():
|
func _on_interact():
|
||||||
$Speaker.start_dialog("intro_science_followup")
|
$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")
|
||||||
|
@ -17,6 +17,20 @@ var motion : Vector2 = Vector2(0,0) # Player's current velocity
|
|||||||
var gui
|
var gui
|
||||||
|
|
||||||
var interactables = []
|
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):
|
func add_interactable(interactable):
|
||||||
interactables.append(interactable)
|
interactables.append(interactable)
|
||||||
@ -49,7 +63,7 @@ func _physics_process(delta):
|
|||||||
|
|
||||||
|
|
||||||
func user_input():
|
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()
|
interactables[0].interact()
|
||||||
|
|
||||||
if is_on_floor() and Input.is_action_just_pressed("ui_up") and Input.is_action_pressed("ui_down"):
|
if is_on_floor() and Input.is_action_just_pressed("ui_up") and Input.is_action_pressed("ui_down"):
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
extends Node2D
|
extends Node2D
|
||||||
|
|
||||||
|
export var display_name = "Untitled"
|
||||||
export var load_on_start = false
|
export var load_on_start = false
|
||||||
export var music : AudioStream
|
export var music : AudioStream
|
||||||
|
|
||||||
|
var loaded = false
|
||||||
|
|
||||||
|
func is_loaded():
|
||||||
|
return loaded
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
if load_on_start:
|
if load_on_start:
|
||||||
load_zone()
|
load_zone()
|
||||||
@ -13,7 +19,9 @@ func load_zone():
|
|||||||
if $"/root/MusicManager".stream != music:
|
if $"/root/MusicManager".stream != music:
|
||||||
$"/root/MusicManager".play_stream(music)
|
$"/root/MusicManager".play_stream(music)
|
||||||
show()
|
show()
|
||||||
|
loaded = true
|
||||||
|
|
||||||
func unload_zone():
|
func unload_zone():
|
||||||
hide()
|
hide()
|
||||||
|
loaded = false
|
||||||
|
|
||||||
|
@ -12,6 +12,9 @@ func _on_body_entered(body):
|
|||||||
var child = parent.get_child(i)
|
var child = parent.get_child(i)
|
||||||
if child.has_method("load_zone"):
|
if child.has_method("load_zone"):
|
||||||
if child.name == load_zone + "Zone":
|
if child.name == load_zone + "Zone":
|
||||||
child.load_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:
|
else:
|
||||||
child.unload_zone()
|
child.unload_zone()
|
||||||
|
@ -9,7 +9,7 @@ func _ready():
|
|||||||
|
|
||||||
func play_music(song, loop=true):
|
func play_music(song, loop=true):
|
||||||
var audio_file = "res://Assets/Music/" + song + ".ogg"
|
var audio_file = "res://Assets/Music/" + song + ".ogg"
|
||||||
if File.new().file_exists(audio_file):
|
if load(audio_file):
|
||||||
var track = load(audio_file)
|
var track = load(audio_file)
|
||||||
looping = loop
|
looping = loop
|
||||||
main_player.stream = track
|
main_player.stream = track
|
||||||
|
@ -14,4 +14,4 @@ func _ready():
|
|||||||
|
|
||||||
func play_sound(audio_stream):
|
func play_sound(audio_stream):
|
||||||
audio_player.stream = audio_stream
|
audio_player.stream = audio_stream
|
||||||
audio_player.play()
|
#audio_player.play()
|
||||||
|
@ -1,10 +1,23 @@
|
|||||||
extends CanvasLayer
|
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():
|
func is_in_dialog():
|
||||||
return in_dialog or $Dialog.is_visible_in_tree()
|
return in_dialog or $Dialog.is_visible_in_tree()
|
||||||
|
|
||||||
var in_dialog = false
|
|
||||||
|
|
||||||
func current_dialog():
|
func current_dialog():
|
||||||
return $Dialog/Textbox/Body.text
|
return $Dialog/Textbox/Body.text
|
||||||
|
|
||||||
@ -32,3 +45,65 @@ func add_choice(speaker : Node, choice_id : int, choice_text : String):
|
|||||||
|
|
||||||
func show_choices():
|
func show_choices():
|
||||||
$Dialog/Choices.show()
|
$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()
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
[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/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"]
|
[node name="Line" type="GraphNode"]
|
||||||
margin_right = 324.0
|
margin_right = 324.0
|
||||||
@ -52,15 +50,6 @@ size_flags_horizontal = 3
|
|||||||
size_flags_vertical = 3
|
size_flags_vertical = 3
|
||||||
smooth_scrolling = true
|
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"]
|
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
|
||||||
margin_top = 68.0
|
margin_top = 68.0
|
||||||
margin_right = 364.0
|
margin_right = 364.0
|
||||||
|
@ -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>
|
|
Before Width: | Height: | Size: 388 B |
@ -5,7 +5,7 @@ platform="Windows Desktop"
|
|||||||
runnable=true
|
runnable=true
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter="*"
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path=""
|
export_path=""
|
||||||
patch_list=PoolStringArray( )
|
patch_list=PoolStringArray( )
|
||||||
@ -47,7 +47,7 @@ platform="Windows Desktop"
|
|||||||
runnable=false
|
runnable=false
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter="*"
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path=""
|
export_path=""
|
||||||
patch_list=PoolStringArray( )
|
patch_list=PoolStringArray( )
|
||||||
@ -89,7 +89,7 @@ platform="Linux/X11"
|
|||||||
runnable=true
|
runnable=true
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter="*"
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path=""
|
export_path=""
|
||||||
patch_list=PoolStringArray( )
|
patch_list=PoolStringArray( )
|
||||||
@ -115,7 +115,7 @@ platform="HTML5"
|
|||||||
runnable=true
|
runnable=true
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter="*"
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path=""
|
export_path=""
|
||||||
patch_list=PoolStringArray( )
|
patch_list=PoolStringArray( )
|
||||||
@ -138,7 +138,7 @@ platform="Mac OSX"
|
|||||||
runnable=true
|
runnable=true
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter="*"
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path=""
|
export_path=""
|
||||||
patch_list=PoolStringArray( )
|
patch_list=PoolStringArray( )
|
||||||
|
BIN
client/icon.aseprite
Normal file
BIN
client/icon.png
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 161 B |
@ -15,8 +15,9 @@ _global_script_class_icons={
|
|||||||
|
|
||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="the-connection"
|
config/name="The Connection"
|
||||||
run/main_scene="res://Scenes/Title.scn"
|
run/main_scene="res://Scenes/Title.scn"
|
||||||
|
boot_splash/image="res://wallpaper.png"
|
||||||
config/icon="res://icon.png"
|
config/icon="res://icon.png"
|
||||||
|
|
||||||
[autoload]
|
[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)
|
, 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]
|
[rendering]
|
||||||
|
|
||||||
|
threads/thread_model=2
|
||||||
environment/default_environment="res://default_env.tres"
|
environment/default_environment="res://default_env.tres"
|
||||||
|
BIN
client/wallpaper.png
Normal file
After Width: | Height: | Size: 429 KiB |
@ -2,15 +2,15 @@
|
|||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
path="res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex"
|
path="res://.import/wallpaper.png-86c4487027ea12d352559cb034241ff5.stex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
source_file="res://addons/EXP-System-Dialog/Dialog Editor/Nodes/Line/icon_distraction_free.svg"
|
source_file="res://wallpaper.png"
|
||||||
dest_files=[ "res://.import/icon_distraction_free.svg-5120bf5545890a3868c1108c903f7cd9.stex" ]
|
dest_files=[ "res://.import/wallpaper.png-86c4487027ea12d352559cb034241ff5.stex" ]
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|