Tidy UP!
This commit is contained in:
parent
7ce2863cfd
commit
e216364ec1
12 changed files with 84 additions and 71 deletions
|
|
@ -40,6 +40,7 @@ var _glow: ColorRect
|
|||
var _perfect_zone: ColorRect
|
||||
var _face_scale_tween: Tween
|
||||
var _face_shake_tween: Tween
|
||||
var _flash_tween: Tween
|
||||
var _floor_label: Label
|
||||
|
||||
signal pulse_started(duration: float)
|
||||
|
|
@ -99,10 +100,10 @@ func _ready():
|
|||
add_child(_floor_label)
|
||||
EventBus.floor_changed.connect(_update_floor_label)
|
||||
|
||||
func start(floor_num: int = 10):
|
||||
func start(floor_num: int = EventBus.STARTING_FLOOR):
|
||||
active = true
|
||||
pulses_blocked = 0
|
||||
var floors_descended = 10 - floor_num
|
||||
var floors_descended = EventBus.STARTING_FLOOR - floor_num
|
||||
pulse_speed = pulse_speed_initial + floors_descended * pulse_speed_per_floor
|
||||
pulse_gap = 1.0
|
||||
$AIFace.text = ">:)"
|
||||
|
|
@ -148,14 +149,7 @@ func _update_floor_label(floor_num: int):
|
|||
_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)
|
||||
UIUtils.flip_label_text(_floor_label, new_text)
|
||||
|
||||
func _update_perfect_zone():
|
||||
var bz = $TargetZone
|
||||
|
|
@ -252,9 +246,11 @@ func flash(color: Color):
|
|||
var style = get_theme_stylebox("panel") as StyleBoxFlat
|
||||
if not style:
|
||||
return
|
||||
if _flash_tween:
|
||||
_flash_tween.kill()
|
||||
style.bg_color = color
|
||||
var tween = create_tween()
|
||||
tween.tween_property(style, "bg_color", base_color, 0.3)
|
||||
_flash_tween = create_tween()
|
||||
_flash_tween.tween_property(style, "bg_color", base_color, 0.3)
|
||||
|
||||
func show_countdown():
|
||||
stop()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue