diff --git a/enemies/boss/boss.gd b/enemies/boss/boss.gd index 3992491..808b4d0 100644 --- a/enemies/boss/boss.gd +++ b/enemies/boss/boss.gd @@ -2,9 +2,9 @@ extends CharacterBody2D @onready var earthaligner = $EarthAligner @onready var player = get_tree().get_root().get_node("main/Player") var moves = ["slam", "wave", "water_rise", "splash"] -@onready var next_move = choose_next_move() @export var big_blob : PackedScene @onready var water : Water = get_tree().get_root().get_node("main/Water") +@onready var next_move = choose_next_move() var risen = 0 var attack_ready = true @@ -16,7 +16,6 @@ var damage = 1 var dead = false signal grounded - func choose_next_move() -> String: if $EnemyHurtbox.hp < 2 * $EnemyHurtbox.max_hp / 3 and risen == 0: risen += 1 @@ -26,9 +25,9 @@ func choose_next_move() -> String: return "water_rise" var pool = ["splash"] - if not (position.length() - %Water.radius < 300 and randf()<0.75): + if not (position.length() - water.radius < 300 and randf()<0.75): pool.append("slam") - if not (player.position.length() > %Water.radius + 900 and randf()<0.75): + if not (player.position.length() > water.radius + 900 and randf()<0.75): pool.append("wave") return ["slam", "wave", "splash"].pick_random() diff --git a/enemies/boss/boss_spawner.gd b/enemies/boss/boss_spawner.gd index 019d4a8..c69829c 100644 --- a/enemies/boss/boss_spawner.gd +++ b/enemies/boss/boss_spawner.gd @@ -2,7 +2,8 @@ extends Node @export var boss : PackedScene - +func _ready() -> void: + pass func _on_water_water_reached_max_height() -> void: var node = boss.instantiate() diff --git a/enemies/leech/giant_leech.tscn b/enemies/leech/giant_leech.tscn index 8e67243..41eefc4 100644 --- a/enemies/leech/giant_leech.tscn +++ b/enemies/leech/giant_leech.tscn @@ -12,7 +12,7 @@ size = Vector2(2, 24) scale = Vector2(1, 1.2) script = ExtResource("1_wfsrb") broadth = 400 -hp = 300 +hp = 180 [node name="Segments" type="Node2D" parent="."]