From f6b0bfb72052ef44392e02e0f200ce81aef17c69 Mon Sep 17 00:00:00 2001 From: Logan Date: Sun, 19 Jul 2020 18:48:23 -0500 Subject: [PATCH] Removed prints and added projectile collision --- magic/Projectiles/EcoProjectile.tscn | 2 ++ magic/Projectiles/ExplosiveProjectile.tscn | 2 ++ magic/Projectiles/PhantomProjectile.tscn | 2 ++ magic/Projectiles/WaveProjectile.tscn | 2 ++ magic/Wands/WandClass.gd | 1 - script/Inventory.gd | 1 - 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/magic/Projectiles/EcoProjectile.tscn b/magic/Projectiles/EcoProjectile.tscn index 533bcdf..a4b4051 100644 --- a/magic/Projectiles/EcoProjectile.tscn +++ b/magic/Projectiles/EcoProjectile.tscn @@ -7,6 +7,8 @@ radius = 5.0 [node name="EcoProjectile" type="KinematicBody2D"] +collision_layer = 8 +collision_mask = 2 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/magic/Projectiles/ExplosiveProjectile.tscn b/magic/Projectiles/ExplosiveProjectile.tscn index f919223..0197ae6 100644 --- a/magic/Projectiles/ExplosiveProjectile.tscn +++ b/magic/Projectiles/ExplosiveProjectile.tscn @@ -7,6 +7,8 @@ radius = 6.0 [node name="ExplosiveProjectile" type="KinematicBody2D"] +collision_layer = 8 +collision_mask = 6 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/magic/Projectiles/PhantomProjectile.tscn b/magic/Projectiles/PhantomProjectile.tscn index 2f17b8c..45e38c9 100644 --- a/magic/Projectiles/PhantomProjectile.tscn +++ b/magic/Projectiles/PhantomProjectile.tscn @@ -8,6 +8,8 @@ radius = 5.0 height = 2.0 [node name="PhantomProjectile" type="KinematicBody2D"] +collision_layer = 8 +collision_mask = 6 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/magic/Projectiles/WaveProjectile.tscn b/magic/Projectiles/WaveProjectile.tscn index dbfe583..e715434 100644 --- a/magic/Projectiles/WaveProjectile.tscn +++ b/magic/Projectiles/WaveProjectile.tscn @@ -8,6 +8,8 @@ radius = 4.0 height = 4.0 [node name="WaveProjectile" type="KinematicBody2D"] +collision_layer = 8 +collision_mask = 6 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/magic/Wands/WandClass.gd b/magic/Wands/WandClass.gd index 4df2ce8..9a23b94 100644 --- a/magic/Wands/WandClass.gd +++ b/magic/Wands/WandClass.gd @@ -3,7 +3,6 @@ class_name Wands func fire(projectile, effect): if $ShootDelay.is_stopped() and projectile != null: - print("fire") var temp = projectile.instance() get_tree().current_scene.add_child(temp) temp.global_transform = $ProjectileSpawn.global_transform diff --git a/script/Inventory.gd b/script/Inventory.gd index 406940b..c32c45d 100644 --- a/script/Inventory.gd +++ b/script/Inventory.gd @@ -33,7 +33,6 @@ 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: