From a1f807687ae97b5863f2e238733c5f2311cb0f0e Mon Sep 17 00:00:00 2001 From: Logan Date: Sun, 19 Jul 2020 18:43:58 -0500 Subject: [PATCH] Fixed wands for real --- magic/Wands/BouncyWand.tscn | 2 ++ magic/Wands/PrismWand.tscn | 3 +++ magic/Wands/TripleWand.tscn | 1 + script/Inventory.gd | 1 + 4 files changed, 7 insertions(+) diff --git a/magic/Wands/BouncyWand.tscn b/magic/Wands/BouncyWand.tscn index 8650c71..45bce4f 100644 --- a/magic/Wands/BouncyWand.tscn +++ b/magic/Wands/BouncyWand.tscn @@ -14,3 +14,5 @@ position = Vector2( -8.01086e-05, -22 ) rotation = -1.5708 [node name="ShootDelay" type="Timer" parent="."] +wait_time = 0.3 +one_shot = true diff --git a/magic/Wands/PrismWand.tscn b/magic/Wands/PrismWand.tscn index daa5f37..f4d9456 100644 --- a/magic/Wands/PrismWand.tscn +++ b/magic/Wands/PrismWand.tscn @@ -4,6 +4,7 @@ [ext_resource path="res://magic/Wands/WandClass.gd" type="Script" id=2] [node name="PrismWand" type="Sprite"] +position = Vector2( 4, 0 ) rotation = 1.5708 texture = ExtResource( 1 ) offset = Vector2( 0, -10 ) @@ -14,3 +15,5 @@ position = Vector2( 0, -20 ) rotation = -1.5708 [node name="ShootDelay" type="Timer" parent="."] +wait_time = 0.3 +one_shot = true diff --git a/magic/Wands/TripleWand.tscn b/magic/Wands/TripleWand.tscn index c405d4e..56b4b14 100644 --- a/magic/Wands/TripleWand.tscn +++ b/magic/Wands/TripleWand.tscn @@ -19,3 +19,4 @@ position = Vector2( -8.01086e-05, -22 ) position = Vector2( 4.99993, -20 ) [node name="ShootDelay" type="Timer" parent="."] +wait_time = 0.3 diff --git a/script/Inventory.gd b/script/Inventory.gd index c32c45d..406940b 100644 --- a/script/Inventory.gd +++ b/script/Inventory.gd @@ -33,6 +33,7 @@ onready var Effect4 = $Inventory/Effects/Effect4 func _process(delta): if Input.is_action_just_pressed("inventory"): set_open(!open) + print(active_conduit) func set_open(new): if open != new: