diff --git a/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.md5 b/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.md5 new file mode 100644 index 0000000..4e115c4 --- /dev/null +++ b/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.md5 @@ -0,0 +1,3 @@ +source_md5="29f28fa741ffa711826400e7fea90a27" +dest_md5="2fe6ef3f4c5624748dc861a0b95a251b" + diff --git a/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex b/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex new file mode 100644 index 0000000..b6817ad Binary files /dev/null and b/client/.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex differ diff --git a/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.md5 b/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.md5 new file mode 100644 index 0000000..c8ba1ab --- /dev/null +++ b/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.md5 @@ -0,0 +1,3 @@ +source_md5="a2e5738b2c3c72b7747d4619c999f663" +dest_md5="52ebec391e52938a37545ccc6f79cf74" + diff --git a/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.stex b/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.stex new file mode 100644 index 0000000..9937c81 Binary files /dev/null and b/client/.import/flashlight.png-9efdbc2b7641e3d048bb739e7ca8b977.stex differ diff --git a/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.md5 b/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.md5 new file mode 100644 index 0000000..f268f66 --- /dev/null +++ b/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.md5 @@ -0,0 +1,3 @@ +source_md5="66ca8a87ea50ca711ae82b664f60a2a4" +dest_md5="369b1a9c914d86a94dc9b0795e76649f" + diff --git a/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.stex b/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.stex new file mode 100644 index 0000000..0c0d5a8 Binary files /dev/null and b/client/.import/flashlight_map.png-07edc3c3fd79a9ce4de9ab28aa95564c.stex differ diff --git a/client/Assets/Art/Characters/aura.aseprite b/client/Assets/Art/Characters/aura.aseprite new file mode 100644 index 0000000..c59ad5e Binary files /dev/null and b/client/Assets/Art/Characters/aura.aseprite differ diff --git a/client/Assets/Art/Characters/aura.png b/client/Assets/Art/Characters/aura.png new file mode 100644 index 0000000..b369b98 Binary files /dev/null and b/client/Assets/Art/Characters/aura.png differ diff --git a/client/Assets/Art/Characters/aura.png.import b/client/Assets/Art/Characters/aura.png.import new file mode 100644 index 0000000..f8a1f90 --- /dev/null +++ b/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 diff --git a/client/Assets/Art/Objects/flashlight.aseprite b/client/Assets/Art/Objects/flashlight.aseprite new file mode 100644 index 0000000..354728d Binary files /dev/null and b/client/Assets/Art/Objects/flashlight.aseprite differ diff --git a/client/Assets/Art/Objects/flashlight.png b/client/Assets/Art/Objects/flashlight.png new file mode 100644 index 0000000..a48b0f7 Binary files /dev/null and b/client/Assets/Art/Objects/flashlight.png differ diff --git a/client/Assets/Art/Objects/flashlight.png.import b/client/Assets/Art/Objects/flashlight.png.import new file mode 100644 index 0000000..11e37aa --- /dev/null +++ b/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 diff --git a/client/Assets/Art/flashlight_map.aseprite b/client/Assets/Art/flashlight_map.aseprite new file mode 100644 index 0000000..0bd0c26 Binary files /dev/null and b/client/Assets/Art/flashlight_map.aseprite differ diff --git a/client/Assets/Art/flashlight_map.png b/client/Assets/Art/flashlight_map.png new file mode 100644 index 0000000..e830a67 Binary files /dev/null and b/client/Assets/Art/flashlight_map.png differ diff --git a/client/Assets/Art/flashlight_map.png.import b/client/Assets/Art/flashlight_map.png.import new file mode 100644 index 0000000..fae7e99 --- /dev/null +++ b/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 diff --git a/client/Assets/Stories/english_story.tres b/client/Assets/Stories/english_story.tres index fc26e90..13d3b0f 100644 --- a/client/Assets/Stories/english_story.tres +++ b/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,42 @@ 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( 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 = [ ] diff --git a/client/Nodes/Player.tscn b/client/Nodes/Player.tscn index 879d91b..7f4b2d4 100644 --- a/client/Nodes/Player.tscn +++ b/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 @@ -766,6 +769,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 +899,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="."] diff --git a/client/Scenes/World.scn b/client/Scenes/World.scn index 4cd28bb..45cb7d3 100644 Binary files a/client/Scenes/World.scn and b/client/Scenes/World.scn differ diff --git a/client/Scripts/Component/Pickup.gd b/client/Scripts/Component/Pickup.gd new file mode 100644 index 0000000..b2d43f9 --- /dev/null +++ b/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() diff --git a/client/Scripts/Component/TipArea.gd b/client/Scripts/Component/TipArea.gd new file mode 100644 index 0000000..5991ba0 --- /dev/null +++ b/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() diff --git a/client/Scripts/Entities/Flashlight.gd b/client/Scripts/Entities/Flashlight.gd new file mode 100644 index 0000000..1c0e1b7 --- /dev/null +++ b/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 diff --git a/client/Scripts/Entities/NPCs/Aura.gd b/client/Scripts/Entities/NPCs/Aura.gd new file mode 100644 index 0000000..38f9408 --- /dev/null +++ b/client/Scripts/Entities/NPCs/Aura.gd @@ -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") diff --git a/client/Scripts/Entities/NPCs/CEO.gd b/client/Scripts/Entities/NPCs/CEO.gd index eddbbe8..ae157f0 100644 --- a/client/Scripts/Entities/NPCs/CEO.gd +++ b/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") diff --git a/client/Scripts/Entities/NPCs/IntroScientist.gd b/client/Scripts/Entities/NPCs/IntroScientist.gd index c9d371a..15b493d 100644 --- a/client/Scripts/Entities/NPCs/IntroScientist.gd +++ b/client/Scripts/Entities/NPCs/IntroScientist.gd @@ -4,8 +4,12 @@ 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") 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") diff --git a/client/Scripts/Entities/Player.gd b/client/Scripts/Entities/Player.gd index 241d100..4b8dedf 100644 --- a/client/Scripts/Entities/Player.gd +++ b/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"): diff --git a/client/Scripts/Entities/Zone.gd b/client/Scripts/Entities/Zone.gd index 6306c57..b20827c 100644 --- a/client/Scripts/Entities/Zone.gd +++ b/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 diff --git a/client/Scripts/Entities/ZoneLoader.gd b/client/Scripts/Entities/ZoneLoader.gd index ce7a108..7ab0661 100644 --- a/client/Scripts/Entities/ZoneLoader.gd +++ b/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": - 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: child.unload_zone() diff --git a/client/Scripts/Singletons/WorldManager.gd b/client/Scripts/Singletons/WorldManager.gd index 8919e5a..94c4d21 100644 --- a/client/Scripts/Singletons/WorldManager.gd +++ b/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() diff --git a/client/Scripts/Systems/GameGui.gd b/client/Scripts/Systems/GameGui.gd index aeebf57..607c6ab 100644 --- a/client/Scripts/Systems/GameGui.gd +++ b/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() diff --git a/client/project.godot b/client/project.godot index cf276b6..38abc2f 100644 --- a/client/project.godot +++ b/client/project.godot @@ -65,6 +65,17 @@ 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]