Pre-Release

scripts/player/Weapons.gd

@@ -1,6 +1,6 @@
 extends Node3D
 
-const CONFIG_PATH = "user://weapons.scoom"
+const CONFIG_PATH = "weapons.cfg"
 const REVOLVER = 0
 const UZI = 1
 const CHAINSAW = 2
@@ -9,8 +9,6 @@ var state = 0
 @onready var player_root = get_node("../../../../PlayerQ3") as CharacterBody3D
 @onready var raycast = get_node("../Camera3D/AimCast") as RayCast3D
 #@onready var crosshair = $Crosshair
-@onready var MainCam = get_node("../Camera3D") 
-@onready var GunCam = get_node("../Camera3D/SubViewportContainer/SubViewport/GunCam")
 
 
 var weapons = []
@@ -21,7 +19,23 @@ var sway_lerp = 5
 
 func _ready():
 	var config = load_data() as ConfigFile
+	Init_Config(config)
+
+	weapons[current_weapon].init()
+	raycast.target_position.z = -weapons[current_weapon].RAY_LEN
+
+func load_data():
+	var path = Runtimeloader.PATH
 	
+	var config = ConfigFile.new()
+	var err = config.load(path + CONFIG_PATH)
+	
+	if err != OK:
+		printerr("FAILED LOADING WEAPONS DATA @ ",path + CONFIG_PATH)
+	
+	return config
+
+func Init_Config(config):
 	for weapon in config.get_sections():
 		var root = Weapon.new()
 		root.name = weapon
@@ -29,9 +43,6 @@ func _ready():
 		var old_parent = weapon_model.get_parent()
 		old_parent.remove_child(weapon_model)
 		
-		var mesh = weapon_model.get_child(0) as MeshInstance3D
-		var mat = mesh.material_override as Material
-		//TODO
 		#Set Weapon nodes
 		root.add_child(weapon_model)
 		root.position = config.get_value(weapon, "HAND_POS")
@@ -64,9 +75,6 @@ func _ready():
 		root.RELOAD_TIME = config.get_value(weapon, "RELOAD_TIME")
 			
 		weapons.append(root)
-	weapons[current_weapon].init()
-	raycast.target_position.z = -weapons[current_weapon].RAY_LEN
-
 
 func _input(event):
 	if event is InputEventMouseMotion:
@@ -93,7 +101,6 @@ func ChangeWeapon(i):
 
 var time = 0
 func _process(delta):
-	GunCam.global_transform = MainCam.global_transform
 	if Input.is_action_pressed("shoot") && weapons[current_weapon].Shoot():
 		if(weapons[current_weapon].HITSCAN):
 			HitScan()
@@ -132,18 +139,4 @@ func HitScan():
 func Projectile():
 	pass
 
-func load_data():
-	var path = ""
-	if(OS.has_feature("editor")):
-		path = "/home/kookroach/Documents/Projects/Scoom_test/"
-	else:
-		path = OS.get_executable_path() + "/"
-	
-	var config = ConfigFile.new()
-	var err = config.load(path+"weapons.cfg")
-	
-	if err != OK:
-		printerr("FAILED LOADING WEAPONS DATA")
-	
-	return config