Fixes an issue with Apples & Tilemap (lol)

3 files changed, 57 insertions, 33 deletions

diff --git a/collectables/Apple.gd b/collectables/Apple.gd
index 909eaf2..e95ef61 100644
--- a/collectables/Apple.gd
+++ b/collectables/Apple.gd
@@ -6,6 +6,6 @@ func _ready():
 
 
 func _on_Area2D_body_entered(body):
-	if body.entity_type=="PLAYER":
+	if (body.name=="Player"):
 		body.health += health
 		queue_free()
diff --git a/entities/Player.gd b/entities/Player.gd
index bae5935..5804af8 100644
--- a/entities/Player.gd
+++ b/entities/Player.gd
@@ -24,7 +24,6 @@ func get_input():
 	if jump and is_on_floor():
 		jumping = true
 		velocity.y = jump_speed
-		print(health)
 	if right:
 		velocity.x += run_speed
 		facing_right = true
diff --git a/scenes/level1.tscn b/scenes/level1.tscn
index 4bbe8b8..bbe7b4a 100644
--- a/scenes/level1.tscn
+++ b/scenes/level1.tscn
@@ -13,95 +13,123 @@ position = Vector2( 77, 31 )
 tile_set = ExtResource( 2 )
 cell_size = Vector2( 16, 16 )
 format = 1
-tile_data = PoolIntArray( 262144, 6, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 7, 0, 262150, 7, 0, 262151, 7, 0, 262152, 7, 0, 262153, 7, 0, 262154, 7, 0, 262155, 8, 0, 393230, 6, 0, 393231, 7, 0, 393232, 7, 0, 393233, 7, 0, 393234, 7, 0, 393235, 7, 0, 393236, 7, 0, 393237, 7, 0, 393238, 7, 0, 393239, 7, 0, 393240, 7, 0, 393241, 8, 0, 917510, 6, 0, 917511, 7, 0, 917512, 7, 0, 917513, 7, 0, 917514, 7, 0, 917515, 7, 0, 917516, 7, 0, 917517, 7, 0, 917518, 7, 0, 917519, 7, 0, 917520, 7, 0, 917521, 8, 0, 917529, 6, 0, 917530, 7, 0, 917531, 7, 0, 917532, 7, 0, 917533, 7, 0, 917534, 7, 0, 917535, 7, 0, 917536, 7, 0, 917537, 7, 0, 917538, 7, 0, 917539, 7, 0, 917540, 8, 0, 1310758, 6, 0, 1310759, 7, 0, 1310760, 7, 0, 1310761, 7, 0, 1310762, 7, 0, 1310763, 7, 0, 1310764, 7, 0, 1310765, 7, 0, 1310766, 7, 0, 1310767, 7, 0, 1310768, 7, 0, 1310769, 8, 0 )
+tile_data = PoolIntArray( 0, 12, 0, 1, 13, 0, 2, 13, 0, 3, 13, 0, 4, 13, 0, 5, 13, 0, 6, 13, 0, 7, 13, 0, 8, 13, 0, 9, 13, 0, 10, 13, 0, 11, 13, 0, 12, 13, 0, 13, 13, 0, 14, 13, 0, 15, 13, 0, 16, 13, 0, 17, 13, 0, 18, 13, 0, 19, 13, 0, 20, 13, 0, 21, 13, 0, 22, 13, 0, 23, 13, 0, 24, 13, 0, 25, 13, 0, 26, 13, 0, 27, 13, 0, 28, 13, 0, 29, 13, 0, 30, 13, 0, 31, 13, 0, 32, 13, 0, 33, 13, 0, 34, 13, 0, 35, 13, 0, 36, 13, 0, 37, 13, 0, 38, 13, 0, 39, 13, 0, 40, 13, 0, 41, 13, 0, 42, 13, 0, 43, 13, 0, 44, 13, 0, 45, 13, 0, 46, 13, 0, 47, 13, 0, 48, 13, 0, 49, 14, 0, 65536, 15, 0, 65585, 15, 0, 131072, 37, 0, 131121, 37, 0, 196608, 37, 0, 196657, 37, 0, 262144, 37, 0, 262193, 37, 0, 327680, 37, 0, 327729, 37, 0, 393216, 37, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 7, 0, 393223, 7, 0, 393224, 7, 0, 393225, 7, 0, 393226, 7, 0, 393227, 7, 0, 393228, 8, 0, 393265, 37, 0, 458752, 37, 0, 458754, 50, 0, 458755, 51, 0, 458756, 51, 0, 458757, 51, 0, 458758, 51, 0, 458759, 51, 0, 458760, 51, 0, 458761, 51, 0, 458762, 51, 0, 458763, 51, 0, 458764, 52, 0, 458801, 37, 0, 524288, 37, 0, 524303, 6, 0, 524304, 7, 0, 524305, 7, 0, 524306, 7, 0, 524307, 7, 0, 524308, 7, 0, 524309, 7, 0, 524310, 7, 0, 524311, 7, 0, 524312, 7, 0, 524313, 7, 0, 524314, 8, 0, 524337, 37, 0, 589824, 37, 0, 589839, 50, 0, 589840, 51, 0, 589841, 51, 0, 589842, 51, 0, 589843, 51, 0, 589844, 51, 0, 589845, 51, 0, 589846, 51, 0, 589847, 51, 0, 589848, 51, 0, 589849, 51, 0, 589850, 52, 0, 589858, 6, 0, 589859, 7, 0, 589860, 7, 0, 589861, 7, 0, 589862, 7, 0, 589863, 7, 0, 589864, 7, 0, 589865, 7, 0, 589866, 7, 0, 589867, 7, 0, 589868, 7, 0, 589869, 8, 0, 589873, 37, 0, 655360, 37, 0, 655394, 50, 0, 655395, 51, 0, 655396, 51, 0, 655397, 51, 0, 655398, 51, 0, 655399, 51, 0, 655400, 51, 0, 655401, 51, 0, 655402, 51, 0, 655403, 51, 0, 655404, 51, 0, 655405, 52, 0, 655409, 37, 0, 720896, 37, 0, 720945, 37, 0, 786432, 37, 0, 786481, 37, 0, 851968, 37, 0, 852017, 37, 0, 917504, 37, 0, 917553, 37, 0, 983040, 37, 0, 983089, 37, 0, 1048576, 37, 0, 1048625, 37, 0, 1114112, 37, 0, 1114134, 6, 0, 1114135, 7, 0, 1114136, 7, 0, 1114137, 7, 0, 1114138, 7, 0, 1114139, 7, 0, 1114140, 7, 0, 1114141, 7, 0, 1114142, 7, 0, 1114143, 7, 0, 1114144, 7, 0, 1114145, 8, 0, 1114161, 37, 0, 1179648, 37, 0, 1179653, 6, 0, 1179654, 7, 0, 1179655, 7, 0, 1179656, 7, 0, 1179657, 7, 0, 1179658, 7, 0, 1179659, 7, 0, 1179660, 7, 0, 1179661, 7, 0, 1179662, 7, 0, 1179663, 7, 0, 1179664, 8, 0, 1179670, 50, 0, 1179671, 51, 0, 1179672, 51, 0, 1179673, 51, 0, 1179674, 51, 0, 1179675, 51, 0, 1179676, 51, 0, 1179677, 51, 0, 1179678, 51, 0, 1179679, 51, 0, 1179680, 51, 0, 1179681, 52, 0, 1179697, 37, 0, 1245184, 37, 0, 1245189, 50, 0, 1245190, 51, 0, 1245191, 51, 0, 1245192, 51, 0, 1245193, 51, 0, 1245194, 51, 0, 1245195, 51, 0, 1245196, 51, 0, 1245197, 51, 0, 1245198, 51, 0, 1245199, 51, 0, 1245200, 52, 0, 1245233, 37, 0, 1310720, 37, 0, 1310758, 6, 0, 1310759, 7, 0, 1310760, 7, 0, 1310761, 7, 0, 1310762, 7, 0, 1310763, 7, 0, 1310764, 7, 0, 1310765, 7, 0, 1310766, 7, 0, 1310767, 7, 0, 1310768, 8, 0, 1310769, 37, 0, 1376256, 37, 0, 1376294, 28, 0, 1376295, 29, 0, 1376296, 29, 0, 1376297, 29, 0, 1376298, 29, 0, 1376299, 29, 0, 1376300, 29, 0, 1376301, 29, 0, 1376302, 29, 0, 1376303, 29, 0, 1376304, 30, 0, 1376305, 37, 0, 1441792, 37, 0, 1441830, 50, 0, 1441831, 51, 0, 1441832, 51, 0, 1441833, 51, 0, 1441834, 51, 0, 1441835, 51, 0, 1441836, 51, 0, 1441837, 51, 0, 1441838, 51, 0, 1441839, 51, 0, 1441840, 52, 0, 1441841, 37, 0, 1507328, 37, 0, 1507377, 37, 0, 1572864, 37, 0, 1572913, 37, 0, 1638400, 37, 0, 1638449, 37, 0, 1703936, 37, 0, 1703985, 37, 0, 1769472, 37, 0, 1769521, 37, 0, 1835008, 37, 0, 1835057, 37, 0, 1900544, 37, 0, 1900593, 37, 0, 1966080, 37, 0, 1966129, 37, 0, 2031616, 37, 0, 2031665, 37, 0, 2097152, 37, 0, 2097201, 37, 0, 2162688, 37, 0, 2162737, 37, 0, 2228224, 37, 0, 2228273, 37, 0, 2293760, 37, 0, 2293809, 37, 0, 2359296, 59, 0, 2359345, 59, 0, 2424832, 12, 0, 2424833, 13, 0, 2424834, 13, 0, 2424835, 13, 0, 2424836, 13, 0, 2424837, 13, 0, 2424838, 13, 0, 2424839, 13, 0, 2424840, 13, 0, 2424841, 13, 0, 2424842, 13, 0, 2424843, 13, 0, 2424844, 13, 0, 2424845, 13, 0, 2424846, 13, 0, 2424847, 13, 0, 2424848, 13, 0, 2424849, 13, 0, 2424850, 13, 0, 2424851, 13, 0, 2424852, 13, 0, 2424853, 13, 0, 2424854, 13, 0, 2424855, 13, 0, 2424856, 13, 0, 2424857, 13, 0, 2424858, 13, 0, 2424859, 13, 0, 2424860, 13, 0, 2424861, 13, 0, 2424862, 13, 0, 2424863, 13, 0, 2424864, 13, 0, 2424865, 13, 0, 2424866, 13, 0, 2424867, 13, 0, 2424868, 13, 0, 2424869, 13, 0, 2424870, 13, 0, 2424871, 13, 0, 2424872, 13, 0, 2424873, 13, 0, 2424874, 13, 0, 2424875, 13, 0, 2424876, 13, 0, 2424877, 13, 0, 2424878, 13, 0, 2424879, 13, 0, 2424880, 13, 0, 2424881, 14, 0 )
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2( 400, 300 )
 current = true
