more preinit on viewport

master
Josha von Gizycki 6 years ago
parent faeccbecde
commit 62c49be8d4

@ -65,24 +65,24 @@
</tileset> </tileset>
<layer id="22" name="Hintergrund" width="30" height="24"> <layer id="22" name="Hintergrund" width="30" height="24">
<data encoding="csv"> <data encoding="csv">
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,43,43,42,43,43, 42,43,41,41,41,42,43,42,41,41,43,41,42,41,41,43,41,42,42,41,41,43,43,42,42,43,43,42,43,43,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,41,43,41,41,42, 43,42,43,43,43,41,41,41,43,43,43,41,41,42,41,41,42,42,41,42,42,42,41,42,43,41,43,41,41,42,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,42,41,43,42,42, 43,41,41,42,43,41,42,42,41,41,42,41,43,42,41,42,43,41,42,41,43,43,43,43,43,42,41,43,42,42,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,1, 43,43,42,43,43,42,43,42,41,42,42,41,42,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,42,42,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,2,3,3,2,2,3,2,2,2,3,1,2,2,1,1, 43,42,41,42,43,42,43,41,43,41,42,41,41,1,3,2,3,3,2,2,3,2,2,2,3,1,2,42,42,43,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,3,2,3,2,2,2,3,3,2,1,2,2,2,1, 42,42,42,42,1,1,1,1,1,43,41,42,41,1,2,2,3,2,3,2,2,2,3,3,2,1,2,2,43,41,
1,1,1,1,1,2,2,2,1,1,1,1,1,1,2,3,3,1,1,1,1,1,2,3,3,1,3,1,3,2, 43,43,42,41,1,2,2,2,1,43,43,42,43,1,2,3,3,1,1,1,1,1,2,3,3,1,3,1,3,2,
1,1,1,1,1,3,2,3,1,1,1,1,1,1,2,2,3,1,1,1,1,1,3,1,2,1,3,2,3,3, 41,41,41,42,1,3,2,3,1,42,41,41,41,1,2,2,3,1,1,1,1,1,3,1,2,1,3,2,3,3,
1,1,1,1,1,2,3,2,1,1,1,1,1,1,3,2,3,1,1,1,1,1,3,3,3,1,3,1,2,3, 41,41,43,42,1,2,3,2,1,42,43,42,42,1,3,2,3,1,1,1,1,1,3,3,3,1,3,1,2,3,
1,1,1,1,1,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,2,1, 42,43,43,42,1,2,2,2,1,41,41,43,42,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,2,1,
1,1,1,1,1,2,3,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,3,3,1,3,1, 41,43,42,43,1,2,3,2,1,42,41,43,41,1,1,1,1,1,1,1,1,1,1,1,2,3,3,1,3,1,
1,1,1,1,1,2,3,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,2,1,2,2,1, 1,1,1,1,1,2,3,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,2,1,2,2,1,
1,1,1,1,1,3,3,3,3,3,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,2,1,1, 1,1,1,1,1,3,3,3,3,3,2,2,328,1,1,1,1,1,1,1,1,1,1,1,1,3,1,2,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 367,367,367,367,367,367,367,367,367,367,367,367,368,367,367,367,367,367,368,367,367,367,367,367,367,367,367,367,367,367,
1,1,1,1,1,2,2,2,3,3,3,3,3,2,3,2,2,3,3,2,3,2,2,3,2,2,3,2,3,3, 1,1,1,1,1,2,2,2,3,3,3,3,328,2,3,2,2,3,3,2,3,2,2,3,2,2,3,2,3,3,
1,1,1,1,1,2,2,2,2,2,3,2,3,3,3,2,3,3,2,3,2,2,2,3,3,2,3,3,2,3, 1,1,1,1,1,2,2,2,2,2,3,2,328,3,3,2,3,3,2,3,2,2,2,3,3,2,3,3,2,3,
1,1,1,1,1,3,3,3,2,2,3,2,2,2,2,3,3,3,2,2,3,2,3,2,2,3,3,3,1,1, 1,1,1,1,1,3,3,3,2,2,3,2,328,2,2,3,3,3,2,2,3,2,3,2,2,3,3,3,1,1,
1,1,1,1,1,3,3,2,3,3,2,3,3,3,2,3,3,3,2,3,3,3,2,2,2,1,2,1,2,3, 1,1,1,1,1,3,3,2,3,3,2,3,407,367,367,367,367,367,409,3,3,3,2,2,2,1,2,1,2,3,
1,1,1,1,1,2,3,2,3,2,3,2,3,2,2,3,3,2,2,3,3,2,2,2,3,1,1,2,3,3, 1,1,1,1,1,2,3,2,3,2,3,2,3,2,2,3,3,2,2,3,3,2,2,2,3,1,1,2,3,3,
1,2,2,1,1,3,2,3,3,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,2,3, 1,2,2,1,1,3,2,3,3,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,2,3,
3,3,2,3,1,1,3,3,2,2,2,3,2,3,2,3,2,3,2,2,3,1,2,2,3,3,2,2,3,2, 3,3,2,3,1,1,3,3,2,2,2,3,2,3,2,3,2,3,2,2,3,1,2,2,3,3,2,2,3,2,
@ -93,25 +93,25 @@
</layer> </layer>
<layer id="25" name="Vordergrund" width="30" height="24"> <layer id="25" name="Vordergrund" width="30" height="24">
<data encoding="csv"> <data encoding="csv">
42,41,43,41,42,43,43,41,41,41,42,43,43,41,42,41,43,41,42,43,43,43,42,42,41,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
43,41,41,42,41,41,43,42,41,41,41,41,41,42,43,42,41,42,42,43,43,41,41,42,41,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
41,43,41,42,41,41,43,41,43,42,43,42,41,42,43,42,43,43,41,41,41,43,43,42,42,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
41,42,42,42,41,43,43,41,42,42,41,43,43,82,82,82,82,82,81,82,81,81,82,81,82,0,0,0,42,43, 0,0,0,0,0,0,0,0,0,0,0,0,0,82,82,82,82,82,81,82,81,81,82,81,82,0,0,0,0,0,
43,43,43,43,43,42,43,43,43,43,41,42,43,81,337,338,339,0,0,52,0,10,11,82,81,0,0,43,43,41, 0,0,0,0,0,0,0,0,0,0,0,0,0,81,337,338,339,0,0,52,0,10,11,82,81,0,0,0,0,0,
43,43,41,41,81,82,82,82,82,43,43,42,41,81,0,0,0,0,0,0,52,50,51,81,10,11,0,0,42,41, 0,0,0,0,81,82,82,82,82,0,0,0,0,81,0,0,0,0,0,0,52,50,51,81,10,11,0,0,0,0,
42,43,41,43,82,0,0,0,82,43,43,43,41,82,0,0,0,486,487,488,489,490,82,82,50,51,0,0,0,0, 0,0,0,0,82,0,0,0,82,0,0,0,0,82,0,0,0,486,487,488,489,490,82,82,50,51,0,0,0,0,
42,43,42,43,81,0,0,0,82,42,43,42,41,82,0,0,0,526,527,528,529,530,7,8,9,10,11,0,0,0, 0,0,0,0,81,0,0,0,82,0,0,0,0,82,0,0,0,526,527,528,529,530,7,8,9,10,11,0,0,0,
41,42,43,42,81,0,0,0,81,43,42,41,42,82,615,615,615,566,567,568,569,570,47,48,49,50,51,0,0,0, 0,0,0,0,81,0,0,0,81,0,0,0,0,82,615,615,615,566,567,568,569,570,47,48,49,50,51,0,0,0,
42,42,42,43,82,0,0,0,81,41,43,41,43,82,0,0,0,0,328,334,335,336,0,0,0,573,0,0,0,0, 0,0,0,0,82,0,0,0,81,0,0,0,0,82,0,0,0,0,328,334,335,336,0,0,0,573,0,0,0,0,
42,42,43,43,81,0,0,0,81,43,43,41,43,82,0,780,0,0,328,0,0,0,0,0,0,573,0,0,0,0, 0,0,0,0,81,0,0,0,81,0,0,0,0,82,0,780,0,0,328,0,0,0,0,0,0,573,0,0,0,0,
82,82,81,82,82,0,0,0,82,81,82,82,698,82,0,0,0,0,328,0,0,0,0,0,0,613,615,615,615,615, 82,82,81,82,82,0,0,0,82,81,82,82,698,82,0,0,0,0,328,0,0,0,0,0,0,613,615,615,615,615,
0,0,3,0,0,0,0,0,0,0,0,0,328,0,0,0,0,0,328,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,328,0,0,0,0,0,328,0,0,0,0,0,0,0,0,0,0,0,
367,367,367,367,367,367,367,367,367,367,367,367,368,367,367,367,367,367,368,369,369,369,369,369,369,367,367,367,367,367, 367,367,367,367,367,367,367,367,367,367,367,367,368,367,367,367,367,367,368,369,369,369,369,369,369,367,367,367,367,367,
3,0,0,3,0,0,0,0,0,0,0,0,408,583,587,587,587,453,454,455,456,587,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,408,583,587,587,587,453,454,455,456,587,0,0,0,0,0,0,0,0,
81,82,81,82,82,0,0,0,0,0,0,0,408,626,166,0,0,493,494,495,496,625,0,0,0,10,11,7,8,9, 81,82,81,82,82,0,0,0,0,0,0,0,408,626,166,0,0,493,494,495,496,625,0,0,0,10,11,7,8,9,
2,2,2,2,82,0,0,0,0,0,0,0,408,626,0,0,0,533,534,535,536,625,0,0,0,50,51,47,48,49, 2,0,0,0,82,0,0,0,0,0,0,0,408,626,0,0,0,533,534,535,536,625,0,0,0,50,51,47,48,49,
2,3,3,2,82,0,0,0,0,0,0,0,407,369,369,369,369,369,409,0,0,625,0,0,0,10,11,0,0,0, 0,3,2,0,82,0,0,0,0,0,0,0,407,369,369,369,369,369,409,0,0,625,0,0,0,10,11,0,0,0,
3,2,3,0,81,0,0,0,0,0,0,0,0,666,664,664,664,664,664,664,664,665,0,0,0,50,51,0,0,0, 0,3,0,0,81,0,0,0,0,0,0,0,0,666,664,664,664,664,664,664,664,665,0,0,0,50,51,0,0,0,
0,0,0,0,81,7,8,9,10,11,7,8,9,7,8,9,10,11,7,8,9,10,11,7,8,9,0,0,0,0, 0,0,0,0,81,7,8,9,10,11,7,8,9,7,8,9,10,11,7,8,9,10,11,7,8,9,0,0,0,0,
0,0,0,0,81,47,48,49,50,51,47,48,49,47,48,49,50,51,47,48,49,50,51,47,48,49,0,0,0,0, 0,0,0,0,81,47,48,49,50,51,47,48,49,47,48,49,50,51,47,48,49,50,51,47,48,49,0,0,0,0,
0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

@ -2,7 +2,7 @@
"infinite":false, "infinite":false,
"layers":[ "layers":[
{ {
"data":[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 43, 43, 42, 43, 43, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 41, 43, 41, 41, 42, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 42, 41, 43, 42, 42, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 3, 3, 2, 2, 3, 2, 2, 2, 3, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 2, 3, 2, 2, 2, 3, 3, 2, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, 1, 1, 1, 1, 1, 2, 3, 3, 1, 3, 1, 3, 2, 1, 1, 1, 1, 1, 3, 2, 3, 1, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 1, 1, 3, 1, 2, 1, 3, 2, 3, 3, 1, 1, 1, 1, 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 3, 2, 3, 1, 1, 1, 1, 1, 3, 3, 3, 1, 3, 1, 2, 3, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 1, 1, 1, 1, 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 1, 3, 1, 1, 1, 1, 1, 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 2, 3, 2, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 3, 2, 3, 3, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, 3, 2, 3, 3, 2, 3, 1, 1, 1, 1, 1, 3, 3, 3, 2, 2, 3, 2, 2, 2, 2, 3, 3, 3, 2, 2, 3, 2, 3, 2, 2, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3, 2, 2, 2, 1, 2, 1, 2, 3, 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, 3, 2, 3, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 2, 3, 1, 1, 2, 3, 3, 1, 2, 2, 1, 1, 3, 2, 3, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, 3, 1, 1, 3, 3, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 2, 2, 3, 1, 2, 2, 3, 3, 2, 2, 3, 2, 3, 1, 2, 2, 1, 2, 2, 2, 3, 3, 2, 1, 1, 2, 3, 2, 3, 3, 2, 2, 3, 2, 1, 2, 3, 2, 2, 3, 3, 2, 3, 2, 2, 2, 1, 2, 3, 3, 2, 3, 2, 2, 2, 2, 3, 3, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 2, 2, 1, 3, 2, 1, 2, 2, 1, 1, 3, 2, 3, 3, 2, 3, 2, 3, 3, 3, 2, 2, 3, 2, 3, 2, 3, 2, 1, 1, 3, 2, 2, 3], "data":[42, 43, 41, 41, 41, 42, 43, 42, 41, 41, 43, 41, 42, 41, 41, 43, 41, 42, 42, 41, 41, 43, 43, 42, 42, 43, 43, 42, 43, 43, 43, 42, 43, 43, 43, 41, 41, 41, 43, 43, 43, 41, 41, 42, 41, 41, 42, 42, 41, 42, 42, 42, 41, 42, 43, 41, 43, 41, 41, 42, 43, 41, 41, 42, 43, 41, 42, 42, 41, 41, 42, 41, 43, 42, 41, 42, 43, 41, 42, 41, 43, 43, 43, 43, 43, 42, 41, 43, 42, 42, 43, 43, 42, 43, 43, 42, 43, 42, 41, 42, 42, 41, 42, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 42, 42, 43, 42, 41, 42, 43, 42, 43, 41, 43, 41, 42, 41, 41, 1, 3, 2, 3, 3, 2, 2, 3, 2, 2, 2, 3, 1, 2, 42, 42, 43, 42, 42, 42, 42, 1, 1, 1, 1, 1, 43, 41, 42, 41, 1, 2, 2, 3, 2, 3, 2, 2, 2, 3, 3, 2, 1, 2, 2, 43, 41, 43, 43, 42, 41, 1, 2, 2, 2, 1, 43, 43, 42, 43, 1, 2, 3, 3, 1, 1, 1, 1, 1, 2, 3, 3, 1, 3, 1, 3, 2, 41, 41, 41, 42, 1, 3, 2, 3, 1, 42, 41, 41, 41, 1, 2, 2, 3, 1, 1, 1, 1, 1, 3, 1, 2, 1, 3, 2, 3, 3, 41, 41, 43, 42, 1, 2, 3, 2, 1, 42, 43, 42, 42, 1, 3, 2, 3, 1, 1, 1, 1, 1, 3, 3, 3, 1, 3, 1, 2, 3, 42, 43, 43, 42, 1, 2, 2, 2, 1, 41, 41, 43, 42, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 41, 43, 42, 43, 1, 2, 3, 2, 1, 42, 41, 43, 41, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 1, 3, 1, 1, 1, 1, 1, 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 2, 2, 328, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 1, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 368, 367, 367, 367, 367, 367, 368, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 328, 2, 3, 2, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 3, 2, 3, 3, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 2, 328, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, 3, 2, 3, 3, 2, 3, 1, 1, 1, 1, 1, 3, 3, 3, 2, 2, 3, 2, 328, 2, 2, 3, 3, 3, 2, 2, 3, 2, 3, 2, 2, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, 3, 3, 2, 3, 407, 367, 367, 367, 367, 367, 409, 3, 3, 3, 2, 2, 2, 1, 2, 1, 2, 3, 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, 3, 2, 3, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 2, 3, 1, 1, 2, 3, 3, 1, 2, 2, 1, 1, 3, 2, 3, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, 3, 1, 1, 3, 3, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 2, 2, 3, 1, 2, 2, 3, 3, 2, 2, 3, 2, 3, 1, 2, 2, 1, 2, 2, 2, 3, 3, 2, 1, 1, 2, 3, 2, 3, 3, 2, 2, 3, 2, 1, 2, 3, 2, 2, 3, 3, 2, 3, 2, 2, 2, 1, 2, 3, 3, 2, 3, 2, 2, 2, 2, 3, 3, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 2, 2, 1, 3, 2, 1, 2, 2, 1, 1, 3, 2, 3, 3, 2, 3, 2, 3, 3, 3, 2, 2, 3, 2, 3, 2, 3, 2, 1, 1, 3, 2, 2, 3],
"height":24, "height":24,
"id":22, "id":22,
"name":"Hintergrund", "name":"Hintergrund",
@ -14,7 +14,7 @@
"y":0 "y":0
}, },
{ {
"data":[42, 41, 43, 41, 42, 43, 43, 41, 41, 41, 42, 43, 43, 41, 42, 41, 43, 41, 42, 43, 43, 43, 42, 42, 41, 0, 0, 0, 0, 0, 43, 41, 41, 42, 41, 41, 43, 42, 41, 41, 41, 41, 41, 42, 43, 42, 41, 42, 42, 43, 43, 41, 41, 42, 41, 0, 0, 0, 0, 0, 41, 43, 41, 42, 41, 41, 43, 41, 43, 42, 43, 42, 41, 42, 43, 42, 43, 43, 41, 41, 41, 43, 43, 42, 42, 0, 0, 0, 0, 0, 41, 42, 42, 42, 41, 43, 43, 41, 42, 42, 41, 43, 43, 82, 82, 82, 82, 82, 81, 82, 81, 81, 82, 81, 82, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 42, 43, 43, 43, 43, 41, 42, 43, 81, 337, 338, 339, 0, 0, 52, 0, 10, 11, 82, 81, 0, 0, 43, 43, 41, 43, 43, 41, 41, 81, 82, 82, 82, 82, 43, 43, 42, 41, 81, 0, 0, 0, 0, 0, 0, 52, 50, 51, 81, 10, 11, 0, 0, 42, 41, 42, 43, 41, 43, 82, 0, 0, 0, 82, 43, 43, 43, 41, 82, 0, 0, 0, 486, 487, 488, 489, 490, 82, 82, 50, 51, 0, 0, 0, 0, 42, 43, 42, 43, 81, 0, 0, 0, 82, 42, 43, 42, 41, 82, 0, 0, 0, 526, 527, 528, 529, 530, 7, 8, 9, 10, 11, 0, 0, 0, 41, 42, 43, 42, 81, 0, 0, 0, 81, 43, 42, 41, 42, 82, 615, 615, 615, 566, 567, 568, 569, 570, 47, 48, 49, 50, 51, 0, 0, 0, 42, 42, 42, 43, 82, 0, 0, 0, 81, 41, 43, 41, 43, 82, 0, 0, 0, 0, 328, 334, 335, 336, 0, 0, 0, 573, 0, 0, 0, 0, 42, 42, 43, 43, 81, 0, 0, 0, 81, 43, 43, 41, 43, 82, 0, 780, 0, 0, 328, 0, 0, 0, 0, 0, 0, 573, 0, 0, 0, 0, 82, 82, 81, 82, 82, 0, 0, 0, 82, 81, 82, 82, 698, 82, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 0, 613, 615, 615, 615, 615, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 368, 367, 367, 367, 367, 367, 368, 369, 369, 369, 369, 369, 369, 367, 367, 367, 367, 367, 3, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 408, 583, 587, 587, 587, 453, 454, 455, 456, 587, 0, 0, 0, 0, 0, 0, 0, 0, 81, 82, 81, 82, 82, 0, 0, 0, 0, 0, 0, 0, 408, 626, 166, 0, 0, 493, 494, 495, 496, 625, 0, 0, 0, 10, 11, 7, 8, 9, 2, 2, 2, 2, 82, 0, 0, 0, 0, 0, 0, 0, 408, 626, 0, 0, 0, 533, 534, 535, 536, 625, 0, 0, 0, 50, 51, 47, 48, 49, 2, 3, 3, 2, 82, 0, 0, 0, 0, 0, 0, 0, 407, 369, 369, 369, 369, 369, 409, 0, 0, 625, 0, 0, 0, 10, 11, 0, 0, 0, 3, 2, 3, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 666, 664, 664, 664, 664, 664, 664, 664, 665, 0, 0, 0, 50, 51, 0, 0, 0, 0, 0, 0, 0, 81, 7, 8, 9, 10, 11, 7, 8, 9, 7, 8, 9, 10, 11, 7, 8, 9, 10, 11, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 81, 47, 48, 49, 50, 51, 47, 48, 49, 47, 48, 49, 50, 51, 47, 48, 49, 50, 51, 47, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 82, 82, 82, 82, 81, 82, 81, 81, 82, 81, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 337, 338, 339, 0, 0, 52, 0, 10, 11, 82, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 82, 82, 82, 82, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 52, 50, 51, 81, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 82, 0, 0, 0, 0, 82, 0, 0, 0, 486, 487, 488, 489, 490, 82, 82, 50, 51, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 82, 0, 0, 0, 0, 82, 0, 0, 0, 526, 527, 528, 529, 530, 7, 8, 9, 10, 11, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 81, 0, 0, 0, 0, 82, 615, 615, 615, 566, 567, 568, 569, 570, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 81, 0, 0, 0, 0, 82, 0, 0, 0, 0, 328, 334, 335, 336, 0, 0, 0, 573, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 81, 0, 0, 0, 0, 82, 0, 780, 0, 0, 328, 0, 0, 0, 0, 0, 0, 573, 0, 0, 0, 0, 82, 82, 81, 82, 82, 0, 0, 0, 82, 81, 82, 82, 698, 82, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 0, 613, 615, 615, 615, 615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, 368, 367, 367, 367, 367, 367, 368, 369, 369, 369, 369, 369, 369, 367, 367, 367, 367, 367, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 408, 583, 587, 587, 587, 453, 454, 455, 456, 587, 0, 0, 0, 0, 0, 0, 0, 0, 81, 82, 81, 82, 82, 0, 0, 0, 0, 0, 0, 0, 408, 626, 166, 0, 0, 493, 494, 495, 496, 625, 0, 0, 0, 10, 11, 7, 8, 9, 2, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 408, 626, 0, 0, 0, 533, 534, 535, 536, 625, 0, 0, 0, 50, 51, 47, 48, 49, 0, 3, 2, 0, 82, 0, 0, 0, 0, 0, 0, 0, 407, 369, 369, 369, 369, 369, 409, 0, 0, 625, 0, 0, 0, 10, 11, 0, 0, 0, 0, 3, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 666, 664, 664, 664, 664, 664, 664, 664, 665, 0, 0, 0, 50, 51, 0, 0, 0, 0, 0, 0, 0, 81, 7, 8, 9, 10, 11, 7, 8, 9, 7, 8, 9, 10, 11, 7, 8, 9, 10, 11, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 81, 47, 48, 49, 50, 51, 47, 48, 49, 47, 48, 49, 50, 51, 47, 48, 49, 50, 51, 47, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":24, "height":24,
"id":25, "id":25,
"name":"Vordergrund", "name":"Vordergrund",
@ -208,7 +208,7 @@
}], }],
"opacity":1, "opacity":1,
"type":"objectgroup", "type":"objectgroup",
"visible":true, "visible":false,
"x":0, "x":0,
"y":0 "y":0
}], }],

