Move sacreams to survivors!
This commit is contained in:
parent
2b66f20365
commit
01dc50193c
3 changed files with 21 additions and 33 deletions
|
|
@ -19,14 +19,6 @@ var points_per_person := 100 # base + bonus per person above threshold
|
||||||
|
|
||||||
var people_in_elevator := 0
|
var people_in_elevator := 0
|
||||||
|
|
||||||
const CHASE_SHORT_1 := preload("res://audio/Shortchase1.wav")
|
|
||||||
const CHASE_SHORT_2 := preload("res://audio/Shortchase2.wav")
|
|
||||||
const CHASE_MID := preload("res://audio/Midchase1.wav")
|
|
||||||
const CHASE_LONG := preload("res://audio/Chase1.wav")
|
|
||||||
const CHASE_TRACKS := [CHASE_SHORT_1, CHASE_SHORT_2, CHASE_MID, CHASE_LONG]
|
|
||||||
var _last_chase: AudioStream = null
|
|
||||||
var _chase_tween: Tween = null
|
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
var button = $PanelMargin/PanelColumn/CloseButton
|
var button = $PanelMargin/PanelColumn/CloseButton
|
||||||
button.text = "BLOCK"
|
button.text = "BLOCK"
|
||||||
|
|
@ -60,7 +52,6 @@ func _start_floor():
|
||||||
var screen = $PanelMargin/PanelColumn/Screen
|
var screen = $PanelMargin/PanelColumn/Screen
|
||||||
screen.start()
|
screen.start()
|
||||||
screen.launch_pulse() # first survivor arrives
|
screen.launch_pulse() # first survivor arrives
|
||||||
_start_chase()
|
|
||||||
|
|
||||||
# --- Input ---
|
# --- Input ---
|
||||||
|
|
||||||
|
|
@ -72,7 +63,6 @@ func _on_block_pressed():
|
||||||
# --- Pulse callbacks ---
|
# --- Pulse callbacks ---
|
||||||
|
|
||||||
func _on_pulse_blocked():
|
func _on_pulse_blocked():
|
||||||
_stop_chase()
|
|
||||||
# This survivor made it in
|
# This survivor made it in
|
||||||
survivors_remaining -= 1
|
survivors_remaining -= 1
|
||||||
people_in_elevator += 1
|
people_in_elevator += 1
|
||||||
|
|
@ -91,8 +81,7 @@ func _on_pulse_blocked():
|
||||||
get_tree().create_timer(gap).timeout.connect(
|
get_tree().create_timer(gap).timeout.connect(
|
||||||
func():
|
func():
|
||||||
if not doors_closing_flag:
|
if not doors_closing_flag:
|
||||||
screen.launch_pulse()
|
screen.launch_pulse(),
|
||||||
_start_chase(),
|
|
||||||
CONNECT_ONE_SHOT
|
CONNECT_ONE_SHOT
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -101,8 +90,6 @@ func _on_doors_closing():
|
||||||
return
|
return
|
||||||
doors_closing_flag = true
|
doors_closing_flag = true
|
||||||
|
|
||||||
_stop_chase()
|
|
||||||
|
|
||||||
var screen = $PanelMargin/PanelColumn/Screen
|
var screen = $PanelMargin/PanelColumn/Screen
|
||||||
|
|
||||||
# Lose: not enough people
|
# Lose: not enough people
|
||||||
|
|
@ -137,22 +124,3 @@ func _on_doors_closing():
|
||||||
var tween = create_tween()
|
var tween = create_tween()
|
||||||
tween.tween_interval(2.0)
|
tween.tween_interval(2.0)
|
||||||
tween.tween_callback(_start_floor)
|
tween.tween_callback(_start_floor)
|
||||||
|
|
||||||
func _start_chase():
|
|
||||||
if _chase_tween and _chase_tween.is_valid():
|
|
||||||
_chase_tween.kill()
|
|
||||||
|
|
||||||
var candidates: Array = CHASE_TRACKS.filter(func(s): return s != _last_chase)
|
|
||||||
var stream: AudioStream = candidates[randi() % candidates.size()]
|
|
||||||
_last_chase = stream
|
|
||||||
|
|
||||||
$SfxChase.stream = stream
|
|
||||||
$SfxChase.volume_db = 0.0
|
|
||||||
$SfxChase.play()
|
|
||||||
|
|
||||||
func _stop_chase():
|
|
||||||
if _chase_tween and _chase_tween.is_valid():
|
|
||||||
_chase_tween.kill()
|
|
||||||
_chase_tween = create_tween()
|
|
||||||
_chase_tween.tween_property($SfxChase, "volume_db", -80.0, 0.3)
|
|
||||||
_chase_tween.tween_callback($SfxChase.stop)
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,12 @@
|
||||||
extends CharacterBody3D
|
extends CharacterBody3D
|
||||||
|
|
||||||
|
const CHASE_SHORT_1 := preload("res://audio/Shortchase1.wav")
|
||||||
|
const CHASE_SHORT_2 := preload("res://audio/Shortchase2.wav")
|
||||||
|
const CHASE_MID := preload("res://audio/Midchase1.wav")
|
||||||
|
const CHASE_LONG := preload("res://audio/Chase1.wav")
|
||||||
|
const CHASE_TRACKS := [CHASE_SHORT_1, CHASE_SHORT_2, CHASE_MID, CHASE_LONG]
|
||||||
|
static var _last_chase: AudioStream = null
|
||||||
|
|
||||||
var speed: int = 3
|
var speed: int = 3
|
||||||
var clumsiness: int = 0
|
var clumsiness: int = 0
|
||||||
|
|
||||||
|
|
@ -10,6 +17,17 @@ var clumsiness: int = 0
|
||||||
#transform = xform
|
#transform = xform
|
||||||
#velocity = (-xform.basis.z * speed).rotated(Vector3.UP, randf_range(-PI/4, PI/4))
|
#velocity = (-xform.basis.z * speed).rotated(Vector3.UP, randf_range(-PI/4, PI/4))
|
||||||
|
|
||||||
|
func _ready():
|
||||||
|
var candidates: Array = CHASE_TRACKS.filter(func(s): return s != _last_chase)
|
||||||
|
var stream: AudioStream = candidates[randi() % candidates.size()]
|
||||||
|
_last_chase = stream
|
||||||
|
$ScreamPlayer.stream = stream
|
||||||
|
var delay := randf_range(0.0, 0.5)
|
||||||
|
get_tree().create_timer(delay).timeout.connect(
|
||||||
|
func(): $ScreamPlayer.play(),
|
||||||
|
CONNECT_ONE_SHOT
|
||||||
|
)
|
||||||
|
|
||||||
func _physics_process(delta):
|
func _physics_process(delta):
|
||||||
velocity.z -= speed * delta
|
velocity.z -= speed * delta
|
||||||
move_and_slide()
|
move_and_slide()
|
||||||
|
|
|
||||||
|
|
@ -55,4 +55,6 @@ frame_progress = 0.99938977
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.080844045, -0.14428711)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.080844045, -0.14428711)
|
||||||
shape = SubResource("BoxShape3D_7yc2n")
|
shape = SubResource("BoxShape3D_7yc2n")
|
||||||
|
|
||||||
|
[node name="ScreamPlayer" type="AudioStreamPlayer3D" parent="."]
|
||||||
|
|
||||||
[connection signal="area_entered" from="Area3D" to="." method="_on_area_3d_area_entered"]
|
[connection signal="area_entered" from="Area3D" to="." method="_on_area_3d_area_entered"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue