godot-shooter / commit
Simplified default weapon for player.
actors/Player.gd | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/actors/Player.gd b/actors/Player.gd index 99cf0cf..9eae39b 100644 --- a/actors/Player.gd +++ b/actors/Player.gd @@ -39,13 +39,15 @@ onready var final_score_label = $UI/DeathScreen/CenterContainer/PanelContainer/V const Utils = preload("res://utils/Utils.gd") const PopupControl = preload("res://utils/Popup.tscn") -var weapon: Weapon -var default_weapon: Weapon = Weapons.create_basic_gun() +var weapon: Weapon = create_default_weapon() var dead = false var velocity: Vector2 var can_fire = true var settings: Settings +func create_default_weapon() -> Weapon: + return Weapons.create_basic_gun() + func _ready() -> void: velocity= Vector2.UP * move_speed weapon = Weapons.create_basic_gun() @@ -184,7 +186,7 @@ func shoot_at(pos: Vector2): can_fire = false if weapon.ammo != INF: if weapon.ammo <= 0: - weapon = default_weapon + weapon = create_default_weapon() weapon.ammo -= 1 shot_timer.wait_time = weapon.cooldown_seconds shot_timer.start()