@ -126,11 +126,12 @@
more accurately. more accurately.
if continue? is true, wait for 5 seconds plain" if continue? is true, wait for 5 seconds plain"
[gamestate] [gamestate]
(if (:continue? gamestate) (let [update-elapsed (- (.now js/performance)
(/ (- 1000 (- (.now js/performance) (get-in gamestate [:timing :now]))]
(get-in gamestate [:timing :now]))) (if (:continue? gamestate)
(:target-fps gamestate)) (/ (- 1000 update-elapsed)
5000)) (:target-fps gamestate))
5000)))
(defn mainloop (defn mainloop
"transforms the given gamestate by invoking a series of update "transforms the given gamestate by invoking a series of update

@ -29,6 +29,7 @@
:viewport {:keep-in {:x 0 :y 0 :viewport {:keep-in {:x 0 :y 0
:w 0 :h 0} :w 0 :h 0}
:tileset :pokelike :tileset :pokelike
:tileset-def nil
:x 6 :y 9 :x 6 :y 9
:w (get-in gamestate [:dimensions :w]) :w (get-in gamestate [:dimensions :w])
:h (get-in gamestate [:dimensions :h]) :h (get-in gamestate [:dimensions :h])
@ -51,25 +52,38 @@
(:keep-in viewport) (:keep-in viewport)
(collision/pps->px gamestate viewport))) (collision/pps->px gamestate viewport)))
(defn init-viewport [scenestate]
(let [{loaded-def :def
zoom :zoom} (get-in scenestate [:map-def])
viewport (:viewport scenestate)
{mw :width mh :height
tw :tilewidth th :tileheight} loaded-def]
(-> scenestate
(assoc-in [:viewport :keep-in :w] (* (dec mw) zoom tw))
(assoc-in [:viewport :keep-in :h] (* (dec mh) zoom th))
(update-in [:viewport :x] * tw zoom)
(update-in [:viewport :y] * th zoom)
(assoc-in [:viewport :tileset-def]
(tileset/map-def->tileset loaded-def
(:tileset viewport))))))
(defn init-map-def [scenestate] (defn init-map-def [scenestate]
(if (and (not (get-in scenestate [:map-def :def])) (if (and (not (get-in scenestate [:map-def :def]))
(some? @map-def)) (some? @map-def))
(let [loaded-def (walk/keywordize-keys @map-def) (let [loaded-def (walk/keywordize-keys @map-def)
zoom (get-in scenestate [:map-def :zoom]) zoom (get-in scenestate [:map-def :zoom])
viewport (:viewport scenestate)
{mw :width mh :height {mw :width mh :height
tw :tilewidth th :tileheight} loaded-def] tw :tilewidth th :tileheight} loaded-def]
(-> scenestate (-> scenestate
(assoc-in [:map-def :def] loaded-def) (assoc-in [:map-def :def] loaded-def)
(update-in [:map-def :def] (update-in [:map-def :def]
(partial tileset/prepare-map-def zoom)) (partial tileset/prepare-map-def zoom))
(assoc-in [:viewport :keep-in :w] (* (dec mw) zoom tw))
(assoc-in [:viewport :keep-in :h] (* (dec mh) zoom th))
(update-in [:viewport :x] * tw zoom)
(update-in [:viewport :y] * th zoom)
(assoc-in [:player :w] (- tw 2)) (assoc-in [:player :w] (- tw 2))
(assoc-in [:player :h] (- th 2)) (assoc-in [:player :h] (- th 2))
(update-in [:player :w] - (/ tw 2)) (update-in [:player :w] - (/ tw 2))
(update-in [:player :h] - (/ th 2)))) (update-in [:player :h] - (/ th 2))
init-viewport))
scenestate)) scenestate))
(defn update-scene [gamestate scenestate] (defn update-scene [gamestate scenestate]

@ -87,7 +87,7 @@
height width layers]} def height width layers]} def
tileset-id (:tileset viewport) tileset-id (:tileset viewport)
image (tileset-id images) image (tileset-id images)
tileset (map-def->tileset def (:tileset viewport))] tileset (:tileset-def viewport)]
(doseq [layer layers] (doseq [layer layers]
(doseq [dest layer (doseq [dest layer
:let [dx (- (:x dest) (:x viewport)) :let [dx (- (:x dest) (:x viewport))

Loading…
Cancel
Save