Slight tweak to remove warnings.
This commit is contained in:
parent
2db5f37975
commit
313e013543
2 changed files with 5 additions and 6 deletions
|
|
@ -13,8 +13,7 @@ projectiles = 5
|
||||||
spacing = 100.0
|
spacing = 100.0
|
||||||
origin = -15
|
origin = -15
|
||||||
horizontal_offset = 8.25
|
horizontal_offset = 8.25
|
||||||
spread_angle = 7.5
|
spread_angle = 25.0
|
||||||
stagger_offset = 0.5
|
stagger_offset = 0.5
|
||||||
stagger_animation = true
|
stagger_animation = true
|
||||||
follow_angle = true
|
|
||||||
metadata/_custom_type_script = "uid://7n1itonn35fm"
|
metadata/_custom_type_script = "uid://7n1itonn35fm"
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ func _ready() -> void:
|
||||||
func _emit_weapon_changed() -> void:
|
func _emit_weapon_changed() -> void:
|
||||||
var ship: Sprite2D = get_parent().get_node("Ship")
|
var ship: Sprite2D = get_parent().get_node("Ship")
|
||||||
var sprite_size = ship.get_rect().size
|
var sprite_size = ship.get_rect().size
|
||||||
var origin_offset = weapon_data.origin if weapon_data else 0.0
|
var origin_offset: int = weapon_data.origin if weapon_data else 0
|
||||||
EventBus.weapon_changed.emit(weapon_data.shot_name, get_parent(), sprite_size, origin_offset)
|
EventBus.weapon_changed.emit(weapon_data.shot_name, get_parent(), sprite_size, origin_offset)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -31,12 +31,12 @@ func get_bullet_scene() -> PackedScene:
|
||||||
func get_weapon_resource() -> Resource:
|
func get_weapon_resource() -> Resource:
|
||||||
return weapon_data
|
return weapon_data
|
||||||
|
|
||||||
func select_weapon_by_name(name: String) -> bool:
|
func select_weapon_by_name(weapon_name: String) -> bool:
|
||||||
for i in range(available_weapons.size()):
|
for i in range(available_weapons.size()):
|
||||||
if available_weapons[i].shot_name == name:
|
if available_weapons[i].shot_name == weapon_name:
|
||||||
_current_weapon_index = i
|
_current_weapon_index = i
|
||||||
weapon_data = available_weapons[i]
|
weapon_data = available_weapons[i]
|
||||||
print("Switched to: ", name)
|
print("Switched to: ", weapon_name)
|
||||||
|
|
||||||
_emit_weapon_changed()
|
_emit_weapon_changed()
|
||||||
_trigger_change_flash()
|
_trigger_change_flash()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue