diff --git a/Scenes/bullet.tscn b/Scenes/bullet.tscn index dd16ff97..d8a6c07f 100644 --- a/Scenes/bullet.tscn +++ b/Scenes/bullet.tscn @@ -24,4 +24,5 @@ editor_description = "Player Bullet" [node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] +[connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/Scenes/fragola.cs b/Scenes/fragola.cs index c5f5f55c..a135cdd8 100644 --- a/Scenes/fragola.cs +++ b/Scenes/fragola.cs @@ -25,9 +25,9 @@ public partial class fragola : RigidBody2D private void _on_body_entered(Node body) { Debug.WriteLine("Collision"); - + EmitSignal(SignalName.Hit); - + } private void _on_area_2d_area_entered(Area2D area) { @@ -35,10 +35,10 @@ public partial class fragola : RigidBody2D Debug.WriteLine("Collision area"); EmitSignal(SignalName.Hit); - if (_isAlive) + if (_isAlive) { Explode(); - } + } } private void Explode() diff --git a/Scenes/player.tscn b/Scenes/player.tscn index 46d825e8..fac4b1ae 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -135,9 +135,10 @@ animations = [{ [node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("Muzzle") groups=["player"]] collision_layer = 2 -collision_mask = 3 +collision_mask = 35 script = ExtResource("1_m27vu") -Speed = 2000 +Speed = 2500 +CrosshairDistance = 20.0 BulletScene = ExtResource("2_ov36d") Muzzle = NodePath("Muzzle") metadata/_edit_group_ = true diff --git a/Scenes/test.tscn b/Scenes/test.tscn index e42c6d70..70eda189 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -6149,9 +6149,9 @@ texture = ExtResource("8_0km4o") 3:0/0 = 0 3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:0/0/physics_layer_0/angular_velocity = 0.0 -3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:0/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:0/0/physics_layer_1/angular_velocity = 0.0 +3:0/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:0/0 = 0 4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:0/0/physics_layer_0/angular_velocity = 0.0 @@ -6193,33 +6193,28 @@ texture = ExtResource("8_0km4o") 1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 1:1/0/physics_layer_1/angular_velocity = 0.0 -1:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:1/0 = 0 2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:1/0/physics_layer_0/angular_velocity = 0.0 2:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 2:1/0/physics_layer_1/angular_velocity = 0.0 -2:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:1/0 = 0 3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:1/0/physics_layer_0/angular_velocity = 0.0 3:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:1/0/physics_layer_1/angular_velocity = 0.0 -3:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:1/0 = 0 4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:1/0/physics_layer_0/angular_velocity = 0.0 4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 4:1/0/physics_layer_1/angular_velocity = 0.0 -4:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:1/0 = 0 5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:1/0/physics_layer_0/angular_velocity = 0.0 5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 5:1/0/physics_layer_1/angular_velocity = 0.0 -5:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:1/0 = 0 6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:1/0/physics_layer_0/angular_velocity = 0.0 @@ -6346,28 +6341,24 @@ texture = ExtResource("8_0km4o") 0:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 0:4/0/physics_layer_1/linear_velocity = Vector2(0, 0) 0:4/0/physics_layer_1/angular_velocity = 0.0 -0:4/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:4/0 = 0 1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 1:4/0/physics_layer_0/angular_velocity = 0.0 1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:4/0/physics_layer_1/linear_velocity = Vector2(0, 0) 1:4/0/physics_layer_1/angular_velocity = 0.0 -1:4/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:4/0 = 0 2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:4/0/physics_layer_0/angular_velocity = 0.0 2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:4/0/physics_layer_1/linear_velocity = Vector2(0, 0) 2:4/0/physics_layer_1/angular_velocity = 0.0 -2:4/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:4/0 = 0 3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:4/0/physics_layer_0/angular_velocity = 0.0 3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:4/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:4/0/physics_layer_1/angular_velocity = 0.0 -3:4/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:4/0 = 0 4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:4/0/physics_layer_0/angular_velocity = 0.0 @@ -6404,42 +6395,36 @@ texture = ExtResource("8_0km4o") 0:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 0:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 0:5/0/physics_layer_1/angular_velocity = 0.0 -0:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:5/0 = 0 1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 1:5/0/physics_layer_0/angular_velocity = 0.0 1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 1:5/0/physics_layer_1/angular_velocity = 0.0 -1:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:5/0 = 0 2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:5/0/physics_layer_0/angular_velocity = 0.0 2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 2:5/0/physics_layer_1/angular_velocity = 0.0 -2:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:5/0 = 0 3:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:5/0/physics_layer_0/angular_velocity = 0.0 3:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:5/0/physics_layer_1/angular_velocity = 0.0 -3:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:5/0 = 0 4:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:5/0/physics_layer_0/angular_velocity = 0.0 4:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 4:5/0/physics_layer_1/angular_velocity = 0.0 -4:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:5/0 = 0 5:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:5/0/physics_layer_0/angular_velocity = 0.0 5:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:5/0/physics_layer_1/linear_velocity = Vector2(0, 0) 5:5/0/physics_layer_1/angular_velocity = 0.0 -5:5/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:5/0 = 0 6:5/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:5/0/physics_layer_0/angular_velocity = 0.0 @@ -6466,35 +6451,30 @@ texture = ExtResource("8_0km4o") 0:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 0:6/0/physics_layer_1/linear_velocity = Vector2(0, 0) 0:6/0/physics_layer_1/angular_velocity = 0.0 -0:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:6/0 = 0 1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0) 1:6/0/physics_layer_0/angular_velocity = 0.0 1:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:6/0/physics_layer_1/linear_velocity = Vector2(0, 0) 1:6/0/physics_layer_1/angular_velocity = 0.0 -1:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:6/0 = 0 2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:6/0/physics_layer_0/angular_velocity = 0.0 2:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:6/0/physics_layer_1/linear_velocity = Vector2(0, 0) 2:6/0/physics_layer_1/angular_velocity = 0.0 -2:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:6/0 = 0 3:6/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:6/0/physics_layer_0/angular_velocity = 0.0 3:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:6/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:6/0/physics_layer_1/angular_velocity = 0.0 -3:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:6/0 = 0 5:6/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:6/0/physics_layer_0/angular_velocity = 0.0 5:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:6/0/physics_layer_1/linear_velocity = Vector2(0, 0) 5:6/0/physics_layer_1/angular_velocity = 0.0 -5:6/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:6/0 = 0 6:6/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:6/0/physics_layer_0/angular_velocity = 0.0 @@ -6521,35 +6501,30 @@ texture = ExtResource("8_0km4o") 0:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 0:7/0/physics_layer_1/linear_velocity = Vector2(0, 0) 0:7/0/physics_layer_1/angular_velocity = 0.0 -0:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:7/0 = 0 1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0) 1:7/0/physics_layer_0/angular_velocity = 0.0 1:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 1:7/0/physics_layer_1/linear_velocity = Vector2(0, 0) 1:7/0/physics_layer_1/angular_velocity = 0.0 -1:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:7/0 = 0 2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:7/0/physics_layer_0/angular_velocity = 0.0 2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:7/0/physics_layer_1/linear_velocity = Vector2(0, 0) 2:7/0/physics_layer_1/angular_velocity = 0.0 -2:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:7/0 = 0 3:7/0/physics_layer_0/linear_velocity = Vector2(0, 0) 3:7/0/physics_layer_0/angular_velocity = 0.0 3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:7/0/physics_layer_1/linear_velocity = Vector2(0, 0) 3:7/0/physics_layer_1/angular_velocity = 0.0 -3:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:7/0 = 0 5:7/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:7/0/physics_layer_0/angular_velocity = 0.0 5:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:7/0/physics_layer_1/linear_velocity = Vector2(0, 0) 5:7/0/physics_layer_1/angular_velocity = 0.0 -5:7/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:7/0 = 0 6:7/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:7/0/physics_layer_0/angular_velocity = 0.0 @@ -6923,9 +6898,9 @@ texture = ExtResource("8_0km4o") [sub_resource type="TileSet" id="TileSet_d7en2"] physics_layer_0/collision_layer = 1 -physics_layer_0/collision_mask = 26 -physics_layer_1/collision_layer = 1 -physics_layer_1/collision_mask = 2 +physics_layer_0/collision_mask = 30 +physics_layer_1/collision_layer = 32 +physics_layer_1/collision_mask = 18 sources/0 = SubResource("TileSetAtlasSource_jwf4b") [node name="GameScene" type="Node2D"] @@ -6947,7 +6922,7 @@ layer_0/y_sort_enabled = true layer_0/navigation_enabled = false layer_0/tile_data = PackedInt32Array(1572855, 131073, 0, 589817, 1, 0, 655353, 131073, 0, 720889, 131073, 0, 720890, 131073, 0, 786425, 131073, 0, 983032, 131073, 0, 1048567, 131073, 0, 1114103, 131073, 0, 1179638, 131073, 0, 1114106, 196609, 0, 1179642, 131073, 0, 1245178, 131073, 0, 1179641, 196609, 0, 589813, 1, 0, 655349, 1, 0, 720886, 1, 0, 786421, 1, 0, 720885, 1, 0, 786420, 1, 0, 720884, 1, 0, 655348, 1, 0, 851956, 1, 0, 917492, 1, 0, 851957, 1, 0, 917493, 1, 0, 983029, 1, 0, 983028, 1, 0, 1048564, 1, 0, 262134, 1, 0, 327671, 1, 0, 393207, 1, 0, 458743, 1, 0, 393206, 1, 0, -262148, 131073, 0, -327683, 131073, 0, -393219, 131073, 0, -458754, 131073, 0, -524290, 131073, 0, -589825, 131073, 0, -655361, 131073, 0, -458755, 1, 0, -393220, 1, 0, -524291, 1, 0, -589826, 1, 0, -655362, 1, 0, -327684, 1, 0, -262149, 1, 0, -196612, 131073, 0, -786432, 131073, 0, -720896, 131073, 0, -786431, 131073, 0, -655360, 131073, 0, -524289, 131073, 0, -458753, 131073, 0, -393217, 65537, 1, -327681, 65537, 1, -262146, 65537, 1, -196610, 65537, 1, -131075, 65537, 1, -65539, 65537, 1, -131076, 131073, 0, -524288, 65537, 1, -589824, 65537, 1, -655359, 65537, 1, -720895, 131073, 0, -196611, 131073, 0, -262147, 131073, 0, -327682, 131073, 0, -393218, 131073, 0, -589823, 65537, 1, -524287, 131073, 0, -458752, 131073, 0, -393216, 786433, 0, -262145, 786433, 0, -196609, 786433, 0, -131074, 786433, 0, -65538, 851969, 3, -3, 851969, 3, -327680, 851969, 3, -393215, 851969, 3, -458751, 131073, 0, -524286, 65537, 1, -589822, 131073, 0, -655357, 131073, 0, -720893, 1, 0, -655356, 1, 0, -589821, 131073, 0, -524285, 131073, 0, -262144, 851969, 3, -131073, 851969, 3, 65533, 851969, 3, 131068, 786433, 0, 196604, 786433, 0, 131069, 851969, 3, 65534, 851969, 3, -2, 851969, 3, -65537, 851969, 3, -458750, 65537, 1, -458749, 131073, 0, -393213, 65537, 1, -327678, 131073, 0, -262142, 851969, 3, -196607, 851969, 3, -131071, 851969, 3, -65536, 851969, 3, 0, 851969, 3, 131071, 851969, 3, 196607, 851969, 3, 262142, 851969, 3, 327678, 851969, 3, -524284, 131073, 0, -589820, 1, 0, -655355, 1, 0, -458748, 131073, 0, -393212, 131073, 0, -327677, 65537, 1, -262141, 786433, 0, -196606, 851969, 3, -131070, 851969, 3, -65535, 851969, 3, 1, 851969, 3, 65536, 851969, 3, 131072, 851969, 3, 262143, 851969, 3, 327679, 851969, 3, 393213, 786433, 0, 458749, 65537, 1, 524284, 65537, 1, 393214, 851969, 3, 131073, 851969, 3, 65537, 851969, 3, 2, 786433, 0, -65534, 851969, 3, -131069, 851969, 3, -131068, 131073, 0, -196604, 65537, 1, -262139, 131073, 0, -327675, 131073, 0, -393210, 1, 0, -458746, 1, 0, -65533, 851969, 3, 3, 851969, 3, 65538, 851969, 3, 131074, 851969, 3, 196609, 851969, 3, 262145, 851969, 3, 327680, 851969, 3, 393215, 851969, 3, 458751, 851969, 3, 524286, 851969, 3, 589822, 65537, 1, 458750, 851969, 3, -524283, 1, 0, -589819, 1, 0, -458747, 1, 0, -393211, 131073, 0, -327676, 131073, 0, -262140, 65537, 1, 196608, 851969, 3, 393216, 851969, 3, 524287, 851969, 3, 589823, 786433, 0, 524285, 65537, 1, -196605, 786433, 0, -393214, 131073, 0, -327679, 851969, 3, -262143, 851969, 3, -131072, 851969, 3, -1, 851969, 3, 65535, 851969, 3, 131070, 851969, 3, 196606, 851969, 3, 196605, 786433, 0, 262140, 786433, 0, 327677, 786433, 0, 262141, 786433, 0, -196608, 851969, 3, 262144, 851969, 3, 655359, 786433, 0, 720895, 65537, 1, 786430, 65537, 1, 851966, 131073, 0, 917502, 131073, 0, 851967, 65537, 1, 786431, 65537, 1, 655360, 786433, 0, 589824, 851969, 3, 524289, 851969, 3, 458753, 851969, 3, 393218, 786433, 0, 327682, 786433, 0, 262147, 786433, 0, 196611, 786433, 0, 131076, 786433, 0, 65540, 786433, 0, 5, 131073, 0, -65531, 65537, 1, -131066, 131073, 0, -196602, 131073, 0, -262137, 1, 0, -327674, 1, 0, -393209, 1, 0, -262138, 131073, 0, -196603, 131073, 0, -131067, 65537, 1, -65532, 131073, 0, 4, 851969, 3, 65539, 851969, 3, 131075, 851969, 3, 196610, 851969, 3, 262146, 851969, 3, 327681, 851969, 3, 393217, 851969, 3, 917503, 65537, 1, 786432, 65537, 1, 720896, 786433, 0, 524288, 851969, 3, 458752, 851969, 3, 655361, 786433, 0, 589825, 131073, 0, 524290, 786433, 0, 458754, 131073, 0, 393219, 131073, 0, 458755, 65537, 1, 393220, 65537, 1, 327684, 65537, 1, 262149, 65537, 1, 196613, 65537, 1, 131078, 65537, 1, 65542, 65537, 1, 6, 65537, 1, -65530, 131073, 0, -131065, 131073, 0, -196601, 131073, 0, 7, 131073, 0, 524292, 131073, 0, 589827, 131073, 0, 655363, 131073, 0, 589826, 65537, 1, 655362, 65537, 1, 720897, 65537, 1, 786433, 65537, 1, 851968, 65537, 1, 917504, 65537, 1, 983039, 131073, 0, 1048575, 131073, 0, 1114111, 131073, 0, 1179647, 131073, 0, 1048576, 131073, 0, 983040, 131073, 0, 1048577, 131073, 0, 983041, 131073, 0, 917506, 131073, 0, 851970, 131073, 0, 786435, 131073, 0, 720899, 131073, 0, 655364, 131073, 0, 589828, 131073, 0, 458756, 131073, 0, 393221, 131073, 0, 327685, 131073, 0, 262150, 131073, 0, 196614, 131073, 0, 131079, 131073, 0, 65543, 131073, 0, 8, 131073, 0, 196615, 131073, 0, 262151, 131073, 0, 327686, 131073, 0, 393222, 131073, 0, 458757, 131073, 0, 524293, 131073, 0, 589829, 131073, 0, 655365, 131073, 0, 720900, 131073, 0, 786436, 131073, 0, 851971, 131073, 0, 917507, 131073, 0, 917508, 1, 0, 851972, 1, 0, 917509, 1, 0, 851973, 1, 0, 786438, 1, 0, 720902, 1, 0, 655366, 1, 0, 589830, 1, 0, 524295, 1, 0, 458759, 1, 0, 393223, 131073, 0, 458758, 131073, 0, 524294, 131073, 0, 720901, 1, 0, 786437, 1, 0, 983044, 1, 0, 131077, 131073, 0, 65541, 131073, 0, 196612, 131073, 0, 262148, 131073, 0, 327683, 131073, 0, 524291, 65537, 1, 720898, 131073, 0, 786434, 131073, 0, 851969, 131073, 0, 917505, 131073, 0, -655358, 131073, 0, -196614, 1, 0, -131078, 1, 0, -65542, 1, 0, -6, 131073, 0, 65530, 131073, 0, -7, 1, 0, -65543, 1, 0, -131079, 1, 0, 65529, 1, 0, -720901, 1, 0, -655366, 1, 0, -589829, 1, 0, -524294, 1, 0, -589830, 1, 0, -524295, 1, 0, -655367, 1, 0, -720903, 1, 0, -786439, 1, 0, -851974, 1, 0, -786438, 1, 0, -720902, 1, 0, -917508, 1, 0, -851971, 1, 0, -786436, 1, 0, -1114109, 1, 0, -1048573, 1, 0, -983038, 1, 0, -1048574, 1, 0, -1114110, 1, 0, -1179645, 1, 0, -1114111, 1, 0, -1179647, 1, 0, -1179648, 1, 0, 1114108, 131073, 0, 1048572, 131073, 0, 983037, 131073, 0, 917500, 131073, 0, 851964, 196609, 0, 917499, 196609, 0, 983035, 196609, 0, 1048571, 131073, 0, 917498, 196609, 0, 851963, 196609, 0, 786427, 196609, 0, 720891, 131073, 0, 720892, 196609, 0, 786428, 196609, 0, 983036, 131073, 0, 1048573, 131073, 0, 1114109, 131073, 0, 1179645, 1, 0, 1114110, 131073, 0, 983038, 131073, 0, 917501, 131073, 0, 851965, 131073, 0, 786429, 131073, 0, 720893, 196609, 0, 655357, 65537, 1, 720894, 65537, 1, 655358, 65537, 1, 1048574, 131073, 0, 589821, 65537, 1, 655356, 196609, 0, 589820, 131073, 0, 655355, 131073, 0, 589819, 131073, 0, 524283, 131073, 0, 458747, 131073, 0, 393211, 65537, 1, 458748, 65537, 1, 393212, 65537, 1, 524282, 131073, 0, 458746, 131073, 0, 393210, 131073, 0, 589818, 131073, 0, 655354, 131073, 0, 851962, 131073, 0, 524281, 131073, 0, 327675, 65537, 1, 262139, 65537, 1, 327676, 65537, 1, 786426, 131073, 0, 393209, 131073, 0, 524297, 1, 0, 589833, 1, 0, 655370, 1, 0, 720905, 1, 0, 786441, 1, 0, 655369, 1, 0, 589832, 1, 0, 720904, 1, 0, 720903, 1, 0, 655367, 1, 0, 589831, 1, 0, 524296, 1, 0, 655368, 1, 0, 393224, 1, 0, 327688, 1, 0, 458760, 1, 0, 327687, 131073, 0, 262152, 131073, 0, 196616, 131073, 0, 131081, 131073, 0, 262153, 1, 0, 327689, 1, 0, 393225, 1, 0, 262154, 1, 0, 196618, 1, 0, 196617, 1, 0, 65544, 131073, 0, 131080, 131073, 0, 9, 1, 0, -65528, 131073, 0, -65529, 131073, 0, -262136, 1, 0, -196600, 1, 0, -131064, 131073, 0, 65545, 1, 0, 131082, 1, 0, 262155, 1, 0, 327690, 1, 0, -65527, 1, 0, -131063, 1, 0, 10, 1, 0, 65546, 1, 0, 393227, 1, 0, 458762, 1, 0, 524298, 1, 0, 458761, 1, 0, 393226, 1, 0, 327691, 1, 0, 458763, 1, 0, 524299, 1, 0, 589835, 1, 0, 655371, 1, 0, 720907, 1, 0, 786443, 1, 0, 720906, 1, 0, 589834, 1, 0, 786442, 1, 0, 851978, 1, 0, 917514, 1, 0, 983050, 1, 0, 1048586, 1, 0, 1048585, 1, 0, 983049, 1, 0, 917513, 1, 0, 983048, 1, 0, 917512, 1, 0, 851976, 1, 0, 786440, 1, 0, 851977, 1, 0, 983047, 1, 0, 917511, 1, 0, 983046, 1, 0, 1048582, 1, 0, 851975, 1, 0, 851974, 1, 0, 917510, 1, 0, 983045, 1, 0, 1048581, 1, 0, 786439, 1, 0, 1179653, 1, 0, 1114116, 1, 0, 1048580, 1, 0, 983043, 1, 0, 1048579, 1, 0, 1114114, 1, 0, 1048578, 131073, 0, 1114113, 131073, 0, 983042, 131073, 0, 1179650, 1, 0, 1245185, 1, 0, 1179649, 131073, 0, 1245184, 131073, 0, 1179648, 131073, 0, 1114112, 131073, 0, 1310719, 131073, 0, 1245183, 131073, 0, 1310718, 1, 0, 1245182, 1, 0, 1179646, 131073, 0, -65544, 1, 0, -9, 1, 0, 65527, 1, 0, -65545, 1, 0, 131063, 1, 0, 65528, 1, 0, 131064, 1, 0, -8, 1, 0, 131065, 131073, 0, 196601, 131073, 0, 262137, 131073, 0, 327673, 131073, 0, 458745, 131073, 0, 524280, 1, 0, 589816, 1, 0, 655352, 1, 0, 458744, 1, 0, 393208, 131073, 0, 327672, 131073, 0, 262135, 1, 0, 262136, 131073, 0, 196599, 1, 0, 196600, 1, 0, 524278, 1, 0, 524279, 1, 0, 589815, 1, 0, 655351, 1, 0, 720887, 1, 0, 655350, 1, 0, 720888, 1, 0, 786423, 1, 0, 851960, 131073, 0, 917496, 131073, 0, 983033, 131073, 0, 1048568, 131073, 0, 917495, 131073, 0, 851961, 131073, 0, 786424, 131073, 0, 983031, 131073, 0, 851959, 1, 0, 786422, 1, 0, 917497, 131073, 0, 1048569, 196609, 0, 1048570, 196609, 0, 1114105, 196609, 0, 983034, 196609, 0, 1114104, 131073, 0, 917494, 1, 0, 851958, 1, 0, 589814, 1, 0, 458742, 1, 0, 327670, 1, 0, 196598, 1, 0, 131062, 1, 0, -10, 1, 0, -131081, 1, 0, -131080, 1, 0, -196615, 1, 0, 327674, 131073, 0, 1179643, 131073, 0, 1114107, 131073, 0, 1245179, 131073, 0, 1310714, 131073, 0, 1376250, 131073, 0, 1310713, 131073, 0, 1245177, 196609, 0, 1310712, 196609, 0, 1245176, 196609, 0, 1179639, 131073, 0, 1179640, 196609, 0, 131066, 131073, 0, 196603, 65537, 1, 262138, 65537, 1, 196602, 131073, 0, 65531, 131073, 0, -5, 131073, 0, 65532, 65537, 1, 131067, 65537, 1, -65540, 131073, 0, -4, 65537, 1, -131077, 131073, 0, -65541, 131073, 0, -196613, 1, 0, 524277, 1, 0, 917491, 1, 0, 393205, 1, 0, 327669, 1, 0, 393204, 1, 0, 262133, 1, 0, 196597, 1, 0, 131061, 1, 0, 65526, 1, 0, -196616, 1, 0, -262152, 1, 0, -327687, 1, 0, -327686, 1, 0, -262151, 1, 0, -262150, 1, 0, -327685, 1, 0, -393221, 1, 0, -458756, 1, 0, -524292, 1, 0, -589827, 1, 0, -655363, 1, 0, -720898, 1, 0, -786434, 1, 0, -720897, 1, 0, -786433, 1, 0, -917504, 1, 0, -917505, 1, 0, -851968, 131073, 0, -851967, 131073, 0, -917502, 1, 0, -851966, 1, 0, -786430, 131073, 0, 1048566, 131073, 0, 1245175, 131073, 0, 1376248, 196609, 0, 1441784, 131073, 0, 1507320, 131073, 0, 1572856, 131073, 0, 1507321, 131073, 0, 1441785, 131073, 0, 1179644, 131073, 0, 1245180, 131073, 0, 1310715, 131073, 0, 1376251, 131073, 0, 1441786, 131073, 0, 1376255, 1, 0, 1310720, 131073, 0, 1114115, 1, 0, 1179651, 1, 0, 1245186, 1, 0, 1310722, 1, 0, 1376257, 1, 0, 1441793, 1, 0, 1507328, 1, 0, 1441792, 1, 0, 1376256, 1, 0, 1310721, 1, 0, 1179652, 1, 0, -524281, 1, 0, -458745, 1, 0, -262135, 1, 0, -327672, 1, 0, 1114117, 1, 0, 1114120, 1, 0, 1114121, 1, 0, 393228, 1, 0, 917515, 1, 0, 1048587, 1, 0, -1114112, 1, 0, -1179646, 1, 0, -1179644, 1, 0, -1048575, 1, 0, -983040, 1, 0, -983039, 1, 0, -917503, 1, 0, -851970, 1, 0, -786435, 1, 0, -851972, 1, 0, -983043, 1, 0, -720900, 1, 0, -655365, 1, 0, -851973, 1, 0, -786437, 1, 0, -589831, 1, 0, -458758, 1, 0, -393223, 1, 0, -458759, 1, 0, -524293, 1, 0, -458757, 1, 0, -393222, 1, 0, -589828, 1, 0, -655364, 1, 0, -720899, 1, 0, -327688, 1, 0, -262153, 1, 0, -327689, 1, 0, -393225, 1, 0, -196617, 1, 0, -131082, 1, 0, -65546, 1, 0, -393224, 1, 0, -458760, 1, 0, -524296, 1, 0, 1376249, 131073, 0, 1441783, 196609, 0, -720894, 131073, 0, -851969, 1, 0, -1048578, 1, 0, -983042, 1, 0, -917507, 1, 0, -1048579, 1, 0, -917506, 1, 0, -983041, 1, 0, -1048577, 1, 0, -1048576, 1, 0, -917501, 1, 0, -851965, 1, 0, -786428, 1, 0, -720892, 1, 0, -786429, 1, 0, -983037, 1, 0, -917500, 1, 0, -851964, 1, 0, -786427, 1, 0, -720891, 1, 0, -524282, 1, 0, -327673, 1, 0, -196599, 1, 0, -131062, 1, 0, -327671, 1, 0, -393207, 1, 0, -458744, 1, 0, -524280, 1, 0, -589817, 1, 0, -589818, 1, 0, -655354, 1, 0, -1048572, 1, 0, -983036, 1, 0, -917499, 1, 0, -851963, 1, 0, -393208, 1, 0, -655353, 1, 0, -720890, 1, 0, -786426, 1, 0, -1114108, 1, 0, -1048571, 1, 0, -983035, 1, 0, -917498, 1, 0, -851962, 1, 0, -786425, 1, 0, -720889, 1, 0, -655352, 1, 0, -589816, 1, 0, -524279, 1, 0, -458743, 1, 0, -393206, 1, 0, -327670, 1, 0, -262134, 1, 0, -196598, 1, 0, -131061, 1, 0, -65526, 1, 0, -262133, 1, 0, -196597, 1, 0, -65525, 1, 0, 11, 1, 0, 65547, 1, 0, 131083, 1, 0, 12, 1, 0, 131084, 1, 0, 196619, 1, 0, -131060, 1, 0, -65524, 1, 0, 65548, 1, 0, 131085, 1, 0, 196620, 1, 0, 262157, 1, 0, 327692, 1, 0, 262156, 1, 0, 1245187, 1, 0, 1310723, 1, 0, 1376258, 1, 0, 1572863, 1, 0, 1507327, 1, 0, 1441791, 1, 0, 1245181, 1, 0, 1310717, 1, 0, 1376254, 1, 0, 1441789, 1, 0, 1507326, 1, 0, 1572862, 1, 0, 1376247, 196609, 0, 1310711, 196609, 0, 1114102, 131073, 0, 1179637, 131073, 0, 1245174, 131073, 0, 1310709, 131073, 0, 1310710, 131073, 0, 1507322, 131073, 0, 1572857, 131073, 0, 1638393, 131073, 0, 1572860, 1, 0, 1507325, 1, 0, 1376253, 1, 0, 1310716, 1, 0, 1441788, 1, 0, 1507324, 1, 0, 1572859, 1, 0, 1507323, 1, 0, 1441787, 1, 0, 1376252, 1, 0, 1441790, 1, 0, 1572861, 1, 0, 1638397, 1, 0, 1638396, 1, 0, 1703931, 1, 0, 1638395, 1, 0, 1703930, 1, 0, 1638394, 1, 0, 1572858, 1, 0, 1703932, 1, 0, 1703933, 1, 0, 1638398, 1, 0, 1638399, 1, 0, 1572864, 1, 0, 1572865, 1, 0, 1507329, 1, 0, 1572866, 1, 0, 1507330, 1, 0, 1638401, 1, 0, 1638400, 1, 0, 1703935, 1, 0, 1769471, 1, 0, 1703934, 1, 0, 1769470, 1, 0, 1441794, 1, 0, 1376259, 1, 0, 1310724, 1, 0, 1245188, 1, 0, 1310725, 1, 0, 1245189, 1, 0, 1179654, 1, 0, 1114118, 1, 0, 1048583, 1, 0, 1114119, 1, 0, 1048584, 1, 0, 1179655, 1, 0, 1441795, 1, 0, 1507331, 1, 0, 1441796, 1, 0, 1376260, 1, 0, 1376261, 1, 0, 1310726, 1, 0, 1245190, 1, 0, 1245191, 1, 0, 1179656, 1, 0) -[node name="Solid Tilemap" type="TileMap" parent="."] +[node name="Solid Tilemap" type="TileMap" parent="." groups=["Solid"]] y_sort_enabled = true tile_set = SubResource("TileSet_7o1eb") format = 2 @@ -6958,7 +6933,7 @@ layer_0/tile_data = PackedInt32Array(-196610, 262144, 1, -131075, 262144, 1, -65 [node name="Factory Tilemaps" type="Node2D" parent="."] -[node name="Solid" type="TileMap" parent="Factory Tilemaps"] +[node name="Solid" type="TileMap" parent="Factory Tilemaps" groups=["Solid"]] tile_set = SubResource("TileSet_d7en2") format = 2 layer_0/name = "Floor" @@ -6971,7 +6946,6 @@ script = ExtResource("6_t8ide") [node name="Player" parent="." instance=ExtResource("2_8mh54")] position = Vector2(-790, -165) -CrosshairDistance = 10.0 [node name="ReferenceRect" type="ReferenceRect" parent="."] visible = false diff --git a/Scripts/Bullet.cs b/Scripts/Bullet.cs index 5ae51210..1e029e92 100644 --- a/Scripts/Bullet.cs +++ b/Scripts/Bullet.cs @@ -20,10 +20,10 @@ public partial class Bullet : Area2D //private void OnBodyEntered(Node body) //{ - // When a body is entered, invoke the event and pass the collided body + // When a body is entered, invoke the event and pass the collided body // BulletHit?.Invoke(body); - - // Then remove the bullet + + // Then remove the bullet // QueueFree(); //} @@ -40,7 +40,7 @@ public partial class Bullet : Area2D // Called every frame. 'delta' is the elapsed time since the previous frame. public override void _Process(double delta) { - this.Position += ((float) (Speed * delta) * _direction); + this.Position += ((float)(Speed * delta) * _direction); } private void _on_visible_on_screen_notifier_2d_screen_exited() @@ -49,7 +49,19 @@ public partial class Bullet : Area2D QueueFree(); } + private void _on_body_entered(Node2D body) + { + if (body.IsInGroup("Solid")) + { + Debug.WriteLine("Collision"); + QueueFree(); + } + + } } + + + diff --git a/project.godot b/project.godot index 0804fd9a..7b257454 100644 --- a/project.godot +++ b/project.godot @@ -72,6 +72,7 @@ shoot={ 2d_physics/layer_3="items" 2d_physics/layer_4="bullets" 2d_physics/layer_5="enemies" +2d_physics/layer_6="shoot-through" [physics]