Merge branch 'bos_testing' into devRefactor

src/Objects/Torch/Torch.gd

@@ -1,4 +1,4 @@
-extends StaticBody2D
+extends Node2D
 
 export(int, 1, 5) var lifePoints = 3
 export(int, 1, 30) var spawnRate = 5
@@ -7,13 +7,14 @@ var elapsedTime = 0.0
 
 func _physics_process(delta):
 	elapsedTime += delta
-	if(elapsedTime>=spawnRate):
-		elapsedTime-=spawnRate
-		var Minion = load("")
-		var world = get_tree().current_scene.get_child(2)
-		var minion = Minion.instance()
-		world.add_child(minion)
-		minion.global_position = global_position
+	#if(elapsedTime>=spawnRate):
+	#	elapsedTime-=spawnRate
+	#	var Minion = load("")
+	#	var world = get_tree().current_scene.get_child(2)
+	#	#TODO minions
+	#	var minion = Minion.instance()
+	#	world.add_child(minion)
+	#	minion.global_position = global_position
 
 
 func _on_Hurtbox_area_entered(area):

src/Objects/Torch/Torch.tscn

@@ -4,16 +4,20 @@
 [ext_resource path="res://testSprites/fackel.png" type="Texture" id=2]
 [ext_resource path="res://Objects/Torch/Torch.gd" type="Script" id=3]
 [ext_resource path="res://Effects/Fire/FireEffect.tscn" type="PackedScene" id=4]
+[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=5]
 
 [sub_resource type="CapsuleShape2D" id=1]
 radius = 8.0
 height = 12.0
 
-[node name="Torch" type="StaticBody2D"]
+[node name="Torch" type="Node2D"]
 script = ExtResource( 3 )
 
 [node name="FireEffect" parent="." instance=ExtResource( 4 )]
 position = Vector2( 1.88936, -12.4698 )
+[node name="Kind" parent="." instance=ExtResource( 5 )]
+general = 4
+kind = 2
 
 [node name="Sprite" type="Sprite" parent="."]
 position = Vector2( 0, -8 )