From f140c6ec9cfb2bbbf7338e1ac5b976631191df11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 8 Jun 2012 19:31:10 +0200 Subject: [PATCH] added TilesetBuilder command line, added Tileset extractor removing all copyrighted raw tileset files --- mods/d2k/raw/BLOXBASE.tsx => BASE.tsx | 3232 +++++++++-------- mods/d2k/raw/arrakis.tsx => BAT.tsx | 2725 +++++++------- BGBS.tsx | 225 ++ OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj | 1 + OpenRA.TilesetBuilder/Program.cs | 9 +- OpenRA.TilesetBuilder/defaults.yaml | 38 + OpenRA.TilesetBuilder/frmBuilder.cs | 294 +- OpenRA.Utility/Command.cs | 29 + OpenRA.Utility/Program.cs | 15 +- mods/d2k/TODO | 4 +- mods/d2k/bits/arrakis.mix | Bin 117162 -> 0 bytes mods/d2k/bits/arrakis.pal | Bin 768 -> 0 bytes mods/d2k/bits/cursor.pal | Bin 0 -> 768 bytes mods/d2k/maps/blank.oramap | Bin 572 -> 564 bytes mods/d2k/maps/bloxbase-test.oramap | Bin 592 -> 0 bytes mods/d2k/maps/test.oramap | Bin 1190 -> 955 bytes mods/d2k/mod.yaml | 7 +- mods/d2k/raw/BLOXBASE.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXBAT.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXBGBS.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXICE.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXTREE.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXWAST.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/BLOXXMAS.bmp | Bin 820278 -> 0 bytes mods/d2k/raw/arrakis.bmp | Bin 769076 -> 0 bytes mods/d2k/rules/atreides.yaml | 2 + mods/d2k/rules/defaults.yaml | 32 +- mods/d2k/rules/harkonnen.yaml | 2 + mods/d2k/rules/ordos.yaml | 2 + mods/d2k/rules/system.yaml | 46 +- mods/d2k/rules/vehicles.yaml | 4 +- mods/d2k/sequences.yaml | 11 +- mods/d2k/tilesets/arrakis.yaml | 291 -- .../bloxbase.yaml => tilesets/base.yaml} | 2097 +++++------ mods/d2k/tilesets/bloxbase.yaml | 2369 ------------ mods/d2k/tilesets/bloxbase/bloxbase.pal | Bin 768 -> 0 bytes mods/d2k/tilesets/bloxbase/t00.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t01.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t02.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t03.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t04.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t05.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t06.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t07.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t08.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t09.blo | Bin 15445 -> 0 bytes mods/d2k/tilesets/bloxbase/t10.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t100.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t101.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t102.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t103.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t104.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t105.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t106.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t107.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t108.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t109.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t11.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t110.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t111.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t112.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t113.blo | Bin 3121 -> 0 bytes mods/d2k/tilesets/bloxbase/t114.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t115.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t116.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t117.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t118.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t119.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t12.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t120.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t121.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t122.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t123.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t124.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t125.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t126.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t127.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t128.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t129.blo | Bin 9283 -> 0 bytes mods/d2k/tilesets/bloxbase/t13.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t130.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t131.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t132.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t133.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t134.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t135.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t136.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t137.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t138.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t139.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t14.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t140.blo | Bin 8256 -> 0 bytes mods/d2k/tilesets/bloxbase/t141.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t142.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t143.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t144.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t145.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t146.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t147.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t148.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t149.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t15.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t150.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t151.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t152.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t153.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t154.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t155.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t156.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t157.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t158.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t159.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t16.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t160.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t161.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t162.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t163.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t164.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t165.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t166.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t167.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t168.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t169.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t17.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t170.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t171.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t172.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t173.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t174.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t175.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t176.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t177.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t178.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t179.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t18.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t180.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t181.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t182.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t183.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t184.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t185.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t186.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t187.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t188.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t189.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t19.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t190.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t191.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t192.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t193.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t194.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t195.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t196.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t197.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t198.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t199.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t20.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t200.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t201.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t202.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t203.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t204.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t205.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t206.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t207.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t208.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t209.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t21.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t210.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t211.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t212.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t213.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t214.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t215.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t216.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t217.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t218.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t219.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t22.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t220.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t221.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t222.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t223.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t224.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t225.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t226.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t227.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t228.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t229.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t23.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t230.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t231.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t232.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t233.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t234.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t235.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t236.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t237.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t238.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t239.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t24.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t240.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t241.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t242.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t243.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t244.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t245.blo | Bin 10310 -> 0 bytes mods/d2k/tilesets/bloxbase/t246.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t247.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t248.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t249.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t25.blo | Bin 9283 -> 0 bytes mods/d2k/tilesets/bloxbase/t250.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t251.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t252.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t253.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t254.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t255.blo | Bin 9283 -> 0 bytes mods/d2k/tilesets/bloxbase/t256.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t257.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t258.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t259.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t26.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t27.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t28.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t29.blo | Bin 9283 -> 0 bytes mods/d2k/tilesets/bloxbase/t30.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t31.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t32.blo | Bin 8256 -> 0 bytes mods/d2k/tilesets/bloxbase/t33.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t34.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t35.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t36.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t37.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t38.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t39.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t40.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t41.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t42.blo | Bin 9283 -> 0 bytes mods/d2k/tilesets/bloxbase/t43.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t44.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t45.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t46.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t47.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t48.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t49.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t50.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t51.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t52.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t53.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t54.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t55.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t56.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t57.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t58.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t59.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t60.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t61.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t62.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t63.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t64.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t65.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t66.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t67.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t68.blo | Bin 6202 -> 0 bytes mods/d2k/tilesets/bloxbase/t69.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t70.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t71.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t72.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t73.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t74.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t75.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t76.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t77.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t78.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t79.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t80.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t81.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t82.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t83.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t84.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t85.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t86.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t87.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t88.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t89.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t90.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t91.blo | Bin 2094 -> 0 bytes mods/d2k/tilesets/bloxbase/t92.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t93.blo | Bin 1067 -> 0 bytes mods/d2k/tilesets/bloxbase/t94.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t95.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t96.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t97.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t98.blo | Bin 4148 -> 0 bytes mods/d2k/tilesets/bloxbase/t99.blo | Bin 4148 -> 0 bytes ripD2kGameFiles.sh | 32 +- tsbdefaults.yaml | 46 - 298 files changed, 4582 insertions(+), 6931 deletions(-) rename mods/d2k/raw/BLOXBASE.tsx => BASE.tsx (55%) rename mods/d2k/raw/arrakis.tsx => BAT.tsx (71%) create mode 100644 BGBS.tsx create mode 100644 OpenRA.TilesetBuilder/defaults.yaml delete mode 100644 mods/d2k/bits/arrakis.mix delete mode 100644 mods/d2k/bits/arrakis.pal create mode 100644 mods/d2k/bits/cursor.pal delete mode 100644 mods/d2k/maps/bloxbase-test.oramap delete mode 100644 mods/d2k/raw/BLOXBASE.bmp delete mode 100644 mods/d2k/raw/BLOXBAT.bmp delete mode 100644 mods/d2k/raw/BLOXBGBS.bmp delete mode 100644 mods/d2k/raw/BLOXICE.bmp delete mode 100644 mods/d2k/raw/BLOXTREE.bmp delete mode 100644 mods/d2k/raw/BLOXWAST.bmp delete mode 100644 mods/d2k/raw/BLOXXMAS.bmp delete mode 100644 mods/d2k/raw/arrakis.bmp delete mode 100644 mods/d2k/tilesets/arrakis.yaml rename mods/d2k/{raw/output/bloxbase.yaml => tilesets/base.yaml} (66%) delete mode 100644 mods/d2k/tilesets/bloxbase.yaml delete mode 100644 mods/d2k/tilesets/bloxbase/bloxbase.pal delete mode 100644 mods/d2k/tilesets/bloxbase/t00.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t01.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t02.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t03.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t04.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t05.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t06.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t07.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t08.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t09.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t10.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t100.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t101.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t102.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t103.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t104.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t105.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t106.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t107.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t108.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t109.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t11.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t110.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t111.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t112.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t113.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t114.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t115.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t116.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t117.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t118.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t119.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t12.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t120.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t121.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t122.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t123.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t124.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t125.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t126.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t127.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t128.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t129.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t13.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t130.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t131.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t132.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t133.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t134.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t135.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t136.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t137.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t138.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t139.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t14.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t140.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t141.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t142.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t143.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t144.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t145.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t146.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t147.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t148.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t149.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t15.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t150.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t151.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t152.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t153.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t154.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t155.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t156.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t157.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t158.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t159.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t16.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t160.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t161.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t162.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t163.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t164.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t165.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t166.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t167.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t168.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t169.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t17.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t170.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t171.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t172.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t173.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t174.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t175.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t176.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t177.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t178.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t179.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t18.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t180.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t181.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t182.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t183.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t184.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t185.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t186.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t187.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t188.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t189.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t19.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t190.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t191.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t192.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t193.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t194.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t195.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t196.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t197.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t198.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t199.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t20.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t200.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t201.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t202.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t203.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t204.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t205.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t206.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t207.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t208.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t209.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t21.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t210.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t211.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t212.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t213.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t214.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t215.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t216.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t217.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t218.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t219.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t22.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t220.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t221.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t222.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t223.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t224.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t225.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t226.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t227.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t228.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t229.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t23.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t230.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t231.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t232.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t233.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t234.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t235.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t236.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t237.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t238.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t239.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t24.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t240.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t241.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t242.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t243.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t244.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t245.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t246.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t247.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t248.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t249.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t25.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t250.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t251.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t252.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t253.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t254.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t255.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t256.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t257.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t258.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t259.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t26.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t27.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t28.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t29.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t30.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t31.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t32.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t33.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t34.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t35.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t36.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t37.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t38.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t39.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t40.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t41.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t42.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t43.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t44.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t45.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t46.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t47.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t48.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t49.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t50.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t51.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t52.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t53.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t54.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t55.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t56.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t57.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t58.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t59.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t60.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t61.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t62.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t63.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t64.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t65.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t66.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t67.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t68.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t69.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t70.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t71.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t72.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t73.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t74.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t75.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t76.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t77.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t78.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t79.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t80.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t81.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t82.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t83.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t84.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t85.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t86.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t87.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t88.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t89.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t90.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t91.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t92.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t93.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t94.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t95.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t96.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t97.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t98.blo delete mode 100644 mods/d2k/tilesets/bloxbase/t99.blo delete mode 100644 tsbdefaults.yaml diff --git a/mods/d2k/raw/BLOXBASE.tsx b/BASE.tsx similarity index 55% rename from mods/d2k/raw/BLOXBASE.tsx rename to BASE.tsx index a28511d643..d98790f9e0 100644 --- a/mods/d2k/raw/BLOXBASE.tsx +++ b/BASE.tsx @@ -1,780 +1,696 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - -