diff --git a/audio/556700__nachtmahrtv__elevator-bell.wav b/audio/556700__nachtmahrtv__elevator-bell.wav new file mode 100644 index 0000000..e534926 Binary files /dev/null and b/audio/556700__nachtmahrtv__elevator-bell.wav differ diff --git a/audio/556700__nachtmahrtv__elevator-bell.wav.import b/audio/556700__nachtmahrtv__elevator-bell.wav.import new file mode 100644 index 0000000..46f93bd --- /dev/null +++ b/audio/556700__nachtmahrtv__elevator-bell.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c2iaspcnilk5" +path="res://.godot/imported/556700__nachtmahrtv__elevator-bell.wav-6950997a5a23767b57ff571b61830129.sample" + +[deps] + +source_file="res://audio/556700__nachtmahrtv__elevator-bell.wav" +dest_files=["res://.godot/imported/556700__nachtmahrtv__elevator-bell.wav-6950997a5a23767b57ff571b61830129.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/scenes/elevator.gd b/scenes/elevator.gd new file mode 100644 index 0000000..c46f635 --- /dev/null +++ b/scenes/elevator.gd @@ -0,0 +1,37 @@ +extends Node3D + +const DOOR_OPEN_X := 1.154 +const DOOR_CLOSED_X := 0.7 +const DOOR_DEFAULT_TIME := 3.0 +const DOOR_FAST_CLOSE_TIME := 1.0 +const DOOR_REOPEN_TIME := 0.4 + +var _tween: Tween = null + +func _ready(): + $ElevatorDoorRight.position = Vector3(DOOR_CLOSED_X, 0, 0) + $ElevatorDoorLeft.position = Vector3(-DOOR_CLOSED_X, 0, 0) + EventBus.doors_opened.connect(_on_doors_opened) + EventBus.doors_closed.connect(_on_doors_closed) + EventBus.pulse_started.connect(_on_pulse_started) + EventBus.pulse_blocked.connect(_on_pulse_blocked) + +func _on_doors_opened(): + _tween_doors(DOOR_OPEN_X, DOOR_DEFAULT_TIME) + +func _on_doors_closed(fast: bool): + _tween_doors(DOOR_CLOSED_X, DOOR_FAST_CLOSE_TIME if fast else DOOR_DEFAULT_TIME) + +func _on_pulse_started(duration: float): + _tween_doors(DOOR_CLOSED_X, duration) + +func _on_pulse_blocked(): + _tween_doors(DOOR_OPEN_X, DOOR_REOPEN_TIME) + +func _tween_doors(target_x: float, duration: float): + if _tween: + _tween.kill() + _tween = create_tween() + _tween.set_parallel(true) + _tween.tween_property($ElevatorDoorRight, "position:x", target_x, duration) + _tween.tween_property($ElevatorDoorLeft, "position:x", -target_x, duration) diff --git a/scenes/elevator.gd.uid b/scenes/elevator.gd.uid new file mode 100644 index 0000000..93d2011 --- /dev/null +++ b/scenes/elevator.gd.uid @@ -0,0 +1 @@ +uid://cw4kqlft85a5g diff --git a/scenes/elevator.tscn b/scenes/elevator.tscn index 8686a81..07d5482 100644 --- a/scenes/elevator.tscn +++ b/scenes/elevator.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://brd3iponame0e"] [ext_resource type="PackedScene" uid="uid://8ybwrid1vk4j" path="res://scenes/elevator_door.tscn" id="1_uuuf0"] +[ext_resource type="Script" path="res://scenes/elevator.gd" id="2_elev"] [sub_resource type="Animation" id="Animation_8o2wm"] length = 0.001 @@ -93,6 +94,7 @@ _data = { } [node name="Elevator" type="Node3D" unique_id=242258467] +script = ExtResource("2_elev") [node name="ElevatorDoorLeft" parent="." unique_id=1751198646 instance=ExtResource("1_uuuf0")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.25, 0, 0) diff --git a/scenes/elevator_panel.gd b/scenes/elevator_panel.gd index f79fcc6..7a3f491 100644 --- a/scenes/elevator_panel.gd +++ b/scenes/elevator_panel.gd @@ -27,16 +27,18 @@ var robot_delay_min := 1.0 var people_in_elevator := 0 const PERFECT_STUN_DURATION := 0.25 +const PRE_PULSE_DELAY := 3.5 func _ready(): var button = $PanelMargin/PanelColumn/CloseButton - button.text = "BLOCK" + button.text = "CLOSE" button.pressed.connect(_on_block_pressed) var screen = $PanelMargin/PanelColumn/Screen + screen.pulse_started.connect(_on_pulse_started) screen.pulse_blocked.connect(_on_pulse_blocked) screen.pulse_blocked_perfect.connect(_on_pulse_blocked_perfect) - screen.doors_closing.connect(_on_doors_closing) + screen.doors_closing.connect(func(): _on_doors_closing(true)) EventBus.game_started.connect(_start_floor) @@ -49,8 +51,10 @@ func _unhandled_input(event): func _start_floor(): $SfxOpen.play() + $SfxBell.play() doors_closing_flag = false people_in_elevator = 0 + $PanelMargin/PanelColumn/CloseButton.text = "CLOSE" EventBus.doors_opened.emit() var floors_remaining = current_floor - 1 @@ -77,22 +81,40 @@ func _start_floor(): screen.show_onboarding("BLOCK\nIN GREEN ZONE") get_tree().create_timer(3.0).timeout.connect( func(): + if not is_instance_valid(screen): + return screen.end_onboarding() screen.launch_pulse(), CONNECT_ONE_SHOT ) else: - screen.launch_pulse() + get_tree().create_timer(PRE_PULSE_DELAY).timeout.connect( + func(): + if not is_instance_valid(self) or doors_closing_flag: + return + screen.launch_pulse(), + CONNECT_ONE_SHOT + ) func _on_block_pressed(): if doors_closing_flag: return - $PanelMargin/PanelColumn/Screen.attempt_block() + var screen = $PanelMargin/PanelColumn/Screen + if screen.pulse_active: + screen.attempt_block() + else: + _on_doors_closing(false) + +func _on_pulse_started(duration: float): + $PanelMargin/PanelColumn/CloseButton.text = "BLOCK" + EventBus.pulse_started.emit(duration) func _on_pulse_blocked_perfect(): EventBus.robot_stun_requested.emit(PERFECT_STUN_DURATION) func _on_pulse_blocked(): + $PanelMargin/PanelColumn/CloseButton.text = "CLOSE" + EventBus.pulse_blocked.emit() survivors_remaining -= 1 people_in_elevator += 1 $SfxDing.play() @@ -111,11 +133,11 @@ func _on_pulse_blocked(): CONNECT_ONE_SHOT ) -func _on_doors_closing(): +func _on_doors_closing(fast: bool = false): if doors_closing_flag: return doors_closing_flag = true - EventBus.doors_closed.emit() + EventBus.doors_closed.emit(fast) var screen = $PanelMargin/PanelColumn/Screen @@ -145,5 +167,5 @@ func _on_doors_closing(): screen.shrink_block_zone() var tween = create_tween() - tween.tween_interval(2.0) + tween.tween_interval(3.0) tween.tween_callback(_start_floor) diff --git a/scenes/game.tscn b/scenes/game.tscn index ae9db23..8e73005 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -7,6 +7,7 @@ [ext_resource type="AudioStream" uid="uid://mqoxmuiw0obf" path="res://audio/ElevatorDing1.wav" id="4_p57ef"] [ext_resource type="AudioStream" uid="uid://bavo8f76jr7i6" path="res://audio/ElevatorOpen1.wav" id="5_u5sy4"] [ext_resource type="AudioStream" uid="uid://dgqb1rovgwuan" path="res://audio/ElevatorClose1.wav" id="6_gee14"] +[ext_resource type="AudioStream" uid="uid://c2iaspcnilk5" path="res://audio/556700__nachtmahrtv__elevator-bell.wav" id="7_bell"] [ext_resource type="PackedScene" path="res://scenes/component_spawn.tscn" id="9_0tnpc"] [ext_resource type="PackedScene" path="res://scenes/end_screen.tscn" id="10_endsc"] [ext_resource type="PackedScene" path="res://scenes/title_screen.tscn" id="11_title"] @@ -35,6 +36,9 @@ stream = ExtResource("5_u5sy4") [node name="SfxClose" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=380307389] stream = ExtResource("6_gee14") +[node name="SfxBell" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=887766] +stream = ExtResource("7_bell") + [node name="SfxChase" type="AudioStreamPlayer3D" parent="CanvasPanel/ElevatorPanel" unique_id=812445001] [node name="ComponentSpawn" parent="." unique_id=649225939 instance=ExtResource("9_0tnpc")] diff --git a/scenes/hud.gd b/scenes/hud.gd index 1a27306..1467967 100644 --- a/scenes/hud.gd +++ b/scenes/hud.gd @@ -1,5 +1,7 @@ extends MarginContainer +var _displayed_floor := -1 + func _ready(): $StatsColumn/FloorLabel.text = "FLOOR: 10" $StatsColumn/SavedLabel.text = "SAVED: 0" @@ -12,7 +14,23 @@ func _ready(): EventBus.score_changed.connect(update_score) func update_floor(floor_num: int): - $StatsColumn/FloorLabel.text = "FLOOR: " + str(floor_num) + if _displayed_floor == floor_num: + return + var label = $StatsColumn/FloorLabel + var new_text = "FLOOR: " + str(floor_num) + if _displayed_floor == -1: + label.text = new_text + _displayed_floor = floor_num + return + _displayed_floor = floor_num + label.pivot_offset = Vector2(0, label.size.y) + var tween = create_tween() + tween.tween_property(label, "scale:y", 0.0, 0.15).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_IN) + tween.tween_callback(func(): + label.text = new_text + label.pivot_offset = Vector2.ZERO + ) + tween.tween_property(label, "scale:y", 1.0, 0.15).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_OUT) func update_saved(count: int): $StatsColumn/SavedLabel.text = "SAVED: " + str(count) diff --git a/scenes/robot.gd b/scenes/robot.gd index 22661b3..abae3fc 100644 --- a/scenes/robot.gd +++ b/scenes/robot.gd @@ -15,7 +15,7 @@ var _spawn_transform: Transform3D func _ready() -> void: _spawn_transform = transform EventBus.doors_opened.connect(func(): doors_open = true) - EventBus.doors_closed.connect(func(): doors_open = false) + EventBus.doors_closed.connect(func(_fast: bool): doors_open = false) EventBus.robot_stun_requested.connect(func(d: float): stun_remaining += d) EventBus.robot_floor_started.connect(_on_floor_started) diff --git a/scenes/screen.gd b/scenes/screen.gd index 109adfc..3e7c63e 100644 --- a/scenes/screen.gd +++ b/scenes/screen.gd @@ -18,7 +18,9 @@ var block_zone_speed := 0.0 var block_zone_direction := -1 var block_zone_min_x := 0.0 var block_zone_max_x := 0.0 -const BLOCK_ZONE_RANGE_LEFT_RATIO := 0.5 +const MOVING_RANGE_RATIO := 0.6 +const PULSE_TOP_MARGIN := 40.0 +const PULSE_BOTTOM_MARGIN := 16.0 const TRAIL_GHOSTS := 8 const TRAIL_SPACING := 3.0 @@ -40,14 +42,15 @@ var _face_scale_tween: Tween var _face_shake_tween: Tween var _floor_label: Label +signal pulse_started(duration: float) signal pulse_blocked signal pulse_blocked_perfect signal doors_closing func _ready(): var bz = $TargetZone - bz.size = Vector2(50, size.y - 40) - bz.position = Vector2(size.x - bz.size.x - 10, 20) + bz.size = Vector2(50, size.y - PULSE_TOP_MARGIN - PULSE_BOTTOM_MARGIN) + bz.position = Vector2((size.x - bz.size.x) / 2, PULSE_TOP_MARGIN) _perfect_zone = ColorRect.new() _perfect_zone.color = PERFECT_ZONE_COLOR @@ -56,8 +59,8 @@ func _ready(): _update_perfect_zone() var sl = $SweepLine - sl.size = Vector2(4, size.y - 40) - sl.position = Vector2(0, 20) + sl.size = Vector2(4, size.y - PULSE_TOP_MARGIN - PULSE_BOTTOM_MARGIN) + sl.position = Vector2(0, PULSE_TOP_MARGIN) sl.visible = false var face = $AIFace @@ -105,15 +108,17 @@ func start(floor_num: int = 10): $AIFace.text = ">:)" $TargetZone.visible = true block_zone_moving = false - $TargetZone.position.x = size.x - $TargetZone.size.x - 10 + $TargetZone.position.x = (size.x - $TargetZone.size.x) / 2 func set_block_zone_movement(speed: float): block_zone_speed = speed block_zone_moving = speed > 0.0 var bz = $TargetZone - block_zone_max_x = size.x - bz.size.x - 10 - block_zone_min_x = size.x * BLOCK_ZONE_RANGE_LEFT_RATIO - bz.position.x = block_zone_max_x + var range_half = size.x * MOVING_RANGE_RATIO / 2 + var center_x = size.x / 2 + block_zone_min_x = center_x - range_half + block_zone_max_x = center_x + range_half - bz.size.x + bz.position.x = (size.x - bz.size.x) / 2 block_zone_direction = -1 func stop(): @@ -125,15 +130,32 @@ func stop(): func shrink_block_zone(): var bz = $TargetZone var new_width = max(bz.size.x - block_zone_shrink, block_zone_min) - var new_x = size.x - new_width - 10 + var new_x = (size.x - new_width) / 2 var tween = create_tween() tween.set_parallel(true) tween.tween_property(bz, "size:x", new_width, 0.3) tween.tween_property(bz, "position:x", new_x, 0.3) tween.tween_method(func(_v): _update_perfect_zone(), 0.0, 1.0, 0.3) +var _displayed_floor := -1 + func _update_floor_label(floor_num: int): - _floor_label.text = "FL " + str(floor_num) + if _displayed_floor == floor_num: + return + var new_text = "FL " + str(floor_num) + if _displayed_floor == -1: + _floor_label.text = new_text + _displayed_floor = floor_num + return + _displayed_floor = floor_num + _floor_label.pivot_offset = Vector2(0, _floor_label.size.y) + var tween = create_tween() + tween.tween_property(_floor_label, "scale:y", 0.0, 0.15).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_IN) + tween.tween_callback(func(): + _floor_label.text = new_text + _floor_label.pivot_offset = Vector2.ZERO + ) + tween.tween_property(_floor_label, "scale:y", 1.0, 0.15).set_trans(Tween.TRANS_CUBIC).set_ease(Tween.EASE_OUT) func _update_perfect_zone(): var bz = $TargetZone @@ -153,6 +175,7 @@ func launch_pulse(): ghost.visible = true $AIFace.text = ">:)" _start_ready_pulse() + pulse_started.emit(size.x / pulse_speed) func get_pulse_gap() -> float: return pulse_gap @@ -260,10 +283,12 @@ func show_onboarding(msg: String): $AIFace.add_theme_font_size_override("font_size", 18) $AIFace.size = Vector2(size.x, 60) $AIFace.text = msg + $TargetZone.visible = false func end_onboarding(): $AIFace.add_theme_font_size_override("font_size", 32) $AIFace.size = Vector2(size.x, 30) + $TargetZone.visible = true func _start_ready_pulse(): if _ready_pulse_tween: diff --git a/scenes/title_screen.gd b/scenes/title_screen.gd index 902ffe3..a2a414a 100644 --- a/scenes/title_screen.gd +++ b/scenes/title_screen.gd @@ -6,6 +6,7 @@ func _ready(): func _unhandled_input(event): if event is InputEventKey and event.pressed and not event.echo: if event.keycode == KEY_SPACE or event.keycode == KEY_ENTER: + get_viewport().set_input_as_handled() _start() func _start(): diff --git a/scenes/title_screen.tscn b/scenes/title_screen.tscn index 7aca8c6..d87cdd8 100644 --- a/scenes/title_screen.tscn +++ b/scenes/title_screen.tscn @@ -43,10 +43,11 @@ theme_override_constants/margin_bottom = 48 theme_override_constants/separation = 24 [node name="Title" type="Label" parent="Center/Card/Margin/Column"] -text = "ELEVATOR" +text = "AGENTIC INCIDENT +(A.I.)" horizontal_alignment = 1 theme_override_colors/font_color = Color(0.2, 1, 0.2, 1) -theme_override_font_sizes/font_size = 72 +theme_override_font_sizes/font_size = 48 [node name="Prompt" type="Label" parent="Center/Card/Margin/Column"] text = "PRESS SPACE TO START" diff --git a/scripts/event_bus.gd b/scripts/event_bus.gd index 4cb2381..a3866f0 100644 --- a/scripts/event_bus.gd +++ b/scripts/event_bus.gd @@ -11,7 +11,9 @@ signal game_won signal game_lost(reason: String) signal floor_started(survivor_count: int) signal doors_opened -signal doors_closed +signal doors_closed(fast: bool) +signal pulse_started(duration: float) +signal pulse_blocked signal robot_stun_requested(duration: float) signal robot_floor_started(delay: float, robot_speed: float)