henry/facsimile-wing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored weapon and shoot component use and resources.

Browse source
This commit is contained in:
Henry Faber 2026-06-09 13:57:40 +01:00
parent 79122a074e
commit bdbc3b015f
29 changed files with 239 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

131
scripts/components.gd
View file

@ -1,131 +0,0 @@
# Component types for the game's architecture
# All components extend Node and are meant to be attached to parent objects
class_name compoents extends Node
var move_dir: Vector2 = Vector2.ZERO
var shoot_pressed: bool = false
var shooting: bool = false
func update() -> void:
move_dir = Input.get_vector("left", "right", "up", "down")
shoot_pressed = Input.is_action_just_pressed("shoot")
shooting = Input.is_action_pressed("shoot")
class_name MovementComponent extends Node
@export var player: Area2D
@export var speed: float = 275
@export var bounds_x: int = 12
@export var bounds_y: int = 12
@onready var weapon_component: Node = %WeaponComponent
@onready var screensize = get_viewport().content_scale_size
var input = Input.get_vector("left", "right", "up", "down")
func tick(delta: float):
# Check to see if there's a player to move
if player == null: return
# Shorten variable for accessing weapon_component for clarity
var weapon_system = weapon_component.data
# Calculate ship to bullet displacement
player.ship_displacement = player.position.y - player.previous_position.y
player.travel += abs(weapon_system.speed) * delta + (player.ship_displacement)
player.travel = clamp(player.travel, 0, 1.9 * weapon_system.spacing)
# Thruster animation in relation to player movement
if input.x > 0:
player.position.x = player.position.x + 1
%Ship.frame = 2
%Ship/Thrusters.flip_h = true
%Ship/Thrusters.animation = "banked"
elif input.x < 0:
player.position.x = player.position.x - 1
%Ship.frame = 1
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "banked"
else:
%Ship.frame = 0
player.position.x = player.position.x
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "fwd"
# Get previous position for equidistant bullet calculation
player.previous_position = player.position
# Move player within screen bounds
player.position += input * speed * delta
player.position = player.position.clamp(Vector2i(bounds_x, bounds_y), screensize - Vector2i(bounds_x, bounds_y))
class_name ShootComponent extends Node
@onready var weapon_component: Node = %WeaponComponent
@onready var player: PlayerComponent = $".."
func shoot():
# Shorten variable for accessing weapon_component for clarity
var weapon_system = weapon_component.data
if player.travel > weapon_system.spacing:
for b in range(weapon_system.projectiles):
# Instantiate the bullets
var bullet = weapon_component.weapon_current.instantiate()
get_tree().root.add_child(bullet)
# Adjust bullet spacing before firing
bullet.position = player.position + Vector2((b - (weapon_system.projectiles - 1) / 2.0) * round(round((weapon_system.projectiles + weapon_system.spacing / 2)) / 2), weapon_system.origin)
print(b, bullet.position.x)
# Print which weapon is firing
print(b, bullet.shot_data.shot_name, "weapon fired")
# Subtract projectile spacing from current Player travel for next
player.travel -= weapon_system.spacing
else: return
class_name PlayerComponent extends Area2D
# Components managed by Player
@onready var input_component: InputComponent = $InputComponent
@onready var movement_component: MovementComponent = $MovementComponent
@onready var shoot_component: ShootComponent = $ShootComponent
@onready var weapon_component: WeaponComponent = $WeaponComponent
# Variables for Player shooting status
@export var can_shoot: bool = true
@export var is_shooting: bool = false
# Variables for Player position calculations for equidistant bullets
var previous_position: Vector2
var ship_displacement: float
var travel: float = 0
func _process(delta) -> void:
# Read Controls
input_component.update()
# Read Shooting
if input_component.shooting:
is_shooting = true
else: is_shooting = false
if is_shooting == true:
shoot_component.shoot()
# Read Movement Component
movement_component.input = input_component.move_dir
movement_component.tick(delta)

1
scripts/components.gd.uid
View file

@ -1 +0,0 @@
uid://imu0upeiufxn

52
scripts/movement_component.gd
View file

@ -1,51 +1,49 @@
class_name MovementComponent extends Node
@export var player: Area2D
@export var speed: float = 275
@export var bounds_x: int = 12
@export var bounds_y: int = 12
@onready var weapon_component: Node = %WeaponComponent
@onready var player = $"../Player"
@onready var screensize = get_viewport().content_scale_size
var input = Input.get_vector("left", "right", "up","down")
func tick(delta: float):
prints(tick)
# Check to see if there's a player to move
if player == null: return
if player == null: return
# Shorten variable for accessing weapon_component for clarity
var weapon_system = weapon_component.data
var weapon_system = weapon_component.data
# Calculate ship to bullet displacement
player.ship_displacement = player.position.y - player.previous_position.y
player.travel += abs(weapon_system.speed) * delta + (player.ship_displacement)
player.travel = clamp(player.travel, 0, 1.9 * weapon_system.spacing)
player.ship_displacement = player.position.y - player.previous_position.y
player.travel += abs(weapon_system.speed) * delta + (player.ship_displacement)
player.travel = clamp(player.travel, 0, 1.9 * weapon_system.spacing)
# Thruster animation in relation to player movement
if input.x > 0:
player.position.x = player.position.x+1
%Ship.frame = 2
%Ship/Thrusters.flip_h = true
%Ship/Thrusters.animation = "banked"
elif input.x < 0:
player.position.x = player.position.x-1
%Ship.frame = 1
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "banked"
else:
%Ship.frame = 0
player.position.x = player.position.x
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "fwd"
if input.x > 0:
player.position.x = player.position.x+1
%Ship.frame = 2
%Ship/Thrusters.flip_h = true
%Ship/Thrusters.animation = "banked"
elif input.x < 0:
player.position.x = player.position.x-1
%Ship.frame = 1
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "banked"
else:
%Ship.frame = 0
player.position.x = player.position.x
%Ship/Thrusters.flip_h = false
%Ship/Thrusters.animation = "fwd"
# Get previous positon for equidistant bullet calculation
player.previous_position = player.position
player.previous_position = player.position
# Move player within screenbounds
player.position += input * speed * delta
player.position = player.position.clamp(Vector2i(bounds_x,bounds_y), screensize - Vector2i(bounds_x,bounds_y))
player.position += input * speed * delta
player.position = player.position.clamp(Vector2i(bounds_x,bounds_y), screensize - Vector2i(bounds_x,bounds_y))

13
scripts/player_shot.gd
View file

@ -1,13 +0,0 @@
class_name PlayerShot
extends Resource
@export_category("Info")
@export var shot_name: String
@export var sprite: Texture2D = preload("res://graphics/shot.png")
@export_category("Shot Data")
@export var damage: int = 1
@export var speed: int = 135
@export var projectiles: int = 2
@export var spacing: float = 35
@export var origin: int = -23

1
scripts/player_shot.gd.uid
View file

@ -1 +0,0 @@
uid://ccdohs4gduee5

53
scripts/shoot_component.gd
View file

@ -1,31 +1,32 @@
class_name ShootComponent extends Node
@onready var weapon_component: Node = %WeaponComponent
@onready var player = $"../Player"
@onready var player = $".."
# Change from instantiating WeaponComponent to instantiating Shot nodes
func shoot():
# Shorten variable for accessing weapon_component for clarity
var weapon_system = weapon_component.data
if player.travel > weapon_system.spacing:
for b in range(weapon_system.projectiles):
# Instantiate the bullets
var bullet = weapon_component.weapon_current.instantiate()
get_tree().root.add_child(bullet)
# Adjust bullet spacing before firing
bullet.position = player.position + Vector2((b - (weapon_system.projectiles - 1) / 2.0) * round(round((weapon_system.projectiles + weapon_system.spacing / 2)) / 2), weapon_system.origin)
print(b, bullet.position.x)
# Print which weapon is firing
prints(bullet.shot_data.shot_name, "weapon fired")
# Subtract projectile spacing from current Player travel for next
player.travel -= weapon_system.spacing
else: return
var weapon_data = weapon_component.data # WeaponShot resource configuration
if player.travel > weapon_data.spacing:
for b in range(weapon_data.projectiles):
# Get the Shot scene from the WeaponShot resource
var bullet_scene = weapon_data.bullet_scene # Or however you store it
# Instantiate the bullet based data
var bullet := bullet_scene.instantiate() as Node
get_tree().root.add_child(bullet)
# Set up the bullet from resource data
#bullet.shot_data = weapon_data # Pass the configuration
# Adjust bullet spacing before firing
bullet.position = player.position + Vector2((b - (weapon_data.projectiles - 1) / 2.0) * round(round((weapon_data.projectiles + weapon_data.spacing / 2)) / 2 - 2), weapon_data.origin)
print(b, bullet.position.x)
print(weapon_data.shot_name + " "+"fired!")
# Subtract projectile spacing from current Player travel for next
player.travel -= weapon_data.spacing
else: return

17
scripts/weapon_component.gd
View file

@ -1,16 +1,9 @@
class_name WeaponComponent extends Node
@export var weapon_current : PackedScene
var data : PlayerShot = load("res://resources/player_weapons/shot_stock.tres")
#@export var projectile_origin: int = -23
@export var loaded_weapon: PackedScene = load("res://scenes/weapon_stock.tscn")
var data : WeaponShot = load("res://resources/player_weapons/weapon_shot_stock.tres")
#@export_category("Temp Bullet Data")
#@export var projectiles: int = 3
#@export var projectile_spacing: float = 10
#var damage: int = 0
#var speed: int = 135
#var projectiles: int = 2
#var rate: float = 0.1
#var cooldown: float = 0.25
#var projectile_spacing: float = 10
func get_bullet_scene() -> PackedScene:
return data.weapon_shot # Reference to the Shot scene from the resource

21
scripts/weapon_component_original.gd
View file

@ -1,21 +0,0 @@
class_name WeaponComponent extends Node
@export var weapon_current : PackedScene
var data: PlayerShot = load("res://resources/player_weapons/shot_stock.tres")
#@export var projectile_origin: int = -23
#@export_category("Temp Bullet Data")
#@export var projectiles: int = 3
#@export var projectile_spacing: float = 10
#var damage: int = 0
#var speed: int = 135
#var projectiles: int = 2
#var rate: float = 0.1
#var cooldown: float = 0.25
#var projectile_spacing: float = 10

1
scripts/weapon_component_original.gd.uid
View file

@ -1 +0,0 @@
uid://cy50u6ksjqvjc

14
scripts/weapon_shot.gd
View file

@ -1,14 +0,0 @@
class_name WeaponShot
extends Resource
@export_category("Info")
@export var shot_name: String
@export var sprite: Texture2D = preload("res://graphics/shot.png")
@export_category("Shot Data")
@export var damage: int = 1
@export var speed: int = 135
@export var projectiles: int = 2
@export var spacing: float = 35
@export var origin: int = -23

1
scripts/weapon_shot.gd.uid
View file

@ -1 +0,0 @@
uid://7n1itonn35fm