GKaszewski/przygody-pana-cegly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor charge throw component; add minimum charge duration and improve charge handling

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-05-12 23:16:55 +02:00
parent 59c309409c
commit 3d65daf0c5
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/components/brick_throw.gd
View File

@@ -21,7 +21,6 @@ func _input(event: InputEvent) -> void:
if event.is_action_released("attack") and can_throw and charge_throw_component:
var power_multiplier: float = charge_throw_component.stop_charging()
print("Power Multiplier: ", power_multiplier)
throw_brick(power_multiplier)

22
scripts/components/charge_throw_component.gd
View File

@@ -1,6 +1,7 @@
class_name ChargeThrowComponent
extends Node
@export var min_charge_duration: float = 0.1
@export var min_power: float = 0.5
@export var max_power: float = 2.0
@export var max_charge_time: float = 1.5
@@ -23,7 +24,7 @@ func _process(_delta: float) -> void:
func start_charging() -> void:
is_charging = true
charge_start_time = Time.get_ticks_msec() / 1000.0
charge_started.emit()
call_deferred("emit_charge_started")
func get_charge_ratio() -> float:
@@ -37,9 +38,22 @@ func get_charge_ratio() -> float:
func stop_charging() -> float:
is_charging = false
if not is_charging:
return min_power
var held_time := (Time.get_ticks_msec() / 1000.0) - charge_start_time
var t = clamp(held_time / max_charge_time, 0.0, 1.0)
is_charging = false
charge_start_time = 0.0
charge_stopped.emit()
return lerp(min_power, max_power, t)
if held_time < min_charge_duration:
return min_power
var t = clamp(held_time / max_charge_time, 0.0, 1.0)
return lerp(min_power, max_power, t)
func emit_charge_started() -> void:
if not is_charging:
return
charge_started.emit()