diff options
| author | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-18 15:57:14 -0800 |
|---|---|---|
| committer | RibbonCable <ambiguousmachine@gmail.com> | 2022-02-18 15:57:14 -0800 |
| commit | 4399396b397ce36c2c35eae5eb870627a36cf555 (patch) | |
| tree | 42f399a6d413d3d841e0dc7f101b8d52b3ffe6ea | |
| parent | ef48284d5dbda449ad74d1da2bfe9bf02557b785 (diff) | |
Small edit to pickups in exchange for tokens.
| -rw-r--r-- | enemies.lua | 2 | ||||
| -rw-r--r-- | pickups.lua | 7 | ||||
| -rw-r--r-- | pico-bhell.p8 | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/enemies.lua b/enemies.lua index 4636f7f..06a0c0b 100644 --- a/enemies.lua +++ b/enemies.lua @@ -29,7 +29,7 @@ function enemydie(enemy, sound, soundchannel, points, isboss) addpickup(enemy.x+rnd(enemy.w), enemy.y+rnd(enemy.h), "health") end if isboss then - addpickup(enemy.x+rnd(32), enemy.y+rnd(32), "powerup") + addpickup(enemy.x+rnd(32), enemy.y+rnd(32)) addpickup(enemy.x+rnd(32), enemy.y+rnd(32), "health") end if shake < 3 then diff --git a/pickups.lua b/pickups.lua index f4ad10b..5634c18 100644 --- a/pickups.lua +++ b/pickups.lua @@ -17,15 +17,14 @@ function addpickup(x, y, type) local pickup = {} x = x y = y - type = type or rnd({"health", "health", "fastshoot", "3shoot"}) - if type == "powerup" then type = rnd({"fastshoot", "3shoot"}) end + type = type or rnd({"fastshoot", "3shoot"}) function pickup.draw(pickup) sprite = 4 --had to move these checks into draw or they'd have incorrect sprites if type == "fastshoot" then sprite = 20 elseif type == "3shoot" then - sprite = 36 + sprite = 36 --health end spr(sprite, x, y) @@ -39,7 +38,7 @@ function addpickup(x, y, type) if type == "fastshoot" then color = 12 elseif type == "3shoot" then - color = 9 + color = 9 --health end addcircle(x, y, sin(i/8), cos(i/8), 2, 0.6, color) end diff --git a/pico-bhell.p8 b/pico-bhell.p8 index 197879b..3587d42 100644 --- a/pico-bhell.p8 +++ b/pico-bhell.p8 @@ -40,10 +40,10 @@ __gfx__ 9fcc1fc700000000000000000fccccf0577777750a9aa44000000000000000000000000000000000000000000000067776000000003333327ebbbe3000000000 6a994a97000000000000000004999940577777756a994a9700000000000000000000000000000000000000000000000000033000000330000000000000000000 0a9aa4006a99a997000000004977779477999a77000000000000000000000000000000000000000000633333300003eb9e9e9e9999e9e9e900ebbbe900000000 -04a999a00aa444a000499400977977797999a777000000000000000000000000000000000000000007bebbbbbe33bba0000330000003300003bbe3009033bbbe -00a44499049444990097790097799979799999a700000000000000000000000000000000000000007bbbebbbbbebbb930eeeeee00eeeeee07e3b300007e3b330 -00a4449904a9999a009779009799977977779a7700000000000000000000000000000000000000007bbbebbbbbeebb9003b3bb3003b3bb307e3b300007ebbe30 -04a999a00a9aa44000499400977797797779a77700000000000000000000000000000000000000007bbb3eeeee3eeb930033b3000033b30003bbe300903ebbbe +04a999a00aa444a000499400977977797999a777000000000000000000000000000000000000000007bebbbbbe33bba0000330000003300003bbe300033bbbe9 +00a44499049444990097790097799979799999a700000000000000000000000000000000000000007bbbebbbbbebbb930eeeeee00eeeeee07e3b30007e3b3300 +00a4449904a9999a009779009799977977779a7700000000000000000000000000000000000000007bbbebbbbbeebb9003b3bb3003b3bb307e3b30007ebbe300 +04a999a00a9aa44000499400977797797779a77700000000000000000000000000000000000000007bbb3eeeee3eeb930033b3000033b30003bbe30003ebbbe9 0a9aa4006a994a970000000049777794777a7777000000000000000000000000000000000000000007eebbbbbe33eea0000ee000000ee00000ebbbe900000000 6a994a9700000000000000000499994057777775000000000000000000000000000000000000000000633333300003eb00077000000770000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000007777e0ebee300000077000000770000000000000000000 |