From 8f1d06ff31487f92b43e1c06192885ef59a91ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 7 Jun 2012 19:22:45 +0200 Subject: [PATCH] added TilesetBuilder2 and fixed it for Dune 2000 does not support TerrainTypes other than "clear" yet --- Makefile | 14 +- OpenRA.TilesetBuilder/Form1.Designer.cs | 326 --- OpenRA.TilesetBuilder/Form1.cs | 278 -- OpenRA.TilesetBuilder/Form1.resx | 334 --- .../OpenRA.TilesetBuilder.csproj | 228 +- OpenRA.TilesetBuilder/Program.cs | 63 +- .../Properties/AssemblyInfo.cs | 82 +- .../Properties/Resources.Designer.cs | 142 +- .../Properties/Settings.Designer.cs | 60 +- OpenRA.TilesetBuilder/Surface.cs | 263 +- OpenRA.TilesetBuilder/Surface.resx | 123 + OpenRA.TilesetBuilder/Template.cs | 48 +- OpenRA.TilesetBuilder/frmBuilder.Designer.cs | 349 +++ OpenRA.TilesetBuilder/frmBuilder.cs | 447 ++++ OpenRA.TilesetBuilder/frmBuilder.resx | 509 ++++ OpenRA.TilesetBuilder/frmNew.Designer.cs | 228 ++ OpenRA.TilesetBuilder/frmNew.cs | 88 + OpenRA.TilesetBuilder/frmNew.resx | 120 + .../tilesetbuilder_icon copy.ico | Bin 0 -> 4286 bytes mods/d2k/TODO | 4 +- mods/d2k/bits/arrakis.pal | Bin 0 -> 768 bytes mods/d2k/maps/bloxbase-test.oramap | Bin 0 -> 592 bytes mods/d2k/maps/test.oramap | Bin 1171 -> 1190 bytes mods/d2k/mod.yaml | 3 +- .../raw/{d2k_BLOXBASE.bmp => BLOXBASE.bmp} | Bin .../raw/{d2k_BLOXBASE.tsx => BLOXBASE.tsx} | 0 mods/d2k/raw/BLOXBAT.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/BLOXBGBS.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/BLOXICE.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/BLOXTREE.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/BLOXWAST.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/BLOXXMAS.bmp | Bin 0 -> 820278 bytes mods/d2k/raw/output/bloxbase.yaml | 2369 +++++++++++++++++ mods/d2k/tilesets/bloxbase.yaml | 2369 +++++++++++++++++ mods/d2k/tilesets/bloxbase/bloxbase.pal | Bin 0 -> 768 bytes mods/d2k/tilesets/bloxbase/t00.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t01.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t02.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t03.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t04.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t05.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t06.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t07.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t08.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t09.blo | Bin 0 -> 15445 bytes mods/d2k/tilesets/bloxbase/t10.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t100.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t101.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t102.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t103.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t104.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t105.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t106.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t107.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t108.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t109.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t11.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t110.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t111.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t112.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t113.blo | Bin 0 -> 3121 bytes mods/d2k/tilesets/bloxbase/t114.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t115.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t116.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t117.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t118.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t119.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t12.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t120.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t121.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t122.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t123.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t124.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t125.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t126.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t127.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t128.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t129.blo | Bin 0 -> 9283 bytes mods/d2k/tilesets/bloxbase/t13.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t130.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t131.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t132.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t133.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t134.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t135.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t136.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t137.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t138.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t139.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t14.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t140.blo | Bin 0 -> 8256 bytes mods/d2k/tilesets/bloxbase/t141.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t142.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t143.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t144.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t145.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t146.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t147.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t148.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t149.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t15.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t150.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t151.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t152.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t153.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t154.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t155.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t156.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t157.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t158.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t159.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t16.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t160.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t161.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t162.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t163.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t164.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t165.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t166.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t167.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t168.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t169.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t17.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t170.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t171.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t172.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t173.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t174.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t175.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t176.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t177.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t178.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t179.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t18.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t180.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t181.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t182.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t183.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t184.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t185.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t186.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t187.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t188.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t189.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t19.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t190.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t191.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t192.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t193.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t194.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t195.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t196.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t197.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t198.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t199.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t20.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t200.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t201.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t202.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t203.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t204.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t205.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t206.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t207.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t208.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t209.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t21.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t210.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t211.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t212.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t213.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t214.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t215.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t216.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t217.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t218.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t219.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t22.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t220.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t221.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t222.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t223.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t224.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t225.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t226.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t227.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t228.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t229.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t23.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t230.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t231.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t232.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t233.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t234.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t235.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t236.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t237.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t238.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t239.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t24.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t240.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t241.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t242.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t243.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t244.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t245.blo | Bin 0 -> 10310 bytes mods/d2k/tilesets/bloxbase/t246.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t247.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t248.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t249.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t25.blo | Bin 0 -> 9283 bytes mods/d2k/tilesets/bloxbase/t250.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t251.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t252.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t253.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t254.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t255.blo | Bin 0 -> 9283 bytes mods/d2k/tilesets/bloxbase/t256.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t257.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t258.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t259.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t26.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t27.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t28.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t29.blo | Bin 0 -> 9283 bytes mods/d2k/tilesets/bloxbase/t30.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t31.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t32.blo | Bin 0 -> 8256 bytes mods/d2k/tilesets/bloxbase/t33.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t34.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t35.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t36.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t37.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t38.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t39.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t40.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t41.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t42.blo | Bin 0 -> 9283 bytes mods/d2k/tilesets/bloxbase/t43.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t44.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t45.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t46.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t47.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t48.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t49.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t50.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t51.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t52.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t53.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t54.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t55.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t56.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t57.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t58.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t59.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t60.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t61.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t62.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t63.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t64.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t65.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t66.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t67.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t68.blo | Bin 0 -> 6202 bytes mods/d2k/tilesets/bloxbase/t69.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t70.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t71.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t72.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t73.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t74.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t75.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t76.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t77.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t78.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t79.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t80.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t81.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t82.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t83.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t84.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t85.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t86.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t87.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t88.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t89.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t90.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t91.blo | Bin 0 -> 2094 bytes mods/d2k/tilesets/bloxbase/t92.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t93.blo | Bin 0 -> 1067 bytes mods/d2k/tilesets/bloxbase/t94.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t95.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t96.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t97.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t98.blo | Bin 0 -> 4148 bytes mods/d2k/tilesets/bloxbase/t99.blo | Bin 0 -> 4148 bytes tsbdefaults.yaml | 46 + 296 files changed, 7113 insertions(+), 1380 deletions(-) delete mode 100644 OpenRA.TilesetBuilder/Form1.Designer.cs delete mode 100644 OpenRA.TilesetBuilder/Form1.cs delete mode 100644 OpenRA.TilesetBuilder/Form1.resx create mode 100644 OpenRA.TilesetBuilder/Surface.resx create mode 100644 OpenRA.TilesetBuilder/frmBuilder.Designer.cs create mode 100644 OpenRA.TilesetBuilder/frmBuilder.cs create mode 100644 OpenRA.TilesetBuilder/frmBuilder.resx create mode 100644 OpenRA.TilesetBuilder/frmNew.Designer.cs create mode 100644 OpenRA.TilesetBuilder/frmNew.cs create mode 100644 OpenRA.TilesetBuilder/frmNew.resx create mode 100644 OpenRA.TilesetBuilder/tilesetbuilder_icon copy.ico create mode 100644 mods/d2k/bits/arrakis.pal create mode 100644 mods/d2k/maps/bloxbase-test.oramap rename mods/d2k/raw/{d2k_BLOXBASE.bmp => BLOXBASE.bmp} (100%) rename mods/d2k/raw/{d2k_BLOXBASE.tsx => BLOXBASE.tsx} (100%) create mode 100644 mods/d2k/raw/BLOXBAT.bmp create mode 100644 mods/d2k/raw/BLOXBGBS.bmp create mode 100644 mods/d2k/raw/BLOXICE.bmp create mode 100644 mods/d2k/raw/BLOXTREE.bmp create mode 100644 mods/d2k/raw/BLOXWAST.bmp create mode 100644 mods/d2k/raw/BLOXXMAS.bmp create mode 100644 mods/d2k/raw/output/bloxbase.yaml create mode 100644 mods/d2k/tilesets/bloxbase.yaml create mode 100644 mods/d2k/tilesets/bloxbase/bloxbase.pal create mode 100644 mods/d2k/tilesets/bloxbase/t00.blo create mode 100644 mods/d2k/tilesets/bloxbase/t01.blo create mode 100644 mods/d2k/tilesets/bloxbase/t02.blo create mode 100644 mods/d2k/tilesets/bloxbase/t03.blo create mode 100644 mods/d2k/tilesets/bloxbase/t04.blo create mode 100644 mods/d2k/tilesets/bloxbase/t05.blo create mode 100644 mods/d2k/tilesets/bloxbase/t06.blo create mode 100644 mods/d2k/tilesets/bloxbase/t07.blo create mode 100644 mods/d2k/tilesets/bloxbase/t08.blo create mode 100644 mods/d2k/tilesets/bloxbase/t09.blo create mode 100644 mods/d2k/tilesets/bloxbase/t10.blo create mode 100644 mods/d2k/tilesets/bloxbase/t100.blo create mode 100644 mods/d2k/tilesets/bloxbase/t101.blo create mode 100644 mods/d2k/tilesets/bloxbase/t102.blo create mode 100644 mods/d2k/tilesets/bloxbase/t103.blo create mode 100644 mods/d2k/tilesets/bloxbase/t104.blo create mode 100644 mods/d2k/tilesets/bloxbase/t105.blo create mode 100644 mods/d2k/tilesets/bloxbase/t106.blo create mode 100644 mods/d2k/tilesets/bloxbase/t107.blo create mode 100644 mods/d2k/tilesets/bloxbase/t108.blo create mode 100644 mods/d2k/tilesets/bloxbase/t109.blo create mode 100644 mods/d2k/tilesets/bloxbase/t11.blo create mode 100644 mods/d2k/tilesets/bloxbase/t110.blo create mode 100644 mods/d2k/tilesets/bloxbase/t111.blo create mode 100644 mods/d2k/tilesets/bloxbase/t112.blo create mode 100644 mods/d2k/tilesets/bloxbase/t113.blo create mode 100644 mods/d2k/tilesets/bloxbase/t114.blo create mode 100644 mods/d2k/tilesets/bloxbase/t115.blo create mode 100644 mods/d2k/tilesets/bloxbase/t116.blo create mode 100644 mods/d2k/tilesets/bloxbase/t117.blo create mode 100644 mods/d2k/tilesets/bloxbase/t118.blo create mode 100644 mods/d2k/tilesets/bloxbase/t119.blo create mode 100644 mods/d2k/tilesets/bloxbase/t12.blo create mode 100644 mods/d2k/tilesets/bloxbase/t120.blo create mode 100644 mods/d2k/tilesets/bloxbase/t121.blo create mode 100644 mods/d2k/tilesets/bloxbase/t122.blo create mode 100644 mods/d2k/tilesets/bloxbase/t123.blo create mode 100644 mods/d2k/tilesets/bloxbase/t124.blo create mode 100644 mods/d2k/tilesets/bloxbase/t125.blo create mode 100644 mods/d2k/tilesets/bloxbase/t126.blo create mode 100644 mods/d2k/tilesets/bloxbase/t127.blo create mode 100644 mods/d2k/tilesets/bloxbase/t128.blo create mode 100644 mods/d2k/tilesets/bloxbase/t129.blo create mode 100644 mods/d2k/tilesets/bloxbase/t13.blo create mode 100644 mods/d2k/tilesets/bloxbase/t130.blo create mode 100644 mods/d2k/tilesets/bloxbase/t131.blo create mode 100644 mods/d2k/tilesets/bloxbase/t132.blo create mode 100644 mods/d2k/tilesets/bloxbase/t133.blo create mode 100644 mods/d2k/tilesets/bloxbase/t134.blo create mode 100644 mods/d2k/tilesets/bloxbase/t135.blo create mode 100644 mods/d2k/tilesets/bloxbase/t136.blo create mode 100644 mods/d2k/tilesets/bloxbase/t137.blo create mode 100644 mods/d2k/tilesets/bloxbase/t138.blo create mode 100644 mods/d2k/tilesets/bloxbase/t139.blo create mode 100644 mods/d2k/tilesets/bloxbase/t14.blo create mode 100644 mods/d2k/tilesets/bloxbase/t140.blo create mode 100644 mods/d2k/tilesets/bloxbase/t141.blo create mode 100644 mods/d2k/tilesets/bloxbase/t142.blo create mode 100644 mods/d2k/tilesets/bloxbase/t143.blo create mode 100644 mods/d2k/tilesets/bloxbase/t144.blo create mode 100644 mods/d2k/tilesets/bloxbase/t145.blo create mode 100644 mods/d2k/tilesets/bloxbase/t146.blo create mode 100644 mods/d2k/tilesets/bloxbase/t147.blo create mode 100644 mods/d2k/tilesets/bloxbase/t148.blo create mode 100644 mods/d2k/tilesets/bloxbase/t149.blo create mode 100644 mods/d2k/tilesets/bloxbase/t15.blo create mode 100644 mods/d2k/tilesets/bloxbase/t150.blo create mode 100644 mods/d2k/tilesets/bloxbase/t151.blo create mode 100644 mods/d2k/tilesets/bloxbase/t152.blo create mode 100644 mods/d2k/tilesets/bloxbase/t153.blo create mode 100644 mods/d2k/tilesets/bloxbase/t154.blo create mode 100644 mods/d2k/tilesets/bloxbase/t155.blo create mode 100644 mods/d2k/tilesets/bloxbase/t156.blo create mode 100644 mods/d2k/tilesets/bloxbase/t157.blo create mode 100644 mods/d2k/tilesets/bloxbase/t158.blo create mode 100644 mods/d2k/tilesets/bloxbase/t159.blo create mode 100644 mods/d2k/tilesets/bloxbase/t16.blo create mode 100644 mods/d2k/tilesets/bloxbase/t160.blo create mode 100644 mods/d2k/tilesets/bloxbase/t161.blo create mode 100644 mods/d2k/tilesets/bloxbase/t162.blo create mode 100644 mods/d2k/tilesets/bloxbase/t163.blo create mode 100644 mods/d2k/tilesets/bloxbase/t164.blo create mode 100644 mods/d2k/tilesets/bloxbase/t165.blo create mode 100644 mods/d2k/tilesets/bloxbase/t166.blo create mode 100644 mods/d2k/tilesets/bloxbase/t167.blo create mode 100644 mods/d2k/tilesets/bloxbase/t168.blo create mode 100644 mods/d2k/tilesets/bloxbase/t169.blo create mode 100644 mods/d2k/tilesets/bloxbase/t17.blo create mode 100644 mods/d2k/tilesets/bloxbase/t170.blo create mode 100644 mods/d2k/tilesets/bloxbase/t171.blo create mode 100644 mods/d2k/tilesets/bloxbase/t172.blo create mode 100644 mods/d2k/tilesets/bloxbase/t173.blo create mode 100644 mods/d2k/tilesets/bloxbase/t174.blo create mode 100644 mods/d2k/tilesets/bloxbase/t175.blo create mode 100644 mods/d2k/tilesets/bloxbase/t176.blo create mode 100644 mods/d2k/tilesets/bloxbase/t177.blo create mode 100644 mods/d2k/tilesets/bloxbase/t178.blo create mode 100644 mods/d2k/tilesets/bloxbase/t179.blo create mode 100644 mods/d2k/tilesets/bloxbase/t18.blo create mode 100644 mods/d2k/tilesets/bloxbase/t180.blo create mode 100644 mods/d2k/tilesets/bloxbase/t181.blo create mode 100644 mods/d2k/tilesets/bloxbase/t182.blo create mode 100644 mods/d2k/tilesets/bloxbase/t183.blo create mode 100644 mods/d2k/tilesets/bloxbase/t184.blo create mode 100644 mods/d2k/tilesets/bloxbase/t185.blo create mode 100644 mods/d2k/tilesets/bloxbase/t186.blo create mode 100644 mods/d2k/tilesets/bloxbase/t187.blo create mode 100644 mods/d2k/tilesets/bloxbase/t188.blo create mode 100644 mods/d2k/tilesets/bloxbase/t189.blo create mode 100644 mods/d2k/tilesets/bloxbase/t19.blo create mode 100644 mods/d2k/tilesets/bloxbase/t190.blo create mode 100644 mods/d2k/tilesets/bloxbase/t191.blo create mode 100644 mods/d2k/tilesets/bloxbase/t192.blo create mode 100644 mods/d2k/tilesets/bloxbase/t193.blo create mode 100644 mods/d2k/tilesets/bloxbase/t194.blo create mode 100644 mods/d2k/tilesets/bloxbase/t195.blo create mode 100644 mods/d2k/tilesets/bloxbase/t196.blo create mode 100644 mods/d2k/tilesets/bloxbase/t197.blo create mode 100644 mods/d2k/tilesets/bloxbase/t198.blo create mode 100644 mods/d2k/tilesets/bloxbase/t199.blo create mode 100644 mods/d2k/tilesets/bloxbase/t20.blo create mode 100644 mods/d2k/tilesets/bloxbase/t200.blo create mode 100644 mods/d2k/tilesets/bloxbase/t201.blo create mode 100644 mods/d2k/tilesets/bloxbase/t202.blo create mode 100644 mods/d2k/tilesets/bloxbase/t203.blo create mode 100644 mods/d2k/tilesets/bloxbase/t204.blo create mode 100644 mods/d2k/tilesets/bloxbase/t205.blo create mode 100644 mods/d2k/tilesets/bloxbase/t206.blo create mode 100644 mods/d2k/tilesets/bloxbase/t207.blo create mode 100644 mods/d2k/tilesets/bloxbase/t208.blo create mode 100644 mods/d2k/tilesets/bloxbase/t209.blo create mode 100644 mods/d2k/tilesets/bloxbase/t21.blo create mode 100644 mods/d2k/tilesets/bloxbase/t210.blo create mode 100644 mods/d2k/tilesets/bloxbase/t211.blo create mode 100644 mods/d2k/tilesets/bloxbase/t212.blo create mode 100644 mods/d2k/tilesets/bloxbase/t213.blo create mode 100644 mods/d2k/tilesets/bloxbase/t214.blo create mode 100644 mods/d2k/tilesets/bloxbase/t215.blo create mode 100644 mods/d2k/tilesets/bloxbase/t216.blo create mode 100644 mods/d2k/tilesets/bloxbase/t217.blo create mode 100644 mods/d2k/tilesets/bloxbase/t218.blo create mode 100644 mods/d2k/tilesets/bloxbase/t219.blo create mode 100644 mods/d2k/tilesets/bloxbase/t22.blo create mode 100644 mods/d2k/tilesets/bloxbase/t220.blo create mode 100644 mods/d2k/tilesets/bloxbase/t221.blo create mode 100644 mods/d2k/tilesets/bloxbase/t222.blo create mode 100644 mods/d2k/tilesets/bloxbase/t223.blo create mode 100644 mods/d2k/tilesets/bloxbase/t224.blo create mode 100644 mods/d2k/tilesets/bloxbase/t225.blo create mode 100644 mods/d2k/tilesets/bloxbase/t226.blo create mode 100644 mods/d2k/tilesets/bloxbase/t227.blo create mode 100644 mods/d2k/tilesets/bloxbase/t228.blo create mode 100644 mods/d2k/tilesets/bloxbase/t229.blo create mode 100644 mods/d2k/tilesets/bloxbase/t23.blo create mode 100644 mods/d2k/tilesets/bloxbase/t230.blo create mode 100644 mods/d2k/tilesets/bloxbase/t231.blo create mode 100644 mods/d2k/tilesets/bloxbase/t232.blo create mode 100644 mods/d2k/tilesets/bloxbase/t233.blo create mode 100644 mods/d2k/tilesets/bloxbase/t234.blo create mode 100644 mods/d2k/tilesets/bloxbase/t235.blo create mode 100644 mods/d2k/tilesets/bloxbase/t236.blo create mode 100644 mods/d2k/tilesets/bloxbase/t237.blo create mode 100644 mods/d2k/tilesets/bloxbase/t238.blo create mode 100644 mods/d2k/tilesets/bloxbase/t239.blo create mode 100644 mods/d2k/tilesets/bloxbase/t24.blo create mode 100644 mods/d2k/tilesets/bloxbase/t240.blo create mode 100644 mods/d2k/tilesets/bloxbase/t241.blo create mode 100644 mods/d2k/tilesets/bloxbase/t242.blo create mode 100644 mods/d2k/tilesets/bloxbase/t243.blo create mode 100644 mods/d2k/tilesets/bloxbase/t244.blo create mode 100644 mods/d2k/tilesets/bloxbase/t245.blo create mode 100644 mods/d2k/tilesets/bloxbase/t246.blo create mode 100644 mods/d2k/tilesets/bloxbase/t247.blo create mode 100644 mods/d2k/tilesets/bloxbase/t248.blo create mode 100644 mods/d2k/tilesets/bloxbase/t249.blo create mode 100644 mods/d2k/tilesets/bloxbase/t25.blo create mode 100644 mods/d2k/tilesets/bloxbase/t250.blo create mode 100644 mods/d2k/tilesets/bloxbase/t251.blo create mode 100644 mods/d2k/tilesets/bloxbase/t252.blo create mode 100644 mods/d2k/tilesets/bloxbase/t253.blo create mode 100644 mods/d2k/tilesets/bloxbase/t254.blo create mode 100644 mods/d2k/tilesets/bloxbase/t255.blo create mode 100644 mods/d2k/tilesets/bloxbase/t256.blo create mode 100644 mods/d2k/tilesets/bloxbase/t257.blo create mode 100644 mods/d2k/tilesets/bloxbase/t258.blo create mode 100644 mods/d2k/tilesets/bloxbase/t259.blo create mode 100644 mods/d2k/tilesets/bloxbase/t26.blo create mode 100644 mods/d2k/tilesets/bloxbase/t27.blo create mode 100644 mods/d2k/tilesets/bloxbase/t28.blo create mode 100644 mods/d2k/tilesets/bloxbase/t29.blo create mode 100644 mods/d2k/tilesets/bloxbase/t30.blo create mode 100644 mods/d2k/tilesets/bloxbase/t31.blo create mode 100644 mods/d2k/tilesets/bloxbase/t32.blo create mode 100644 mods/d2k/tilesets/bloxbase/t33.blo create mode 100644 mods/d2k/tilesets/bloxbase/t34.blo create mode 100644 mods/d2k/tilesets/bloxbase/t35.blo create mode 100644 mods/d2k/tilesets/bloxbase/t36.blo create mode 100644 mods/d2k/tilesets/bloxbase/t37.blo create mode 100644 mods/d2k/tilesets/bloxbase/t38.blo create mode 100644 mods/d2k/tilesets/bloxbase/t39.blo create mode 100644 mods/d2k/tilesets/bloxbase/t40.blo create mode 100644 mods/d2k/tilesets/bloxbase/t41.blo create mode 100644 mods/d2k/tilesets/bloxbase/t42.blo create mode 100644 mods/d2k/tilesets/bloxbase/t43.blo create mode 100644 mods/d2k/tilesets/bloxbase/t44.blo create mode 100644 mods/d2k/tilesets/bloxbase/t45.blo create mode 100644 mods/d2k/tilesets/bloxbase/t46.blo create mode 100644 mods/d2k/tilesets/bloxbase/t47.blo create mode 100644 mods/d2k/tilesets/bloxbase/t48.blo create mode 100644 mods/d2k/tilesets/bloxbase/t49.blo create mode 100644 mods/d2k/tilesets/bloxbase/t50.blo create mode 100644 mods/d2k/tilesets/bloxbase/t51.blo create mode 100644 mods/d2k/tilesets/bloxbase/t52.blo create mode 100644 mods/d2k/tilesets/bloxbase/t53.blo create mode 100644 mods/d2k/tilesets/bloxbase/t54.blo create mode 100644 mods/d2k/tilesets/bloxbase/t55.blo create mode 100644 mods/d2k/tilesets/bloxbase/t56.blo create mode 100644 mods/d2k/tilesets/bloxbase/t57.blo create mode 100644 mods/d2k/tilesets/bloxbase/t58.blo create mode 100644 mods/d2k/tilesets/bloxbase/t59.blo create mode 100644 mods/d2k/tilesets/bloxbase/t60.blo create mode 100644 mods/d2k/tilesets/bloxbase/t61.blo create mode 100644 mods/d2k/tilesets/bloxbase/t62.blo create mode 100644 mods/d2k/tilesets/bloxbase/t63.blo create mode 100644 mods/d2k/tilesets/bloxbase/t64.blo create mode 100644 mods/d2k/tilesets/bloxbase/t65.blo create mode 100644 mods/d2k/tilesets/bloxbase/t66.blo create mode 100644 mods/d2k/tilesets/bloxbase/t67.blo create mode 100644 mods/d2k/tilesets/bloxbase/t68.blo create mode 100644 mods/d2k/tilesets/bloxbase/t69.blo create mode 100644 mods/d2k/tilesets/bloxbase/t70.blo create mode 100644 mods/d2k/tilesets/bloxbase/t71.blo create mode 100644 mods/d2k/tilesets/bloxbase/t72.blo create mode 100644 mods/d2k/tilesets/bloxbase/t73.blo create mode 100644 mods/d2k/tilesets/bloxbase/t74.blo create mode 100644 mods/d2k/tilesets/bloxbase/t75.blo create mode 100644 mods/d2k/tilesets/bloxbase/t76.blo create mode 100644 mods/d2k/tilesets/bloxbase/t77.blo create mode 100644 mods/d2k/tilesets/bloxbase/t78.blo create mode 100644 mods/d2k/tilesets/bloxbase/t79.blo create mode 100644 mods/d2k/tilesets/bloxbase/t80.blo create mode 100644 mods/d2k/tilesets/bloxbase/t81.blo create mode 100644 mods/d2k/tilesets/bloxbase/t82.blo create mode 100644 mods/d2k/tilesets/bloxbase/t83.blo create mode 100644 mods/d2k/tilesets/bloxbase/t84.blo create mode 100644 mods/d2k/tilesets/bloxbase/t85.blo create mode 100644 mods/d2k/tilesets/bloxbase/t86.blo create mode 100644 mods/d2k/tilesets/bloxbase/t87.blo create mode 100644 mods/d2k/tilesets/bloxbase/t88.blo create mode 100644 mods/d2k/tilesets/bloxbase/t89.blo create mode 100644 mods/d2k/tilesets/bloxbase/t90.blo create mode 100644 mods/d2k/tilesets/bloxbase/t91.blo create mode 100644 mods/d2k/tilesets/bloxbase/t92.blo create mode 100644 mods/d2k/tilesets/bloxbase/t93.blo create mode 100644 mods/d2k/tilesets/bloxbase/t94.blo create mode 100644 mods/d2k/tilesets/bloxbase/t95.blo create mode 100644 mods/d2k/tilesets/bloxbase/t96.blo create mode 100644 mods/d2k/tilesets/bloxbase/t97.blo create mode 100644 mods/d2k/tilesets/bloxbase/t98.blo create mode 100644 mods/d2k/tilesets/bloxbase/t99.blo create mode 100644 tsbdefaults.yaml diff --git a/Makefile b/Makefile index 6e44e59f3a..879cbb07ab 100644 --- a/Makefile +++ b/Makefile @@ -137,15 +137,19 @@ ralint: $(ralint_TARGET) # Builds and exports tilesets from a bitmap tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs') -tsbuild_TARGET = TilesetBuilder.exe +tsbuild_TARGET = OpenRA.TilesetBuilder.exe tsbuild_KIND = winexe tsbuild_DEPS = $(fileformats_TARGET) $(game_TARGET) tsbuild_LIBS = $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll -tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.Form1.resources +tsbuild_EXTRA = -resource:OpenRA.TilesetBuilder.frmBuilder.resources -resource:OpenRA.TilesetBuilder.frmNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources PROGRAMS += tsbuild -OpenRA.TilesetBuilder.Form1.resources: - resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null -tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET) +OpenRA.TilesetBuilder.frmBuilder.resources: + resgen2 OpenRA.TilesetBuilder/frmBuilder.resx OpenRA.TilesetBuilder.frmBuilder.resources 1> /dev/null +OpenRA.TilesetBuilder.frmNew.resources: + resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.frmNew.resources 1> /dev/null +OpenRA.TilesetBuilder.Surface.resources: + resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null +tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET) # # Launchers / Utilities diff --git a/OpenRA.TilesetBuilder/Form1.Designer.cs b/OpenRA.TilesetBuilder/Form1.Designer.cs deleted file mode 100644 index 6c5336a3fc..0000000000 --- a/OpenRA.TilesetBuilder/Form1.Designer.cs +++ /dev/null @@ -1,326 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -namespace OpenRA.TilesetBuilder -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); - this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); - this.panel1 = new System.Windows.Forms.Panel(); - this.surface1 = new OpenRA.TilesetBuilder.Surface(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton14 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton12 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton11 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton9 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton13 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripContainer1.ContentPanel.SuspendLayout(); - this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); - this.toolStripContainer1.SuspendLayout(); - this.panel1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // toolStripContainer1 - // - // - // toolStripContainer1.ContentPanel - // - this.toolStripContainer1.ContentPanel.Controls.Add(this.panel1); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(745, 571); - this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.toolStripContainer1.Location = new System.Drawing.Point(0, 0); - this.toolStripContainer1.Name = "toolStripContainer1"; - this.toolStripContainer1.Size = new System.Drawing.Size(745, 596); - this.toolStripContainer1.TabIndex = 0; - this.toolStripContainer1.Text = "toolStripContainer1"; - // - // toolStripContainer1.TopToolStripPanel - // - this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1); - // - // panel1 - // - this.panel1.AutoScroll = true; - this.panel1.Controls.Add(this.surface1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(745, 571); - this.panel1.TabIndex = 0; - // - // surface1 - // - this.surface1.BackColor = System.Drawing.Color.Black; - this.surface1.Location = new System.Drawing.Point(0, 0); - this.surface1.Name = "surface1"; - this.surface1.Size = new System.Drawing.Size(598, 372); - this.surface1.TabIndex = 2; - this.surface1.Text = "surface1"; - // - // toolStrip1 - // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton2, - this.toolStripButton14, - this.toolStripButton3, - this.toolStripSeparator1, - this.toolStripButton4, - this.toolStripButton12, - this.toolStripButton11, - this.toolStripButton10, - this.toolStripButton9, - this.toolStripButton8, - this.toolStripButton7, - this.toolStripButton6, - this.toolStripButton5, - this.toolStripButton13, - this.toolStripButton1}); - this.toolStrip1.Location = new System.Drawing.Point(3, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(602, 25); - this.toolStrip1.TabIndex = 0; - // - // toolStripButton2 - // - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(51, 22); - this.toolStripButton2.Text = "Save"; - this.toolStripButton2.Click += new System.EventHandler(this.SaveClicked); - // - // toolStripButton14 - // - this.toolStripButton14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton14.Image"))); - this.toolStripButton14.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton14.Name = "toolStripButton14"; - this.toolStripButton14.Size = new System.Drawing.Size(60, 22); - this.toolStripButton14.Text = "Export"; - this.toolStripButton14.Click += new System.EventHandler(this.ExportClicked); - // - // toolStripButton3 - // - this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(104, 22); - this.toolStripButton3.Text = "Show Overlays"; - this.toolStripButton3.Click += new System.EventHandler(this.ShowOverlaysClicked); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // toolStripButton4 - // - this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(25, 22); - this.toolStripButton4.Tag = "0"; - this.toolStripButton4.Text = "tt0"; - this.toolStripButton4.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton12 - // - this.toolStripButton12.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton12.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton12.Image"))); - this.toolStripButton12.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton12.Name = "toolStripButton12"; - this.toolStripButton12.Size = new System.Drawing.Size(25, 22); - this.toolStripButton12.Tag = "1"; - this.toolStripButton12.Text = "tt1"; - this.toolStripButton12.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton11 - // - this.toolStripButton11.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image"))); - this.toolStripButton11.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton11.Name = "toolStripButton11"; - this.toolStripButton11.Size = new System.Drawing.Size(25, 22); - this.toolStripButton11.Tag = "2"; - this.toolStripButton11.Text = "tt2"; - this.toolStripButton11.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton10 - // - this.toolStripButton10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton10.Image"))); - this.toolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton10.Name = "toolStripButton10"; - this.toolStripButton10.Size = new System.Drawing.Size(25, 22); - this.toolStripButton10.Tag = "3"; - this.toolStripButton10.Text = "tt3"; - this.toolStripButton10.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton9 - // - this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image"))); - this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton9.Name = "toolStripButton9"; - this.toolStripButton9.Size = new System.Drawing.Size(25, 22); - this.toolStripButton9.Tag = "4"; - this.toolStripButton9.Text = "tt4"; - this.toolStripButton9.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton8 - // - this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); - this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(25, 22); - this.toolStripButton8.Tag = "5"; - this.toolStripButton8.Text = "tt5"; - this.toolStripButton8.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton7 - // - this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); - this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton7.Name = "toolStripButton7"; - this.toolStripButton7.Size = new System.Drawing.Size(25, 22); - this.toolStripButton7.Tag = "6"; - this.toolStripButton7.Text = "tt6"; - this.toolStripButton7.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton6 - // - this.toolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); - this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton6.Name = "toolStripButton6"; - this.toolStripButton6.Size = new System.Drawing.Size(25, 22); - this.toolStripButton6.Tag = "7"; - this.toolStripButton6.Text = "tt7"; - this.toolStripButton6.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton5 - // - this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(25, 22); - this.toolStripButton5.Tag = "8"; - this.toolStripButton5.Text = "tt8"; - this.toolStripButton5.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // toolStripButton13 - // - this.toolStripButton13.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton13.Image"))); - this.toolStripButton13.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton13.Name = "toolStripButton13"; - this.toolStripButton13.Size = new System.Drawing.Size(25, 22); - this.toolStripButton13.Tag = "9"; - this.toolStripButton13.Text = "tt9"; - // - // toolStripButton1 - // - this.toolStripButton1.Checked = true; - this.toolStripButton1.CheckState = System.Windows.Forms.CheckState.Checked; - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(88, 22); - this.toolStripButton1.Text = "Template Tool"; - this.toolStripButton1.Click += new System.EventHandler(this.TerrainTypeSelectorClicked); - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(745, 596); - this.Controls.Add(this.toolStripContainer1); - this.Name = "Form1"; - this.Text = "Tileset Builder"; - this.toolStripContainer1.ContentPanel.ResumeLayout(false); - this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false); - this.toolStripContainer1.TopToolStripPanel.PerformLayout(); - this.toolStripContainer1.ResumeLayout(false); - this.toolStripContainer1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ToolStripContainer toolStripContainer1; - private System.Windows.Forms.Panel panel1; - private Surface surface1; - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.ToolStripButton toolStripButton2; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripButton toolStripButton3; - private System.Windows.Forms.ToolStripButton toolStripButton4; - private System.Windows.Forms.ToolStripButton toolStripButton12; - private System.Windows.Forms.ToolStripButton toolStripButton11; - private System.Windows.Forms.ToolStripButton toolStripButton10; - private System.Windows.Forms.ToolStripButton toolStripButton9; - private System.Windows.Forms.ToolStripButton toolStripButton8; - private System.Windows.Forms.ToolStripButton toolStripButton7; - private System.Windows.Forms.ToolStripButton toolStripButton6; - private System.Windows.Forms.ToolStripButton toolStripButton5; - private System.Windows.Forms.ToolStripButton toolStripButton13; - private System.Windows.Forms.ToolStripButton toolStripButton14; - - } -} - diff --git a/OpenRA.TilesetBuilder/Form1.cs b/OpenRA.TilesetBuilder/Form1.cs deleted file mode 100644 index 1c1c084360..0000000000 --- a/OpenRA.TilesetBuilder/Form1.cs +++ /dev/null @@ -1,278 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Linq; -using System.Windows.Forms; -using System.Xml; -using OpenRA.FileFormats; - -namespace OpenRA.TilesetBuilder -{ - public partial class Form1 : Form - { - string srcfile; - int size; - - public Form1( string src, int size ) - { - srcfile = src; - this.size = size; - InitializeComponent(); - surface1.TileSize = size; - surface1.Image = (Bitmap)Image.FromFile(src); - surface1.Image.SetResolution(96, 96); // people keep being noobs about DPI, and GDI+ cares. - surface1.TerrainTypes = new int[surface1.Image.Width / size, surface1.Image.Height / size]; /* all passable by default */ - surface1.Templates = new List