Beginning to update weapon components

scripts/movement_component.gd

@@ -15,7 +15,9 @@ 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)

scripts/player_shot.gd

@@ -1,4 +1,4 @@
-class_name PlayerShot
+class_name PlayerShotResource
 extends Resource
 
 @export_category("Info")
@@ -11,5 +11,3 @@ extends Resource
 @export var projectiles: int = 2
 @export var spacing: float = 35
 @export var origin: int = -23
-#@export var rate: float = 0.1
-#@export var cooldown: float = 0.25

scripts/shoot_component.gd

@@ -3,36 +3,29 @@ class_name ShootComponent extends Node
 @onready var weapon_component: Node = %WeaponComponent
 @onready var player: Player = $".."
 
-#var travel: float = 0
-#var weapon_spacing: float = 0.1
-
-
 func shoot():
   
-    var weapon_system = weapon_component.data
+  # Shorten variable for accessing weapon_component for clarity
+  var weapon_system = weapon_component.data
   
-    if player.travel > weapon_system.spacing:
-      print("Travel is greater!")    
-      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)
-        ## Get weapon speed and spacing for equidistant calculations - non comp
-        #weapon_rate = bullet.weapon_component.bullet_data.rate
-        #weapon_component.bullet_data.projectile_spacing = bullet.weapon_component.bullet_data.projectile_spacing
-        #weapon_component.bullet_data.speed = bullet.weapon_component.bullet_data.speed
-        
-        # 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
+  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
   
   

scripts/weapon_component_original.gd

@@ -0,0 +1,21 @@
+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
+
+
+
+
+  

scripts/weapon_component_original.gd.uid

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

scripts/weapon_shot.gd

@@ -0,0 +1,13 @@
+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

scripts/weapon_shot.gd.uid

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