instancing start gun and assigned ammo to array

assets/player.tscn

@@ -29,7 +29,7 @@ size = Vector3(3, 3, 3)
 [sub_resource type="BoxShape3D" id="BoxShape3D_gnkxs"]
 size = Vector3(11.7881, 6, 11)
 
-[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder", "gun") groups=["player"]]
+[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["player"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0)
 collision_layer = 3
 safe_margin = 0.2
@@ -37,7 +37,6 @@ script = ExtResource("1_x7wms")
 weapon_holder = NodePath("Head/Camera3D/WeaponHolder")
 weapon_sway_amount = 0.1
 weapon_rotation_amount = 0.1
-gun = NodePath("")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 visible = false

scenes/test_level_2v2.tscn

@@ -1,9 +1,11 @@
-[gd_scene load_steps=47 format=3 uid="uid://dyop6vk3rgkkb"]
+[gd_scene load_steps=49 format=3 uid="uid://dyop6vk3rgkkb"]
 
 [ext_resource type="Script" path="res://scripts/WeaponManager.gd" id="1_orhgl"]
 [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
+[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_6rjit"]
 [ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="2_f87c2"]
 [ext_resource type="PackedScene" uid="uid://d1j6ktsmxfq6e" path="res://assets/spider.tscn" id="3_cvvjo"]
+[ext_resource type="PackedScene" uid="uid://dslxb3psx30vp" path="res://assets/pistol1.tscn" id="3_rky7g"]
 [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_8nxyr"]
 [ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="5_28rul"]
 [ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"]
@@ -403,8 +405,11 @@ _data = {
 [sub_resource type="BoxShape3D" id="BoxShape3D_82n8k"]
 size = Vector3(16.265, 5.07275, 15.3267)
 
-[node name="Test Level 2" type="Node3D"]
+[node name="Test Level 2" type="Node3D" node_paths=PackedStringArray("player")]
 script = ExtResource("1_orhgl")
+player = NodePath("Player")
+gun_1 = ExtResource("2_6rjit")
+gun_2 = ExtResource("3_rky7g")
 
 [node name="Player" parent="." instance=ExtResource("2_f87c2")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.0295, 1.4435, 21.1166)

scripts/WeaponManager.gd

@@ -1,14 +1,6 @@
 extends Node3D
 
-<<<<<<< Updated upstream
-var current_weapon = null
-var weapon_stack = []
-var weapon_indicator = 0
-var next_weapon : String
-var weapon_list = {}
 
-@export var weapon_resources : Array[weapon_resource]
-=======
 @export var player : Node
 @export var gun_1 : Resource
 @export var gun_2 : Resource
@@ -17,12 +9,11 @@ var ammo_current = [0,0]
 var ammo_reserve = [0,0]
 var guns_dict = {}
 var current_gun_index
->>>>>>> Stashed changes
+
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	held_guns = [gun_1,gun_2]
-	
 	var instance_gun = held_guns[0].instantiate()
 	var instance_gun_2 = held_guns[1].instantiate()
 	ammo_current[1] = instance_gun_2.max_ammo