Skip to content
Permalink
Browse files
Adding zatyka's game, Freedom
  • Loading branch information
josefnpat committed Sep 29, 2016
1 parent 8dc9204 commit 2a1595bca58a0fbff93ecd3107ad27984f85d507
Showing with 142 additions and 68 deletions.
  1. +9 −9 collab_2/gfx/gfx0
  2. +23 −23 collab_2/gfx/gfx1
  3. +75 −1 collab_2/lua/05.lua
  4. +16 −16 collab_2/map/map0
  5. +16 −16 collab_2/map/map1
  6. +3 −3 collab_2/sfx/sfx16
@@ -5,15 +5,15 @@
82828288050cc050c00000dd111911c18882828228282888ccc1c1c11c1c1ccc0000000000000000000000000000000000000000000000000000000000000000
8282828805c00c50000ff00011911cc18882828228282888ccc1c1c11c1c1ccc0000000000000000000000000000000000000000000000000000000000000000
5688886555555555000ff000199ddcc1568888888888886565cccccccccccc560000000000000000000000000000000000000000000000000000000000000000
5655556505000050f00ee00b11111111560000000000006565000000000000560000000000000000000000000000000000000000000000000000000000000000
44444444116666116666666677777777333366555555555555663131333333330000000000000000000000000000000000000000655500000000000000000000
4444444416666661666666667777777733366555555555555556631333131333000000000000000000000000000000000a000000666600000200000000000000
449449441d666656676676677677677336655555555555555556633333133330000000000000000000000000000000000000000556500000000000000000000
444994441dd66556667766677766777366555555555555555555663333333330000000000000000000000000000000000000000666600000000000000000000
444994441ddd55516667766677766777665555555555555555555566333331310000000000000000000000000000000000000000000000000000000000000000
449449441ddd55516676676677677677655555555555555555555556333333130000000000000000000000000000000000000000000000000000000000000000
4444444411dd55116666666677777777555555555555555555555555333333330000000000000000000000000000000000000000000000000000000000000000
44444444111d51116666666677777777555555555555555555555555333333330000000000000000000000000000000000000000000000000000000000000000
0777770005000050f00ee00b11111111560000000000006565000000000000560000000000000000000000000000000000000000000000000000000000000000
77000700116666116666666677777777333366555555555555663131333333330000000000000000000000000000000000000000655500000000000000000000
7700070016666661666666667777777733366555555555555556631333131333000000000000000000000000000000000a000000666600000200000000000000
700707001d666656676676677677677336655555555555555556633333133330000000000000000000000000000000000000000556500000000000000000000
770007001dd66556667766677766777366555555555555555555663333333330000000000000000000000000000000000000000666600000000000000000000
077770001ddd55516667766677766777665555555555555555555566333331310000000000000000000000000000000000000000000000000000000000000000
070070001ddd55516676676677677677655555555555555555555556333333130000000000000000000000000000000000000000000000000000000000000000
5555555011dd55116666666677777777555555555555555555555555333333330000000000000000000000000000000000000000000000000000000000000000
22222250111d51116666666677777777555555555555555555555555333333330000000000000000000000000000000000000000000000000000000000000000
8888888844444444aaaaaaaabbbbbbbb666666661111111111111111111111110000000000000000000000000000000000000000000000000000000000000000
8888888846666664aaaaaaaabbbbbbbb155555561111111111171111111111110000000000000000000000000000000000000000000000000000000000000000
88e88e8846464444aa9aa9aabb3bb3bb151151161111111111111111111111110000000000000000000000000000000000000000000000000000000000000000
@@ -6,27 +6,27 @@
0fddd0000d888880556000000000065516dd77777777711d100001dd666dd6110000000000000000000000000000000000155100444444447676767676467676
00dddf0000d8880055600000000006551666dd7777711ddd10001666dd6661d10000000000000000000000000000000000011000848884886767676767476767
00404000000dd0005560000000000655166666dd711ddddd10001dd666dd61d10000000000000000000000000000000000000000444444447676767676767676
55600000000006555560000000000655166666661ddddddd1001666dd6661dd10000000000000000000000000000000000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd1001dd666dd61dd10000000000000000000000000000000000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd101666dd6661ddd10000000000000000000000000000000000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd101dd666dd61ddd10000000000000000000000000000000000000000000000000000000000000000
55600000000006555560000000000655166666661dddddd111666dd6661dddd10000000000000000000000000000000000000000000000000000000000000000
55600000000006555606666666666065011666661dddd1100116666dd61dd1100000000000000000000000000000000000000000000000000000000000000000
55600000000006555565555555555655000116661dd110000001166661d110000000000000000000000000000000000000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd1001666dd6661dd17777770077777700777777007777770000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd1001dd666dd61dd17000077070000770700007707000077000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd101666dd6661ddd17070007070700070707000707070007000000000000000000000000000000000
55600000000006555560000000000655166666661ddddddd101dd666dd61ddd17000007070000070700000707000007000000000000000000000000000000000
55600000000006555560000000000655166666661dddddd111666dd6661dddd17700077077000770770007707700077000000000000000000000000000000000
55600000000006555606666666666065011666661dddd1100116666dd61dd1100777770007777700077777000777770000000000000000000000000000000000
55600000000006555565555555555655000116661dd110000001166661d110000700070007000700007000700070007000000000000000000000000000000000
55600000000006555555555555555555000001161110000000000116611000000000000000000000000000000000000000000000000000000000000000000000
00000000555555555555555555555555000000011000000000000001100000000000000000000000000000000000000000000000000000000000000000000000
00000000555555555555555500000000000000dd0000000090000900000000000000000000000000000000000000000000000000000000000000000000000000
000000006666666655555555000000000000dd55dd0000097100999000ddd0000000000000000000000000000000000000000000000000000000000000000000
0000000000000000555555550000000000dd555555dd0001778079780d111d000000000000000000000000000000000000000000000000000000000000000000
00000000000000005555555500000000dd5555555555dd0777002770d16661d00000000000000000000000000000000000000000000000000000000000000000
6666666600000000555555550000000055555555555555027e2222201666661d0000000000000000000000000000000000000000000000000000000000000000
55555555000000005555555555555555dd5555555555dde22e22e22e1666661d0000000000000000000000000000000000000000000000000000000000000000
5555555500000000555555555555555500dd555555dd00e22e22e22e166666610000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000dd55dd0000eccc22ccce166666610000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000dd000000ec0c72c0c7166666d10000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000888888888888887c0c07c0c01666ddd10000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000888888888888880c0c00c0c016ddddd10000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000888888888888880c0c00c0c01dddddd10000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000888888888888880c022022c0011dddd10000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000088888888888888022000002200011dd10000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000888888888888880000000000000001110000000000000000000000000000000000000000000000000000000000000000
00000000555555555555555555555555000000011000000000000001100000000000000007777770077777700777777000000000000000000000000000000000
00000000555555555555555500000000000000dd000000009000090000000000000000007788887777bbbb7777cccc7700000000000000000000000000000000
000000006666666655555555000000000000dd55dd0000097100999000ddd00000000000787788877b77bbb77c77ccc700000000000000000000000000000000
0000000000000000555555550000000000dd555555dd0001778079780d111d0000000000787888877b7bbbb77c7cccc700000000000000000000000000000000
00000000000000005555555500000000dd5555555555dd0777002770d16661d000000000788887877bbbb7b77cccc7c700000000000000000000000000000000
6666666600000000555555550000000055555555555555027e2222201666661d00000000788877877bbb77b77ccc77c700000000000000000000000000000000
55555555000000005555555555555555dd5555555555dde22e22e22e1666661d000000007788887777bbbb7777cccc7700000000000000000000000000000000
5555555500000000555555555555555500dd555555dd00e22e22e22e166666610000000007777770077777700777777000000000000000000000000000000000
000000000000000000000000000000000000dd55dd0000eccc22ccce166666615555555555555555555555555555555500000000000000000000000000000000
00000000000000000000000000000000000000dd000000ec0c72c0c7166666d152222225577777755dd11dd55666666500000000000000000000000000000000
00000000000000000000000000000000888888888888887c0c07c0c01666ddd15222dd25575555755dddddd55677776500000000000000000000000000000000
00000000000000000000000000000000888888888888880c0c00c0c016ddddd15222dd255755557551dddd155676676500000000000000000000000000000000
00000000000000000000000000000000888888888888880c0c00c0c01dddddd152dd22255755557551dddd155666676500000000000000000000000000000000
00000000000000000000000000000000888888888888880c022022c0011dddd152dd2225575555755dddddd55777776500000000000000000000000000000000
0000000000000000000000000000000088888888888888022000002200011dd152222225577777755dd11dd55666666500000000000000000000000000000000
00000000000000000000000000000000888888888888880000000000000001115555555555555555555555555555555500000000000000000000000000000000
@@ -1,2 +1,76 @@
add(games,{name="tbd",author="tbd",_update = function() win() end}) -- game 5
add(games,{
name="freedom",
author="zatyka",
_init = function()

text,tick,px,py,ps,pdy,pjmax,pjcnt,pspd,pf,solids,pwrups=" ‹ freedom",0,192,88,21,0,1,0,3,0,{},{{384,408,"shrink"},{384,136,"shrink"},{176,440,"air jump"},{16,80,"speed"}}
for ix=0,31 do
for iy=0,31 do
tileval=mget(ix+96,iy)

for i=3,0,0xffff do
if (tileval>=2^i) s={(32*(i%2)+ix)*8, (32*flr(i/2)+iy)*8,rnd(4)} add(solids,s) tileval-=2^i
end
end
end
function col(objs)
for o in all(objs) do
if(px<o[1]+8 and px+ps>o[1] and py<o[2]+8 and py+ps>o[2]) fobj,pwrup=o,o[3] return true end
return false
end
end,
_update = function()
tick+=1

pf,colsol=0,{}
for s in all(solids) do
if (abs(s[1]-px)<50 and abs(s[2]-py)<50) add(colsol,s)
end

if(btn(1)) px+=pspd xdirc,pf=1,tick%4
if(btn(0)) px+=-pspd xdirc,pf=0xffff,tick%4

while (col(colsol)) do
px+=-xdirc
end

if((btnp(2) or btnp(4)) and (pjcnt<pjmax)) pdy=0xfff8 pjcnt+=1 sfx(16)
pdy=min(pdy+1,15)
py+=pdy
local ydirc=sgn(pdy)
if (pjcnt==0) pjcnt=1
while (col(colsol)) do
py-=ydirc
pdy=0
if (ydirc==1) pjcnt=0
end


if (col(pwrups)) then
if (pwrup=="air jump") pjmax+=1
if (pwrup=="shrink") ps-=7
if (pwrup=="speed") pspd+=1
del(pwrups,fobj)
sfx(17)
end

camera(mid(px-64,0,640),mid(py-64,0,640))
if (px<0) text,py,px=" thanks for playing",0xfff8,64 sfx(18)
end,
_draw = function()
cls()
sspr(64+pf*8,40,7,7,px,py,ps,ps,xdirc==1)

for s in all(solids) do
spr(120+s[3],s[1],s[2])
end
for pwr in all(pwrups) do
local x,y = pwr[1],pwr[2]
spr(105+x%3,x,y+sin(tick/25))
print(pwr[3],x-8,y-7)
end
print(text,10,17)
-- print(#solids,px,py-8,6)

end
}) -- game 5
@@ -1,16 +1,16 @@
2525252525252525252525252525252563636363636363636363636363636363050505050503050505050501030105050505010103010105050101010301010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525262725252525252526272562626262626262626262626262626262050505050501050505050505050505050505050501050505050105050105050100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2526362525252525252525262725252562626262626262626262626262626262050505050505050505050505050502050505050505050505050105050505050100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525252525262725252525252562626262626262626262626262626262050505050501050505050501010105050505050501050505050502050501050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525262725252525252525252627252562626262626262626262626262626262050505020504050505050505040505050505050505050205050505010505050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525262725252526272525252542616161616161616161616161616143050505050505050505050505050505050501020105010205050502050101020500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2526272525252525252525252525252550000000000000000000000000000051050505050505050505050205050505050505050405050505010501050405050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525252627252525252526272550000000000000000000000000000051050505050505050505050505050505050505050505050505050505050505050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252627252525252627252525252550000000000000000000000000000051010301010505050503050101010101010301010505050101010505050505030500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525252525252525252525252550000000000000000000000000000051050101050505050505050505050505010101050502050504050202050205010500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
2525252525252525252525252525252550000000000000000000000000000051050502050505050501050101050502050105010505050105050505020501050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1717173514151534151515163717171750000000000000000000000000000051050105010505050501050101010505050105050105010505050505050501050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1717351415151515151515151637171750000000000000000000000000000051050502050205050501050504050505050105010105010105010105050505050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1735141515151534151515151516371750000000000000000000000000000051050105010501050501050505050505050105050505050505010101050105050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
3514151515151515151515151515163750000000000000000000000000000051050502050504050501050205050505050105050205020505050405050505050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1415151515151534151515151515151652606060606060606060606060606053050505050505050501010505050505050105050505050505050505050505050500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
252525252525252525252525252525256363636363636363636363636363636305050505050305050505050103010505050501010301010505010101030101010000000000000000000000000000000000000000000000000000000000000000070303070303030b0b07030303030b0303030b0b03030303030303030303030b
252525252526272525252525252627256262626262626262626262626262626205050505050105050505050505050505050505050105050505010505010505010000000000000000000000000000000000000000000000000000000000000000040000000000000808040000000009000000000000000000020202020202020a
25263625252525252525252627252525626262626262626262626262626262620505050505050505050505050505020505050505050505050501050505050501000000000000000000000000000000000000000000000000000000000000000007030202020202020206040400020b02020a0a0b0f070501030303020202060e
252525252525252526272525252525256262626262626262626262626262626205050505050105050505050101010505050505050105050505050205050105050000000000000000000000000000000000000000000000000000000000000000050501010101000000040000000008000008000000000000020202020202060e
25252627252525252525252526272525626262626262626262626262626262620505050205040505050505050405050505050505050502050505050105050505000000000000000000000000000000000000000000000000000000000000000005010101010101010105000000000802020a020202020202020202020202020a
252525252526272525252627252525254261616161616161616161616161614305050505050505050505050505050505050102010501020505050205010102050000000000000000000000000000000000000000000000000000000000000000050101050101010101050000000008000008040406060202020202020202020a
252627252525252525252525252525255000000000000000000000000000005105050505050505050505020505050505050505040505050501050105040505050000000000000000000000000000000000000000000000000000000000000000050101010101010101050000000008000008040406060202020202020202020a
2525252525252627252525252526272550000000000000000000000000000051050505050505050505050505050505050505050505050505050505050505050500000000000000000000000000000000000000000000000000000000000000000501010101010101050500000000080000080c0c06060602020202020202020a
2525252627252525252627252525252550000000000000000000000000000051010301010505050503050101010101010301010505050101010505050505030500000000000000000000000000000000000000000000000000000000000000000501010101010909090d0c04000008000008080806060602020202020202020a
252525252525252525252525252525255000000000000000000000000000005105010105050505050505050505050501010105050205050405020205020501050000000000000000000000000000000000000000000000000000000000000000050000040602020a0a0d0c04000008000008080806060602020202020202060e
252525252525252525252525252525255000000000000000000000000000005105050205050505050105010105050205010501050505010505050502050105050000000000000000000000000000000000000000000000000000000000000000050000000000000000050c04000008000008080806000001010101010101040e
171717351415153415151516371717175000000000000000000000000000005105010501050505050105010101050505010505010501050505050505050105050000000000000000000000000000000000000000000000000000000000000000050000000000000000050c0404040a02020a0a0a03010101000000000000000a
17173514151515151515151516371717500000000000000000000000000000510505020502050505010505040505050501050101050101050101050505050505000000000000000000000000000000000000000000000000000000000000000005050101010908000405080000000a02020a0a0b03010101000000000000000a
17351415151515341515151515163717500000000000000000000000000000510501050105010505010505050505050501050505050505050101010501050505000000000000000000000000000000000000000000000000000000000000000005000000000908000005080000000a02020a0b0b0a080808020202000000000a
35141515151515151515151515151637500000000000000000000000000000510505020505040505010502050505050501050502050205050504050505050505000000000000000000000000000000000000000000000000000000000000000007020202020b0b0202070b0202020e060707030202010109030303010101010b
1415151515151534151515151515151652606060606060606060606060606053050505050505050501010505050505050105050505050505050505050505050500000000000000000000000000000000000000000000000000000000000000000d000000040c0c000205080000040c040505040001010008020202000000000e

0 comments on commit 2a1595b

Please sign in to comment.