update node paths after Player and Witch moved into World
parent
6177d2afbb
commit
3779426968
|
|
@ -12,8 +12,8 @@ var _sfx_player: AudioStreamPlayer
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
body_entered.connect(_on_body_entered)
|
body_entered.connect(_on_body_entered)
|
||||||
witch = get_node_or_null("/root/Game/Witch")
|
witch = get_node_or_null("/root/Game/World/Witch")
|
||||||
player = get_node_or_null("/root/Game/Player")
|
player = get_node_or_null("/root/Game/World/Player")
|
||||||
if witch == null or player == null:
|
if witch == null or player == null:
|
||||||
queue_free()
|
queue_free()
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ var progres_index = 0
|
||||||
var is_brewing
|
var is_brewing
|
||||||
var brew_explosion = true
|
var brew_explosion = true
|
||||||
@onready var witch = get_parent()
|
@onready var witch = get_parent()
|
||||||
@onready var player = get_node("/root/Game/Player")
|
@onready var player = get_node("/root/Game/World/Player")
|
||||||
var explosion_scene = preload("res://scenes/explosion.tscn")
|
var explosion_scene = preload("res://scenes/explosion.tscn")
|
||||||
var _ignite_sfx = preload("res://assets/music&sfx/sfx/data_pion-sfx9-fwoosh-324525.mp3")
|
var _ignite_sfx = preload("res://assets/music&sfx/sfx/data_pion-sfx9-fwoosh-324525.mp3")
|
||||||
var _ignite_player: AudioStreamPlayer
|
var _ignite_player: AudioStreamPlayer
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
extends CanvasLayer
|
extends CanvasLayer
|
||||||
|
|
||||||
@onready var _spawn_control = get_node("/root/Game/SpawnControl")
|
@onready var _spawn_control = get_node("/root/Game/SpawnControl")
|
||||||
@onready var _witch = get_node("/root/Game/Witch")
|
@onready var _witch = get_node("/root/Game/World/Witch")
|
||||||
@onready var _drop_manager = get_node("/root/Game/DropManager")
|
@onready var _drop_manager = get_node("/root/Game/DropManager")
|
||||||
@onready var _player = get_node("/root/Game/Player")
|
@onready var _player = get_node("/root/Game/World/Player")
|
||||||
|
|
||||||
var _fruit_scenes: Dictionary = {
|
var _fruit_scenes: Dictionary = {
|
||||||
"Apple": preload("res://scenes/apple.tscn"),
|
"Apple": preload("res://scenes/apple.tscn"),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
extends Node2D
|
extends Node2D
|
||||||
|
|
||||||
@onready var player = get_node("/root/Game/Player")
|
@onready var player = get_node("/root/Game/World/Player")
|
||||||
@onready var bar = get_node("/root/Game/CanvasLayer/ProgressBar")
|
@onready var bar = get_node("/root/Game/CanvasLayer/ProgressBar")
|
||||||
signal leveled_up
|
signal leveled_up
|
||||||
@export var fruit_drop_threshold: int = 7
|
@export var fruit_drop_threshold: int = 7
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@ var xp = 1
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
add_to_group("enemies")
|
add_to_group("enemies")
|
||||||
died.connect(get_node("/root/Game/DropManager").on_enemy_died)
|
died.connect(get_node("/root/Game/DropManager").on_enemy_died)
|
||||||
witch = get_node("/root/Game/Witch")
|
witch = get_node("/root/Game/World/Witch")
|
||||||
player = get_node("/root/Game/Player")
|
player = get_node("/root/Game/World/Player")
|
||||||
animated_sprite_2d.sprite_frames = animated_sprite_2d.sprite_frames.duplicate()
|
animated_sprite_2d.sprite_frames = animated_sprite_2d.sprite_frames.duplicate()
|
||||||
hp = max_hp
|
hp = max_hp
|
||||||
$Area2D.body_entered.connect(_on_base_body_entered)
|
$Area2D.body_entered.connect(_on_base_body_entered)
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@ func show_perks():
|
||||||
func select_perk(perk):
|
func select_perk(perk):
|
||||||
perk.effect.call()
|
perk.effect.call()
|
||||||
get_tree().paused = false
|
get_tree().paused = false
|
||||||
_spawn_level_up_particles(get_node("/root/Game/Witch").global_position)
|
_spawn_level_up_particles(get_node("/root/Game/World/Witch").global_position)
|
||||||
_spawn_level_up_particles(get_node("/root/Game/Player").global_position)
|
_spawn_level_up_particles(get_node("/root/Game/World/Player").global_position)
|
||||||
perks.erase(perk)
|
perks.erase(perk)
|
||||||
for child in $HBoxContainer.get_children():
|
for child in $HBoxContainer.get_children():
|
||||||
child.animate_out()
|
child.animate_out()
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
extends Node2D
|
extends Node2D
|
||||||
|
|
||||||
@onready var witch = get_node("/root/Game/Witch")
|
@onready var witch = get_node("/root/Game/World/Witch")
|
||||||
@onready var player = get_node("/root/Game/Player")
|
@onready var player = get_node("/root/Game/World/Player")
|
||||||
var fireball = preload("res://scenes/fireball.tscn")
|
var fireball = preload("res://scenes/fireball.tscn")
|
||||||
var throwing_knife = preload("res://scenes/throwing_knive.tscn")
|
var throwing_knife = preload("res://scenes/throwing_knive.tscn")
|
||||||
var cauldron
|
var cauldron
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ func _ready() -> void:
|
||||||
super()
|
super()
|
||||||
speed = 400.0
|
speed = 400.0
|
||||||
damage = 12
|
damage = 12
|
||||||
var witch = get_node("/root/Game/Witch")
|
var witch = get_node("/root/Game/World/Witch")
|
||||||
_target_enemy = witch.get_nearest_enemy(witch.global_position, _knife_filter)
|
_target_enemy = witch.get_nearest_enemy(witch.global_position, _knife_filter)
|
||||||
if _target_enemy == null:
|
if _target_enemy == null:
|
||||||
queue_free()
|
queue_free()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue