From 373de1abe4738b8fc2a3c12fb686fd6f2b1a87b0 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 3 Mar 2016 11:07:05 +0200 Subject: [PATCH] Crudely hack tileset support back in --- koperkapel/generators/maps.py | 2 +- .../images/{ => bunker}/floor/floor_1.png | Bin .../images/{ => bunker}/floor/floor_2.png | Bin .../images/{ => bunker}/floor/floor_3.png | Bin .../images/{ => bunker}/floor/floor_4.png | Bin .../images/{ => bunker}/wall/wall_1.png | Bin .../images/{ => bunker}/wall/wall_2.png | Bin .../images/{ => bunker}/wall/wall_3.png | Bin .../images/{ => bunker}/wall/wall_4.png | Bin koperkapel/images/tiles/dungeon/cwall.png | Bin 1259 -> 0 bytes koperkapel/images/tiles/dungeon/floor.png | Bin 918 -> 0 bytes koperkapel/levels/level1.json | 2 +- koperkapel/loaders/levelloader.py | 18 +++++++++++------- 13 files changed, 13 insertions(+), 9 deletions(-) rename koperkapel/images/{ => bunker}/floor/floor_1.png (100%) rename koperkapel/images/{ => bunker}/floor/floor_2.png (100%) rename koperkapel/images/{ => bunker}/floor/floor_3.png (100%) rename koperkapel/images/{ => bunker}/floor/floor_4.png (100%) rename koperkapel/images/{ => bunker}/wall/wall_1.png (100%) rename koperkapel/images/{ => bunker}/wall/wall_2.png (100%) rename koperkapel/images/{ => bunker}/wall/wall_3.png (100%) rename koperkapel/images/{ => bunker}/wall/wall_4.png (100%) delete mode 100644 koperkapel/images/tiles/dungeon/cwall.png delete mode 100644 koperkapel/images/tiles/dungeon/floor.png diff --git a/koperkapel/generators/maps.py b/koperkapel/generators/maps.py index ae174d5..ac3ec8c 100644 --- a/koperkapel/generators/maps.py +++ b/koperkapel/generators/maps.py @@ -184,7 +184,7 @@ class LevelGenerator: def _to_json(self): level = {} - level['tileset'] = 'dungeon' + level['tileset'] = 'bunker' level['tiles'] = [] for l, lu in zip(self.map, self.underlayer): row = [] diff --git a/koperkapel/images/floor/floor_1.png b/koperkapel/images/bunker/floor/floor_1.png similarity index 100% rename from koperkapel/images/floor/floor_1.png rename to koperkapel/images/bunker/floor/floor_1.png diff --git a/koperkapel/images/floor/floor_2.png b/koperkapel/images/bunker/floor/floor_2.png similarity index 100% rename from koperkapel/images/floor/floor_2.png rename to koperkapel/images/bunker/floor/floor_2.png diff --git a/koperkapel/images/floor/floor_3.png b/koperkapel/images/bunker/floor/floor_3.png similarity index 100% rename from koperkapel/images/floor/floor_3.png rename to koperkapel/images/bunker/floor/floor_3.png diff --git a/koperkapel/images/floor/floor_4.png b/koperkapel/images/bunker/floor/floor_4.png similarity index 100% rename from koperkapel/images/floor/floor_4.png rename to koperkapel/images/bunker/floor/floor_4.png diff --git a/koperkapel/images/wall/wall_1.png b/koperkapel/images/bunker/wall/wall_1.png similarity index 100% rename from koperkapel/images/wall/wall_1.png rename to koperkapel/images/bunker/wall/wall_1.png diff --git a/koperkapel/images/wall/wall_2.png b/koperkapel/images/bunker/wall/wall_2.png similarity index 100% rename from koperkapel/images/wall/wall_2.png rename to koperkapel/images/bunker/wall/wall_2.png diff --git a/koperkapel/images/wall/wall_3.png b/koperkapel/images/bunker/wall/wall_3.png similarity index 100% rename from koperkapel/images/wall/wall_3.png rename to koperkapel/images/bunker/wall/wall_3.png diff --git a/koperkapel/images/wall/wall_4.png b/koperkapel/images/bunker/wall/wall_4.png similarity index 100% rename from koperkapel/images/wall/wall_4.png rename to koperkapel/images/bunker/wall/wall_4.png diff --git a/koperkapel/images/tiles/dungeon/cwall.png b/koperkapel/images/tiles/dungeon/cwall.png deleted file mode 100644 index 849133b8411803497a2cccc16fad1da0f97d5dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1259 zcmV3>A=qG9{%; zN|%&A0!PRZI6{uV5ja9hN|%%_DP3;qG9AD8U!E5sdl}}>s#s@++1(`4a~w;0el|BD zgfCK#QVJ0f&GSsZIoSTUJ}!kng%A!Wa?bU$ltRuqBBJ`)Izk8(W30C9r<6j7k#p|) zx-|YRUHLJ|p5@Smold6{rIaXy@U1q_^GwdU`l$_F_Q4oj+SqQ} zHnPOO`VhGB-hW*+53r=W?86d&BBGi=v@*iyuw2Q{9^H&FHj`b>nNmuo_=5_!dOqh& zA%sKOkgQA+6QrcFbm28*a498I{7Keaz7eTrkCsY%jitpHt1o;Y>E8l>LPLxfHe!Qy zUF&x(rdk{x-)8T@t?)+~2(LR)cq%5Q+FD`sxQu*Sc8cz9TuZazOhABM*~ z&-IVXO(~^LDO+?CZPA8fm#^iV>2x}gCH~bj!I1-66!L0R;dNaPL`15xJsR0kYNaZR zwO3*+%VLT@LI8UoiHKIJ_?$MuXbBQrmhgU5cdhX!G}eZj){qwE)P%>@Ob#E!692F+ zASV71i&+bHKu-uqf(F;-JbwGQw5PLGd|lyk24vdYUo`2KC%YKN3kDt@c% zrIg5fe<*z^r9+4A`%drg@AUNabhwW@dQjm(g|AoCNIUg+IyU zfpcY9T4bYIC95?|wZ>WF4=OyUaEC_zFS_|#`%B;-sIZKi*Voqr-R!Bbt!qqKH4KhN zOZ*W6NJTZ}R3jy_bg_??SScwjk`inDTWwK7?G|h@kb75^-k~L^+Y)XYpJ#^VS*{DCH`FqVdaM4W&|FBsLJAk zBiGiH5;^DUIq!Y_o>HRE&(G?E_Xgvh-54Wz@2f(Lx!~jDquQcxzRvB9F;=CS+rsT- zeC#Y#zy}o`IpE*WYN<6nv6AmCrI7c&#$IpBtIYbixM6{Rki?{+Bpba|T$HR(gTo!0 z(l4(fS>lfn=ut)-9k^5T+_5anxBu`uCsbJBPclAGg2FhHJiSLf<;Fz$K-f5I{7EJX zNilnGsg-CX89|zg1V%oD1^&nZ_$K6vjijmP79VgOPYylp&B~Erfq&z@|GMTC;y;2! Vl?6uPH#z_S002ovPDHLkV1n4~Uy=X- diff --git a/koperkapel/images/tiles/dungeon/floor.png b/koperkapel/images/tiles/dungeon/floor.png deleted file mode 100644 index 45b06f553095ca4d28eec3b3121a4b1f96f1923d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 zcmV;H18Mw;P)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-sk5(pb4_QK+J0009uNkl#+Vw z+{D#o(Q>EW7+ZI;*)~cuM0aA>bn@rAEiqbU^r}(Jx-6^Oefh4tHx2YpFvK*^x@Gff zXF_(zyHl6;6S3)&XM2r=Xs*B}Pj5oGF&L&#q{Jc)GQHArhFmvX;b!-{4j?yRdAYXE$& zW;ko!+6Yf?LKopeE~HpxbUBRGTx3_I%o4-hZUI0_fv#;e02Qf&X=WFU*Eu2zxd#sT zb4yoT&jp&_%xKz@sEo+}BbJx|x7os_LMM^5Y3UHYaH&{(h*62Do5ScP7a}15)9Mip;!fzf;Wxe2A)t=s773XPlII$ELW2Q*!rNzWEIuwN$&95}woSmkwJ**#j|z-0@v!0`d~ z0RVjGD6@Vm^>5~hU7B7wOkkY!(e@x0xGOP{Jd9+ECBAj$20*THGB?>i=E|8(xPlOr zymDr--@P}Av#}Wr&t#@ja0iaG0p`{sh;`FwRZ0LyKy8V;8)m^Rx)w_^j>iHb%fV@9 sAUC?L0yIS$jO{WI7vcl?x4M4+13SsXavsQfcmMzZ07*qoM6N<$g2q^$eE