diff options
| -rw-r--r-- | Sound Effects Index.txt | 93 | ||||
| -rw-r--r-- | background.lua | 2 | ||||
| -rw-r--r-- | draw.lua | 11 | ||||
| -rw-r--r-- | enemies.lua | 6 | ||||
| -rw-r--r-- | pickups.lua | 2 | ||||
| -rw-r--r-- | pico-bhell.p8 | 251 | ||||
| -rw-r--r-- | players.lua | 7 | ||||
| -rw-r--r-- | ui.lua | 102 |
8 files changed, 263 insertions, 211 deletions
diff --git a/Sound Effects Index.txt b/Sound Effects Index.txt index 5b61a4c..dac9a09 100644 --- a/Sound Effects Index.txt +++ b/Sound Effects Index.txt @@ -1,26 +1,35 @@ -00 -01 -02 -03 -04 -05 -06 -07 -08 +CHANNELS +-------- +0 Melody Track +1 Bass Track / Player / Pickup +2 Short SFX - Bullets / Basic Enemy Hits/Kills +3 Long SFX - Tough Enemy/Bosses + +SOUNDS +------ +00 RESERVED INSRUMENT +01 RESERVED INSRUMENT +02 RESERVED INSRUMENT +03 RESERVED INSRUMENT +04 RESERVED INSRUMENT +05 RESERVED INSRUMENT +06 RESERVED INSRUMENT +07 RESERVED INSRUMENT +08 RESERVED INSRUMENT 09 Player Shoot 10 Player Hit 11 Player Killed 12 Triple Shot -13 +13 Intro Transition 14 15 Basic Enemy Shoot 16 Basic Enemy Hit 17 Basic Enemy Killed 18 Wall Crawl Shoot -19 Circular Shoot -20 Circular Kill -21 Rocket Shoot -22 Rocket Thruster +19 Circular/Wall Shoot +20 Circular/Wall Kill +21 +22 23 Laser Charge (1.5 Seconds) 24 Laser Loop 25 Laser Finished @@ -30,35 +39,35 @@ 29 Rewind Checkpoint 30 Powerup Get! 31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -42 -43 -44 -45 -46 -47 -48 -49 -50 -51 -52 -53 +32 MUSIC +33 MUSIC +34 MUSIC +35 MUSIC +36 MUSIC +37 MUSIC +38 MUSIC +39 MUSIC +40 MUSIC +41 MUSIC +42 MUSIC +43 MUSIC +44 MUSIC +45 MUSIC +46 MUSIC +47 MUSIC +48 MUSIC +49 MUSIC +50 MUSIC +51 MUSIC +52 MUSIC +53 MUSIC 54 55 56 57 -58 -59 -60 -61 -62 -63
\ No newline at end of file +58 Rocket Shoot / Thruster Loop sfx(21, 3) (channel 4 for longer sounds) +59 Rocket Projectile Explosion +60 Rocket Killed +61 Kamikaze Charge +62 Kamikaze Ignite +63 Kamikaze Denied
\ No newline at end of file diff --git a/background.lua b/background.lua index 3c3a03e..dc82aba 100644 --- a/background.lua +++ b/background.lua @@ -49,7 +49,7 @@ function drawbg() --galaxies spr(254, 100, 40, 1, 1) spr(239, 20, 30, 1, 1) - spr(254, 42, 72, 1, 1, true, true) + spr(254, 42, 74, 1, 1, true, true) bgplanetmegasprite(150-(gt)%300,50) @@ -16,13 +16,13 @@ drawobjs() if gamerunning then if gameover then --gameover timer, it does a cute spinny! - print(ceil(respawntimer), 62+sin(t())*3,61+cos(t())*3, 4) - print(ceil(respawntimer), 62+sin(t())*3,60+cos(t())*3, 7) + print(ceil(respawntimer), 62+sin(t())*3,61+cos(t())*3, 5) + print(ceil(respawntimer), 62+sin(t())*3,60+cos(t())*3, 6) elseif players[1].health <=0 then - print(ceil(players[1].inv), players[1].x+sin(t())*3, players[1].y+cos(t())*3+1, 4) + print(ceil(players[1].inv), players[1].x+sin(t())*3, players[1].y+cos(t())*3+1, 15) print(ceil(players[1].inv), players[1].x+sin(t())*3, players[1].y+cos(t())*3, 12) elseif #players > 1 and players[2].health <=0 then - print(ceil(players[2].inv), players[2].x+sin(t())*3, players[2].y+cos(t())*3+1, 4) + print(ceil(players[2].inv), players[2].x+sin(t())*3, players[2].y+cos(t())*3+1, 2) print(ceil(players[2].inv), players[2].x+sin(t())*3, players[2].y+cos(t())*3, 9) end end @@ -37,7 +37,8 @@ if not gamerunning or menuscroll < 1 then else drawlogo(24-menuscroll*120,26) end - mainmenutext(24-menuscroll*150,62) + mainmenutext(24-menuscroll*150,53) + titlehighscores(52-menuscroll*110,82) credits(10-menuscroll*140,108) if t() < 2 then for i = 1, 128, 1 do diff --git a/enemies.lua b/enemies.lua index 28abc74..de28adb 100644 --- a/enemies.lua +++ b/enemies.lua @@ -181,9 +181,9 @@ function addballshooter(x, y, health, speed) function enemy.draw(enemy) if enemy.inv < 0 or ceil(enemy.inv*10%2) == 1 then - local sprite = 56 + local sprite = 27 local damaged = (enemy.health < 7) - if damaged then sprite = 40 end + if damaged then sprite = 11 end spr(sprite, enemy.x, enemy.y, 3, 1, false, not damaged) spr(sprite, enemy.x, enemy.y+8, 3, 1, false, damaged) end @@ -261,7 +261,7 @@ function addtargetingenemy(x, y, health, speed) function enemy.draw(enemy) if enemy.inv < 0 or ceil(enemy.inv*10%2) == 1 then - spr(21, enemy.x, enemy.y, 2, 1) + spr(58, enemy.x, enemy.y, 2, 1) end end diff --git a/pickups.lua b/pickups.lua index 97fa2b4..6e4a103 100644 --- a/pickups.lua +++ b/pickups.lua @@ -50,7 +50,7 @@ function addpickup(x, y, type) elseif pickup.type == "3shoot" then player.shoot3 = true end - sfx(30, 2) + sfx(30, 1) end function pickup.draw(pickup) diff --git a/pico-bhell.p8 b/pico-bhell.p8 index a827e63..088a39c 100644 --- a/pico-bhell.p8 +++ b/pico-bhell.p8 @@ -33,102 +33,102 @@ function _draw() #include draw.lua end __gfx__ -00000000000000000000000003bbbb30577777750000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000003b7777b37778877700633333300003eb0000000000000000000000000000000000000000000000000000000073ee330000000000 -00700700003e3300003bb300b77b777b7778877707bebbbbbe33bba0000000000000000000000000000000000000000000000000000000000e33ebe973bbbe00 -0007700000bbb00000b77b00b77bbb7b788888877bbbebbbbbebbb9300000000000000000000000000000000000000000000000000000000b3bbbbe9b3bbe33a -00077000007e700000b77b00b7bbb77b722882277bbbebbbbbeebb9000000000000000000000000000000000000000000000000000000000b3bbe330b3bbbbe9 -0070070000030300003bb300b777b77b777887777bbb3eeeee3eeb9300000000000000000000000000000000000000000000000000000000b3bbbbe90e33ebe9 -0000000000000000000000003b7777b37772277707eebbbbbe33eea0000000000000000000000000000000000000000000000000000000000e33ebe973ee3300 -00000000000000000000000003bbbb305777777500633333300003eb0000000000000000000000000000000000000000000000000000000073ee330000000000 -9fcc1fc700000000000000000fccccf057777775007777e0ebee3000000000000000000000000000000000000000000000000000000000007ebbbe3000000000 -0fcff1009fccfcc700000000fc7777cf7c77c77707bbbbb33ebb9a00000000000000000000000000000000000000000000000000000000000003ebea7eb33e30 -01fcccf00ff111f000fccf00c77c777c7cc7cc777bbebe33b3b3e9000000000000000000000000000000000000000000000000000000000000003eb9003bb3ea -00f111cc01f111cc00c77c00c77ccc7c7cccccc77bebbbbe3330000000000000000000000000000000000000000000000000000000000000003bb3b0003bb3b9 -00f111cc01fccccf00c77c00c7ccc77c7ccfccf77bebbbbe3330000000000000000000000000000000000000000000000000000000000000003bb3b000003eb9 -01fcccf00fcff1f000fccf00c777c77c7cf7cf777bbebe33b3b3e9000000000000000000000000000000000000000000000000000000000000003eb90003ebea -0fcff1009fcc1fc700000000fc7777cf7f77f77707bbbbb33ebb9a00000000000000000000000000000000000000000000000000000000000003ebea7ebbbe30 -9fcc1fc700000000000000000fccccf057777775007777e0ebee3000000000000000000000000000000000000000000000000000000000007ebbbe3000000000 -6a994a970000000000000000049999405777777500000000000000000000000000000677760000000033333a0000000000033000000330000000000000000000 -0a9aa4006a99a997000000004977779477999a7700000000000000000000000000067333333000333333333a000000009e9e9e9999e9e9e900ebbbe900000000 -04a999a00aa444a000499400977977797999a777003ee300000000000000000000733eebebee33e3e3e3ee3900000000000330000003300003bbe300033bbbe9 -00a44499049444990097790097799979799999a700bbbbb3b3b3b3b3b3b3b3b30633eb33333333b3b3bebe3a000000000eeeeee00eeeeee07e3b30007e3b3300 -00a4449904a9999a009779009799977977779a77007b7be3e3e3e3e3e3e3e3e0073e33ebebebe333e3eeee390000000003b3bb3003b3bb307e3b30007ebbe300 -04a999a00a9aa44000499400977797797779a77700eeee30030030030030030063eb3be3333333333333333a000000000033b3000033b30003bbe30003ebbbe9 -0a9aa4006a994a970000000049777794777a777700030030030030030030030073e3ee33b3e3b3e3333e330000000000000ee000000ee00000ebbbe900000000 -6a994a970000000000000000049999405777777500003003003003003003003073e3eb3e3b3e3b3bebe3e3300000000000077000000770000000000000000000 -00003333333333333333333300a00000a9a00000223fff22222272220b0000007eb3bb3bebebeb3eeee3e3300000000000077000000770000000000000000000 -00003bbbbb3bbbb33b3bbbb30a9a0000999a00002ffffeb222252222e30000b37ebebbe3bebebeb3333e3300000000000b0b30b00b0b30b00033bb3000003300 -0000333b333b33b33b3b3333a999a000a999a000fff1eddb22d2222233000b3363bb3bbe333333333333333a000000000b3b3bb00b3b3bb07ebe33e97eb3bb39 -0000003b303b33b33b3b30000a999a000aaaaa002f1fdffd200dd0003300e33307ebe3bbbbbee3e3e3bbbb390000000003e33e3003e33e3000e3bbe000e3bbe0 -0000003e303e33e33e3e300000a999a000a999a0f370d70d05550700330e3333063ebbe3333333b3e3bbbb39000000000eeeeee00eeeeee000e3bbe07ebe33e9 -0000003b303b33b33b3b3333000a999a000aaaaa22da9ddbdfcc060d030333330073ebbbbbbe33b3b3bebb390000000033333333333333337ebe33e90033bb30 -0000003e303eeee33e3eeee30000a9990000a9a0229999ae2d0000d200033330000673eeee30003333eeee3a00000000e3e3e3e33e3e3e3e0033bb3000000000 -00000033303333333333333300000a9a00000a0029999ae22220d2220000330000000677760000000033333a000000003b3b3b3bb3b3b3b30000000000000000 -3bbbbbbbbbbbbbbbbbbbbe3300000000003bbbbbbbbbbbbb30000000000000000000000000000000000000000000000000000000000000000000000000000000 -bbbbbbbbbbbbbeebbebebbbe33eeeea006bbbbbbbbbbbbbbb3000000000000000000000000000000000000000000000000000000000000000000000000000000 -be3ebe3ebe3ebbbbbbbbbbbbbe3e3e9a07bb3b3b3bbbbbbbb3000000000000000000000000000000000000000000000000000000000000000000000000000000 -b33eb33eb33ebe33333333ebbbb33e9907bb3b3b3bbbbbbbb300000000000000000000000000bbbbbbbb00000000000000000000000000000000000000000000 -be3ebe3ebe3ebbbbbbbbe33ebbbb3e9a07bb3b3b3bbbbbbbb3333303030000000000000000bbbbbbbbbbbb000000000000000000000000000000000000000000 -bbbbbbbbbbbbbbbbbbbbbe33ebbbb3a007bb3b3b3bbbbbbbb3bbbbbbbbbbbba000000000bbbbbbbbbbbbbbbb0000000000000000000000000000000000000000 -3eeeeee0000003bbb3ebbbe33bbbbe3006bbbbbbbbbbbbbbb3bbbbbbbbbbbb9a0000000bbbbbbbbbbbbbbbbbb000000000000000000000000000000000000000 -077776000000003bb3ebbbe33bb3eb30003bbbbbbbbbbbbbb3bb33b33b33bb99000000bbbbbbbbbbbbbbbbbbbb00000000000000000000000000000000000000 -077760000000000bbbbbbbb33bb3ebe000333333333333333bbb33b33b33bb9900000bbbbbbbbbbbbbbbbbbbbbb0000000000000000000000000000000000000 -0776000000000033ebebbbe33bbbbbb3003bbbbbbbbbbbbbbbbbbbbbbbbbbb9a00000bbbbbbbbbbbbbbbbbbbbbb0000000000000000000000000000000000000 -07600000000006ee3bebbbb33bbbbbbe00bbbbbbbbbbbbbbbbbbbbbbbbbbbba00000bbbbbbbbbbbbbbbbbbbbbbbb000000000000000000000000000000000000 -06000000000007ee3bebbbb33bbeeeee00bbbbb3bbbb3333333b3bbbb33030000000bbbbbbbbbbbbbbbbbbbbbbbb000000000000000000000000000000000000 -00000000000007ee3bee3bb33beebeee0bbbbb3bbb3bbbbbbbbbb3bb30000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000000000000000000000000000 -00000000000007ee3bbbbbb33beebebe0b33bbbbb3bbbbb3333bb3bb00000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000000000000000000000000000 -00000000000007ee3b3ebbb33bbebebe0b33bbbb3bb633333bb3bbb300000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000000000000000000000000000 -00000000000007ee3bbeeeb33bbebebe0b33bbbb3bb7bbbbb3b3bbb000000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000000000000000000000000000 -00000000000007333ee333e33ee3e3e30e33eeee3ee7eeeee3e3eee000000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000 -00000000000007333e33eee33ee3e3e30e33eeee3ee633333ee3eee300000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000 -00000000000007333ebebeb33e33e3e30e33eeeee3eeeee3333ee3ee00000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000 -00000000000007333e333ee33e33e3330eeeee3eee3eeeeeeeeee3ee30000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000 -06000000000007333e3ebeb33ee3333300eeeee3eeee3333333e3eeee33030000000eeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000 -07600000000006333e3eeee33eeeeee300eeeeeeeeeeeeeeeeeeeeeeeeeeeea00000eeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000 -0776000000000033be3ebeb33ebebeb3003eeeeeeeeeeeeeeeeeeeeeeeeeee9a00000eeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000 -077760000000000eeeeeeee33ee3eee000333333333333333eee33e33e33ee9900000eeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000 -077776000000003eb33ebeb33eb3be30003eeeeeeeeeeeeee3ee33e33e33ee99000000eeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000000 -3eeeeee0000003eee33eeee33eeeee3006eeeeeeeeeeeeeee3eeeeeeeeeeee9a0000000eeeeeeeeeeeeeeeeee000000000000000000000000000000000000000 -bebebebebebebebebebebe33bebeb3a007ee3e3e3eeeeeeee3eeeeeeeeeeeea000000000eeeeeeeeeeeeeeee0000000000000000000000000000000000000000 -ee33ee33ee33eeeeeeeee33eeeee3e9a07ee3e3e3eeeeeeee3333303030000000000000000eeeeeeeeeeee000000000000000000000000000000000000000000 -b333b333b333be33333333bebeb33e9907ee3e3e3eeeeeeee300000000000000000000000000eeeeeeee00000000000000000000000000000000000000000000 -ee33ee33ee33eeeeeeeeeeeeee3e3e9a07ee3e3e3eeeeeeee3000000000000000000000000000000000000000000000000000000000000000000000000000000 -bebebebebebee333e3e3eebe33eeeea006eeeeeeeeeeeeeee3000000000000000000000000000000000000000000000000000000000000000000000000000000 -3eeeeeeeeeeeeeeeeeeeee3300000000003eeeeeeeeeeeee30000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000003bbbb30577777750000000000000000000000000000000000000000000000000000067776000000003333320000000000000000 +00000000cccccccc000000003b7777b37778877700000000000000000000000000000000000000000000000000067333333000333333333a73ee330000000000 +00700700eeeeeeee003bb300b77b777b7778877700000000000000000000000000000000000000000000000000733eebebee33e3e3e3ee3a0e33ebe973bbbe00 +000770007777777700b77b00b77bbb7b788888870000000000000000000000000000000000000000000000000633eb33333333b3b3bebe3ab3bbbbe9b3bbe33a +00077000eeeeeeee00b77b00b7bbb77b72288227000000000000000000000000000000000000000000000000073e33ebebebe333e3eeee3ab3bbe330b3bbbbe9 +00700700cccccccc003bb300b777b77b7778877700000000000000000000000000000000000000000000000063eb3be33333333333333332b3bbbbe90e33ebe9 +0000000000000000000000003b7777b37772277700000000000000000000000000000000000000000000000073e3ee33b3e3b3e3333e33000e33ebe973ee3300 +00000000000000000000000003bbbb305777777500000000000000000000000000000000000000000000000073e3eb3e3b3e3b3bebe3e33073ee330000000000 +9fcc1fc700000000000000000fccccf0577777750000000000000000000000000000000000000000000000007eb3bb3bebebeb3eeee3e3307ebbbe3000000000 +0fcff1009fccfcc700000000fc7777cf7c77c7770000000000000000000000000000000000000000000000007ebebbe3bebebeb3333e33000003ebea7eb33e30 +01fcccf00ff111f000fccf00c77c777c7cc7cc7700000000000000000000000000000000000000000000000063bb3bbe333333333333333a00003eb9003bb3ea +00f111cc01f111cc00c77c00c77ccc7c7cccccc700000000000000000000000000000000000000000000000007ebe3bbbbbee3e3e3bbbb39003bb3b0003bb3b9 +00f111cc01fccccf00c77c00c7ccc77c7ccfccf7000000000000000000000000000000000000000000000000063ebbe3333333b3e3bbbb39003bb3b000003eb9 +01fcccf00fcff1f000fccf00c777c77c7cf7cf770000000000000000000000000000000000000000000000000073ebbbbbbe33b3b3bebb3900003eb90003ebea +0fcff1009fcc1fc700000000fc7777cf7f77f777000000000000000000000000000000000000000000000000000673eeee30003333eeee3a0003ebea7ebbbe30 +9fcc1fc700000000000000000fccccf05777777500000000000000000000000000000000000000000000000000000677760000000033333a7ebbbe3000000000 +6a994a97000000000000000004999940577777750000000000000000000000000000000000000000000000000000000000033000000330000000000000000000 +0a9aa4006a99a997000000004977779477999a77000000000000000000000000000000000000000000633333300003eb9e9e9e9999e9e9e900ebbbe900000000 +04a999a00aa444a000499400977977797999a777000000000000000000000000000000000000000007bebbbbbe33bba0000330000003300003bbe300033bbbe9 +00a44499049444990097790097799979799999a700000000000000000000000000000000000000007bbbebbbbbebbb930eeeeee00eeeeee07e3b30007e3b3300 +00a4449904a9999a009779009799977977779a7700000000000000000000000000000000000000007bbbebbbbbeebb9003b3bb3003b3bb307e3b30007ebbe300 +04a999a00a9aa44000499400977797797779a77700000000000000000000000000000000000000007bbb3eeeee3eeb930033b3000033b30003bbe30003ebbbe9 +0a9aa4006a994a970000000049777794777a7777000000000000000000000000000000000000000007eebbbbbe33eea0000ee000000ee00000ebbbe900000000 +6a994a9700000000000000000499994057777775000000000000000000000000000000000000000000633333300003eb00077000000770000000000000000000 +223fff22222272220000333333333333000a0000a99a000033333333000000000000000000000000007777e0ebee300000077000000770000000000000000000 +2ffffeb22225222200003bbbbb3bbbb300a9a0009999a0003b3bbbb300000000000000000000000007bbbbb33ebb9a000b0b30b00b0b30b00033bb3000003300 +fff1eddb22d222220000333b333b33b30a999a00aaaaaa003b3b33330000000000000000000000007bbebe33b3b3e9000b3b3bb00b3b3bb07ebe33e97eb3bb39 +2f1fdffd200dd0000000003b303b33b3a99999a0a99999a03b3b30000000000000000000000000007bebbbbe3330000003e33e3003e33e3000e3bbe000e3bbe0 +f370d70d055507000000003e303e33e3aa99999aaa99999a3e3e30000000000000000000000000007bebbbbe333000000eeeeee00eeeeee000e3bbe07ebe33e9 +22da9ddbdfcc060d0000003b303b33b30aa999990aaaaaaa3b3b33330000000000000000000000007bbebe33b3b3e90033333333333333337ebe33e90033bb30 +229999ae2d0000d20000003e303eeee300aa999900aaaaaa3e3eeee300000000000000000000000007bbbbb33ebb9a00e3e3e3e33e3e3e3e0033bb3000000000 +29999ae22220d2220000003330333333000aa99a000aaaa033333333000000000000000000000000007777e0ebee30003b3b3b3bb3b3b3b30000000000000000 +3bbbbbbbbbbbbbbbbbbbbe3300000000003bbbbbbbbbebee3000000000000000000000000000000000000000000000000000000000033333000ee3333eb33330 +bbbbbbbbbbbbbeebbebebbbe33eeeea006bbbbbbbbbbbbbee3000000000000000000000000000000000000000000000000000000000dd3ee005663ee3ebeeeea +be3ebe3ebe3ebbbbbbbbbbbbbe3e3e9a07bb3b3b3bbbbbbbe300000000000000000000000000000000000000000000000000000000d553be006773be3eebbbb9 +b33eb33eb33ebe33333333ebbbb33e9907bb3b3b3bbbbbbbe300000000000000000000000000bbbbbbbb00000000000000000000005553bb007773bbe3eeeeea +be3ebe3ebe3ebbbbbbbbe33ebbbb3e9a07bb3b3b3bbbbbbbe3333303030000000000000000bbbbbbbbbbbb000000000000000000005553bb007773bbe3330000 +bbbbbbbbbbbbbbbbbbbbbe33ebbbb3a007bb3b3b3bbbbbbbe33eebbbbbbbe3a000000000bbbbbbbbbbbbbbbb0000000000000000005553bb007773bbe3ee0000 +3eeeeee0000003bbb3ebbbe33bbbbe3006bbbbbbbbbbbbbee3eebbbbbbbbb39a0000000bbbbbbbbbbbbbbbbbb00000000000000000d553bb006773bbe3eb0000 +077776000000003bb3ebbbe33bb3eb30003bbbbbbbbbebeee3eb3eb3eb3eb399000000bbbbbbbbbbbbbbbbbbbb00000000000000000dd3bb005663bbe3eb0000 +077760000000000bbbbbbbb33bb3ebe000333333333333333ebb3eb3eb3eb39900000bbbbbbbbbbbbbbbbbbbbbb0000000000000000333ee000ee3eee3ee0000 +0776000000000033ebebbbe33bbbbbb3003bbbbbbe3bbbbb3ebbbbbbbbbbb39a00000bbbbbbbbbbbbbbbbbbbbbb0000000000000000dd3bb005663bbe3333030 +07600000000006ee3bebbbb33bbbbbbe00bbbbbbbe3bbbbb3ebbe3eeeeeee3a00000bbbbbbbbbbbbbbbbbbbbbbbb00000000000000d553bb006773bb3eeeee3a +06000000000007ee3bebbbb33bbeeeee00bbbbb3ee3bbbbb3ebe3eeeee3030000000bbbbbbbbbbbbbbbbbbbbbbbb000000000000005553bb007773bb3bbbbb39 +00000000000007ee3bee3bb33beebeee0bbbbb3bbe3bbbbb3ebe3eee30000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000005553bb007773bb3bbbbb39 +00000000000007ee3bbbbbb33beebebe0b33bbebbe3bbbbb3ebe3eee00000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000005553bb007773bb3ebbbb39 +00000000000007ee3b3ebbb33bbebebe0b33bbebbe3bbbbb3ebe3ee300000000000bbbbbbbbbbbbbbbbbbbbbbbbbb0000000000000d553bb006773bb3eeeee3a +00000000000007ee3bbeeeb33bbebebe0b33bbebbe3bbbbb3ebe3ee000000000000bbbbbbbbbbbbbbbbbbbbbbbbbb00000000000000dd3bb005663bbe3333030 +00000000000007333ee333e33ee3e3e30e33ee3eee3eeeee3eee3ee000000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000000dd33300566333333e3000 +00000000000007333e33eee33ee3e3e30e33ee3eee3eeeee3eee3ee300000000000eeeeeeeeeeeeeeeeeeeeeeeeee0000000000000d553ee006773ee333e3000 +00000000000007333ebebeb33e33e3e30e33ee3eee3eeeee3eee3eee00000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000005553be007773be333e3000 +00000000000007333e333ee33e33e3330eeeee3eee3eeeee3eee3eee30000000000eeeeeeeeeeeeeeeeeeeeeeeeee00000000000005553ee007773ee333e3000 +06000000000007333e3ebeb33ee3333300eeeee3333eeeee3eee3eeee33030000000eeeeeeeeeeeeeeeeeeeeeeee000000000000005553ee007773ee333e3000 +07600000000006333e3eeee33eeeeee300eeeeeeee3eeeee3eee33eeeeeeee200000eeeeeeeeeeeeeeeeeeeeeeee00000000000000d553be006773be333e3000 +0776000000000033be3ebeb33ebebeb3003eeeeeee3eeeee3eeeeeeeeeeeeea200000eeeeeeeeeeeeeeeeeeeeee0000000000000000dd33300566333333e3000 +077760000000000eeeeeeee33ee3eee000333333333333333eee33e33e33ee9a00000eeeeeeeeeeeeeeeeeeeeee00000000000000003333300033333333e3000 +077776000000003eb33ebeb33eb3be30003eeeeeeeeeeeeee3ee33e33e33ee9a000000eeeeeeeeeeeeeeeeeeee00000000000000000dd3330056633333000000 +3eeeeee0000003eee33eeee33eeeee3006eeeeeeeeeeeeeee3eeeeeeeeeeeea20000000eeeeeeeeeeeeeeeeee00000000000000000d553ee006773ee33000000 +bebebebebebebebebebebe33bebeb32007ee3e3e3eeeeeeee3eeeeeeeeeeee2000000000eeeeeeeeeeeeeeee0000000000000000005553bb007773bb33000000 +ee33ee33ee33eeeeeeeee33eeeee3ea207ee3e3e3eeeeeeee3333303030000000000000000eeeeeeeeeeee000000000000000000005553ee007773ee33333300 +b333b333b333be33333333bebeb33e9a07ee3e3e3eeeeeeee300000000000000000000000000eeeeeeee00000000000000000000005553ee007773ee333e3e20 +ee33ee33ee33eeeeeeeeeeeeee3e3ea207ee3e3e3eeeeeeee300000000000000000000000000000000000000000000000000000000d5533300677333333b3ba0 +bebebebebebee333e3e3eebe33eeee2006eeeeeeeeeeeeeee3000000000000000000000000000000000000000000000000000000000dd33300566333333e3e20 +3eeeeeeeeeeeeeeeeeeeee3300000000003eeeeeeeeeeeee30000000000000000000000000000000000000000000000000000000000333330003333333333330 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dd3bbe3eb000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d553bbe3eb000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005553bbe3ee000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005553bbe333000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005553bbe3eeeeea00000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d553bb3eebbbb900000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dd3bb3ebeeeea00000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000333ee3eb3333000000000 +0b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005663bb3eee3ee000000000 +e30000b3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006773bb3eeb3ee300000000 +33000b33000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007773bb3eeb3ebe00000000 +3300e333000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007773bb3eeb3ebb30000000 +330e3333000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007773bb3eeb3eebbe303000 +03033333000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006773bb3eeb33ebbbbbe3a0 +00033330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005663bb3eebbbbbbbbbb39a +00003300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ee3ee3eeb3eb3eb3eb399 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005663bbe3eb3eb3eb3eb399 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006773bbe3eebbbbbbbbb39a +003e3300003ee3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007773bbe33eebbbbbbbe3a0 +00bbb00000bbbbb3b3b3b3b3b3b3b3b3000000000000000000000000000000000000000000000000000000000000000000000000007773bbe333330303000000 +007e7000007b7be3e3e3e3e3e3e3e3e0000000000000000000000000000000000000000000000000000000000000000000000000007773bbe300000000000000 +0003030000eeee300300300300300300000000000000000000000000000000000000000000000000000000000000000000000000006773bee300000000000000 +00000000000300300300300300300300000000000000000000000000000000000000000000000000000000000000000000000000005663eee300000000000000 +00000000000030030030030030030030000000000000000000000000000000000000000000000000000000000000000000000000000ee3333000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000222222222222220000000022222222200000022222220222000 02888888888882000000000000000000000000000000000000000000000000000000000002222022222002222222000000222222222200000222222202220000 28888888888888200000000000000000000000000000000002222000000000000022220022222202220220222222222222222222222200002222222022200000 @@ -292,23 +292,23 @@ oooo22222222222ooooo2o22222o2ooooo22222222222oooooo2oooooooooooo22222222222ooooo 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 __gff__ -0040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000010000000000000000000000010000000100000000000000000000000001000101 -__map__ -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000fe0000c2c3c4c500c7c80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000d2d3d4d5d6d7d80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000c9cacbcccdcecf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000d9dadbdcddde000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000ea00ecedeedf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000fafbfcfd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000012120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000202000000001f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000110000000000001212000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000ef0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -3536000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000010000000000000000000000010000000100000000000000000000000001000101 +__map__ +00000000000000000000000000000000000000020000000000024b4e46479000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000002000000000002005e56570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000fe0000c2c3c4c500c7c80000000000000002000000000002005e4f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000d2d3d4d5d6d7d80000000000000002000000000002005e5f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000c9cacbcccdcecf0000000000000002001100000002005e9e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000d9dadbdcddde000000000000000000000002000000005d4f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000ea00ecedeedf00000000000000000000000002000000005d5f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000fafbfcfd000000000000000000000000000002000000009d5f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000012120000000000000002000000009d9e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000202000000001f0000000000000200000000000200ad4f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000011000000000000121200000000000000000200000021000200ad5f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000200000000000200ad9e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000ef000000000200000000000200adaeaf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +353600000000000000000000000000000000000200000000000200bdbebf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 __sfx__ 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -323,7 +323,7 @@ __sfx__ 48021400296200e07034630150703564010070276400d0000a05005000010500465006660076000866006600056600365000650006500f7000f7000f7000f7000f7000f7000f7000f7000f700000000000000000 c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a02139021370113601135011330112f0112b015270151a001180011500113001100010e0010b0010c0011f001 50011800190122c5323502230522310222a52224022210221a5221802213522130220e522075220b1220c0220a1220a0220712208022061220701204112070120610201602016020160201602016020160201602 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +9108000022614286102d6103061033610356103661037610376103561034610326102e6102b610286102661022610206101d610186101661013610116100f6100c61009610066100461003610016100161000615 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 90020e0016321215311b3312a53117331113210f32105621240010462100001036212a00100611000012c0012d0012d001000012d0012d0012b0012a00127001220011e001180011600114001130011300113001 9001110000070040703661012650191301363024140136300f62000020000100c6000001000000015100000001510000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -331,10 +331,10 @@ c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a 90031400153311052112341185311033117541143411d53114321215211533120511193112151109511065110451102511005110e5012d0012b0012a00127001220011e001180011600114001130011300113001 900516000c373093630635305343053430534305343043430334302343013330033300323003230031300313003130031300303003130030300313003030030301303013030230302303023032e3030000300003 92051d002e6732f673306732c66320553165331c54300673016730807300653060430064307653190330864315043026430f03304023016130101300613000130010300613012030020300613001030010300103 -900310001a6321e64220652206521e6521d65218652156421263211632106220e6120e6120e6120e6120f61200002000020000200002000020000200002000020000200002000020000200002000020000200002 -9102001f0863007630076400764006640076300664005630076300664003630066400664004640066300664006640076400564005630056300664003630026300764004640066400663007630086400863008630 -9e06000002613076130661106651066110762307651066130665305623066210763307633076330864108623096430a6430a641010430c6130d6430e6110203312613136530201117653020231d6730304123673 -5e011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453 +900200002f60012700356001970038600197003a600157003760012700316000f7002260012700166000e6000c6000a6000960009600056000660003600046000760005600066000660007600086000860008600 +9102001f0860007600076000760006600076000660005600076000660003600066000660004600066000660006600076000560005600056000660003600026000760004600066000660007600086000860008600 +9f06000002613076132c0112c0510661107623076510661306653056232c0112c05107633076330864108623096430a6432c0112c0510c6130d6430e6110203312613136532c0112c051020231d6730304123673 +5f011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453 d60600000303300043104130304310453020130c34301043063330463303323016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403 d60a00002f6732b67312673030730e673020730966301043063330463303323016230242301621014110061100411026130261306601006110260101613076010161306603016130660107603006130060301611 a4040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002 @@ -353,6 +353,23 @@ d11c000821011240161c016210162d01130016280162d01621000180001c000210002d0002400028 4d0e002012053093250c4250b3251e655093250e4250c32512053093250c4250b3251e655093250e4251032512053093250c4250b3251e655093250e4250c32512053093250c4250b3251e655093250242504325 4d0e00200e0530532508425073251a655053250a425083250e0530532508425073251a655053250a4250c3250e0530532508425073251a655053250a425083250e0530532508425073251a655053250042500325 d11c000821011240161c016210162d01130016280162d0161f000220001a0001f0002b0002e000260002b00000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +010400000860008600086000860008600076000860008600086000860007600076000760007600076000760007600076000760007600086000860008600086000860008600086000860008600076000760007600 +9508000022614286102d6103061033610356103661037610376103561034610326102e6102b610286102661022610206101d610186101661013610116100f6100c61009610066100461003610016100161000615 +000300220813400104000040000407144071540000406104001040615400004061340615401104011040010407124061240010400104051540513400104000040010407144071340010400104061240612400004 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +900219202f67112773356761977338676197733a676157533765312740316330f7402264012740166300e6400c6400a6400964009630056300664003630046300764005640066400663007630086400863008630 +90021c000c671121730e676171730c676191730b6761617302070186700166015660050600d650006500515002040041300001000000000000015000600000000010000600000000015001600003000000000000 __music__ 00 20616263 00 20256263 diff --git a/players.lua b/players.lua index cd56cb4..ac755f1 100644 --- a/players.lua +++ b/players.lua @@ -43,20 +43,19 @@ function addplayer(x, y, sprite, bulletsprite) player.shootspeed = 0.25 player.shoot3 = false shake = 9 - sfx(10, 0) + sfx(10, 1) explosion(player.x, player.y) if isgameover() then --FUCK, GAME OVER YOU DIED! - sfx(11, 0) gameover = true -- gameover set to true respawntimer = 5 --respawns all players in 5 seconds player.inv = 20 for i = 1, #enemies, 1 do enemies[i].health = -1 end + sfx(11, 3) sfx(29, 1) elseif player.health <= 0 then - --kill sfx for co-op - sfx(11, 0) + sfx(11, 3) player.inv = 5 end end @@ -1,5 +1,31 @@ menuscroll = 0 menushipscroll = 0 + +function invaderslogotext(x,y) + --default values + -- x = 12 + -- y = 20 + + --font + local text = "i n v a d e r s" + print(text, x, y+1, 3) + print(text, x, y-1, 3) + print(text, x+1, y, 3) + print(text, x-1, y, 3) + print(text, x-1, y+1, 3) + print(text, x+1, y+1, 3) + print(text, x-1, y-1, 3) + print(text, x+1, y-1, 3) + print(text, x+1, y+1, 3) + print(text, x-1, y+2, 3) + print(text, x+1, y+2, 3) + print(text, x, y+2, 3) + print(text, x, y, 14) + clip(x, y, 60, 3) + print(text, x, y, 11) + clip() +end + function drawlogo(x,y) --default values -- x = 24 @@ -7,38 +33,17 @@ function drawlogo(x,y) --this is a horrible way to draw the logo, but I'm doing it anyways. x3 -- muahahahahahahaha!!!!!! - sspr(0,24,16,8,x-1,y+2,32,16) --to shadow - sspr(16,24,8,8,x+53,y+2,16,16) --ic shadow - sspr(0,24,16,8,x-1,y+1,32,16) --to - sspr(16,24,8,8,x+53,y+1,16,16) --ic - --X shadow - sspr(24,24,8,8,x+26,y-6,16,16) - sspr(24,24,8,8,x+42,y-6,16,16,true) - sspr(32,24,8,8,x+26,y+10,16,16, true) - sspr(32,24,8,8,x+42,y+10,16,16) + sspr(16,24,16,8,x-3,y+2,32,16) --to shadow + sspr(16,24,16,8,x-3,y,32,16) --to + sspr(48,24,8,8,x+55,y+2,16,16) --ic shadow + sspr(48,24,8,8,x+55,y,16,16) --ic --X - sspr(24,24,8,8,x+26,y-8,16,16) - sspr(24,24,8,8,x+42,y-8,16,16,true) - sspr(32,24,8,8,x+26,y+8,16,16, true) - sspr(32,24,8,8,x+42,y+8,16,16) - --font - local text = "i n v a d e r s" - print(text, x+10, y+21, 3) - print(text, x+10, y+19, 3) - print(text, x+11, y+20, 3) - print(text, x+9, y+20, 3) - print(text, x+9, y+21, 3) - print(text, x+11, y+21, 3) - print(text, x+9, y+19, 3) - print(text, x+11, y+19, 3) - print(text, x+11, y+21, 3) - print(text, x+9, y+22, 3) - print(text, x+11, y+22, 3) - print(text, x+10, y+22, 3) - print(text, x+10, y+20, 14) - clip(x+10, y+20, 60, 3) - print(text, x+10, y+20, 11) - clip() + sspr(32,24,8,8,x+26,y-9,16,16) + sspr(32,24,8,8,x+42,y-9,16,16,true) + sspr(40,24,8,8,x+26,y+7,16,16, true) + sspr(40,24,8,8,x+42,y+7,16,16) + --invaders + invaderslogotext(x+12,y+20) end function mainmenutext(x,y) @@ -56,6 +61,21 @@ function mainmenutext(x,y) print("(\151) - companion", x+15,y+17,6) end +function titlehighscores(x,y) + -- default values + -- 52 + -- 110 + + --1P high score + print("000000", x-20,y+1,15) + print("000000", x-20,y,12) + print("-", x+10,y+1,5) + print("-", x+10,y,6) + --2P high score + print("000000", x+20,y+1,2) + print("000000", x+20,y,9) +end + function credits(x,y) -- default vaues -- x = 10 @@ -63,19 +83,25 @@ function credits(x,y) palt(2,true) palt(0,false) - spr(53,x-4,y+6+sin(t())*2,1,1,(t()%2<1)) --duck - --pset(x+3,y+10+sin(t())*2,13) --extra dot for glasses - spr(54,x+104,y+6+cos(t())*2,1,1,(t()%2<1)) --bot + spr(48,x-4,y+6+sin(t())*2,1,1,(t()%2<1)) --duck + spr(49,x+104,y+6+cos(t())*2,1,1,(t()%2<1)) --bot palt(2,false) palt(0,true) - print("1029chris ribboncable", x+9,y+6,0) - print("1029chris ribboncable", x+9,y+5,9) - print("code/tunes art/sounds", x+8,y+13,0) - print("code/tunes art/sounds", x+8,y+12,9) + print("1029chris", x+10,y+6,2) + print("1029chris", x+10,y+5,9) + print("ribboncable", x+56,y+6,15) + print("ribboncable", x+56,y+5,12) + print("code tunes", x+8,y+13,3) + print("code tunes", x+8,y+12,11) + print("sprites sfx", x+56,y+13,3) + print("sprites sfx", x+56,y+12,11) + -- print("made in vancouver - 2022", x+6,y+22,0) -- print("made in vancouver - 2022", x+6,y+21,4) end +--sfx for the intro transition +sfx(13,3) -- drawlogo(24,26) -- mainmenutext(24,62) |