godot-shooter / commit
Minor reorg of Player code.
actors/Player.gd | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/actors/Player.gd b/actors/Player.gd index 8f71b2a..2f8e7b4 100644 --- a/actors/Player.gd +++ b/actors/Player.gd @@ -24,12 +24,13 @@ onready var hud = $UI/HUD onready var static_controls = $Graphics/Alive/StaticControls onready var radar_sprite = $Graphics/Alive/StaticControls/RadarSprite onready var radar_container = $Graphics/Alive/StaticControls/Radar +onready var pause_menu = $UI/PauseMenu onready var scores_container = $UI/PauseMenu/CenterContainer/PanelContainer/VBoxContainer/TabContainer/Scores onready var scores_list = $UI/PauseMenu/CenterContainer/PanelContainer/VBoxContainer/TabContainer/Scores/ScoresList -onready var intro_menu = $UI/IntroMenu -onready var intro_always_show_intro_check = $UI/IntroMenu/CenterContainer/PanelContainer/VBoxContainer/AlwaysShowIntroCheckBox onready var pause_always_show_intro_check = $UI/PauseMenu/CenterContainer/PanelContainer/VBoxContainer/TabContainer/Pref/AlwaysShowIntroCheckBox onready var pause_show_items_in_radar_check = $UI/PauseMenu/CenterContainer/PanelContainer/VBoxContainer/TabContainer/Pref/ShowItemsInRadarCheckBox +onready var intro_menu = $UI/IntroMenu +onready var intro_always_show_intro_check = $UI/IntroMenu/CenterContainer/PanelContainer/VBoxContainer/AlwaysShowIntroCheckBox onready var health_label = $Graphics/Alive/StaticControls/HealthLabel onready var trails = $Graphics/Alive/Trails onready var death_screen = $UI/DeathScreen @@ -45,7 +46,7 @@ var velocity: Vector2 = Vector2.UP * move_speed var settings: Settings func create_default_weapon() -> Weapon: - return Weapons.create_rocket_gun() + return Weapons.create_basic_gun() func _ready() -> void: velocity= Vector2.UP * move_speed @@ -262,12 +263,12 @@ func show_message(message: String, duration_seconds: int = 2) -> void: func _on_HUD_paused() -> void: get_tree().paused = true - $UI/PauseMenu.show() + pause_menu.show() clear_destination() func _on_ResumeButton_pressed() -> void: get_tree().paused = false - $UI/PauseMenu.hide() + pause_menu.hide() func _on_HUD_debug_signal() -> void: emit_signal("debug")