Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23

Scenes/Spawnables/bat_spawnable.tscn

@@ -5,19 +5,13 @@
 
 [node name="BatSpawnable" instance=ExtResource("1_verf7")]
 maxHp = 10
-attackSpeed = 10.0
-speed = 2000.0
+attackSpeed = 50.0
+speed = 4000.0
 damage = 1
 priority = 1
 
 [node name="AnimatedSprite2D" parent="." index="0"]
 frame_progress = 0.482614
 
-[node name="AttackCollision" parent="Attack" index="0"]
-position = Vector2(8, 1)
-
-[node name="DamageCollision" parent="Attack" index="1"]
-position = Vector2(10, 1)
-
-[node name="AI" parent="." index="3"]
+[node name="AI" parent="." index="4"]
 script = ExtResource("2_x3ldf")

Scenes/Spawnables/template_spawnable.gd

@@ -1,17 +1,21 @@
 class_name TemplateSpawnable
 extends CharacterBody2D
 
+const ATTACK_COOLDOWN : float = 100
+
 @export var maxHp : int = 0
 @export var attackSpeed : float = 0
 @export var speed : float = 0
 @export var damage : int = 0
 @export var priority : int = 0
+@export var cost : int = 0
+@export var minSpawnRange : float = 0
 @export var canAttack : bool = true
 
 @onready var ai : Node = $AI
 @onready var animatedSprite : AnimatedSprite2D = $AnimatedSprite2D
-@onready var attackCollision : CollisionShape2D = $Attack/AttackCollision
-@onready var damageCollision : CollisionShape2D = $Attack/DamageCollision
+@onready var attackArea : Area2D = $AttackArea
+@onready var damageCollision : CollisionShape2D = $DamageArea/DamageCollision
 
 var isAlive : bool = true
 var isFacingLeft : bool = false
@@ -29,30 +33,44 @@ func _ready():
 func _process(delta):
 	if !isAlive:
 		return
-		
+	
 	if enemy != null:
 		direction = ai.getDirection(global_position, enemy.global_position)
 	else:
 		direction = Vector2.ZERO
 	
-	if !isFacingLeft && velocity.x >= 0:
+	if !isFacingLeft && direction.x < 0:
 		isFacingLeft = true
-		scale = Vector2(1, 1)
-	elif isFacingLeft && velocity.x < 0:
-		isFacingLeft = false
 		scale = Vector2(-1, 1)
+	elif isFacingLeft && direction.x > 0:
+		isFacingLeft = false
+		scale = Vector2(1, 1)
 		
 	velocity = direction * speed * delta
 	move_and_slide()
+	
+	if cooldown > 0:
+		if cooldown - attackSpeed * delta <= 0:
+			cooldown = 0
+		else:
+			cooldown -= attackSpeed * delta
+			
+	attemptAttack()
+
+func attemptAttack():
+	if !canAttack || !isAlive || cooldown > 0:
+		return
+	if attackArea.overlaps_body(enemy):
+		attack()
 
 func attack():
-	if !canAttack || !isAlive:
-		return
+	cooldown = ATTACK_COOLDOWN
 	animatedSprite.play("attack")
+	damageCollision.disabled = false
 	animatedSprite.connect("animation_finished", endAttack)
 
 func endAttack():
-	
+	damageCollision.disabled = true
 	animatedSprite.play("default")
 
 func receive_damage(dmg):
@@ -67,7 +85,10 @@ func receive_damage(dmg):
 
 func die():
 	isAlive = false
+	damageCollision.disabled = true
+	animatedSprite.stop()
 	animatedSprite.play("death")
+	animatedSprite.disconnect("animation_finished", endAttack)
 	animatedSprite.connect("animation_finished", fadeOut)
 	
 func fadeOut():
@@ -78,3 +99,8 @@ func fadeOut():
 
 func clean():
 	queue_free()
+
+
+func _on_damage_area_body_entered(body):
+	if body == enemy:
+		enemy.receive_damage(damage)

Scenes/Spawnables/template_spawnable.tscn

@@ -245,15 +245,17 @@ frame_progress = 0.387978
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_5aviq")
 
-[node name="Attack" type="Area2D" parent="."]
+[node name="AttackArea" type="Area2D" parent="."]
 
-[node name="AttackCollision" type="CollisionShape2D" parent="Attack"]
+[node name="AttackCollision" type="CollisionShape2D" parent="AttackArea"]
 position = Vector2(1, 1)
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_2l8j3")
 debug_color = Color(0.678431, 0.556863, 0.137255, 0.419608)
 
-[node name="DamageCollision" type="CollisionShape2D" parent="Attack"]
+[node name="DamageArea" type="Area2D" parent="."]
+
+[node name="DamageCollision" type="CollisionShape2D" parent="DamageArea"]
 position = Vector2(2, 2)
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_o2kl1")
@@ -261,3 +263,5 @@ disabled = true
 debug_color = Color(0.639216, 0, 0.156863, 0.419608)
 
 [node name="AI" type="Node" parent="."]
+
+[connection signal="body_entered" from="DamageArea" to="." method="_on_damage_area_body_entered"]

Scenes/enemy.tscn

@@ -399,6 +399,7 @@ angular_velocity_max = 50.0
 color = Color(0.623529, 0, 0, 0.729412)
 
 [node name="Atk_cooldown" type="Timer" parent="."]
+wait_time = 2.0
 autostart = true
 
 [node name="LvlUp" type="CPUParticles2D" parent="."]
@@ -431,7 +432,6 @@ collision_layer = 2
 collision_mask = 2
 
 [node name="Attack1CollisionR" type="CollisionShape2D" parent="AttackArea"]
-visible = false
 position = Vector2(3, -7)
 rotation = 1.5708
 skew = 0.223402
@@ -439,7 +439,6 @@ shape = SubResource("CapsuleShape2D_qykhm")
 debug_color = Color(0.956863, 0.203922, 0, 0.419608)
 
 [node name="Attack1CollisionL" type="CollisionShape2D" parent="AttackArea"]
-visible = false
 position = Vector2(-3, -7)
 rotation = 1.5708
 skew = -0.169297
@@ -447,7 +446,6 @@ shape = SubResource("CapsuleShape2D_qykhm")
 debug_color = Color(0.956863, 0.203922, 0, 0.419608)
 
 [node name="Attack2CollisionR" type="CollisionShape2D" parent="AttackArea"]
-visible = false
 position = Vector2(25, -7)
 rotation = 1.5708
 skew = 0.0837758
@@ -455,7 +453,6 @@ shape = SubResource("CapsuleShape2D_qykhm")
 debug_color = Color(0.956863, 0.203922, 0, 0.419608)
 
 [node name="Attack2CollisionL" type="CollisionShape2D" parent="AttackArea"]
-visible = false
 position = Vector2(-25, -7)
 rotation = 1.5708
 skew = -0.0837758