Rendo/Chelimbalo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small refactor

Browse source
This commit is contained in:
Rendo 2025-12-12 13:37:34 +05:00
commit c0489d405b
7 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
systems/weapon_system/weapon_substate_machine.gd
View file

@ -3,8 +3,7 @@ extends SubStateMachine
class_name WeaponSubStateMachine
@export var animation_prefix: StringName
@export var registry_entry: StringName
@export var visibility_target: StringName
@export var weapon_gid: StringName
@export var max_ammo: int
@export var ammo: int = -1:
@ -66,11 +65,11 @@ func _ready() -> void:
func _enter() -> void:
super()
player.weapon_models[visibility_target].show()
player.weapon_models[weapon_gid].show()
func _exit() -> void:
super()
player.weapon_models[visibility_target].hide()
player.weapon_models[weapon_gid].hide()
func use_begin() -> void:
if current_state != null:

6
systems/weapon_system/weapon_system.gd
View file

@ -81,7 +81,7 @@ func get_empty_ability_slot() -> StringName:
func can_add_ability(ability: StringName, slot: StringName) -> bool:
for ability_slot in ["ability_first","ability_second","ability_third"]:
if slots[ability_slot] != null and slots[ability_slot].registry_entry == ability:
if slots[ability_slot] != null and slots[ability_slot].weapon_gid == ability:
return false
return can_add(slot)
@ -116,7 +116,7 @@ func drop(weapon: WeaponSubStateMachine) -> void:
if slots.find_key(weapon) in ["knife","ability_first","ability_second","ability_third"]:
return
var dropped_weapon: DroppableWeapon = Registry.weapons[weapon.registry_entry].dropped_scene.instantiate()
var dropped_weapon: DroppableWeapon = Registry.weapons[weapon.weapon_gid].dropped_scene.instantiate()
dropped_weapon.weapon.ammo = weapon.ammo
dropped_weapon.weapon.remaining_ammo = weapon.remaining_ammo
dropped_weapon.weapon.slot = weapon.slot
@ -172,7 +172,7 @@ func notify_slots_updated():
if slots[key] == null:
display_slots[key] = ""
else:
display_slots[key] = slots[key].registry_entry
display_slots[key] = slots[key].weapon_gid
var current_slot: StringName = ""
var found = slots.find_key(current_state)
if found: