From a72ece88a541c3e78b0bb38b00fef0193439fb0e Mon Sep 17 00:00:00 2001
From: Logan <xterminate18181@gmail.com>
Date: Sat, 18 Jul 2020 16:13:45 -0500
Subject: [PATCH] Fix

---
 art/TripleWand.png          | Bin 0 -> 232 bytes
 art/TripleWand.png.import   |  34 ++++++++++++++++++++++++++++++++++
 magic/Wands/TripleWand.tscn |  12 ++++++++++++
 script/Inventory.gd         |   9 +++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 art/TripleWand.png
 create mode 100644 art/TripleWand.png.import
 create mode 100644 magic/Wands/TripleWand.tscn

diff --git a/art/TripleWand.png b/art/TripleWand.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7cbe899566be877737089fe0bcf9c75f993544
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QjEnx?oJHr&dIz4au#{IIEGmC
zCZ`-=bYW@vul)IbO~vUBUs+*2W(gpe=l3k3qBewoz7U&OP|o3HeD9c&K-7Bi4#vZ0
z8{(hm8Sb%L)h>98hi8IBh1E>v?TnXp+6VABvKySuam(UabZz>BM<0H)-RwFmCgE_6
z$6H&2lWn>pND2rfW*PE0n6ab@?3#QrSd)7fqXBEkNuMJPfy`{pj1iBgH8%bzVPGh>
Wa<7?iTBrf&S_V&7KbLh*2~7aDZ%u>%

literal 0
HcmV?d00001

diff --git a/art/TripleWand.png.import b/art/TripleWand.png.import
new file mode 100644
index 0000000..e51c303
--- /dev/null
+++ b/art/TripleWand.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/TripleWand.png-c3be8bf1f27f8a1003796699f4ff6abc.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/TripleWand.png"
+dest_files=[ "res://.import/TripleWand.png-c3be8bf1f27f8a1003796699f4ff6abc.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/magic/Wands/TripleWand.tscn b/magic/Wands/TripleWand.tscn
new file mode 100644
index 0000000..5a3d27e
--- /dev/null
+++ b/magic/Wands/TripleWand.tscn
@@ -0,0 +1,12 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://art/TripleWand.png" type="Texture" id=1]
+
+[node name="TripleWand" type="Sprite"]
+rotation = 1.5708
+texture = ExtResource( 1 )
+offset = Vector2( 0, -11 )
+
+[node name="ProjectileSpawn" type="Position2D" parent="."]
+
+[node name="ShootDelay" type="Timer" parent="."]
diff --git a/script/Inventory.gd b/script/Inventory.gd
index fa8f333..46fdb6f 100644
--- a/script/Inventory.gd
+++ b/script/Inventory.gd
@@ -78,3 +78,12 @@ func _on_Conduit1_toggled(button_pressed):
 		parent.WandManager.set_current_conduit(active_conduit)
 	else:
 		parent.WandManager.clear_conduit()
+
+
+func _on_Conduit2_toggled(button_pressed):
+	if button_pressed and Conduit2.is_visible():
+		active_conduit = Globals.Magic[Globals.Conduit2]
+		print(active_conduit)
+		parent.WandManager.set_current_conduit(active_conduit)
+	else:
+		parent.WandManager.clear_conduit()