From 3fea3c89ed8313a9af4aca87d4fdcb0dd77ddde6 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@mailbox.org>
Date: Tue, 23 Jul 2024 18:38:58 +0200
Subject: [PATCH] modified collision layers so that the balls stop colliding
 with one another

---
 balls/ball.tscn          |   2 ++
 blocks/block.pdn         | Bin 0 -> 5481 bytes
 blocks/block.tscn        |   3 +++
 blocks/block.webp        | Bin 0 -> 800 bytes
 blocks/block.webp.import |  34 ++++++++++++++++++++++++++++++++++
 project.godot            |   6 ++++++
 scenes/level.tscn        |  34 ++++++++++++++++++----------------
 7 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 blocks/block.pdn
 create mode 100644 blocks/block.tscn
 create mode 100644 blocks/block.webp
 create mode 100644 blocks/block.webp.import

diff --git a/balls/ball.tscn b/balls/ball.tscn
index 71d2861..3caf5b4 100644
--- a/balls/ball.tscn
+++ b/balls/ball.tscn
@@ -3,6 +3,8 @@
 [ext_resource type="Script" path="res://balls/ball.gd" id="1_ija2k"]
 
 [node name="Ball" type="CharacterBody2D"]
+collision_layer = 4
+collision_mask = 10
 motion_mode = 1
 floor_stop_on_slope = false
 script = ExtResource("1_ija2k")
diff --git a/blocks/block.pdn b/blocks/block.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..2fa0ea6df5e50ea66c30049d6c99a36e408ce6b9
GIT binary patch
literal 5481
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
BNeuu1

literal 0
HcmV?d00001

diff --git a/blocks/block.tscn b/blocks/block.tscn
new file mode 100644
index 0000000..9be5cd9
--- /dev/null
+++ b/blocks/block.tscn
@@ -0,0 +1,3 @@
+[gd_scene format=3 uid="uid://c1i1fp3xbp6ly"]
+
+[node name="Block" type="Sprite2D"]
diff --git a/blocks/block.webp b/blocks/block.webp
new file mode 100644
index 0000000000000000000000000000000000000000..18ca2e945b41461a9a89fe387ed4734e8ebac199
GIT binary patch
literal 800
zcmWIYbaRtnW?%?+bqWXzu!!JdU|^5{;&KKCLk0#%p8$^qKpta3=<RK*)~KD2%H%ru
ztAe@va|NT`A6dP3Z{potd>B40{<mrC<NobsH~Z&t9xD^cocv(n71`EZZyHa@Fa7n(
z?^S<NZJBa``%b-GQu3_l8&8PHCcThX<xgCh$-H(MpU>ojfnV$+mz_*ly|Q`gGF~2&
zUIi<SPn-t9TNpa#%&V<&UAX*7nZNJ+-%tHc?t5~v;$i3y*E5q(W?a6xesi9&*93l`
z%N2?k85jh(80Io+RWKMa*x5>SI4Uag{5i+K#rUYo^8l;q`uaC_6!<3{lF%~lTyW+E
z$Hb#Hr;pDsX37t{Ewm-#({4WP9gE9dS0=u$v*k{Toxaz#`yVf7RMsKYwI&P<|Ng9w
zKeN5)?i=G*&wCg*H$D7uD%$92{ZVH**}5c4ruwCEyI1u~=;-%6xv{%o*2FA>-P(uN
ze*fj98pd3HaMHOXw(|!Pb0^IETdK<X@k!jg>rXUZRZlq@x=&jC(S|)j#r3bIp3Uts
zSo8Ct^Yi0d*I)X4!nZcU`<q=_?Sr~t?)i`U*#B>}yw~yLddcS8lH<M1SrZrVyK^6t
zU+H-}Quo#2ZPl-Crai5;+v9w?)6L5NJ4dyN1HZQklfuF-mxD<Q@)<r&I^XQ5)caQa
zM5ppaksizRE~(d#*1I`gvDHvuNO*ALL4`|1po04w=h)P1e(aJ7XYA?%U&`v4^Y|QO
zWwn1F@&DiNkZ<01nYF+D*wNNIKmO}Zft0tiQWzLqBRt)108@ykrxpVTkY-~LVq|6j
zMg<s4F|vZ`Fd$zV%8moFHK1ykfNVoXCI&$uod(32?JQvR6+ku!BmgnUEErvon3-3i
zmzP?iV5(=JXK2j8z{<cdft`T`sK&s^*nn{X!fvJo2(y@>Y$KpLRw#QHkPQM%KpU9A
RCInep09jDe3=IrGvH<Qu9ZmoM

literal 0
HcmV?d00001

diff --git a/blocks/block.webp.import b/blocks/block.webp.import
new file mode 100644
index 0000000..df0b290
--- /dev/null
+++ b/blocks/block.webp.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c7ejgh4t0c7cw"
+path="res://.godot/imported/block.webp-04f85b31d8e2c5ce551b7e59a7a1585d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://blocks/block.webp"
+dest_files=["res://.godot/imported/block.webp-04f85b31d8e2c5ce551b7e59a7a1585d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/project.godot b/project.godot
index 18ccf4a..f0fc98e 100644
--- a/project.godot
+++ b/project.godot
@@ -21,6 +21,12 @@ window/size/viewport_width=1920
 window/size/viewport_height=1080
 window/stretch/mode="viewport"
 
+[layer_names]
+
+2d_physics/layer_2="boundary"
+2d_physics/layer_3="ball"
+2d_physics/layer_4="block"
+
 [rendering]
 
 renderer/rendering_method="gl_compatibility"
diff --git a/scenes/level.tscn b/scenes/level.tscn
index 0691b21..ce61fe9 100644
--- a/scenes/level.tscn
+++ b/scenes/level.tscn
@@ -56,6 +56,8 @@ horizontal_alignment = 1
 
 [node name="WorldBoundary" type="Area2D" parent="GameContent"]
 position = Vector2(1140, 540)
+collision_layer = 2
+collision_mask = 4
 script = ExtResource("3_w4mye")
 
 [node name="Top" parent="GameContent/WorldBoundary" instance=ExtResource("4_455ct")]
@@ -77,82 +79,82 @@ boundary_invert_axis = 0
 [node name="Balls" type="Node2D" parent="GameContent"]
 
 [node name="Ball" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(687, 534)
+position = Vector2(791, 656)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball2" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(971, 920)
+position = Vector2(1049, 563)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball3" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1641, 958)
+position = Vector2(1382, 687)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball4" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(482, 986)
+position = Vector2(1289, 856)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball5" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(899, 280)
+position = Vector2(619, 256)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball6" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1427, 577)
+position = Vector2(663, 857)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball7" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1330, 823)
+position = Vector2(859, 252)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball8" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1544, 413)
+position = Vector2(958, 792)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball9" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1646, 179)
+position = Vector2(1418, 412)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball10" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1666, 660)
+position = Vector2(1677, 692)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball11" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(516, 671)
+position = Vector2(1610, 877)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball12" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(553, 174)
+position = Vector2(1394, 185)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball13" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1303, 479)
+position = Vector2(1285, 546)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball14" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(943, 726)
+position = Vector2(1078, 172)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball15" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1363, 282)
+position = Vector2(1562, 537)
 motion_mode = 0
 floor_stop_on_slope = true
 
 [node name="Ball16" parent="GameContent/Balls" instance=ExtResource("3_14yi2")]
-position = Vector2(1135, 158)
+position = Vector2(1507, 299)
 motion_mode = 0
 floor_stop_on_slope = true