diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd
index 36f1c9c..12227f5 100644
--- a/scripts/Statemachine/EntityBase.gd
+++ b/scripts/Statemachine/EntityBase.gd
@@ -122,6 +122,10 @@ func _ready():
 	if isPlayer():
 		if displayName == MultiplayerState.playerName:
 			UIState.player = self
+		if !OS.is_debug_build():
+			for i in weaponStore.get_children():
+				i.free()
+			weaponStore.add_child(ComponentManager.getWeapon("PurpleCrystal").instantiate())
 		for i in weaponStore.get_children():
 			i.hide()
 			weapons.append(i)
diff --git a/scripts/Tools/Managers/ComponentManager.gd b/scripts/Tools/Managers/ComponentManager.gd
index 704e519..16a9c24 100644
--- a/scripts/Tools/Managers/ComponentManager.gd
+++ b/scripts/Tools/Managers/ComponentManager.gd
@@ -4,6 +4,7 @@ class_name ComponentManager
 
 static var bullets = {}
 static var characters = {}
+static var weapons = {}
 static var summons = {}
 static var effects = {}
 static var feeds = []
@@ -17,6 +18,8 @@ static func init():
 		bullets[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://components/Characters"):
 		characters[DirTool.getBasenameWithoutExtension(i)] = load(i)
+	for i in DirTool.listdir("res://components/Weapons"):
+		weapons[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://components/Summons"):
 		summons[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://components/Effects"):
@@ -35,6 +38,8 @@ static func getBullet(t: String) -> PackedScene:
 	return MathTool.priority(bullets.get(t, false), load("res://components/Bullets/%s.tscn" % t))
 static func getCharacter(t: String) -> PackedScene:
 	return MathTool.priority(characters.get(t, false), load("res://components/Characters/%s.tscn" % t))
+static func getWeapon(t: String) -> PackedScene:
+	return MathTool.priority(weapons.get(t, false), load("res://components/Weapons/%s.tscn" % t))
 static func getSummon(t: String) -> PackedScene:
 	return MathTool.priority(summons.get(t, false), load("res://components/Summons/%s.tscn" % t))
 static func getEffect(t: String) -> PackedScene: