aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRibbonCable <ambiguousmachine@gmail.com>2022-02-20 12:55:11 -0800
committerRibbonCable <ambiguousmachine@gmail.com>2022-02-20 12:55:11 -0800
commit4f4a5405a95c47b34e0250e6b0f143e8e5f8dc76 (patch)
tree9cfe9651c194db292621e712ee099984a9359aa5
parent23acc296abf209ccf2fa15e3641f266b02add71d (diff)
Lots of updates to the music player. Other than track titles and final songs, it's p much done. Also made some sprint non-flipped to save on tokens.
Diffstat
-rw-r--r--Sound Effects Index.txt23
-rw-r--r--background.lua41
-rw-r--r--bullets.lua2
-rw-r--r--enemies.lua26
-rw-r--r--musicplayer/background_music.lua41
-rw-r--r--musicplayer/draw_music.lua19
-rw-r--r--musicplayer/music.p8183
-rw-r--r--musicplayer/objects_music.lua70
-rw-r--r--musicplayer/ui_music.lua9
-rw-r--r--musicplayer/update_music.lua42
-rw-r--r--objects.lua7
-rw-r--r--pickups.lua25
-rw-r--r--pico-bhell.p8265
-rw-r--r--players.lua38
-rw-r--r--ui.lua11
-rw-r--r--update.lua18
-rw-r--r--waves.lua2
17 files changed, 451 insertions, 371 deletions
diff --git a/Sound Effects Index.txt b/Sound Effects Index.txt
index 746aded..f33f325 100644
--- a/Sound Effects Index.txt
+++ b/Sound Effects Index.txt
@@ -1,7 +1,10 @@
+--NOTES--
+Have portal kill as music to sound above all SFX (AND SAVE ON TOKENS)
+
CHANNELS
--------
0 Melody Track
-1 Bass Track / Player / Pickup
+1 Bass Track / Player / Pickup / Portal Thruster Kill
2 Short SFX - Bullets / Basic Enemy Hits/Kills / Bomb Charge
3 Long SFX - Tough Enemy/Bosses
@@ -10,8 +13,8 @@ SOUNDS
00 Intro Transition
01 Portal Shoot
02 Portal Thruster Kill
-03 Portal Kill
-04
+03 Portal Kill Channel 0
+04 Portal Kill Channel 1
05 Bomb Kill
06 Bomb Explode
07 Bomb Charge First Half
@@ -20,23 +23,19 @@ SOUNDS
10 Player Hit
11 Player Killed
12 Triple Shot
-13
+13 Powerup Get!
14 Rocket Shoot / Thruster Loop
15 Basic Enemy Shoot
16 Basic Enemy Hit
17 Basic Enemy Killed
18 Wall Crawl Shoot
-19 Ball Shooter
-20 Ball Shooter
+19 Ball Shooter Shoot
+20 Ball Shooter Kill
21 Boss Kill
-22
+22 Rewind Checkpoint
23 Laser Charge (1.5 Seconds)
24 Laser Loop
25 Laser Finished
-26
+26 Respawn
27 Light Respawn
-28 Respawn
-29 Rewind Checkpoint
-30 Powerup Get!
-31
.. MUSIC \ No newline at end of file
diff --git a/background.lua b/background.lua
index 0874d45..07d5d5f 100644
--- a/background.lua
+++ b/background.lua
@@ -24,9 +24,8 @@ function bgplanetmegasprite(x,y)
palt(0,false)
palt(13,true)
- spr(194,x+10,y+0,7,2)
- spr(201,x+10,y+16,7,2)
- spr(234,x+2,y+32,6,2)
+ spr(200,x,y,7,4)
+ spr(194,x-8,y+32,6,2)
palt()
end
@@ -41,9 +40,9 @@ function drawbg()
end
--galaxies
- spr(120, 20, 30, 1, 1)
- spr(104, 108, 40, 1, 1)
- spr(104, 42, 74, 1, 1, true, true)
+ spr(239, 20, 30, 1, 1)
+ spr(255, 108, 40, 1, 1)
+ spr(255, 42, 74, 1, 1, true, true)
--ringed planet
bgplanetmegasprite(150-(gt)%300,50)
@@ -51,22 +50,22 @@ function drawbg()
--clouds
scrollingcircles(-9, 24, 22, 22, 2)
--small clouds
- scrollingsprite(88, 60, 10, 1, 1, 28)
- scrollingsprite(88, 120, 10, 1, 1, 28)
- scrollingsprite(88, 130, 12, 1, 1, 29)
- scrollingsprite(88, 160, 15, 1, 1, 30)--
- scrollingsprite(72, 145, 15, 1, 1, 30)--
- scrollingsprite(72, 20, 10, 1, 1, 28)
- scrollingsprite(72, 100, 10, 1, 1, 28)
- scrollingsprite(72, 170, 15, 1, 1, 30)
+ scrollingsprite(207, 60, 10, 1, 1, 28)
+ scrollingsprite(207, 120, 10, 1, 1, 28)
+ scrollingsprite(207, 130, 12, 1, 1, 29)
+ scrollingsprite(207, 160, 15, 1, 1, 30)--
+ scrollingsprite(223, 145, 15, 1, 1, 30)--
+ scrollingsprite(223, 20, 10, 1, 1, 28)
+ scrollingsprite(223, 100, 10, 1, 1, 28)
+ scrollingsprite(223, 170, 15, 1, 1, 30)
--large clouds
- scrollingsprite(248, 40, 5, 2, 1, 35)
- scrollingsprite(248, 80, 5, 2, 1, 35)
- scrollingsprite(248, 180, 9, 2, 1, 38)
- scrollingsprite(248, 260, 9, 2, 1, 38)--
- scrollingsprite(232, 120, 7, 2, 1, 36)--
- scrollingsprite(232, 160, 7, 2, 1, 36)
- scrollingsprite(232, 240, 9, 2, 1, 38)
+ scrollingsprite(35, 80, 5, 2, 1, 35)
+ scrollingsprite(35, 180, 9, 2, 1, 38)
+ scrollingsprite(35, 260, 9, 2, 1, 38)--
+ scrollingsprite(51, 40, 5, 2, 1, 35)
+ scrollingsprite(51, 120, 7, 2, 1, 36)--
+ scrollingsprite(51, 160, 7, 2, 1, 36)
+ scrollingsprite(51, 240, 9, 2, 1, 38)
--fg clouds
scrollingcircles(-11, 40, 25, 20, 2)
scrollingcircles(-12, 40, 25, 20, 4)
diff --git a/bullets.lua b/bullets.lua
index c5cf2c7..bd91e0f 100644
--- a/bullets.lua
+++ b/bullets.lua
@@ -129,7 +129,7 @@ function addmissile(x, y, target) --basic small weak enemy
function enemy.draw()
if enemy.inv < 0 or ceil(enemy.inv*10%2) == 1 then
- spr(42, enemy.x, enemy.y, 2, 1)
+ spr(12, enemy.x, enemy.y, 2, 1)
end
end
diff --git a/enemies.lua b/enemies.lua
index a5b8373..0047647 100644
--- a/enemies.lua
+++ b/enemies.lua
@@ -34,7 +34,7 @@ function enemydie(enemy, sound, soundchannel, points, isboss, drop)
addcircle(x+rnd(enemy.w), y+rnd(enemy.h), rnd(4)-2, -rnd(2)-1, 1, 2, rnd({3, 11, 9}), -0.1)
end
if rnd(100) < sqrt(enemy.w*enemy.h)/1.5 and not drop then --you get a better chance of a randomly dropped health from bigger enemies
- addpickup(x+rnd(enemy.w), y+rnd(enemy.h), "health")
+ addpickup(x+rnd(enemy.w), y+rnd(enemy.h), 48)
end
if isboss then
playsong(-1, 3000)
@@ -43,7 +43,7 @@ function enemydie(enemy, sound, soundchannel, points, isboss, drop)
killallenemies()
if not gameover and not drop then
addpickup(x+rnd(32), y+rnd(32))
- addpickup(x+rnd(32), y+rnd(32), "health")
+ addpickup(x+rnd(32), y+rnd(32), 48)
end
end
if shake < 3 then
@@ -189,13 +189,13 @@ function addballshooter(x, y, speed)
function enemy.draw()
if enemy.inv < 0 or flashtime then
- local sprite = 11
+ local sprite = 9
if enemy.health < 4 then
damagesmoke(enemy)
- sprite = 27
+ sprite = 41
end
- spr(sprite, enemy.x, enemy.y, 3, 1, false, true)
- spr(sprite, enemy.x, enemy.y+8, 3, 1)
+ -- spr(sprite, enemy.x, enemy.y, 3, 1, false, true)
+ spr(sprite, enemy.x, enemy.y, 3, 2) --non-flipped image for token's sake
end
end
@@ -238,7 +238,7 @@ function addtargetingenemy(x, y, speed)
damagesmoke(enemy)
end
if enemy.inv < 0 or flashtime then
- spr(58, enemy.x, enemy.y, 2, 1)
+ spr(28, enemy.x, enemy.y, 2, 1)
end
end
@@ -284,13 +284,13 @@ function addlasershooter(x, y, points, speed, stay, isboss)
function enemy:draw()
if enemy.inv < 0 or flashtime then
- local sprite = 64
+ local sprite = 5
if enemy.health < 10 then
damagesmoke(enemy)
- sprite = 96
+ sprite = 65
end
- spr(sprite,enemy.x+0,enemy.y,4,2)
- spr(sprite,enemy.x+0,enemy.y+16,4,2,false,true)
+ spr(sprite,enemy.x,enemy.y,4,2) --non-flipped sprite to reduce tokens
+ -- spr(sprite,enemy.x+0,enemy.y+16,4,2,false,true)
end
end
@@ -517,9 +517,9 @@ function addmissileboss(x, y) --boss that shoots missiles!!!
}
function enemy.draw()
- local sprite = 68
+ local sprite = 69
if enemy.health < 11 then
- sprite = 100
+ sprite = 101
damagesmoke(enemy)
end
if enemy.inv < 0 or flashtime then
diff --git a/musicplayer/background_music.lua b/musicplayer/background_music.lua
index e8d6f5a..dbf2df6 100644
--- a/musicplayer/background_music.lua
+++ b/musicplayer/background_music.lua
@@ -18,9 +18,8 @@ function bgplanetmegasprite(x,y)
palt(0,false)
palt(13,true)
- spr(194,x+10,y+0,7,2)
- spr(201,x+10,y+16,7,2)
- spr(234,x+2,y+32,6,2)
+ spr(200,x,y,7,4)
+ spr(194,x-8,y+32,6,2)
palt()
end
@@ -33,9 +32,9 @@ function drawbg()
end
--galaxies
- spr(120, 20, 30, 1, 1)
- spr(104, 108, 40, 1, 1)
- spr(104, 42, 74, 1, 1, true, true)
+ spr(239, 20, 30, 1, 1)
+ spr(255, 108, 40, 1, 1)
+ spr(255, 42, 74, 1, 1, true, true)
--ringed planet
bgplanetmegasprite(150-(gt*10)%300,50)
@@ -43,22 +42,22 @@ function drawbg()
--clouds
scrollingcircles(-9, 24, 22, 22, 2)
--small clouds
- scrollingsprite(88, 60, 10, 1, 1, 28)
- scrollingsprite(88, 120, 10, 1, 1, 28)
- scrollingsprite(88, 130, 12, 1, 1, 29)
- scrollingsprite(88, 160, 15, 1, 1, 30)--
- scrollingsprite(72, 145, 15, 1, 1, 30)--
- scrollingsprite(72, 20, 10, 1, 1, 28)
- scrollingsprite(72, 100, 10, 1, 1, 28)
- scrollingsprite(72, 170, 15, 1, 1, 30)
+ scrollingsprite(207, 60, 10, 1, 1, 28)
+ scrollingsprite(207, 120, 10, 1, 1, 28)
+ scrollingsprite(207, 130, 12, 1, 1, 29)
+ scrollingsprite(207, 160, 15, 1, 1, 30)--
+ scrollingsprite(223, 145, 15, 1, 1, 30)--
+ scrollingsprite(223, 20, 10, 1, 1, 28)
+ scrollingsprite(223, 100, 10, 1, 1, 28)
+ scrollingsprite(223, 170, 15, 1, 1, 30)
--large clouds
- scrollingsprite(248, 40, 5, 2, 1, 35)
- scrollingsprite(248, 80, 5, 2, 1, 35)
- scrollingsprite(248, 180, 9, 2, 1, 38)
- scrollingsprite(248, 260, 9, 2, 1, 38)--
- scrollingsprite(232, 120, 7, 2, 1, 36)--
- scrollingsprite(232, 160, 7, 2, 1, 36)
- scrollingsprite(232, 240, 9, 2, 1, 38)
+ scrollingsprite(35, 80, 5, 2, 1, 35)
+ scrollingsprite(35, 180, 9, 2, 1, 38)
+ scrollingsprite(35, 260, 9, 2, 1, 38)--
+ scrollingsprite(51, 40, 5, 2, 1, 35)
+ scrollingsprite(51, 120, 7, 2, 1, 36)--
+ scrollingsprite(51, 160, 7, 2, 1, 36)
+ scrollingsprite(51, 240, 9, 2, 1, 38)
--fg clouds
scrollingcircles(-11, 40, 25, 20, 2)
scrollingcircles(-12, 40, 25, 20, 4)
diff --git a/musicplayer/draw_music.lua b/musicplayer/draw_music.lua
index 118d461..36d5328 100644
--- a/musicplayer/draw_music.lua
+++ b/musicplayer/draw_music.lua
@@ -4,8 +4,6 @@ pal({1,2,131,141,5,6,7,136,9,137,139,12,133,3,140,130}, 1) --don't ask me why, b
drawbg()
-drawobjs()
-
menushipscroll += ft
for i = 1, 3, 1 do
@@ -17,13 +15,16 @@ if t() < 1 then
else
drawlogo(24,26)
end
+credits(40,116)
---main screen items
-mainmenutext(15,74)
-credits(10,108)
+if not hideui then
+ --main screen items
+ mainmenutext(15,74)
---intro acid transtition
-acidcounter+=ft
-acidtransition()
+ --intro acid transtition
+ acidcounter+=ft
+ acidtransition()
+ drawobjs() --only used for acid trans here
+end
--- print(tracknumber,0,0) \ No newline at end of file
+-- print(autoplay,0,0,7) \ No newline at end of file
diff --git a/musicplayer/music.p8 b/musicplayer/music.p8
index 880bf46..73dd0c0 100644
--- a/musicplayer/music.p8
+++ b/musicplayer/music.p8
@@ -2,9 +2,10 @@ pico-8 cartridge // http://www.pico-8.com
version 35
__lua__
--▶ toxic invaders soundtrack ◀
---▶ WIP 1029chris ◀
+--▶ WIP 1029chris ◀
--- 0-31 SLOTS ARE FOR SFX
+-- 0-27 SLOTS RESERVED FOR SFX
+-- SPRITEWORK BY RIBBONCABLE
#include objects_music.lua
#include particles_music.lua
@@ -35,54 +36,54 @@ __gfx__
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003eb900000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ebea00000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebbbe3000000000
+00000000000000000000000000444000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000044444000044440000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
+000000000000000000000000444444004444444000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
+00000000000000000000000044044004444004440000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
+00000000000000000000000044400444400040440000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
+000000000000000000000000444444440000444400000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
+000000000000000000000000044444400000044000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
+00000000000000000000000000444400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000444444400004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000004444444440044440000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
+00000000000000000000000044440004444040440000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
+000000000000000000000000444044404444044400000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
+000000000000000000000000444044440444444000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
+00000000000000000000000044440444004444000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
+00000000000000000000000004444444000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
+00000000000000000000000000444440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007e3b300000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003bbe30000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ebbbe900000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3bbe000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ebe33e900000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033bb3000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222200000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002200020000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002022002000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002222020000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002202200000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000002220220200000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000222022000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000044440000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000440004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004440440400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000404400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000404400000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004004440000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044044000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000004044440400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000440400400000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -115,38 +116,38 @@ __gfx__
0000000000000000000000000000000000000000000000000000000000000000dfcc060d28228222bdd9ad220000003b303b33b30aa999990aaaaaaa3b3b3333
00000000000000000000000000000000000000000000000000000000000000002d0000d288822282ea9999220000003e303eeee300aa999900aaaaaa3e3eeee3
00000000000000000000000000000000000000000000000000000000000000002220d222282222222ea999920000003330333333000aa99a000aaaa033333333
-0000000000000000ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00002222222222222200000000222222222dddddd2222222d222ddd
-0288888888888200ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd22220222220022222220000002222222222ddddd2222222d222dddd
-2888888888888820ddddddddddddddddddddddddddddddddddddddddddddddddd22222dd222222022202202222222222222222222222dddd2222222d222ddddd
-8822224442222880ddddddddddddddd022222222dddddddddddddddddddddd022222222d2220022022202022222222222222222222220dd2222222d222dddddd
-8822244422222880ddddddddddddd22222222222222ddddddddddddddddd0222222222222202002200222022222222222222222222200d2222222d222ddddddd
-8888888888888880dddddddddd0222222222222222222dddddddddddd00222222222222222220002222202222222222222222222220002222222d222dddddddd
-8820222222202880dd222dddd222222222222222222222ddddddddd002222220222222220220200000002222222222222222222220002222222d222ddddddddd
-2200282028200220d22222d022002222222222222222222ddddddd002220dddd02222222d00022000002222222222222222222220002222222d222dddddddddd
-0000222022200000d2200202202202222220000222222222dddd00220ddddddd02222222d0022222222222222222222222222220002222222d222ddddddddddd
-0002888888820000d22022022202022222022220222222222d0020dddddddddd22222222dd02222222222222222222222222220022222222d222dddddddddddd
-0028888888882000d22200002222022220222022022002222200ddddddddddd022222222dd0022222222222222222222222220022222222d222ddddddddddddd
-0288822222888200d0222222222022220022020202022022222dddddddddddd22222d222dd002222222222222222222222200022222222d222dddddddddddddd
-0288288888288200dd000000000222220022022202202022222ddddddddddd222222222dddd00222222222222222222222000222222202222ddddddddddddddd
-2888888888888820dd0000000222222200222000002220222220ddddddddd222222d222ddd00002222222222222222220002222222202222dddddddddddddddd
-2882882828828820d00222222222222200022222222202222222dddddddd222222d222ddd00000022222222222222200022222222202222ddddddddddddddddd
-2888888888888820d02222222222222220000222220022222222ddddddd2222222222ddd000dd00022222222222200022222222220222ddddddddddddddddddd
-28282848282828200002888888882000000000000000000022202220000080000044400000000000ddddddd000dddd000022222222000022222222202222dddd
-28288888888828200028822422288200000000002820000028222820000282000444440000444400dddddd000dddddd0000022200000222222222022222ddddd
-28284848282828200088888888888800000000282820000028888820000888004444440044444440ddddd022ddddddddd000000000222222222202222ddddddd
-28288888888828200022200000022200000000282828200022828222008888204404400444400444dddd022ddddddddddd0000002222222222022222dddddddd
-28284828282828200028200000028200000028282828200022828282082888804440044440004044ddd0222dddddddddddd0002222222222002222dddddddddd
-28288888888828200028288888828200000028282828200028888882008888824444444400004444dd0222dddddddddddddd2222222222002222dddddddddddd
-28282828284828200022888888882200000028282828200022828222088882880444444000000440d0222ddddddddddddd22222222220022222ddddddddddddd
-28288888888828200028282848488200000028282828200002828200288288020044440000000000d2222ddddddddddd22222222220022222ddddddddddddddd
-282228284822282000288888888882000000282828282000028282000028888000444444400004400222dddddddd2222222222222d22222ddddddddddddddddd
-282888888888282002882244422288200000028828820000028282000888888804444444440044442222dddddd2222222222222d22222ddddddddddddddddddd
-2828282828282820028824442222882000000028282000000282820082808828444400044440404422222222222222222222dd2222dddddddddddddddddddddd
-282888222888282002888888888888200000002882000000028282000088888044404440444404442222222222222222dddd2222dddddddddddddddddddddddd
-28282822282828200282888888282820000000282000000002828200082088204440444404444440222222222222ddd222222ddddddddddddddddddddddddddd
-2888882228888820028888282888882000000028200000000282820000022200444404440044440022222222dd222222222ddddddddddddddddddddddddddddd
-28882822282888200282882228282820000200282000200002828202000082000444444400000000d222222222222222dddddddddddddddddddddddddddddddd
-28888822288888222288882228888822020220282220202022828222000082000044444000000000dd22222222222ddddddddddddddddddddddddddddddddddd
+0000000000000000ddddddd000dddd000022222222000022222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+0288888888888200dddddd000dddddd0000022200000222222222022222ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+2888888888888820ddddd022ddddddddd000000000222222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddd22222dd02222000
+8822224442222880dddd022ddddddddddd0000002222222222022222ddddddddddddddddddddddd022222222dddddddddddddddddddddd022222222d22000200
+8822244422222880ddd0222dddddddddddd0002222222222002222ddddddddddddddddddddddd22222222222222ddddddddddddddddd02222222222220220020
+8888888888888880dd0222dddddddddddddd2222222222002222dddddddddddddddddddddd0222222222222222222dddddddddddd00222222222222222220200
+8820222222202880d0222ddddddddddddd22222222220022222ddddddddddddddd222dddd222222222222222222222ddddddddd0022222202222222202200000
+2200282028200220d2222ddddddddddd22222222220022222dddddddddddddddd22222d022002222222222222222222ddddddd002220dddd0222222200000000
+00002220222000000222dddddddd2222222222222d22222dddddddddddddddddd2200202202202222220000222222222dddd00220ddddddd0222222200000000
+00028888888200002222dddddd2222222222222d22222dddddddddddddddddddd22022022202022222022220222222222d0020dddddddddd2222222200000000
+002888888888200022222222222222222222dd2222ddddddddddddddddddddddd22200002222022220222022022002222200ddddddddddd02222222202220000
+02888222228882002222222222222222dddd2222ddddddddddddddddddddddddd0222222222022220022020202022022222dddddddddddd22222d22222022000
+0288288888288200222222222222ddd222222ddddddddddddddddddddddddddddd000000000222220022022202202022222ddddddddddd222222222d22202202
+288888888888882022222222dd222222222ddddddddddddddddddddddddddddddd0000000222222200222000002220222220ddddddddd222222d222d02220220
+2882882828828820d222222222222222ddddddddddddddddddddddddddddddddd00222222222222200022222222202222222dddddddd222222d222dd00000000
+2888888888888820dd22222222222dddddddddddddddddddddddddddddddddddd02222222222222220000222220022222222ddddddd2222222222ddd00000000
+2828284828282820000288888888200000000000000000002220222000008000d00002222222222222200000000222222222dddddd2222222d222ddd00444400
+2828888888882820002882242228820000000000282000002822282000028200d22220222220022222220000002222222222ddddd2222222d222dddd04400040
+2828484828282820008888888888880000000028282000002888882000088800222222022202202222222222222222222222dddd2222222d222ddddd40444004
+28288888888828200022200000022200000000282828200022828222008888202220022022202022222222222222222222220dd2222222d222dddddd44404404
+28284828282828200028200000028200000028282828200022828282082888802202002200222022222222222222222222200d2222222d222ddddddd04044004
+282888888888282000282888888282000000282828282000288888820088888222220002222202222222222222222222220002222222d222dddddddd00000040
+28282828284828200022888888882200000028282828200022828222088882880220200000002222222222222222222220002222222d222ddddddddd40000000
+2828888888882820002828284848820000002828282820000282820028828802d00022000002222222222222222222220002222222d222dddddddddd04044000
+2822282848222820002888888888820000002828282820000282820000288880d0022222222222222222222222222220002222222d222ddddddddddd00404000
+2828888888882820028822444222882000000288288200000282820008888888dd02222222222222222222222222220022222222d222dddddddddddd00000000
+2828282828282820028824442222882000000028282000000282820082808828dd0022222222222222222222222220022222222d222ddddddddddddd40044400
+2828882228882820028888888888882000000028820000000282820000888880dd002222222222222222222222200022222222d222dddddddddddddd40440440
+2828282228282820028288888828282000000028200000000282820008208820ddd00222222222222222222222000222222202222ddddddddddddddd40444404
+2888882228888820028888282888882000000028200000000282820000022200dd00002222222222222222220002222222202222dddddddddddddddd04404004
+2888282228288820028288222828282000020028200020000282820200008200d00000022222222222222200022222222202222ddddddddddddddddd00000040
+2888882228888822228888222888882202022028222020202282822200008200000dd00022222222222200022222222220222ddddddddddddddddddd00404000
__label__
iiiiittttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
iiiitttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
@@ -310,7 +311,7 @@ a008000022614286102d6103061033610356103661037610376103561034610326102e6102b61028
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-d01c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d11c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
490e00101000334615346253461510073346153462534615100033461534625346151007334615346253461500000000000000000000000000000000000000000000000000000000000000000000000000000000
110e00080030207755077550775500700077550775507755000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
09380000221212212229121291222912500100001000f1021b1211b1222812128122281250010000100281021d1211d1222112121122211250010000100211021f1211f122221212212222125221002210000000
@@ -325,11 +326,18 @@ d10e00201f42222422264222e4021f42222422264222e4021f42222422264222e4021f4222242226
911c02042b311133212b3211331100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
490e000021600156002160021600216003960039600396002162515600216002160021625396003960039600156252160521625240002d625396053962500000156251560521625216052d625396253962539625
5d0e0020100730715407252071521c675071440c1420a14210073071540a152091521c675071540c3520e152160730d1540d2510d253226750d154121521015216073160731607316073226750d3541946425474
-5d0e0020100730715407252071521c675071440c1420a14210073071540a152091521c675071540c3520e152100730715407251072531c675071540c1520a15210073071540a152091521c675071540035202452
-5d0e0020100730725407252072521c675073440c4420a34210073073540a452093521c675073540c4520e352100730725407251072531c675073540c4520a35210073073540a452093521c675073540045202352
-5d0e0020100730725407252072521c675073440c4420a34210073073540a452093521c675073540c4520e352160730d2540d2510d253226750d3541245210352160730d354104520f352226750d3540645208352
-5d0e0020120730925409252092521e675093440e4420c34212073093540c4520b3521e675093540e45210352180730f2540f2510f253246750f3541445212352180730f3541245211352246750f354084520a352
+5d0e0020100730713407242071321c675071340c1320a13210073071340a132091321c675071340c3420e132100730713407251072531c675071340c1320a13210073071340a132091321c675071340035202452
+5d0e0020100730727407252072521c675073440c4420a34210073073440a442093421c675073440c4420e342100730725407251072531c675073440c4420a34210073073440a442093421c675073440044202342
+5d0e0020100730725407252072521c675073440c4420a34210073073440a442093421c675073440c4420e342160730d2440d2410d243226750d3441244210342160730d344104420f342226750d3440644208342
+5d0e0020120730925409252092521e675093440e4420c34212073093440c4420b3421e675093440e44210342180730f2540f2510f253246750f3441444212342180730f3441244211342246750f344084420a342
d10e002021422244222842230402214222442228422304022142224422284223040221422244222842230402274222a4222e4222a402274222a4222e4222a402274222a4222e4222a402274222a4222e42236402
+5d0e0020100730724413242072421c6751f2442b2421f24210073133441f340093421c67513344184420e342100730d244192410d243226750d2441e44210342100730d344104420f34222675193442b2422b243
+490e0010100633461534625346151e665346151006334615100633461534625346151e66534615346253461500000000000000000000000000000000000000000000000000000000000000000000000000000000
+5d0e0020120731524421242152421e67515244212422124312073093440c4420b3421e6751e6751e6751e675180730f2441b2410f243246750f2442c2421e242180730f3441244211342246750f3442044222342
+5d1c0008100530723413232072321c655072341323207242100001330007300093001c60013300184000e300100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+5d1c1000100000723413232072321c6000723413232072321000007234132321f2321c600072341f23213232100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+5d381000072440724213242072421c675072441c6751f242072440724213242072421c675072001c6001f200100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
+2138000022100221002910029100291002910029100291001b1001b10028100281002810004100101001c1001d1001d1002110021100211001d10021100291001f1001f100221002210022100221002210000000
__music__
00 20616263
00 20256263
@@ -347,14 +355,19 @@ __music__
00 2d2e6161
01 21316161
02 21326161
-00 41424344
-00 41424344
-00 41424344
-00 41424344
-00 41424344
-00 5b5c4344
-01 5b5c5844
-00 5b5c4044
-00 5a5c4344
-02 5a5c4344
+01 37756161
+01 37756161
+00 37356161
+01 21316161
+00 21326161
+00 35316161
+00 35326161
+00 35396161
+00 21346161
+00 21366161
+00 35346161
+00 35366161
+02 35236161
+00 35346161
+00 35366161
diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua
index 2760b05..ea3705b 100644
--- a/musicplayer/objects_music.lua
+++ b/musicplayer/objects_music.lua
@@ -4,43 +4,67 @@ ft = 1/60 --frametime
scrollspeed = 0
menushipscroll = 0
acidcounter = 0
+hideui = false
+autoplay = false
+autoplaytimer = 90
tracknumber = 0
-tracktext = ""
+currentsong = -1
+fadeouttimer = 1
+tracktitleposition = -200
+newtracktitleposition = 0
cartdata("toxicinvaderssoundtrack_by1029chris")
+function playsong(song, fade)
+ fade = fade or 0
+ if song ~= currentsong then
+ music(song, fade)
+ currentsong = song
+ end
+end
+
+function fadeoutsong()
+ fadeouttimer = 1
+ playsong(-1,1000) --fades out currentsong
+end
+
+function selectmusic()
+ if tracknumber == -1 then
+ tracknumber = 0
+ elseif tracknumber == 0 then
+ playsong(-1,0)
+ elseif tracknumber == 1 then
+ playsong(0)
+ elseif tracknumber == 2 then
+ playsong(8)
+ elseif tracknumber == 3 then
+ playsong(17)
+ elseif tracknumber == 4 then
+ playsong(-1,0)
+ end
+end
-function playmusic()
+function updatetracktitlepos()
if tracknumber == 0 then
- tracktext = " mENU"
- music(-1,0,3)
- elseif tracknumber == 1 then
- tracktext = "fORWARD"
- music(2,0,3)
- elseif tracknumber == 2 then
- tracktext = " bOSSY"
- music(8, 0, 3)
- elseif tracknumber == 3 then
- tracktext = " pORTAL"
- music(-1,0,3)
- end
+ newtracktitleposition = -16
+ elseif tracknumber == 1 then
+ newtracktitleposition = 145
+ elseif tracknumber == 2 then
+ newtracktitleposition = 313
+ elseif tracknumber == 3 then
+ newtracktitleposition = 493
+ elseif tracknumber == 4 then
+ newtracktitleposition = 685
end
+end
function updateobjs()
- foreach(players, function(obj) obj:update() end)
- foreach(enemies, function(obj) obj:update() end)
foreach(obj, function(obj) obj:update() end)
- despawnallbullets = false
end
function drawobjs()
foreach(obj, function(obj) obj:draw() end)
- foreach(enemies, function(obj) obj:draw() end)
- clip() --for the final boss
- foreach(players, function(obj) obj:draw() end)
end
function lerp(start, destination, amount)
return start + amount * (destination - start);
-end
-
-playmusic() \ No newline at end of file
+end \ No newline at end of file
diff --git a/musicplayer/ui_music.lua b/musicplayer/ui_music.lua
index ce709cb..7252881 100644
--- a/musicplayer/ui_music.lua
+++ b/musicplayer/ui_music.lua
@@ -54,7 +54,7 @@ function mainmenutext(x,y,currentlyplaying)
printdropshadow("(\139) track selection (\145)\n",x,y,9,2)
poke(0x5f58, 0x9 | 0x4) --makes score BIG
- printdropshadow(tracktext,x+24+circletimex,y+18+circletimey,11,3)
+ printdropshadow("mENU mUSE bATTLE bASS bOSSY bEATS fISSURE fINALE vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3)
poke(0x5f58)
end
@@ -67,9 +67,9 @@ function credits(x,y)
palt(2,true)
palt(0,false)
- spr(186,x+30,y+7+sintimecredits,1,1,timemodcredits) --duck
+ spr(186,x,y+sintimecredits,1,1,timemodcredits) --duck
palt()
- printdropshadow("1029chris",x+42,y+9,9,2)
+ printdropshadow("1029chris",x+11,y+2,9,2)
end
--intro/ending acid effect
@@ -86,4 +86,5 @@ end
--sfx for the intro transition
sfx(0,3,3)
-menuitem(1, "(❎ ⁙ 🅾️) to end", function() music(-1,3000,3) end) \ No newline at end of file
+menuitem(1, "(\152) hide ui", function() hideui = not hideui end)
+menuitem(3, "(❎ ⁙ 🅾️) to end", function() music(-1,3000,3) end) \ No newline at end of file
diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua
index e52c663..f0987ae 100644
--- a/musicplayer/update_music.lua
+++ b/musicplayer/update_music.lua
@@ -4,10 +4,46 @@ circletimex = sin(t())*3 -- for elements that move in a circle (respawn timer)
circletimey = cos(t())*3
gt += scrollspeed + 1/600
+fadeouttimer -= ft
updateobjs() --update all objects
-if btnp(0) then tracknumber-=1 playmusic() elseif btnp(1) then tracknumber+=1 playmusic() end
-if btnp(4) and btnp(5) then music(-1,3000,3) end
+if tracknumber < 0 then
+ tracknumber = 4
+elseif tracknumber > 4 then
+ tracknumber = 0
+end
-if tracknumber < 0 then tracknumber = 0 elseif tracknumber > 3 then tracknumber = 3 end \ No newline at end of file
+if btnp(0) then
+ tracknumber-=1
+ updatetracktitlepos()
+ fadeoutsong()
+elseif btnp(1) then
+ tracknumber+=1
+ updatetracktitlepos()
+ fadeoutsong()
+end
+
+if fadeouttimer <= 0 then
+ fadeouttimer = 0
+ selectmusic()
+ updatetracktitlepos()
+end
+
+if autoplay then
+ autoplaytimer -= ft
+ if autoplaytimer <= 0 then
+ autoplaytimer = 90
+ tracknumber+=1
+ fadeoutsong()
+ end
+ autoplaymenutext = "(♪) autoplay"
+else
+ autoplaymenutext = "(◆) autoplay"
+end
+menuitem(2, autoplaymenutext, function() autoplay = not autoplay end)
+
+
+if btnp(4) and btnp(5) then music(-1,3000) end
+
+tracktitleposition = lerp(tracktitleposition,newtracktitleposition,.03) \ No newline at end of file
diff --git a/objects.lua b/objects.lua
index e216b46..313e59e 100644
--- a/objects.lua
+++ b/objects.lua
@@ -1,4 +1,5 @@
obj = {}
+doshake = true
gt = 0 -- game time, but not actually, this is only used by the background for scrolling.
ft = 1/60 --frametime
scrollspeed = 0
@@ -42,7 +43,11 @@ end
function playsong(song, fade)
fade = fade or 0
if song ~= currentsong then
- music(song, fade, 3)
+ music(song, fade)
currentsong = song
end
+end
+
+function addplayer1() --reduces tokens since called once per gamemmode
+ addplayer(18, 60, 16, 17, 18, 3)
end \ No newline at end of file
diff --git a/pickups.lua b/pickups.lua
index 40d1b75..b913e3d 100644
--- a/pickups.lua
+++ b/pickups.lua
@@ -14,18 +14,12 @@
-- add(obj, randompickups)
function addpickup(x, y, type)
+ --if type is "48," then health. otherwise it'll be a rnd powerup
local pickup = {}
- --x,y = x,y
- type = type or rnd({"fastshoot", "3shoot"})
+ type = type or rnd({49, 50}) --48 = health / 49 = fastshoot / 50 = 3shoot
+ local sprite = type
- function pickup.draw(pickup)
- local sprite = 4 --health
- if type == "fastshoot" then
- sprite = 20
- elseif type == "3shoot" then
- sprite = 36
- end
-
+ function pickup.draw()
spr(sprite, x, y)
end
@@ -38,10 +32,10 @@ function addpickup(x, y, type)
function pickup:affect(player)
local pickupcolor = 8 --health
- if type == "fastshoot" then
+ if type == 49 then --fastshoot
player.shootspeed = 0.17
pickupcolor = 12
- elseif type == "3shoot" then
+ elseif type == 50 then --3shoot
player.shoot3 = true
player.shootspeed = 0.4
pickupcolor = 9
@@ -52,10 +46,10 @@ function addpickup(x, y, type)
addcircle(x, y, sin(i/8), cos(i/8), 2, 0.6, pickupcolor)
end
currentscore+=10 --10 points
- sfx(30, 1)
+ sfx(13, 1)
end
- function pickup.update(pickup)
+ function pickup.update()
x -= 0.3
y += sin(time()/2)*0.2
foreach(players, pickup.collide)
@@ -67,4 +61,5 @@ function addpickup(x, y, type)
add(obj, pickup)
end
- --addpickup(120, 60) \ No newline at end of file
+-- addpickup(128, 60, 48)
+-- addpickup(128, 70) \ No newline at end of file
diff --git a/pico-bhell.p8 b/pico-bhell.p8
index 441aa09..d425957 100644
--- a/pico-bhell.p8
+++ b/pico-bhell.p8
@@ -22,134 +22,134 @@ function _draw()
#include draw.lua
end
__gfx__
-48888840000000000000000003bbbb30577777759fccfcc700000000000000000000000000000000000000007eb3bb3bebebeb3eeee3e3300000000000000000
-8a98a980cccccccc000000003b7777b3777887770ff111f000000000000000000000000000000000000000007ebebbe3bebebeb3333e330073ee330000000000
-89889880eeeeeeee003bb300b77b777b7778877701f111cc000000000000000000000000000000000000000063bb3bbe333333333333333a0e33ebe973bbbe00
-8988a9807777777700b77b00b77bbb7b7888888701fccccf000000000000000000000000000000000000000007ebe3bbbbbee3e3e3bbbb39b3bbbbe9b3bbe33a
-48888840eeeeeeee00b77b00b7bbb77b722882270fcff1f00000000000000000000000000000000000000000063ebbe3333333b3e3bbbb39b3bbe330b3bbbbe9
-00000000cccccccc003bb300b777b77b777887779fcc1fc700000000000000000000000000000000000000000073ebbbbbbe33b3b3bebb39b3bbbbe90e33ebe9
-0000000000000000000000003b7777b377722777000000000000000000000000000000000000000000000000000673eeee30003333eeee3a0e33ebe973ee3300
-00000000000000000000000003bbbb305777777500000000000000000000000000000000000000000000000000000677760000000033333a73ee330000000000
-9fcc1fc700000000000000000fccccf05777777500000000000000000000000000000000000000000000000073e3eb3e3b3e3b3bebe3e3307ebbbe3000000000
-0fcff1009fccfcc700000000fc7777cf7c77c77700000000000000000000000000000000000000000000000073e3ee33b3e3b3e3333e33000003ebea7eb33e30
-01fcccf00ff111f000fccf00c77c777c7cc7cc7700000000000000000000000000000000000000000000000063eb3be3333333333333333200003eb9003bb3ea
-00f111cc01f111cc00c77c00c77ccc7c7cccccc76a99a9970000000000000000000000000000000000000000073e33ebebebe333e3eeee3a003bb3b0003bb3b9
-00f111cc01fccccf00c77c00c7ccc77c7ccfccf70aa444a000000000000000000000000000000000000000000633eb33333333b3b3bebe3a003bb3b000003eb9
-01fcccf00fcff1f000fccf00c777c77c7cf7cf7704944499000000000000000000000000000000000000000000733eebebee33e3e3e3ee3a00003eb90003ebea
-0fcff1009fcc1fc700000000fc7777cf7f77f77704a9999a000000000000000000000000000000000000000000067333333000333333333a0003ebea7ebbbe30
-9fcc1fc700000000000000000fccccf0577777750a9aa44000000000000000000000000000000000000000000000067776000000003333327ebbbe3000000000
-6a994a97000000000000000004999940577777756a994a9700000000000000000000000000000000000000000000000000033000000330000000000000000000
-0a9aa4006a99a997000000004977779477999a77000000000000000000000000000000000000000000633333300003eb9e9e9e9999e9e9e900ebbbe900000000
-04a999a00aa444a000499400977977797999a777000000000000000000000000000000000000000007bebbbbbe33bba0000330000003300003bbe300033bbbe9
-00a44499049444990097790097799979799999a700000000000000000000000000000000000000007bbbebbbbbebbb930eeeeee00eeeeee07e3b30007e3b3300
-00a4449904a9999a009779009799977977779a7700000000000000000000000000000000000000007bbbebbbbbeebb9003b3bb3003b3bb307e3b30007ebbe300
-04a999a00a9aa44000499400977797797779a77700000000000000000000000000000000000000007bbb3eeeee3eeb930033b3000033b30003bbe30003ebbbe9
-0a9aa4006a994a970000000049777794777a7777000000000000000000000000000000000000000007eebbbbbe33eea0000ee000000ee00000ebbbe900000000
-6a994a9700000000000000000499994057777775000000000000000000000000000000000000000000633333300003eb00077000000770000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000007777e0ebee300000077000000770000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000000000000000000007bbbbb33ebb9a000b0b30b00b0b30b00033bb3000003300
-060606000000000000000000000000000000000000000000000000000000000000000000000000007bbebe33b3b3e9000b3b3bb00b3b3bb07ebe33e97eb3bb39
-050505000000000000000000000000000000000000000000000000000000000000000000000000007bebbbbe3330000003e33e3003e33e3000e3bbe000e3bbe0
-000000000000000000000000000000000000000000000000000000000000000000000000000000007bebbbbe333000000eeeeee00eeeeee000e3bbe07ebe33e9
-000000000000000000000000000000000000000000000000000000000000000000000000000000007bbebe33b3b3e90033333333333333337ebe33e90033bb30
-0000000000000000000000000000000000000000000000000000000000000000000000000000000007bbbbb33ebb9a00e3e3e3e33e3e3e3e0033bb3000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000007777e0ebee30003b3b3b3bb3b3b3b30000000000000000
-3bbbbbbbbbbbbbbbbbbbbe3300000000003ebbbebebbeeee3000000000000000000000000000000000a999a00000000000000a9900033333000ee3333eb33330
-bbbbbbbbbbbbbeebbebebbbe33eeeea006ebbeeeeee33333e30000000000000000000000000000000033333e00000000003ee333000dd3ee005663ee3ebeeeea
-be3ebe3ebe3ebbbbbbbbbbbbbe3e3e9a07eb3b3b3bbbeee3e30000000000000002222000000000000eebbbbb000000000eebbbbe00d553be006773be3eebbbb9
-b33eb33eb33ebe33333333ebbbb33e9907eb3b3b3be33e3ee300000000000000220002000033000ebbbbbb330000000e33bbbbbe005553bb007773bbe3eeeeea
-be3ebe3ebe3ebbbbbbbbe33ebbbb3e9a07eb3b3b3be33e3ee3333303030000002022002003ee3ebbbebbb3ee00033eb3ee3bbbbe005553bb007773bbe3330000
-bbbbbbbbbbbbbbbbbbbbbe33ebbbb3a007eb3b3b3bbbeee3e33eebbebebbe3a0222202003eeee3bbbbbb3eee0033eb3eeee3bbbe005553bb007773bbe3ee0000
-3eeeeee0000003bbb3ebbbe33bbbbe3006ebbeeeeee33333e3eebbbbbbbbb39a022000003eeee3ebebbb3eee003ebb3eeee3ebbe00d553bb006773bbe3eb0000
-077776000000003bb3ebbbe33bb3eb30003ebbbebebbeeee33eb3eb3eb3eb3990000000033ee333bbbbb33ee00ebeb33ee333bbe000dd3bb005663bbe3eb0000
-077760000000000bbbbbbbb33bb3ebe000333333333333333eeb3eb3eb3eb3990000000003333e3bebbb3e3300bbbbb3333e3bbe000333ee000ee3eee3ee0000
-0776000000000033ebebbbe33bbbbbb3003ebeeeee3ee3eb3ebbbbbbbbbbb39a000000000b3ee33bebbbe3ee0ebebbbe3ee3ebbe000dd3bb005663bbe3333030
-07600000000006eb3bebbbb33bbbbbbe00bbbbbbbe3eb3eb3eebe3e3e3eee3a002220000ebe333ebebbbbe330bbbbbbbe33ebbbe00d553bb006773bb3eeeee3a
-06000000000007be3bebbbb33bbeeeee00bbbbb3ee3eb3eb3ebe3e3e3e30000022022000ebbbbbbbebbebbbbebbebbbbbbbbbbbe005553bb007773bb3bbbbb39
-00000000000007eb3bee3bb33beebeee06bbbb3bbe3eb3eb3ebe33333000000022202202ebbbbbbbebbbbbbbebbebbbbbbbbbbbe005553bb007773bb3bbbbb39
-00000000000007be3bbbbbb33beebebe07b3ebebbe3eb3eb3ebe3eee0000000002220220ebbbbbbbebbbbbbbebbebbbbbbbbbbbe005553bb007773bb3ebbbb39
-00000000000007eb3b3ebbb33bbebebe07b3ebebbe3eb3eb3ebe333300000000000000003ebbbbbb3bbbbbe3ebb3bbbe33ebbbb300d553bb006773bb3eeeee3a
-00000000000007be3bbeeeb33bbebebe07b3ebebbe3eb3eb3ebe3ee0000000000000000073333333333333373333333377333333000dd3bb005663bbe3333030
-3eeeeeeeeeeeeeeeeeeeee33000000000033eeeeeeeeeeee30000000000000000044440000000000002a9a2000000000000002aa00033333000333333ee33330
-bebebebebebee333e3e3eebe33eeee20063b3b3b3b333333e30000000000000004400040000000000033333e00000000003ee333000dd33300d553e33eeeeeea
-ee33ee33ee33eeeeeeeeeeeeee3e3ea2073b3e3e3eeeeee3e30000000000000040444004000000000bebebeb000000000ebebeb3000dd3be005663ee33ebebe9
-b333b333b333be33333333bebeb33e9a073b3b3b3ee33e3ee300000000000000444044040033000eeeeeeee30000000e33eeeee300d553ee006773ee3333333a
-ee33ee33ee33eeeeeeeee33eeeee3ea2073b3e3e3ee33e3ee3333303030000000404400403ee3bebe3ebeb3e00033eb3ee3ebebe00d553ee006773ee33330000
-bebebebebebebebebebebe33bebeb320073b3b3b3beeeee3e3333bebebeb3320000000403eeee3eeeeeee3ee0033ee3eeee3eeee00d553be006773bb33ee0000
-3eeeeee0000003eee33eeee33eeeee30063e3e3e3e333333e333eeeeeeeee3a2400000003eeee3eb3bebe3ee003ebe3eeee3beb3000dd3ee005663ee33ee0000
-077776000000003eb33ebeb33eb3be300033eeeeeeeeeeee333e33e33e33e39a040440003333333eeeeee33300ee3e3333333eee000dd33300d553ee33ee0000
-077760000000000eeeeeeee33ee3eee00033333333333333333e33e33e33e39a004040000333333bebebe33300bebeb333333eb3000333330003333333ee0000
-0776000000000033be3ebeb33ebebeb3003eeeeee33333eb33eeeeeeeeeee3a2000000000033333e3eeeee330ee3eeee3333eee3000dd33300d553ee33333030
-076000000000063e3e3eeee33eeeeee300ebebeeb33eb3ee333e33eebebeb320400444000be333eb3bebebe30ebebebeb33ebeb3000dd333005663be3eeeee32
-06000000000007e33e3ebeb33ee3333300eeeee3333ee3eb33e333333330300040440440eeeeeeee3ee3eeeeeee3eeeeeeeeeee300d553ee006773ee3ebebe3a
-000000000000073e3e333ee33e33e33306ebeb3ebe3eb3ee33e33e3e3000000040444404ebebebeb3bebebebbeb3bebebebebeb300d553ee006773ee3eeeee39
-00000000000007e33ebebeb33e33e3e307e33e3eee3ee3eb33e333e30000000004404004eeeeeeee3eeeeeeeeee3eeeeeeeeeee300d553bb006773be33bebe3a
-000000000000073e3e33eee33ee3e3e307e33b3ebe3eb3ee33e3333300000000000000403bebebeb3bebebe3beb3bebe33bebeb3000dd3ee005663ee33333332
-00000000000007e33ee333e33ee3e3e307e33e3eee3ee3eb33e333e0000000000040400073333333333333373333333377333333000dd33300d5533333333030
+48888840000000000000000000000000000000003bbbbbbbbbbbbbbbbbbbbe330000000000000677760000000033333a00000000000000000000000000000000
+8a98a980cccccccc000000000000000000000000bbbbbbbbbbbbbeebbebebbbe33eeeea0000673eeee30003333eeee3a00633333300003eb73ee330000000000
+89889880eeeeeeee003bb30000fccf0000499400be3ebe3ebe3ebbbbbbbbbbbbbe3e3e9a0073ebbbbbbe33b3b3bebb3907bebbbbbe33bba00e33ebe973bbbe00
+8988a9807777777700b77b0000c77c0000977900b33eb33eb33ebe33333333ebbbb33e99063ebbe3333333b3e3bbbb397bbbebbbbbebbb93b3bbbbe9b3bbe33a
+48888840eeeeeeee00b77b0000c77c0000977900be3ebe3ebe3ebbbbbbbbe33ebbbb3e9a07ebe3bbbbbee3e3e3bbbb397bbbebbbbbeebb90b3bbe330b3bbbbe9
+00000000cccccccc003bb30000fccf0000499400bbbbbbbbbbbbbbbbbbbbbe33ebbbb3a063bb3bbe333333333333333a7bbb3eeeee3eeb93b3bbbbe90e33ebe9
+00000000000000000000000000000000000000003eeeeee0000003bbb3ebbbe33bbbbe307ebebbe3bebebeb3333e330007eebbbbbe33eea00e33ebe973ee3300
+0000000000000000000000000000000000000000077776000000003bb3ebbbe33bb3eb307eb3bb3bebebeb3eeee3e33000633333300003eb73ee330000000000
+9fcc1fc700000000000000000000000000000000077760000000000bbbbbbbb33bb3ebe07eb3bb3bebebeb3eeee3e330007777e0ebee30007ebbbe3000000000
+0fcff1009fccfcc79fcc1fc700000000000000000776000000000033ebebbbe33bbbbbb37ebebbe3bebebeb3333e330007bbbbb33ebb9a000003ebea7eb33e30
+01fcccf00ff111f00fcff1f0000000000000000007600000000006eb3bebbbb33bbbbbbe63bb3bbe333333333333333a7bbebe33b3b3e90000003eb9003bb3ea
+00f111cc01f111cc01fccccf000000000000000006000000000007be3bebbbb33bbeeeee07ebe3bbbbbee3e3e3bbbb397bebbbbe33300000003bb3b0003bb3b9
+00f111cc01fccccf01f111cc000000000000000000000000000007eb3bee3bb33beebeee063ebbe3333333b3e3bbbb397bebbbbe33300000003bb3b000003eb9
+01fcccf00fcff1f00ff111f0000000000000000000000000000007be3bbbbbb33beebebe0073ebbbbbbe33b3b3bebb397bbebe33b3b3e90000003eb90003ebea
+0fcff1009fcc1fc79fccfcc7000000000000000000000000000007eb3b3ebbb33bbebebe000673eeee30003333eeee3a07bbbbb33ebb9a000003ebea7ebbbe30
+9fcc1fc70000000000000000000000000000000000000000000007be3bbeeeb33bbebebe00000677760000000033333a007777e0ebee30007ebbbe3000000000
+6a994a970000000000000000004440000000000000000000000007be3bbeeeb33bbebebe00000677760000000033333200033000000330000000000000000000
+0a9aa4006a99a9976a994a97044444000044440000000000000007eb3b3ebbb33bbebebe00067333333000333333333a9e9e9e9999e9e9e900ebbbe900000000
+04a999a00aa444a00a9aa440444444004444444000000000000007be3bbbbbb33beebebe00733eebebee33e3e3e3ee3a000330000003300003bbe300033bbbe9
+00a444990494449904a9999a440440044440044400000000000007eb3bee3bb33beebeee0633eb33333333b3b3bebe3a0eeeeee00eeeeee07e3b30007e3b3300
+00a4449904a9999a04944499444004444000404406000000000007be3bebbbb33bbeeeee073e33ebebebe333e3eeee3a03b3bb3003b3bb307e3b30007ebbe300
+04a999a00a9aa4400aa444a0444444440000444407600000000006eb3bebbbb33bbbbbbe63eb3be333333333333333320033b3000033b30003bbe30003ebbbe9
+0a9aa4006a994a976a99a99704444440000004400776000000000033ebebbbe33bbbbbb373e3ee33b3e3b3e3333e3300000ee000000ee00000ebbbe900000000
+6a994a9700000000000000000044440000000000077760000000000bbbbbbbb33bb3ebe073e3eb3e3b3e3b3bebe3e33000077000000770000000000000000000
+5777777557777775577777750044444440000440077776000000003bb3ebbbe33bb3eb3073e3eb3e3b3e3b3bebe3e33000077000000770000000000000000000
+777887777c77c77777999a7704444444440044443eeeeee0000003bbb3ebbbe33bbbbe3073e3ee33b3e3b3e3333e33000b0b30b00b0b30b00033bb3000003300
+777887777cc7cc777999a7774444000444404044bbbbbbbbbbbbbbbbbbbbbe33ebbbb3a063eb3be333333333333333320b3b3bb00b3b3bb07ebe33e97eb3bb39
+788888877cccccc7799999a74440444044440444be3ebe3ebe3ebbbbbbbbe33ebbbb3e9a073e33ebebebe333e3eeee3a03e33e3003e33e3000e3bbe000e3bbe0
+722882277ccfccf777779a774440444404444440b33eb33eb33ebe33333333ebbbb33e990633eb33333333b3b3bebe3a0eeeeee00eeeeee000e3bbe07ebe33e9
+777887777cf7cf777779a7774444044400444400be3ebe3ebe3ebbbbbbbbbbbbbe3e3e9a00733eebebee33e3e3e3ee3a33333333333333337ebe33e90033bb30
+777227777f77f777777a77770444444400000000bbbbbbbbbbbbbeebbebebbbe33eeeea000067333333000333333333ae3e3e3e33e3e3e3e0033bb3000000000
+57777775577777755777777500444440000000003bbbbbbbbbbbbbbbbbbbbe33000000000000067776000000003333323b3b3b3bb3b3b3b30000000000000000
+9fccfcc73eeeeeeeeeeeeeeeeeeeee3300000000003ebbbebebbeeee30000000000000000000000000a999a00000000000000a9900033333000ee3333eb33330
+0ff111f0bebebebebebee333e3e3eebe33eeee2006ebbeeeeee33333e300000000000000000000000033333e00000000003ee333000dd3ee005663ee3ebeeeea
+01f111ccee33ee33ee33eeeeeeeeeeeeee3e3ea207eb3b3b3bbbeee3e300000000000000000000000eebbbbb000000000eebbbbe00d553be006773be3eebbbb9
+01fccccfb333b333b333be33333333bebeb33e9a07eb3b3b3be33e3ee3000000000000000033000ebbbbbb330000000e33bbbbbe005553bb007773bbe3eeeeea
+0fcff1f0ee33ee33ee33eeeeeeeee33eeeee3ea207eb3b3b3be33e3ee33333030300000003ee3ebbbebbb3ee00033eb3ee3bbbbe005553bb007773bbe3330000
+9fcc1fc7bebebebebebebebebebebe33bebeb32007eb3b3b3bbbeee3e33eebbebebbe3a03eeee3bbbbbb3eee0033eb3eeee3bbbe005553bb007773bbe3ee0000
+000000003eeeeee0000003eee33eeee33eeeee3006ebbeeeeee33333e3eebbbbbbbbb39a3eeee3ebebbb3eee003ebb3eeee3ebbe00d553bb006773bbe3eb0000
+00000000077776000000003eb33ebeb33eb3be30003ebbbebebbeeee33eb3eb3eb3eb39933ee333bbbbb33ee00ebeb33ee333bbe000dd3bb005663bbe3eb0000
+00000000077760000000000eeeeeeee33ee3eee000333333333333333eeb3eb3eb3eb39903333e3bebbb3e3300bbbbb3333e3bbe000333ee000ee3eee3ee0000
+000000000776000000000033be3ebeb33ebebeb3003ebeeeee3ee3eb3ebbbbbbbbbbb39a0b3ee33bebbbe3ee0ebebbbe3ee3ebbe000dd3bb005663bbe3333030
+00000000076000000000063e3e3eeee33eeeeee300bbbbbbbe3eb3eb3eebe3e3e3eee3a0ebe333ebebbbbe330bbbbbbbe33ebbbe00d553bb006773bb3eeeee3a
+6a99a99706000000000007e33e3ebeb33ee3333300bbbbb3ee3eb3eb3ebe3e3e3e300000ebbbbbbbebbebbbbebbebbbbbbbbbbbe005553bb007773bb3bbbbb39
+0aa444a0000000000000073e3e333ee33e33e33306bbbb3bbe3eb3eb3ebe333330000000ebbbbbbbebbbbbbbebbebbbbbbbbbbbe005553bb007773bb3bbbbb39
+0494449900000000000007e33ebebeb33e33e3e307b3ebebbe3eb3eb3ebe3eee00000000ebbbbbbbebbbbbbbebbebbbbbbbbbbbe005553bb007773bb3ebbbb39
+04a9999a000000000000073e3e33eee33ee3e3e307b3ebebbe3eb3eb3ebe3333000000003ebbbbbb3bbbbbe3ebb3bbbe33ebbbb300d553bb006773bb3eeeee3a
+0a9aa44000000000000007e33ee333e33ee3e3e307b3ebebbe3eb3eb3ebe3ee00000000073333333333333373333333377333333000dd3bb005663bbe3333030
+6a994a9700000000000007e33ee333e33ee3e3e30033eeeeeeeeeeee300000000000000000000000002a9a2000000000000002aa00033333000333333ee33330
+00000000000000000000073e3e33eee33ee3e3e3063b3b3b3b333333e300000000000000000000000033333e00000000003ee333000dd33300d553e33eeeeeea
+0000000000000000000007e33ebebeb33e33e3e3073b3e3e3eeeeee3e300000000000000000000000bebebeb000000000ebebeb3000dd3be005663ee33ebebe9
+00000000000000000000073e3e333ee33e33e333073b3b3b3ee33e3ee3000000000000000033000eeeeeeee30000000e33eeeee300d553ee006773ee3333333a
+0000000006000000000007e33e3ebeb33ee33333073b3e3e3ee33e3ee33333030300000003ee3bebe3ebeb3e00033eb3ee3ebebe00d553ee006773ee33330000
+00000000076000000000063e3e3eeee33eeeeee3073b3b3b3beeeee3e3333bebebeb33203eeee3eeeeeee3ee0033ee3eeee3eeee00d553be006773bb33ee0000
+000000000776000000000033be3ebeb33ebebeb3063e3e3e3e333333e333eeeeeeeee3a23eeee3eb3bebe3ee003ebe3eeee3beb3000dd3ee005663ee33ee0000
+00000000077760000000000eeeeeeee33ee3eee00033eeeeeeeeeeee333e33e33e33e39a3333333eeeeee33300ee3e3333333eee000dd33300d553ee33ee0000
+00000000077776000000003eb33ebeb33eb3be300033333333333333333e33e33e33e39a0333333bebebe33300bebeb333333eb3000333330003333333ee0000
+000000003eeeeee0000003eee33eeee33eeeee30003eeeeee33333eb33eeeeeeeeeee3a20033333e3eeeee330ee3eeee3333eee3000dd33300d553ee33333030
+06060600bebebebebebebebebebebe33bebeb32000ebebeeb33eb3ee333e33eebebeb3200be333eb3bebebe30ebebebeb33ebeb3000dd333005663be3eeeee32
+05050500ee33ee33ee33eeeeeeeee33eeeee3ea200eeeee3333ee3eb33e3333333303000eeeeeeee3ee3eeeeeee3eeeeeeeeeee300d553ee006773ee3ebebe3a
+00000000b333b333b333be33333333bebeb33e9a06ebeb3ebe3eb3ee33e33e3e30000000ebebebeb3bebebebbeb3bebebebebeb300d553ee006773ee3eeeee39
+00000000ee33ee33ee33eeeeeeeeeeeeee3e3ea207e33e3eee3ee3eb33e333e300000000eeeeeeee3eeeeeeeeee3eeeeeeeeeee300d553bb006773be33bebe3a
+00000000bebebebebebee333e3e3eebe33eeee2007e33b3ebe3eb3ee33e33333000000003bebebeb3bebebe3beb3bebe33bebeb3000dd3ee005663ee33333332
+000000003eeeeeeeeeeeeeeeeeeeee330000000007e33e3eee3ee3eb33e333e00000000073333333333333373333333377333333000dd33300d5533333333030
00033333333333333333333333333000000333333333333333333333333330000003333333333333333333333333300000033333333333333333333333333000
-0039aaebbbbbebbbbbbbbbbbbbbebe00003a88ebbbbbebbbbbbbbbbbbbbebe0000eebbbbbbbbbbbbbbbbbeeeeeeeee000033eeeeeeeeeeeeeeeee3eeeeeee300
-039999aebbbbbebbebeeeeeeebbbeb3003aaaa8ebbbbbebbebeeeeeeebbbeb300eebbbbbbbbbbbbbbbbbbbeeeeeeeee0033eebebebebebebebebee3e3e3e3330
-0399999ebbbbbebbebbeeeeeeebbebe003aaaaaebbbbbebbebbeeeeeeebbebe03ebbbbbbbbbbbbbbbbbbbbbeeeeeeee333eeeeeeeeeeeeeeeeeeeeeeeeeeee33
-3999999aebbbbbebbbbbbbbbbbbbbeb33aaaaaa8ebbbbbebbbbbbbbbbbbbbeb33ebbbbbbbbbbbbbbbbbbbbbeeeeeeee333ebebebebebebebebebebee333e3333
-3999999aebbbbbebbbbbbbbbbbbbbebe3aaaaaa8ebbbbbebbbbbbbbbbbbbbebeeebbbbbbbbbbbbbbbbbbbbbeeeeeeeee33eeeeeeeeeeeeeeeeeeeeeeeeeeee33
-3999999aebbbbbebbbebeeeeeebbbebe3aaaaaa8ebbbbbebbbebeeeeeebbbebeeebbbbbbbbbbbbbbbbbbbbbeeeeeeee333ebebebebebebebebebebee3e3e3e33
-3999999aebbbbbebbbebeeeeeebbbebe3aaaaaa8ebbbbbebbbebeeeeeebbbebeeebbbbbbbbbbbbbbbbbbbbbeeeeeeeee33eeeeeeeeeeeeeeeeeeeeeeeeeeee33
-3999999aeeeeeeeeeeeeeeeeeeeeeeee3aaaaaa8eeeeeeeeeeeeeeeeeeeeeeeeeebbbbbbbbbbbbbbbbbbbbbeeeeeeeee33ebebebebebebebebebebee333e3333
-3999999aebbbbbebbbbbbbbbbbbbbbbe3aaaaaa8ebbbbbebbbbbbbbbbbbbbbbeeebbbbbbbbbbbbbbbbbbbbbeeeeeeee333eeeeeeeeeeeeeeeeeeeeeeeeeeee33
-3999999aeeeeeeeeeeeeeeeeeeeeeeee3aaaaaa8eeeeeeeeeeeeeeeeeeeeeeeeeebbbbbbbbbbbbbbbbbbbbbeeeeeeeee33ebebebebebebebebebebee3e3e3e33
-3999999aeeeeeeee3ee3333333eeeee33aaaaaa8eeeeeeee3ee3333333eeeee33ebbbbbbbbbbbbbbbbbbbbbeeeeeeee333eeeeeeeeeeeeeeeeeeeee333333333
-0399999e33333333333333333333333003aaaaae3333333333333333333333303ebbbbbbbbbbbbbbbbbbbbbeeeeeeee333ebebebebebebebebebebeeeeeeee33
-039999aeeeeeeeee3e3333333eeeee3003aaaa8eeeeeeeee3e3333333eeeee300eebbbbbbbbbbbbbbbbbbbeeeeeeeee0033eeeeeeeeeeeeeeeeeee3333333330
-0039aae3333333333333333333333300003a88e333333333333333333333330003eebbbbbbbbbbbbbbbbbeeeeeeeee300333eeeeeeeeeeeeeeeee3eeeeeee330
+003aaaebbbbbebbbbbbbbbbbbbbebe00003888ebbbbbebbbbbbbbbbbbbbebe0000eebbbbbbbbbbbbbbbbbeeeeeeeee000033eeeeeeeeeeeeeeeee3eeeeeee300
+03a99aaebbbbbebbebeeeeeeebbbeb30038aa88ebbbbbebbebeeeeeeebbbeb300eebbbbbbbbbbbbbbbbbbbeeeeeeeee0033eebebebebebebebebee3e3e3e3330
+039999aebbbbbebbebbeeeeeeebbebe003aaaa8ebbbbbebbebbeeeeeeebbebe03ebbbbbbbe333ebbbbbbbbbeeeeeeee333eeeeeee33333eeeeeeeeeeeeeeee33
+3a9999aaebbbbbebbbbbbbbbbbbbbeb338aaaa88ebbbbbebbbbbbbbbbbbbbeb33ebbbbebe33333ebebbbbbeeeeeeeee333ebebeb3333333e3bebebee333e3333
+3a9999aaebbbbbebbbbbbbbbbbbbbebe38aaaa88ebbbbbebbbbbbbbbbbbbbebeebbbbbbbbbbbbbbbbbbbbbbeeeeeeeee3eeeee3eeeeeeeeeeeeeeeeeeeeeee33
+3a9999aaebbbbbebbbebeeeeeebbbebe38aaaa88ebbbbbebbbebeeeeeebbbebeeebbbbebe33333ebebbbbbeeeeeeeee333ebeb3b3333333e3bebebee3e3e3e33
+3a9999aaebbbbbebbbebeeeeeebbbebe38aaaa88ebbbbbebbbebeeeeeebbbebeebbbbbbbbbbbbbbbbbbbbbbeeeeeeeee3eeeeeeeeeeeeeeeeeeeeeeeeeeeee33
+3a9999aaeeeeeeeeeeeeeeeeeeeeeeee38aaaa88eeeeeeeeeeeeeeeeeeeeeeeeeebbbbebe33333ebebbbbbeeeeeeeeee33ebeb3b3333333e3bebebee333e3333
+3a9999aaebbbbbebbbbbbbbbbbbbbbbe38aaaa88ebbbbbebbbbbbbbbbbbbbbbeebbbbbbbbbbbbbbbbbbbbbbeeeeeeee33eeeeeeeeeeeeeeeeeeeeeeeeeeeee33
+3a9999aaeeeeeeeeeeeeeeeeeeeeeeee38aaaa88eeeeeeeeeeeeeeeeeeeeeeeeeebbbbebe33333ebebbbbbeeeeeeeeee33ebeb3b3333333e3bebebee3e3e3e33
+3a9999aaeeeeeeee3ee3333333eeeee338aaaa88eeeeeeee3ee3333333eeeee33bbbbbbbbbbbbbbbbbbbbbbeeeeeeee33eeeeeeeeeeeeeeeeeeeeee333333333
+039999aa33333333333333333333333003aaaa8e3333333333333333333333303ebbbbebe33333ebebbbbbeeeeeeeee333ebeb3b3333333e3bebeb3eeeeeee33
+03a99aaeeeeeeeee3e3333333eeeee30038aa88eeeeeeeee3e3333333eeeee300eebbbbbbbbbbbbbbbbbbbeeeeeeeee0033eeeeeeeeeeeeeeeeeee3333333330
+003aaae3333333333333333333333300003888e333333333333333333333330003eebbbbbbbbbbbbbbbbbeeeeeeeee300333eeeeeeeeeeeeeeeee3eeeeeee330
00033333333333333333333333333000000333333333333333333333333330003333333333333333333333333333333333333333333333333333333333333333
000333333333333333333333333330000003333333333333333333333333300033ebbeb33ebebbe33ebebbe333ebee33333ee3e333e3ee3333e3ee333e3e3333
-003a883eeeee3eeeeeeeeeeeeee3e3000038223eeeee3eeeeeeeeeeeeee3e3000333333333333333333333333333333003333333333333333333333333333330
-03aaaa83ebebe3ee3e3333333eee3e3003888823ebebe3ee3e3333333eee3e3000777776d6777776d6777776d666660000666665d5666665d5666665d5555500
-03aaaaa3eeeee3ee3ee3333333ee3e3003888883eeeee3ee3ee3333333ee3e30007777755577777555777775566666000066666ddd66666ddd66666dd5555500
-3aaaaaa83ebebe3ebebebebebebeb3e3388888823ebebe3ebebebebebebeb3e3006777655567776555677765556665000056665ddd56665ddd56665ddd555d00
-3aaaaaa83eeeee3eeeeeeeeeeeeee3e3388888823eeeee3eeeeeeeeeeeeee3e30007770d5d07770d5d07770d5d66600000066600d0066600d0066600d0555000
-3aaaaaa83ebebe3ebe3e333333beb3e3388888823ebebe3ebe3e333333beb3e300067600d0067600d0067600d056500000056500000565000005650000d5d000
-3aaaaaa83eeeee3eee3e333333eee3e3388888823eeeee3eee3e333333eee3e300007000000070000000700000050000000060000000600000006000000d0000
-3aaaaaa833333333333333333333333338888882333333333333333333333333222272222222222222fff3220000333333333333000a0000a99a000033333333
-3aaaaaa83eeeee3eeeeeeeeeeeeee3e3388888823eeeee3eeeeeeeeeeeeee3e322252222222828222beffff200003bbbbb3bbbb300a9a0009999a0003b3bbbb3
-3aaaaaa83333333333333333333333333888888233333333333333333333333322d2222222888882bdde1fff0000333b333b33b30a999a00aaaaaa003b3b3333
-3aaaaaa83eeeee3e3ee3333333eee3e3388888823eeeee3e3ee3333333eee3e3200dd00022888882dffdf1f20000003b303b33b3a99999a0a99999a03b3b3000
-03aaaaa3333333333333333333333330038888833333333333333333333333300555070022288822d07d073f0000003e303e33e3aa99999aaa99999a3e3e3000
-03aaaa83eeeee3ee3e3333333eeeee3003888823eeeee3ee3e3333333eeeee30dfcc060d28228222bdd9ad220000003b303b33b30aa999990aaaaaaa3b3b3333
-003a8833333333333333333333333300003822333333333333333333333333002d0000d288822282ea9999220000003e303eeee300aa999900aaaaaa3e3eeee3
+0038883eeeee3eeeeeeeeeeeeee3e3000032223eeeee3eeeeeeeeeeeeee3e3000333333333333333333333333333333003333333333333333333333333333330
+038aa883ebebe3ee3e3333333eee3e3003288223ebebe3ee3e3333333eee3e3000777776d6777776d6777776d666660000666665d5666665d5666665d5555500
+03aaaa83eeeee3ee3ee3333333ee3e3003888823eeeee3ee3ee3333333ee3e30007777755577777555777775566666000066666ddd66666ddd66666dd5555500
+38aaaa883ebebe3ebebebebebebeb3e3328888223ebebe3ebebebebebebeb3e3006777655567776555677765556665000056665ddd56665ddd56665ddd555d00
+38aaaa883eeeee3eeeeeeeeeeeeee3e3328888223eeeee3eeeeeeeeeeeeee3e30007770d5d07770d5d07770d5d66600000066600d0066600d0066600d0555000
+38aaaa883ebebe3ebe3e333333beb3e3328888223ebebe3ebe3e333333beb3e300067600d0067600d0067600d056500000056500000565000005650000d5d000
+38aaaa883eeeee3eee3e333333eee3e3328888223eeeee3eee3e333333eee3e300007000000070000000700000050000000060000000600000006000000d0000
+38aaaa8833333333333333333333333332888822333333333333333333333333222272222222222222fff3220000333333333333000a0000a99a000033333333
+38aaaa883eeeee3eeeeeeeeeeeeee3e3328888223eeeee3eeeeeeeeeeeeee3e322252222222828222beffff200003bbbbb3bbbb300a9a0009999a0003b3bbbb3
+38aaaa883333333333333333333333333288882233333333333333333333333322d2222222888882bdde1fff0000333b333b33b30a999a00aaaaaa003b3b3333
+38aaaa883eeeee3e3ee3333333eee3e3328888223eeeee3e3ee3333333eee3e3200dd00022888882dffdf1f20000003b303b33b3a99999a0a99999a03b3b3000
+03aaaa83333333333333333333333330038888233333333333333333333333300555070022288822d07d073f0000003e303e33e3aa99999aaa99999a3e3e3000
+038aa883eeeee3ee3e3333333eeeee3003288223eeeee3ee3e3333333eeeee30dfcc060d28228222bdd9ad220000003b303b33b30aa999990aaaaaaa3b3b3333
+00388833333333333333333333333300003222333333333333333333333333002d0000d288822282ea9999220000003e303eeee300aa999900aaaaaa3e3eeee3
00033333333333333333333333333000000333333333333333333333333330002220d222282222222ea999920000003330333333000aa99a000aaaa033333333
-0000000000000000ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00002222222222222200000000222222222dddddd2222222d222ddd
-0288888888888200ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd22220222220022222220000002222222222ddddd2222222d222dddd
-2888888888888820ddddddddddddddddddddddddddddddddddddddddddddddddd22222dd222222022202202222222222222222222222dddd2222222d222ddddd
-8822224442222880ddddddddddddddd022222222dddddddddddddddddddddd022222222d2220022022202022222222222222222222220dd2222222d222dddddd
-8822244422222880ddddddddddddd22222222222222ddddddddddddddddd0222222222222202002200222022222222222222222222200d2222222d222ddddddd
-8888888888888880dddddddddd0222222222222222222dddddddddddd00222222222222222220002222202222222222222222222220002222222d222dddddddd
-8820222222202880dd222dddd222222222222222222222ddddddddd002222220222222220220200000002222222222222222222220002222222d222ddddddddd
-2200282028200220d22222d022002222222222222222222ddddddd002220dddd02222222d00022000002222222222222222222220002222222d222dddddddddd
-0000222022200000d2200202202202222220000222222222dddd00220ddddddd02222222d0022222222222222222222222222220002222222d222ddddddddddd
-0002888888820000d22022022202022222022220222222222d0020dddddddddd22222222dd02222222222222222222222222220022222222d222dddddddddddd
-0028888888882000d22200002222022220222022022002222200ddddddddddd022222222dd0022222222222222222222222220022222222d222ddddddddddddd
-0288822222888200d0222222222022220022020202022022222dddddddddddd22222d222dd002222222222222222222222200022222222d222dddddddddddddd
-0288288888288200dd000000000222220022022202202022222ddddddddddd222222222dddd00222222222222222222222000222222202222ddddddddddddddd
-2888888888888820dd0000000222222200222000002220222220ddddddddd222222d222ddd00002222222222222222220002222222202222dddddddddddddddd
-2882882828828820d00222222222222200022222222202222222dddddddd222222d222ddd00000022222222222222200022222222202222ddddddddddddddddd
-2888888888888820d02222222222222220000222220022222222ddddddd2222222222ddd000dd00022222222222200022222222220222ddddddddddddddddddd
-28282848282828200002888888882000000000000000000022202220000080000044400000000000ddddddd000dddd000022222222000022222222202222dddd
-28288888888828200028822422288200000000002820000028222820000282000444440000444400dddddd000dddddd0000022200000222222222022222ddddd
-28284848282828200088888888888800000000282820000028888820000888004444440044444440ddddd022ddddddddd000000000222222222202222ddddddd
-28288888888828200022200000022200000000282828200022828222008888204404400444400444dddd022ddddddddddd0000002222222222022222dddddddd
-28284828282828200028200000028200000028282828200022828282082888804440044440004044ddd0222dddddddddddd0002222222222002222dddddddddd
-28288888888828200028288888828200000028282828200028888882008888824444444400004444dd0222dddddddddddddd2222222222002222dddddddddddd
-28282828284828200022888888882200000028282828200022828222088882880444444000000440d0222ddddddddddddd22222222220022222ddddddddddddd
-28288888888828200028282848488200000028282828200002828200288288020044440000000000d2222ddddddddddd22222222220022222ddddddddddddddd
-282228284822282000288888888882000000282828282000028282000028888000444444400004400222dddddddd2222222222222d22222ddddddddddddddddd
-282888888888282002882244422288200000028828820000028282000888888804444444440044442222dddddd2222222222222d22222ddddddddddddddddddd
-2828282828282820028824442222882000000028282000000282820082808828444400044440404422222222222222222222dd2222dddddddddddddddddddddd
-282888222888282002888888888888200000002882000000028282000088888044404440444404442222222222222222dddd2222dddddddddddddddddddddddd
-28282822282828200282888888282820000000282000000002828200082088204440444404444440222222222222ddd222222ddddddddddddddddddddddddddd
-2888882228888820028888282888882000000028200000000282820000022200444404440044440022222222dd222222222ddddddddddddddddddddddddddddd
-28882822282888200282882228282820000200282000200002828202000082000444444400000000d222222222222222dddddddddddddddddddddddddddddddd
-28888822288888222288882228888822020220282220202022828222000082000044444000000000dd22222222222ddddddddddddddddddddddddddddddddddd
+0000000000000000ddddddd000dddd000022222222000022222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+0288888888888200dddddd000dddddd0000022200000222222222022222ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd00000000
+2888888888888820ddddd022ddddddddd000000000222222222202222dddddddddddddddddddddddddddddddddddddddddddddddddddddddd22222dd02222000
+8822224442222880dddd022ddddddddddd0000002222222222022222ddddddddddddddddddddddd022222222dddddddddddddddddddddd022222222d22000200
+8822244422222880ddd0222dddddddddddd0002222222222002222ddddddddddddddddddddddd22222222222222ddddddddddddddddd02222222222220220020
+8888888888888880dd0222dddddddddddddd2222222222002222dddddddddddddddddddddd0222222222222222222dddddddddddd00222222222222222220200
+8820222222202880d0222ddddddddddddd22222222220022222ddddddddddddddd222dddd222222222222222222222ddddddddd0022222202222222202200000
+2200282028200220d2222ddddddddddd22222222220022222dddddddddddddddd22222d022002222222222222222222ddddddd002220dddd0222222200000000
+00002220222000000222dddddddd2222222222222d22222dddddddddddddddddd2200202202202222220000222222222dddd00220ddddddd0222222200000000
+00028888888200002222dddddd2222222222222d22222dddddddddddddddddddd22022022202022222022220222222222d0020dddddddddd2222222200000000
+002888888888200022222222222222222222dd2222ddddddddddddddddddddddd22200002222022220222022022002222200ddddddddddd02222222202220000
+02888222228882002222222222222222dddd2222ddddddddddddddddddddddddd0222222222022220022020202022022222dddddddddddd22222d22222022000
+0288288888288200222222222222ddd222222ddddddddddddddddddddddddddddd000000000222220022022202202022222ddddddddddd222222222d22202202
+288888888888882022222222dd222222222ddddddddddddddddddddddddddddddd0000000222222200222000002220222220ddddddddd222222d222d02220220
+2882882828828820d222222222222222ddddddddddddddddddddddddddddddddd00222222222222200022222222202222222dddddddd222222d222dd00000000
+2888888888888820dd22222222222dddddddddddddddddddddddddddddddddddd02222222222222220000222220022222222ddddddd2222222222ddd00000000
+2828284828282820000288888888200000000000000000002220222000008000d00002222222222222200000000222222222dddddd2222222d222ddd00444400
+2828888888882820002882242228820000000000282000002822282000028200d22220222220022222220000002222222222ddddd2222222d222dddd04400040
+2828484828282820008888888888880000000028282000002888882000088800222222022202202222222222222222222222dddd2222222d222ddddd40444004
+28288888888828200022200000022200000000282828200022828222008888202220022022202022222222222222222222220dd2222222d222dddddd44404404
+28284828282828200028200000028200000028282828200022828282082888802202002200222022222222222222222222200d2222222d222ddddddd04044004
+282888888888282000282888888282000000282828282000288888820088888222220002222202222222222222222222220002222222d222dddddddd00000040
+28282828284828200022888888882200000028282828200022828222088882880220200000002222222222222222222220002222222d222ddddddddd40000000
+2828888888882820002828284848820000002828282820000282820028828802d00022000002222222222222222222220002222222d222dddddddddd04044000
+2822282848222820002888888888820000002828282820000282820000288880d0022222222222222222222222222220002222222d222ddddddddddd00404000
+2828888888882820028822444222882000000288288200000282820008888888dd02222222222222222222222222220022222222d222dddddddddddd00000000
+2828282828282820028824442222882000000028282000000282820082808828dd0022222222222222222222222220022222222d222ddddddddddddd40044400
+2828882228882820028888888888882000000028820000000282820000888880dd002222222222222222222222200022222222d222dddddddddddddd40440440
+2828282228282820028288888828282000000028200000000282820008208820ddd00222222222222222222222000222222202222ddddddddddddddd40444404
+2888882228888820028888282888882000000028200000000282820000022200dd00002222222222222222220002222222202222dddddddddddddddd04404004
+2888282228288820028288222828282000020028200020000282820200008200d00000022222222222222200022222222202222ddddddddddddddddd00000040
+2888882228888822228888222888882202022028222020202282822200008200000dd00022222222222200022222222220222ddddddddddddddddddd00404000
__label__
iiiiittttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
iiiitttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
@@ -280,6 +280,9 @@ iiiiiiiiiiiiiiiiiiiiiiiiiii33333iiiiiiiij333333333333333333333333333333333333333
iiiiiiiiiiiiiiiiiiiiiiiiiiij333jiiiiiiii3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333
iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333
+__gff__
+0000000000000000000000080000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000008080800000000000000000000000000080808000000000000000000000000000808080000000000000000000000000008080800000000
+0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
__sfx__
a008000022614286102d6103061033610356103661037610376103561034610326102e6102b610286102661022610206101d610186101661013610116100f6100c61009610066100461003610016100161000615
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -294,7 +297,7 @@ a006020026021260610760007600066000760006600056002c0002c0000360006600066000460006
48021400296200e07034630150703564010070276400d0000a05005000010500465006660076000866006600056600365000650006500f7000f7000f7000f7000f7000f7000f7000f7000f700000000000000000
c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a02139021370113601135011330112f0112b015270151a001180011500113001100010e0010b0010c0011f001
50011800190122c5323503230532310222a52224022210221a5221802213522130220e522075220b1220c0220a1220a0220712208022061220701204112070120610201602016020160201602016020160201602
-0010000022600286002d6003060033600356003660037600376003560034600326002e6002b600286002660022600206001d600186001660013600116000f6000c60009600066000460003600016000160000600
+99040900243363234637066110261f126264262e136374463b0260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
900219202f67112773356761977338676197733a676157533765312740316330f7402265012740166300e6200c6300a6200963009620056200663003620046300762005620066200662007620086200862008620
90020e0016321215311b3312a53117331113210f32105621240010462100001036212a00100611000012c0012d0012d001000012d0012d0012b0012a00127001220011e001180011600114001130011300113001
9001110000070040703661012650191301363024140136300f62000020000100c6000001000000015100000001510000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -303,17 +306,17 @@ c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a
900516000c373093730637305373053630536305353043530335302353013430033300323003230031300313003130031300303003130030300313003030030301303013030230302303023032e3030000300003
92051d002e6732f673306732c66320553165331c54300673016730807300653060430064307653190330864315043026430f03304023016130101300613000130010300613012030020300613001030010300103
ce0a00000c6741f4730e676214730e676191730e6761617302070186600166015660050500d650006300511000421026230261306601006110260101613076010161306603016130660107603006130060301611
-901000000c6001f4000e600214000e600191000e6001610002000186000160015600050000d600006000510000400026000260006600006000260001600076000160006600016000660007600006000060001600
+9d0e0008100531307013071346051c65513070130711c6003f60020600000000050000500070000050007000100003460010000346001c6000700000500070000050007000130001300000500070000000000000
9e06000002613076132c0112c0510661107623076510661306653056232c0112c05107633076330864108623096430a6432c0112c0510c6130d6430e6110203312613136532c0112c051020231d6730304123673
5e011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453
d6061d000247101473026730147310473020730c37301063063530464303333016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403
+a1050e0010034107421104214752267521a05226752220522675228052260522c042260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
+a5040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-a0050e0010034107421104214752267521a05226752220522675228052260522c042260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
-a4040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
-9c0e0008100531307013071346051c65513070130711c6003f60320600000000050000500070000050007000100533460510003346051c6550700000500070000050007000130701307100500070000000000000
-90040900243363234637066110261f126264262e136374463b0260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-d01c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d11c00081f011220161a0161f0162b0112e016260162b016000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
490e00101000334615346253461510073346153462534615100033461534625346151007334615346253461500000000000000000000000000000000000000000000000000000000000000000000000000000000
110e00080030207755077550775500700077550775507755000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
09380000221212212229121291222912500100001000f1021b1211b1222812128122281250010000100281021d1211d1222112121122211250010000100211021f1211f122221212212222125221002210000000
diff --git a/players.lua b/players.lua
index 0fcf2e7..b1bff09 100644
--- a/players.lua
+++ b/players.lua
@@ -2,7 +2,7 @@ alwaysfire = false
coopmode = false
players = {}
-function addplayer(x, y, sprite, bulletsprite)
+function addplayer(x, y, sprite, spriteup, spritedwn, bulletsprite)
local player = {
health = 3, --3
x = x,
@@ -19,19 +19,20 @@ function addplayer(x, y, sprite, bulletsprite)
shootspeed = 0.25,
shoot3 = false
}
+
- function player:draw()
- -- print(player.health)
-
- --draw a different sprite when moving, and blink when hurt
+ function player:draw()
+ --draw a different sprite when moving
+ if (player.ymov == 0) then
+ spritelocal = sprite
+ elseif (player.ymov == 1) then
+ spritelocal = spriteup
+ elseif (player.ymov == -1) then
+ spritelocal = spritedwn
+ end
+ --blink when hurt
if (player.inv < 0 or flashtime) and player.health > 0 then
- if (player.ymov == 0) then
- spr(sprite, player.x, player.y)
- elseif (player.ymov == 1) then
- spr(sprite+1, player.x, player.y)
- elseif (player.ymov == -1) then
- spr(sprite+1, player.x, player.y, 1, 1, false, true)
- end
+ spr(spritelocal, player.x, player.y)
end
end
@@ -43,7 +44,7 @@ function addplayer(x, y, sprite, bulletsprite)
player.shootspeed = 0.25
player.shoot3 = false
shake = 9
- sfx(10, 1)
+ sfx(10, 1) --hit, ouch!
explosion(player.x, player.y)
if isgameover() then --FUCK, GAME OVER YOU DIED!
gameover = true -- gameover set to true
@@ -51,8 +52,8 @@ function addplayer(x, y, sprite, bulletsprite)
player.inv = 20
killallenemies()
currentscore-=10
- sfx(11, 3)
- sfx(29, 1)
+ sfx(11, 3) --killed
+ sfx(22, 1) --rewind beat
elseif player.health <= 0 then
currentscore = ceil(currentscore * 0.5) --halves score if coop
sfx(11, 3)
@@ -66,8 +67,7 @@ function addplayer(x, y, sprite, bulletsprite)
for i = 1, 8, 1 do
addcircle(player.x+4, player.y+4, sin(i/8), cos(i/8), 2, 0.6, 7)
end
- --normal and light respawn sfx for co-op
- sfx(26+#players,1)
+ sfx(25+#players,1) --normal and light respawn sfx for co-op
end
function player:update()
@@ -119,9 +119,9 @@ function addplayer(x, y, sprite, bulletsprite)
if player.shoot3 then
addbullet(player.x+3, player.y+3, 2, 0.25, true, bulletsprite)
addbullet(player.x+3, player.y-3, 2, -0.25, true, bulletsprite)
- sfx(12, 2)
+ sfx(12, 2) --3shoot
else
- sfx(9, 2)
+ sfx(9, 2) --normal shoot
end
player.shootcooldown = player.shootspeed
end
diff --git a/ui.lua b/ui.lua
index 6bb37e3..e7f7875 100644
--- a/ui.lua
+++ b/ui.lua
@@ -48,7 +48,7 @@ function mainmenutext(x,y)
-- y = 62
x -= 1
- spr(5,x+2,y+7+(sin(t()*0.7)*2),1,3) --ships
+ spr(64,x+2,y+7+(sin(t()*0.7)*2),1,3) --ships
printdropshadow("(\142) - lone wolf\n\n(\151) - companion",x+15,y+7,6,5)
end
@@ -58,7 +58,7 @@ function titlehighscores(x,y)
-- 110
printdropshadow(scorewithzeros(tostring(highscore0),4),x-10,y,12,15) --1P high score
- spr(48,x+8,y)
+ spr(112,x+8,y)
printdropshadow(scorewithzeros(tostring(highscore1),4),x+18,y,9,2) --2P high score
end
@@ -111,7 +111,6 @@ function finalscorescreen(x,y)
printdropshadow(scorewithzeros(tostring(currentscore),4),x+48+circletimex,y+50+circletimey,playercolour0,playercolour1) --2P high score
poke(0x5f58)
-- printdropshadow("fINAL sCORE", x+43,y+22,6,5)
-
if (coopmode and currentscore > highscore1) or (not coopmode and currentscore > highscore0) then
if flashtime then
printdropshadow("! new high score !", x+27,y+34,11,3)
@@ -138,7 +137,5 @@ end
--sfx for the intro transition
sfx(0,3,3)
---this creates menu items that allow players to turn off screenshake, or always fire the ships gun.
-doshake = true
-menuitem(1, "(\129) screenshake", function() doshake = not doshake end)
-menuitem(2, "(\144) autofire", function() alwaysfire = not alwaysfire end) \ No newline at end of file
+-- autofire accessibility setting
+menuitem(2, "(…) autofire", function() alwaysfire = not alwaysfire end) \ No newline at end of file
diff --git a/update.lua b/update.lua
index a527dbb..abe39b6 100644
--- a/update.lua
+++ b/update.lua
@@ -14,7 +14,7 @@ if gameover then
gameover = false
foreach(players, function(obj) obj:respawn() end)
setwave(mid(checkpoint,currentwave-1,#wave)) --goes back one wave
- sfx(29, -2)
+ sfx(22, -2) --stops respawn rewind beat
end
elseif gamerunning then
updatewaves() -- update the wave function
@@ -37,12 +37,12 @@ if currentwave == 20 then --ending screen
end
elseif not gamerunning and t() > 1 then --main menu
if btn(4) then
- addplayer(18, 60, 16, 18)
+ addplayer1() --reduces tokens, found in objects.lua
startgame()
elseif btn(5) then
coopmode = true
- addplayer(18, 45, 16, 18)
- addplayer(18, 75, 32, 34)
+ addplayer1() --reduces tokens, found in objects.lua
+ addplayer(18, 75, 32, 33, 34, 4)
startgame()
end
end
@@ -63,4 +63,12 @@ end
function scorewithzeros(string,length)
if #string == length then return string end
return "0"..scorewithzeros(string, length-1)
-end \ No newline at end of file
+end
+
+-- screenshake accessibility setting
+if doshake then screenshaketext = "(▒) screenshake" end --adds 9 tokens to visually show the toggle
+menuitem(1,screenshaketext,
+ function()
+ doshake = not doshake
+ screenshaketext = "(█) screenshake"
+ end) \ No newline at end of file
diff --git a/waves.lua b/waves.lua
index be6ea57..0c81b52 100644
--- a/waves.lua
+++ b/waves.lua
@@ -66,7 +66,7 @@ wave[5] = {
for i = 1, 12, 1 do
addwallshooter(100 + (54-i)*i, (i%2==1), 0.4)
end
- addpickup(490, 60, "health")
+ addpickup(490, 60, 48)
end,
everysecond = function()
if flr(currentwavetime%3) == 2 and currentwavetime < 16 then