Merge branch 'main' of github.com:SpieleentwicklungBodensee/ggj_2024 …

…into main
SpieleentwicklungBodensee · Jan 28, 2024 · 459ddec · 459ddec
2 parents 2100b52 + 0ae703f
commit 459ddec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/Feather.py b/Feather.py
@@ -8,7 +8,8 @@
 GRAVITY = np.array([0., 16.])
 DRAG = .0005
 COLLISION_RADIUS = 12 # not an actual radius. Half the collision square's height
-COLLISION_TILES = ["#", 'h', 'i', 'j', 'H', 'X', 'Y']
+COLLISION_TILES = ["#", 'h', 'i', 'j', 'H', 'X', 'Y', 'd', 'b', 'q', 'p', 'l',
+                   '-', '+', 'o', 'u', 'n', ]
 
 
 class Feather:

diff --git a/levels/3.lvl b/levels/3.lvl
@@ -1,16 +1,16 @@
-d---------------------e--------b
+d------------------------------b
 l   d----------------b3   *    l
-q---p d------------b ne        l
-      l            l  3        l
-      l            l  e   #    l
-      l            l  E d------p
-      l    d-b     l    l   d--b
-      qbd--p l     l u  l   l  l
-       ln  T l     l l  q---p  l
-       n  ww l     q+p         l
-        u ww l          d------p
-do----oop ww n          q------b
-n         ww                   l
-          ww                   l
-F         ww mmmmm             l
+q---p  d-----------b ne        l
+#    d-p        ///l  3    Y   l
+# u  l           //l  e    Y   l
+# l  l            /l  E    Yd--p
+# l  l  d--+-b     l     c##l   
+# l  l  l    l     l u    ##l   
+# q--p  n  T l     q+p    ##l   
+#T        ww l              l   
+##      u ww l       ww   d-p   
+do----oop ww n       ww   q----b
+n         ww         ww        l
+          ww         ww        l
+F         ww mmmmm   ww        l
 -------------------------------p