thayol/instructions-clear
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Attack to AttackHitbox for clarity

Browse Source
This commit is contained in:
Thayol
2025-02-27 17:05:57 +09:00
parent 3f1f4b1811
commit 9293b1c96b
6 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/states/lunge.gd → scripts/states/attack.gd
+2 -2
View File
@@ -5,14 +5,14 @@ var players_in_area = {}
func enter() -> void:
super()
if has_node("%Attack"): %Attack.visible = true
if has_node("%AttackHitbox"): %AttackHitbox.visible = true
if has_node("%AttackTimer"): %AttackTimer.start()
if has_node("%AttackCooldown"): %AttackCooldown.start()
hit = false
func exit() -> void:
super()
if has_node("%Attack"): %Attack.visible = false
if has_node("%AttackHitbox"): %AttackHitbox.visible = false
func process_physics(delta: float) -> State:
if not Main.is_server_or_predicting(subject.player_id, subject.client_prediction): return
scripts/states/idle.gd
+1 -1
View File
@@ -8,7 +8,7 @@ func process_physics(delta: float) -> State:
if not subject.is_on_floor(): return %Fall
if has_node("%Dead") and subject.dead: return %Dead
if has_node("%Lunge") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Lunge
if has_node("%Attack") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Attack
if input_direction.length() < 0.05: return
if has_node("%Walk") and %Input.walk: return %Walk
return %Run
scripts/states/run.gd
+1 -1
View File
@@ -8,7 +8,7 @@ func process_physics(delta: float) -> State:
if not subject.is_on_floor(): return %Fall
if has_node("%Dead") and subject.dead: return %Dead
if has_node("%Lunge") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Lunge
if has_node("%Attack") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Attack
if input_direction.length() < 0.05: return %Idle
if has_node("%Walk") and %Input.walk: return %Walk
return
scripts/states/walk.gd
+1 -1
View File
@@ -8,7 +8,7 @@ func process_physics(delta: float) -> State:
if not subject.is_on_floor(): return %Fall
if has_node("%Dead") and subject.dead: return %Dead
if has_node("%Lunge") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Lunge
if has_node("%Attack") and %Input.primary_interact and (not has_node("%AttackCooldown") or %AttackCooldown.time_left == 0): return %Attack
if input_direction.length() < 0.05: return %Idle
if not %Input.walk: return %Run
return