Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23
This commit is contained in:
@@ -18,6 +18,11 @@ extends CharacterBody2D
|
||||
@onready var cooldown: Node = get_node("Atk_cooldown")
|
||||
@onready var lvlanim: Node = get_node("LvlUp")
|
||||
@onready var lvlsnd: Node = get_node("LvlUpSnd")
|
||||
@onready var hitanim: Node = get_node("Hit")
|
||||
@onready var atk1l: Node = get_node("AttackArea/Attack1CollisionL")
|
||||
@onready var atk1r: Node = get_node("AttackArea/Attack1CollisionR")
|
||||
@onready var atk2l: Node = get_node("AttackArea/Attack2CollisionL")
|
||||
@onready var atk2r: Node = get_node("AttackArea/Attack2CollisionR")
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
@@ -52,23 +57,23 @@ func attack():
|
||||
if (level > 1):
|
||||
setAnimState("Attack2")
|
||||
if is_facing_left:
|
||||
get_node("AttackArea/Attack2CollisionL").set_disabled(false)
|
||||
atk2l.set_disabled(false)
|
||||
else:
|
||||
get_node("AttackArea/Attack2CollisionR").set_disabled(false)
|
||||
atk2r.set_disabled(false)
|
||||
else:
|
||||
setAnimState("Attack")
|
||||
if is_facing_left:
|
||||
get_node("AttackArea/Attack1CollisionL").set_disabled(false)
|
||||
atk1l.set_disabled(false)
|
||||
else:
|
||||
get_node("AttackArea/Attack1CollisionR").set_disabled(false)
|
||||
atk1r.set_disabled(false)
|
||||
|
||||
|
||||
func stop_attack():
|
||||
is_attacking = false
|
||||
get_node("AttackArea/Attack1CollisionL").set_disabled(true)
|
||||
get_node("AttackArea/Attack1CollisionR").set_disabled(true)
|
||||
get_node("AttackArea/Attack2CollisionL").set_disabled(true)
|
||||
get_node("AttackArea/Attack2CollisionR").set_disabled(true)
|
||||
atk1l.set_disabled(true)
|
||||
atk1r.set_disabled(true)
|
||||
atk2l.set_disabled(true)
|
||||
atk2r.set_disabled(true)
|
||||
|
||||
|
||||
func setAnimState(newstate):
|
||||
@@ -79,7 +84,10 @@ func setAnimState(newstate):
|
||||
|
||||
|
||||
func receive_damage(dmg):
|
||||
if hitanim.is_emitting():
|
||||
pass
|
||||
hp -= dmg
|
||||
hitanim.restart()
|
||||
if hp < 0:
|
||||
velocity = Vector2(0,0)
|
||||
setAnimState("Die")
|
||||
@@ -93,6 +101,7 @@ func receive_exp(x):
|
||||
setLevel(level + 1)
|
||||
|
||||
|
||||
|
||||
func setLevel(lvl):
|
||||
level = lvl
|
||||
lvlanim.restart()
|
||||
|
Reference in New Issue
Block a user