Circle fix, ribbon did some stuff i dunno what is was dont ask me

3 files changed, 26 insertions, 27 deletions

diff --git a/background.lua b/background.lua
index 32ed9fc..daf0f36 100644
--- a/background.lua
+++ b/background.lua
@@ -1,8 +1,8 @@
 bgcircles = {}
 
 function scrollingcircles(y, speed, spacing, radius, color)
-    for i = 1, (128*(radius*4))/spacing, 1 do
-        circfill(-time()*speed+(spacing*(i-1)), y, radius, color)
+    for i = 1, 256, spacing do
+        circfill((i-(t()*speed))%256-radius*2, y, radius, color)
     end
 end
 
@@ -37,7 +37,7 @@ function drawbg()
 
     --stars
     for i = 1, 64, 1 do
-        pset(((-t()+i*2)*(i/32))%128, sin(i*0.536382)*64+64, 4)
+        pset(((-t()+i*4.3824)*(i/32))%128, sin(i*0.536382)*64+64, 4)
     end
 
     --ringed planet
@@ -47,8 +47,8 @@ function drawbg()
     palt(0,true)
     
     --clouds
-    scrollingcircles(-9, 24, 22, 22, 4)
-    scrollingcircles(-14, 40, 25, 20, 2)
+    scrollingcircles(-9, 24, 22, 22, 2)
+    scrollingcircles(-14, 40, 25, 20, 4)
     --sprites
     --small clouds
     scrollingsprite(198, 20, 10, 1, 1, 28)
@@ -65,9 +65,9 @@ function drawbg()
     scrollingsprite(194, 80, 3, 2, 1, 35)
     scrollingsprite(212, 120, 5, 2, 1, 36)
     scrollingsprite(210, 160, 5, 2, 1, 36)
-    scrollingsprite(210, 180, 10, 2, 1, 38)
-    scrollingsprite(210, 240, 10, 2, 1, 38)
-    scrollingsprite(210, 260, 10, 2, 1, 38)
+    scrollingsprite(210, 180, 7, 2, 1, 38)
+    scrollingsprite(210, 240, 7, 2, 1, 38)
+    scrollingsprite(210, 260, 7, 2, 1, 38)
 
 
     camera((sin(shake+t())*shake)/2, (sin(shake+t()/2.1)*shake)/2)
diff --git a/bullets.lua b/bullets.lua
index 41ff210..5bcb91d 100644
--- a/bullets.lua
+++ b/bullets.lua
@@ -1,5 +1,3 @@
-bullets = {}
-
 function addbullet(x, y, velx, vely, evil, sprite)
     local bullet = {}
 
@@ -47,5 +45,4 @@ function addbullet(x, y, velx, vely, evil, sprite)
     end
 
     add(obj, bullet)
-    add(bullet, #obj)
 end
\ No newline at end of file
diff --git a/pico-bhell.p8 b/pico-bhell.p8
index 7ae7d14..bbb16ac 100644
--- a/pico-bhell.p8
+++ b/pico-bhell.p8
@@ -1,6 +1,8 @@
 pico-8 cartridge // http://www.pico-8.com
 version 34
 __lua__
+--wip by chris & ribbon!
+
 #include objects.lua
 #include particles.lua
 #include players.lua
@@ -114,22 +116,22 @@ bbbbbbbbbbbbbeeebebebbbe33eeee9a07bbbbbbbbbbbbbbb3000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000022200000000000002222220000000000000000000000000000000000000000000000000000000000000002220000000000000000000000
-02888888888882000222220000222200022222222000022000000000000000000000000000000000000000000000000000000022222000000000000000000000
-28888888888888202222220022222220222000022200202204444000000000000000000000000000000000000000000000000022222000000000000000000000
-88222244422228802202200222200222220222202220022244000400000040440000000000000000000000002222222200000022222000000000000000000000
-88222444222228802220022220002022220222220222222040440040044444400000000000000000000002222222222222200002220000000022222200000000
-88888888888888802222222200002222222022220022220044440400000440000000000000000000000222222222222222222000000000022222222222220000
-88202200022028800222222000000220022222220000000004400000000040000000000000222000022222222222222222222200000002222202000002222000
-22002800028002200022220000000000002222200000000000000000000000000000000002222200220022222222222222222220000222220222222222022200
-00002200022000000022220000000000002222222000022000000000000000000000000002200202202202222220000222222222002222222222222222202200
-00028888888200000222222000222200022222222200222200000000000000000000000002202202220202222202222022222222202222220000002202202200
-00288888888820002222022002222220222200022220202204440000000000000000000002220000222202222022202202200222220222000000000222202200
-04888222228884002220222022200222222022202222022244044000000000000000000000222222222022220022020202022022220200000000000202202200
-02882888882882002220220222000022222022220222222044404404000000000000000000000000000222220022022202202022220000000000002202202200
-48888888888888402222002220000022222202220022220004440440000000000000000000000000022222220022200000222022220000000000022022202200
-48828828288288400222222200200220022222220000000000000000000000000000000000022222222222220002222222220222220000000000220222202000
-48888888888888400022220000022200002222200000000000000000000000000000000000222222222222222000022222002222200000000002202222022000
+00000000000000000044400000000000004444440000000000000000000000000000000000000000000000000000000000000002220000000000000000000000
+02888888888882000444440000444400044444444000044000000000000000000000000000000000000000000000000000000022222000000000000000000000
+28888888888888204444440044444440444000044400404402222000000000000000000000000000000000000000000000000022222000000000000000000000
+88222244422228804404400444400444440444404440044422000200000040440000000000000000000000002222222200000022222000000000000000000000
+88222444222228804440044440004044440444440444444020220020044444400000000000000000000002222222222222200002220000000022222200000000
+88888888888888804444444400004444444044440044440022220200000440000000000000000000000222222222222222222000000000022222222222220000
+88202200022028800444444000000440044444440000000002200000000040000000000000222000022222222222222222222200000002222202000002222000
+22002800028002200044440000000000004444400000000000000000000000000000000002222200220022222222222222222220000222220222222222022200
+00002200022000000044440000000000004444444000044000000000000000000000000002200202202202222220000222222222002222222222222222202200
+00028888888200000444444000444400044444444400444400000000000000000000000002202202220202222202222022222222202222220000002202202200
+00288888888820004444044004444440444400044440404402220000000000000000000002220000222202222022202202200222220222000000000222202200
+04888222228884004440444044400444444044404444044422022000000000000000000000222222222022220022020202022022220200000000000202202200
+02882888882882004440440444000044444044440444444022202202000000000000000000000000000222220022022202202022220000000000002202202200
+48888888888888404444004440000044444404440044440002220220000000000000000000000000022222220022200000222022220000000000022022202200
+48828828288288400444444400200440044444440000000000000000000000000000000000022222222222220002222222220222220000000000220222202000
+48888888888888400044440000044400004444400000000000000000000000000000000000222222222222222000022222002222200000000002202222022000
 48282828282828400002888888882000000000000000000044404440000000080000000000000222222222222220000000022222020000000022222220220000
 48288888888828400028822422288200000000004840000048444840000000282000000002222022222002222222000000222220200000000220222202200000
 48282828282828400088888888888800000000484840000048888840000000888000000022222202220220222222222200000002000000202200222022020000