Merged changes
This commit is contained in:
@@ -14,6 +14,7 @@ func setup(qst : Quest) -> void:
|
||||
questorSprite.setup(quest.questor)
|
||||
add_child(questorSprite)
|
||||
questorSprite.global_position = $QuestorPosition.global_position
|
||||
questorSprite.reset_position = questorSprite.position
|
||||
for child in %Layers.get_children():
|
||||
if child is Parallax2D:
|
||||
child.autoscroll.x = -base_speed * child.scroll_scale.x
|
||||
@@ -25,9 +26,10 @@ func set_questor_animation(anim_name : String) -> void:
|
||||
func set_enemy_animation(enemy : Enemy, anim_name : String) -> void:
|
||||
enemy.set_animation(anim_name)
|
||||
|
||||
func place_enemy(enemy : Enemy) -> void:
|
||||
func place_enemy(enemy : Enemy, reset : bool = false) -> void:
|
||||
add_child(enemy)
|
||||
enemy.global_position = $EnemyPosition.global_position
|
||||
enemy.reset_position = enemy.position
|
||||
|
||||
func pause_setting() -> void:
|
||||
setting.process_mode = Node.PROCESS_MODE_DISABLED
|
||||
|
||||
Reference in New Issue
Block a user