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

Bug fixes

Browse Source
This commit is contained in:
Ruslan Ignatov
2025-12-24 17:35:18 +03:00
parent 451479af96
commit 3921eaf2db
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/entities/ships/enemies/abstract_enemy_ship.gd
+7 -1
View File
@@ -3,7 +3,13 @@ extends AbstractShip
var is_on_screen : bool = false var is_on_screen : bool = false
var weapon_type : AbstractWeapon.Type = AbstractWeapon.Type.NONE var weapon_type : AbstractWeapon.Type:
set(value):
pass
get():
var type := AbstractWeapon.Type.NONE
for weapon in _weapons: type = weapon.type
return type
var enemy_data : EnemyData: var enemy_data : EnemyData:
set = _set_enemy_data set = _set_enemy_data
game/entities/world/passage.gd
+8 -4
View File
@@ -16,6 +16,7 @@ signal completed
var _current_progress := 0.0 var _current_progress := 0.0
var _timer_time_elapsed := 0.0 var _timer_time_elapsed := 0.0
var _current_enemy_index := 0 var _current_enemy_index := 0
var _player_is_alive = true
@onready var player : PlayerShip = $PlayerShip @onready var player : PlayerShip = $PlayerShip
@@ -25,10 +26,11 @@ var _current_enemy_index := 0
func _physics_process(delta: float) -> void: func _physics_process(delta: float) -> void:
_current_progress += delta if _player_is_alive:
_update_progress_indicator() _current_progress += delta
if _current_progress >= passage_data.length: _update_progress_indicator()
completed.emit() if _current_progress >= passage_data.length:
completed.emit()
func _set_passage_data(new_data: PassageData) -> void: func _set_passage_data(new_data: PassageData) -> void:
@@ -63,6 +65,7 @@ func _start_timer_for_current_enemy() -> void:
func _on_enemy_timer_timeout() -> void: func _on_enemy_timer_timeout() -> void:
if not _player_is_alive: return
var enemy := passage_data.enemies[_current_enemy_index] var enemy := passage_data.enemies[_current_enemy_index]
enemy_swamp_controller.create_enemy(enemy) enemy_swamp_controller.create_enemy(enemy)
_current_enemy_index += 1 _current_enemy_index += 1
@@ -70,4 +73,5 @@ func _on_enemy_timer_timeout() -> void:
func _on_player_ship_destroyed() -> void: func _on_player_ship_destroyed() -> void:
_player_is_alive = false
player_died.emit() player_died.emit()