diff --git a/game/entities/player.gd b/game/entities/player.gd index 4fa7042..4a78d96 100644 --- a/game/entities/player.gd +++ b/game/entities/player.gd @@ -8,7 +8,7 @@ var position : Vector2: return $Ship.position -func _process(delta: float) -> void: +func _physics_process(delta: float) -> void: var input_direction := Input.get_vector("move_left", "move_right", "move_up", "move_down") $Ship.accelerate(input_direction, delta) diff --git a/game/entities/weapons/projectiles/abstract_projectile.gd b/game/entities/weapons/projectiles/abstract_projectile.gd new file mode 100644 index 0000000..c2407aa --- /dev/null +++ b/game/entities/weapons/projectiles/abstract_projectile.gd @@ -0,0 +1,9 @@ +@abstract +class_name AbstractProjectile +extends Node + + +@export var bullet_velocity : int +@export var bullet_acceleration : int +@export var distance : int +@export var bullet_max_livetime : int diff --git a/game/entities/weapons/projectiles/abstract_projectile.gd.uid b/game/entities/weapons/projectiles/abstract_projectile.gd.uid new file mode 100644 index 0000000..3425e48 --- /dev/null +++ b/game/entities/weapons/projectiles/abstract_projectile.gd.uid @@ -0,0 +1 @@ +uid://ctmjb3nkxrepu diff --git a/game/entities/weapons/reloaders/energy_reloader.gd b/game/entities/weapons/reloaders/energy_reloader.gd index 2747116..b1b1e01 100644 --- a/game/entities/weapons/reloaders/energy_reloader.gd +++ b/game/entities/weapons/reloaders/energy_reloader.gd @@ -32,7 +32,7 @@ func _ready() -> void: _calculate_cool() -func _process(delta: float) -> void: +func _physics_process(delta: float) -> void: if _heat > 0: _heat -= _cool_per_sec * delta if _heat < 0: diff --git a/game/entities/weapons/reloaders/firerate_reloader.gd b/game/entities/weapons/reloaders/firerate_reloader.gd index 83999e3..923e3b1 100644 --- a/game/entities/weapons/reloaders/firerate_reloader.gd +++ b/game/entities/weapons/reloaders/firerate_reloader.gd @@ -16,7 +16,7 @@ func _ready() -> void: _calculate_delay() -func _process(delta: float) -> void: +func _physics_process(delta: float) -> void: if _cooldown > 0: _cooldown -= delta diff --git a/game/entities/weapons/reloaders/magazine_reloader.gd b/game/entities/weapons/reloaders/magazine_reloader.gd index 18c3262..5e42ece 100644 --- a/game/entities/weapons/reloaders/magazine_reloader.gd +++ b/game/entities/weapons/reloaders/magazine_reloader.gd @@ -23,7 +23,7 @@ func _ready() -> void: _calculate_reload_time_tenth() -func _process(delta: float) -> void: +func _physics_process(delta: float) -> void: if _countdown > 0: _countdown -= delta if _countdown <= 0: diff --git a/game/entities/weapons/weapon.gd b/game/entities/weapons/weapon.gd index f0d9e08..0b6c3b8 100644 --- a/game/entities/weapons/weapon.gd +++ b/game/entities/weapons/weapon.gd @@ -2,12 +2,9 @@ extends Node2D @export var damage : int -@export var explosion_size : int -@export var bullet_velocity : int -@export var bullet_acceleration : int @export var bullet_per_shot : int @export var sector_angle : int -@export var distance : int +@export var Projectile : AbstractProjectile @export var reloaders : Array[AbstractReloader] @@ -32,7 +29,6 @@ func _init() -> void: #add_child(energy_reloader) - func _ready() -> void: var texture := PlaceholderTexture2D.new() texture.size = Vector2(10, 7)