diff --git a/Game/Mobs/enemy.gd b/Game/Mobs/enemy.gd index 0bf11d6..fc7fb9c 100644 --- a/Game/Mobs/enemy.gd +++ b/Game/Mobs/enemy.gd @@ -58,7 +58,7 @@ func set_character_data(): self.name = "Ork-" + str(randi()) speed = 80 health = 150 - shield = 100 + shield = 200 damage = 5 "Cobold": self.name = "Cobold-" + str(randi()) @@ -131,8 +131,9 @@ func Collision_Handler(body: Node2D): if not body.get_parent().get_if_moving_state(): var surrounding_enemies = body.get_node("Area2D").get_overlapping_bodies() for i in surrounding_enemies: - if i. get_parent().name in NAMES: - enemy_hurt(100) + for j in NAMES: + if i.get_parent().name.contains(j): + enemy_hurt(100) body.get_parent().Explode_Mine() diff --git a/Game/Towers/archer_tower.tscn b/Game/Towers/archer_tower.tscn index 6269fce..006207c 100644 --- a/Game/Towers/archer_tower.tscn +++ b/Game/Towers/archer_tower.tscn @@ -58,7 +58,7 @@ radius = 29.0 height = 88.0 [sub_resource type="CircleShape2D" id="CircleShape2D_be2t6"] -radius = 238.134 +radius = 183.044 [node name="ArcherTower" type="Node2D"] script = ExtResource("1_ssiuv") @@ -68,7 +68,7 @@ script = ExtResource("1_ssiuv") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="CharacterBody2D"] sprite_frames = SubResource("SpriteFrames_xrf6u") autoplay = "default" -frame_progress = 0.157334 +frame_progress = 0.792297 [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"] position = Vector2(0, 17) diff --git a/Game/Towers/towers.gd b/Game/Towers/towers.gd index 638ada6..10aebfa 100644 --- a/Game/Towers/towers.gd +++ b/Game/Towers/towers.gd @@ -1,6 +1,8 @@ extends Node2D var shootingTime = 0 +var bulletSpeed = 0 +var hitpoint = 0 var follower = false var target = null @@ -25,6 +27,8 @@ func _process(delta: float) -> void: func set_properties() -> void: if self.name.contains("ArcherTower"): get_node("Timer").wait_time = 0.8 + bulletSpeed = 400 + hitpoint = 50 func get_if_moving_state(): @@ -36,11 +40,12 @@ func _input(event): follower = false func choose_target(body : Node2D) -> void: - var surroinding_enemies = get_node("CharacterBody2D/Area2D").get_overlapping_bodies() - target = surroinding_enemies[0] - for i in surroinding_enemies: - if i.get_parent().get_progress() > target.get_parent().get_progress(): - target = i + if not follower: + var surroinding_enemies = get_node("CharacterBody2D/Area2D").get_overlapping_bodies() + target = surroinding_enemies[0] + for i in surroinding_enemies: + if i.get_parent().get_progress() > target.get_parent().get_progress(): + target = i pass func shoot() -> void: @@ -48,8 +53,8 @@ func shoot() -> void: if self.name.contains("ArcherTower"): var arrow = ARROW.instantiate() arrow.position = self.position - arrow.set_speed(250) + arrow.set_speed(bulletSpeed) arrow.set_targe(target) - arrow.set_hitpoint(50) + arrow.set_hitpoint(hitpoint) get_parent().add_child(arrow) pass