ruslan/ScrapFrontier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PlayerData and EnemyData reworked for WeaponData

Browse Source
This commit is contained in:
Ruslan Ignatov
2025-12-17 22:02:54 +03:00
parent 36e6a9bb10
commit d55047239a
19 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/entities/ships/enemies/abstract_enemy_ship.gd
+2 -2
View File
@@ -35,8 +35,8 @@ func _set_enemy_data(data: EnemyData) -> void:
positions.remove_at(0)
for i in range(min(enemy_data.weapon_count, positions.size())):
var weapon := _create_weapon(enemy_data.weapon_id)
_add_weapon(weapon, positions[i])
var weapon : AbstractWeapon = enemy_data.weapon.scene.instantiate()
_add_weapon(weapon, weapon_positions[i])
func _create_weapon(weapon_id : String) -> AbstractWeapon:
game/entities/ships/player/player_ship.gd
+4 -10
View File
@@ -67,21 +67,15 @@ func _set_player_data(new_data: PlayerData) -> void:
player_data = new_data
_weapons.clear()
for i in range(min(player_data.weapon_ids.size(), weapon_positions.size())):
_add_weapon_by_id(player_data.weapon_ids[i], weapon_positions[i])
for i in range(min(player_data.weapons.size(), weapon_positions.size())):
var weapon_scene := player_data.weapons[i].scene
var weapon : AbstractWeapon = weapon_scene.instantiate()
_add_weapon(weapon, weapon_positions[i])
if player_data.hull > 0:
health.hull = min(player_data.hull, health.max_hull)
func _add_weapon_by_id(weapon_id: String, weapon_position: Vector2) -> void:
if weapon_id.is_empty() or not weapon_id in WEAPON_SCENES: return
var weapon_scene : PackedScene = load(WEAPON_SCENES[weapon_id])
var weapon : AbstractWeapon = weapon_scene.instantiate()
_add_weapon(weapon, weapon_position)
func _on_hull_updated(value: int, max_value: int) -> void:
super._on_hull_updated(value, max_value)