Add a prettier tileset #16

Merged
pyrex merged 10 commits from tiles into main 2022-12-30 04:12:39 +00:00
Showing only changes of commit dbb0d99bfb - Show all commits

View File

@ -249,12 +249,13 @@ function level:advance()
self:reinit(self.ix+1) self:reinit(self.ix+1)
end end
pitpal = {[0]=1,[7]=0,[6]=1,[4]=1} normpal = {[1]=0,[8]=0,[14]=0}
pitpal = {[8]=0,[6]=5,[4]=3,[15]=3}
function level:draw() function level:draw()
fillp(0b1111111110111111) fillp(0b1111111110111111)
rectfill(0,0,127,127,0x55) rectfill(0,0,127,127,0x55)
fillp() fillp()
pal(8,0) pal(14,0) pal(normpal)
map( map(
self.bigx*16,self.bigy*16, self.bigx*16,self.bigy*16,
0,0,16,16, 0,0,16,16,
@ -264,15 +265,18 @@ function level:draw()
for _,pit in pairs(self._pits) do for _,pit in pairs(self._pits) do
local px,py=pit.px,pit.py local px,py=pit.px,pit.py
local pr=self._pits[_mix(px+1,py)] local pr=self._pits[_mix(px+1,py)]
spr(pit.s,px,py)
spr(pit.s,px,py)
if pit.contents then if pit.contents then
pal(pitpal) pal(pitpal)
palt(0,false) palt(0,false)
spr(pit.contents,pit.px,pit.py) spr(pit.contents,pit.px,pit.py)
pal() pal()
pal(8,0) pal(14,0) pal(normpal)
end end
palt(8,true)
spr(pit.s,px,py)
palt()
end end
for _,crate in pairs(self._crates) do for _,crate in pairs(self._crates) do
spr(crate.s,crate.px,crate.py) spr(crate.s,crate.px,crate.py)
@ -1689,29 +1693,29 @@ function level_text:draw()
end end
end end
__gfx__ __gfx__
000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeee555555550000000000000000000000000000000000000000333333338888888800050000eeeeeeee 000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeee55555555000000000000000000000000000000000000000033333333111111110005000000000000
003333300000332200333330eeffffffffffffffffffffee55ee55ee0000000000000000000000000000000000000000333333338888888800005000eeeeeeee 003333300000332200333330eeffffffffffffffffffffee55885588000000000000000000000000000000000000000033333333111111110000500000000000
099333990039932009333339effeeeeeeeeeeeeeeeeeeffeeeeeeeee0000000000000000000000000000000000000000333333338888888800000000eeeeeeee 099333990039932009333339effeeeeeeeeeeeeeeeeeeffe88888888000000000000000000000000000000000000000033333333111111110000000000000000
09a333a9033a932009333339efeebbebbbbebbbebbbbeefeeeeeeeee0000000000000000000000000000000000000000333333338888888850050050eeeeeeee 09a333a9033a932009333339efeebbebbbbebbbebbbbeefe88888888000000000000000000000000000000000000000033333333111111115005005000000000
023333323333320000222220efebbbebbbbebbbebbbbbefeeeeeeeee0000000000000000000000000000000000000000333333338888888805005005eeeeeeee 023333323333320000222220efebbbebbbbebbbebbbbbefe88888888000000000000000000000000000000000000000033333333111111110500500500000000
002222200000220000222220efebbeeeeeeeeeeeeeebbefeeeeeeeee0000000000000000000000000000000000000000333333338888888800000000eeeeeeee 002222200000220000222220efebbeeeeeeeeeeeeeebbefe88888888000000000000000000000000000000000000000033333333111111110000000000000000
000222c002222c0000022200efeeee555e555e55e5eeeefeeeeeeeee0000000000000000000000000000000000000000333333338888888800050000e55eeeee 000222c002222c0000022200efeeee555e555e55e5eeeefe88888888000000000000000000000000000000000000000033333333111111110005000000000000
00000cc00000cc0000000cc0efebbe5eeeeeeeeee5ebbefeeeeeeeee00000000000000000000000000000000000000003333333388888888000050005555ee55 00000cc00000cc0000000cc0efebbe5eeeeeeeeee5ebbefe88888888000000000000000000000000000000000000000033333333111111110000500000000000
0000ff000000000000000000efebbe5e00000000e5ebbefe555555550000000000000000000000000000000000000000eeeeeeee555555555eee5555eeeeeeee 0000ff000000000000000000efebbe5e00000000e5ebbefe55555555000000000000000000000000000000000000000088888888000000000000000000000000
000f00f0000000000aa00aa0efebbeee00000000eeebbefe55ee55ee0000000000000000000000000000000000000000eeeeeeee55ee55eeeeeeeeeeeeeeeeee 000f00f0000000000aa00aa0efebbeee00000000eeebbefe55885588000000000000000000000000000000000000000088888888000000000000000000000000
00d0000f000000000aaaaaa0efebbe5e00000000e5ebbefeeeeeeeee0000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 00d0000f000000000aaaaaa0efebbe5e00000000e5ebbefe88888888000000000000000000000000000000000000000088888888000000000000000000000000
00d0d00f00c040500aaaaaa0efeeee5e00000000e5eeeefeeeeeeeee0000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 00d0d00f00c040500aaaaaa0efeeee5e00000000e5eeeefe88888888000000000000000000000000000000000000000088888888000000000000000000000000
00dd00ee00c4455000999900efebbe5e00000000e5ebbefeeeeeeeee0000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 00dd00ee00c4455000999900efebbe5e00000000e5ebbefe88888888000000000000000000000000000000000000000088888888000000000000000000000000
00000ee00c44455500aaaa00efebbeee00000000eeebbefeeeeeeeee0000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 00000ee00c44455500aaaa00efebbeee00000000eeebbefe88888888000000000000000000000000000000000000000088888888000000000000000000000000
00eeee000c004005000aa000efebbe5e00000000e5ebbefeee55ee550000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeee5eee55 00eeee000c004005000aa000efebbe5e00000000e5ebbefe88558855000000000000000000000000000000000000000088888888000000000000000000000000
eeee0000cc04405500444400efeeee5e00000000e5eeeefe555555550000000000000000000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeee55555555 eeee0000cc04405500444400efeeee5e00000000e5eeeefe55555555000000000000000000000000000000000000000088888888000000000000000000000000
00000000000a900000000000efebbeeeeeeeeeeeeeebbefeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 00000000000a900000000000efebbeeeeeeeeeeeeeebbefe88888888000000000000000000000000000000000000000000000000000000000000000000000000
00000aaaaaaa910000000000efebbe5555e555e555ebbefeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 00000aaaaaaa910000000000efebbe5555e555e555ebbefe88888888000000000000000000000000000000000000000000000000000000000000000000000000
0000aaaaaa1a911000000000efebbeeeeeeeeeeeeeebbefeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 0000aaaaaa1a911000000000efebbeeeeeeeeeeeeeebbefe88888888000000000000000000000000000000000000000000000000000000000000000000000000
0aaaaaaaaa1a911100000000efebbbebbbbebbbebbbbbefeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 0aaaaaaaaa1a911100000000efebbbebbbbebbbebbbbbefe88888888000000000000000000000000000000000000000000000000000000000000000000000000
0aaaaaaaa41a91a100000000efeebbebbbbebbbebbbbeefeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 0aaaaaaaa41a91a100000000efeebbebbbbebbbebbbbeefe88888888000000000000000000000000000000000000000000000000000000000000000000000000
0a000aa4441a91a100000000effeeeeeeeeeeeeeeeeeeffeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000 0a000aa4441a91a100000000effeeeeeeeeeeeeeeeeeeffe88888888000000000000000000000000000000000000000000000000000000000000000000000000
00a0044449a110a100000000eeffffffffffffffffffffeeee55ee55000000000000000000000000000000000000000000000000000000000000000000000000 00a0044449a110a100000000eeffffffffffffffffffffee88558855000000000000000000000000000000000000000000000000000000000000000000000000
000aa1119911111000000000eeeeeeeeeeeeeeeeeeeeeeee55555555000000000000000000000000000000000000000000000000000000000000000000000000 000aa1119911111000000000eeeeeeeeeeeeeeeeeeeeeeee55555555000000000000000000000000000000000000000000000000000000000000000000000000
000000009910000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddd00ddddddddddddddddddddddddddd 000000009910000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddd00ddddddddddddddddddddddddddd
000000009900000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddd00ddddddddddddddddddddddddddd 000000009900000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddd00ddddddddddddddddddddddddddd
@ -1722,12 +1726,12 @@ eeee0000cc04405500444400efeeee5e00000000e5eeeefe55555555000000000000000000000000
00000007777a000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddddddddddddddddddd00ddddddddddd 00000007777a000000000000000000000000000000000000000000000000000000000000000000000000000000000000ddddddddddddddddddd00ddddddddddd
000444444444440000000000000000000000000000000000000000000000000000000000000000000000000000000000ddddddddddddddddddd00ddddddddddd 000444444444440000000000000000000000000000000000000000000000000000000000000000000000000000000000ddddddddddddddddddd00ddddddddddd
44444444444004444444444444444444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444 44444444444004444444444444444444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444
47766774477007744776677447700774477667744770077447766774477007744776677447700774477667744770077447766774477007744776677447700774 4ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff44ffddff44ff11ff4
47777774477777744777777447777774477777744777777447777774477777744777777447777774477777744777777447777774477777744777777447777774 4ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff4
46700764467007644670070046700700467007644670076446700700467007000070076400700764007007000070070000700764007007640070070000700700 4df11fd44df11fd44df11f104df11f104df11fd44df11fd44df11f104df11f1001f11fd401f11fd401f11f1001f11f1001f11fd401f11fd401f11f1001f11f10
46700764467007644670070046700700467007644670076446700700467007000070076400700764007007000070070000700764007007640070070000700700 4df11fd44df11fd44df11f104df11f104df11fd44df11fd44df11f104df11f1001f11fd401f11fd401f11f1001f11f1001f11fd401f11fd401f11f1001f11f10
47777774477777744777777447777774477777744777777447777774477777744777777447777774477777744777777447777774477777744777777447777774 4ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff44ffffff4
47766774477667744776677447766774477007744770077447700774477007744776677447766774477667744776677447700774477007744770077447700774 4ffddff44ffddff44ffddff44ffddff44ff11ff44ff11ff44ff11ff44ff11ff44ffddff44ffddff44ffddff44ffddff44ff11ff44ff11ff44ff11ff44ff11ff4
44444444444444444444444444444444444004444440044444400444444004444444444444444444444444444444444444400444444004444440044444400444 44444444444444444444444444444444444004444440044444400444444004444444444444444444444444444444444444400444444004444440044444400444
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@ -1884,7 +1888,7 @@ __label__
77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
__gff__ __gff__
000000c0c0c0200000000000c0c00020000000c008c020000000000020202020404000c0c0c020000008080800000000404000080808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000 000000c0c0c0200000000000c0c00000000000c008c020000000000020000000004000c0c0c020000008080800000000404000080808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
__map__ __map__
0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c120c0c0c0c0c0c0c0c0c010c0c0c0c0c0c0c0c0c0c0c0c0c0c120c0c0c0c0c0c0c0c0c0c0c0c0c0c0c3e0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c120c0c0c0c0c0c0c0c0c010c0c0c0c0c0c0c0c0c0c0c0c0c0c120c0c0c0c0c0c0c0c0c0c0c0c0c0c0c3e0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e