+zoom = Vector2( 1, 1.03 )
 
 [node name="Apples" type="Node2D" parent="."]
 position = Vector2( 400, 300 )
 
 [node name="Apple" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -161, -220 )
+position = Vector2( -146, -191 )
 
 [node name="Apple2" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -141, -220 )
+position = Vector2( -126, -191 )
 
 [node name="Apple3" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -121, -220 )
+position = Vector2( -106, -191 )
 
 [node name="Apple4" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -101, -220 )
+position = Vector2( -86, -191 )
 
 [node name="Apple5" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -81, -220 )
+position = Vector2( -66, -191 )
 
 [node name="Apple6" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -61, -220 )
+position = Vector2( -46, -191 )
 
 [node name="Apple7" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -41, -220 )
+position = Vector2( -26, -191 )
 
 [node name="Apple8" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -21, -220 )
+position = Vector2( -6, -191 )
 
 [node name="Apple9" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -1, -220 )
+position = Vector2( 14, -191 )
 
 [node name="Apple10" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -284, -91 )
+position = Vector2( -307, -32 )
 
 [node name="Apple11" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -264, -91 )
+position = Vector2( -287, -32 )
 
 [node name="Apple12" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -244, -91 )
+position = Vector2( -267, -32 )
 
 [node name="Apple13" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -224, -91 )
+position = Vector2( -247, -32 )
 
 [node name="Apple14" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -204, -91 )
+position = Vector2( -227, -32 )
 
 [node name="Apple15" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -184, -91 )
+position = Vector2( -207, -32 )
 
 [node name="Apple16" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -164, -91 )
+position = Vector2( -187, -32 )
 
 [node name="Apple17" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -144, -91 )
+position = Vector2( -167, -32 )
 
 [node name="Apple18" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( -124, -91 )
+position = Vector2( -147, -32 )
 
 [node name="Apple19" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 16, -87 )
+position = Vector2( -34, -46 )
 
 [node name="Apple20" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 36, -87 )
+position = Vector2( -14, -46 )
 
 [node name="Apple21" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 56, -87 )
+position = Vector2( 6, -46 )
 
 [node name="Apple22" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 76, -87 )
+position = Vector2( 26, -46 )
 
 [node name="Apple23" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 96, -87 )
+position = Vector2( 46, -46 )
 
 [node name="Apple24" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 116, -87 )
+position = Vector2( 66, -46 )
 
 [node name="Apple25" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 136, -87 )
+position = Vector2( 86, -46 )
 
 [node name="Apple26" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 156, -87 )
+position = Vector2( 106, -46 )
 
 [node name="Apple27" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 176, -87 )
+position = Vector2( 126, -46 )
+
+[node name="Apple36" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 156, -173 )
+
+[node name="Apple37" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 176, -173 )
+
+[node name="Apple38" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 196, -173 )
+
+[node name="Apple39" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 216, -173 )
+
+[node name="Apple40" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 236, -173 )
+
+[node name="Apple41" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 256, -173 )
+
+[node name="Apple42" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 276, -173 )
+
+[node name="Apple43" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 296, -173 )
+
+[node name="Apple44" parent="Apples" instance=ExtResource( 3 )]
+position = Vector2( 316, -173 )
 
 [node name="Apple28" parent="Apples" instance=ExtResource( 3 )]
 position = Vector2( 225, 6 )
@@ -126,6 +154,3 @@ position = Vector2( 345, 6 )
 
 [node name="Apple35" parent="Apples" instance=ExtResource( 3 )]
 position = Vector2( 365, 6 )
-
-[node name="Apple36" parent="Apples" instance=ExtResource( 3 )]
-position = Vector2( 385, 6 )