瀏覽代碼

Merge buildings3.txt into buildings.json.

Frank Zago 14 年之前
父節點
當前提交
233ce7d6e3
共有 3 個文件被更改,包括 380 次插入708 次删除
  1. 360 342
      config/buildings.json
  2. 0 333
      config/buildings3.txt
  3. 20 33
      lib/CTownHandler.cpp

+ 360 - 342
config/buildings.json

@@ -7,399 +7,417 @@
 {
 	"town_type":
 		[
-		{ "defnames": [
-			{ "id": 16, "defname": "TBCSBLAK.def", "x": 213, "y": 251 },
-			{ "id": 8, "defname": "TBCSCAS2.def", "x": 478, "y": 66 },
-			{ "id": 9, "defname": "TBCSCAS3.def", "x": 478, "y": 37 },
-			{ "id": 7, "defname": "TBCSCSTL.def", "x": 595, "y": 66 },
-			{ "id": 6, "defname": "TBCSDOCK.def", "x": 478, "y": 134 },
-			{ "id": 30, "defname": "TBCSDW_0.def", "x": 304, "y": 92 },
-			{ "id": 31, "defname": "TBCSDW_1.def", "x": 360, "y": 130 },
-			{ "id": 32, "defname": "TBCSDW_2.def", "x": 76, "y": 57 },
-			{ "id": 33, "defname": "TBCSDW_3.def", "x": 176, "y": 101 },
-			{ "id": 34, "defname": "TBCSDW_4.def", "x": 563, "y": 211 },
-			{ "id": 35, "defname": "TBCSDW_5.def", "x": 174, "y": 190 },
-			{ "id": 36, "defname": "TBCSDW_6.def", "x": 303, "y": 0 },
-			{ "id": 21, "defname": "TBCSEXT0.def", "x": 384, "y": 193 },
-			{ "id": 22, "defname": "TBCSEXT1.def", "x": 0, "y": 198 },
+		{
+		  // Castle 0
+		  "defnames": [
+			{ "id": 16, "defname": "TBCSBLAK.def", "x": 213, "y": 251, "border": "TOCSBLAK.bmp", "area": "TZCSBLAK.bmp" },
+			{ "id": 8, "defname": "TBCSCAS2.def", "x": 478, "y": 66, "border": "TOCSCAS2.bmp", "area": "TZCSCAS2.bmp" },
+			{ "id": 9, "defname": "TBCSCAS3.def", "x": 478, "y": 37, "border": "TOCSCAS3.bmp", "area": "TZCSCAS3.bmp" },
+			{ "id": 7, "defname": "TBCSCSTL.def", "x": 595, "y": 66, "border": "TOCSCAS1.bmp", "area": "TZCSCAS1.bmp" },
+			{ "id": 6, "defname": "TBCSDOCK.def", "x": 478, "y": 134, "border": "TOCSDKMS.bmp", "area": "TZCSDKMS.bmp" },
+			{ "id": 30, "defname": "TBCSDW_0.def", "x": 304, "y": 92, "border": "TOCSPIK1.bmp", "area": "TZCSPIK1.bmp" },
+			{ "id": 31, "defname": "TBCSDW_1.def", "x": 360, "y": 130, "border": "TOCSCRS1.bmp", "area": "TZCSCRS1.bmp" },
+			{ "id": 32, "defname": "TBCSDW_2.def", "x": 76, "y": 57, "border": "TOCSGR1N.bmp", "area": "TZCSGR1N.bmp" },
+			{ "id": 33, "defname": "TBCSDW_3.def", "x": 176, "y": 101, "border": "TOCSSWD1.bmp", "area": "TZCSSWD1.bmp" },
+			{ "id": 34, "defname": "TBCSDW_4.def", "x": 563, "y": 211, "border": "TOCSMON1.bmp", "area": "TZCSMON1.bmp" },
+			{ "id": 35, "defname": "TBCSDW_5.def", "x": 174, "y": 190, "border": "TOCSC101.bmp", "area": "TZCSCAV1.bmp" },
+			{ "id": 36, "defname": "TBCSDW_6.def", "x": 303, "y": 0, "border": "TOCSANG1.bmp", "area": "TZCSANG1.bmp" },
+			{ "id": 21, "defname": "TBCSEXT0.def", "x": 384, "y": 193, "border": "TOCSCAVM.bmp", "area": "TZCSCAVM.bmp" },
+			{ "id": 22, "defname": "TBCSEXT1.def", "x": 0, "y": 198, "border": "TOCSTAV2.bmp", "area": "TZCSTAV2.bmp" },
 			{ "id": -1, "defname": "TBCSEXT2.def", "x": 46, "y": 119 },
-			{ "id": 11, "defname": "TBCSHAL2.def", "x": 0, "y": 176 },
-			{ "id": 12, "defname": "TBCSHAL3.def", "x": 0, "y": 164 },
-			{ "id": 13, "defname": "TBCSHAL4.def", "x": 0, "y": 154 },
-			{ "id": 10, "defname": "TBCSHALL.def", "x": 0, "y": 209 },
-			{ "id": 26, "defname": "TBCSHOLY.def", "x": 456, "y": 109 },
-			{ "id": 18, "defname": "TBCSHRD1.def", "x": 76, "y": 53 },
-			{ "id": 19, "defname": "TBCSHRD2.def", "x": 76, "y": 35 },
-			{ "id": 1, "defname": "TBCSMAG2.def", "x": 706, "y": 135 },
-			{ "id": 2, "defname": "TBCSMAG3.def", "x": 704, "y": 107 },
-			{ "id": 3, "defname": "TBCSMAG4.def", "x": 704, "y": 76 },
-			{ "id": 0, "defname": "TBCSMAGE.def", "x": 707, "y": 166 },
-			{ "id": 14, "defname": "TBCSMARK.def", "x": 413, "y": 264 },
-			{ "id": 15, "defname": "TBCSSILO.def", "x": 488, "y": 228 },
-			{ "id": 17, "defname": "TBCSSPEC.def", "x": 533, "y": 71 },
-			{ "id": 5, "defname": "TBCSTVRN.def", "x": 0, "y": 230 },
-			{ "id": 37, "defname": "TBCSUP_0.def", "x": 304, "y": 65 },
-			{ "id": 38, "defname": "TBCSUP_1.def", "x": 360, "y": 115 },
-			{ "id": 39, "defname": "TBCSUP_2.def", "x": 76, "y": 35 },
-			{ "id": 40, "defname": "TBCSUP_3.def", "x": 176, "y": 85 },
-			{ "id": 41, "defname": "TBCSUP_4.def", "x": 563, "y": 173 },
-			{ "id": 42, "defname": "TBCSUP_5.def", "x": 160, "y": 190 },
-			{ "id": 43, "defname": "TBCSUP_6.def", "x": 303, "y": 0 },
-			{ "id": 20, "defname": "TBCSBOAT.def", "x": 478, "y": 134 },
+			{ "id": 11, "defname": "TBCSHAL2.def", "x": 0, "y": 176, "border": "TOCSH201.bmp", "area": "TZCSH201.bmp" },
+			{ "id": 12, "defname": "TBCSHAL3.def", "x": 0, "y": 164, "border": "TOCSH301.bmp", "area": "TZCSH301.bmp" },
+			{ "id": 13, "defname": "TBCSHAL4.def", "x": 0, "y": 154, "border": "TOCSH401.bmp", "area": "TZCSH401.bmp" },
+			{ "id": 10, "defname": "TBCSHALL.def", "x": 0, "y": 209, "border": "TOCSH101.bmp", "area": "TZCSH101.bmp" },
+			{ "id": 26, "defname": "TBCSHOLY.def", "x": 456, "y": 109, "border": "TOCSHOLY.bmp", "area": "TZCSHOLY.bmp" },
+			{ "id": 18, "defname": "TBCSHRD1.def", "x": 76, "y": 53, "border": "TOCSGR1H.bmp", "area": "TZCSGR1H.bmp" },
+			{ "id": 19, "defname": "TBCSHRD2.def", "x": 76, "y": 35, "border": "TOCSGR2H.bmp", "area": "TZCSGR2H.bmp" },
+			{ "id": 1, "defname": "TBCSMAG2.def", "x": 706, "y": 135, "border": "TOCSMAG2.bmp", "area": "TZCSMAG2.bmp" },
+			{ "id": 2, "defname": "TBCSMAG3.def", "x": 704, "y": 107, "border": "TOCSM301.bmp", "area": "TZCSM301.bmp" },
+			{ "id": 3, "defname": "TBCSMAG4.def", "x": 704, "y": 76, "border": "TOCSM401.bmp", "area": "TZCSM401.bmp" },
+			{ "id": 0, "defname": "TBCSMAGE.def", "x": 707, "y": 166, "border": "TOCSMAG1.bmp", "area": "TZCSMAG1.bmp" },
+			{ "id": 14, "defname": "TBCSMARK.def", "x": 413, "y": 264, "border": "TOCSMRK1.bmp", "area": "TZCSMRK1.bmp" },
+			{ "id": 15, "defname": "TBCSSILO.def", "x": 488, "y": 228, "border": "TOCSMRK2.bmp", "area": "TZCSMRK2.bmp" },
+			{ "id": 17, "defname": "TBCSSPEC.def", "x": 533, "y": 71, "border": "TOCSLT01.bmp", "area": "TZCSLT01.bmp" },
+			{ "id": 5, "defname": "TBCSTVRN.def", "x": 0, "y": 230, "border": "TOCSTAV1.bmp", "area": "TZCSTAV1.bmp" },
+			{ "id": 37, "defname": "TBCSUP_0.def", "x": 304, "y": 65, "border": "TOCSPIK2.bmp", "area": "TZCSPIK2.bmp" },
+			{ "id": 38, "defname": "TBCSUP_1.def", "x": 360, "y": 115, "border": "TOCSCRS2.bmp", "area": "TZCSCRS2.bmp" },
+			{ "id": 39, "defname": "TBCSUP_2.def", "x": 76, "y": 35, "border": "TOCSGR2N.bmp", "area": "TZCSGR2N.bmp" },
+			{ "id": 40, "defname": "TBCSUP_3.def", "x": 176, "y": 85, "border": "TOCSSWD2.bmp", "area": "TZCSSWD2.bmp" },
+			{ "id": 41, "defname": "TBCSUP_4.def", "x": 563, "y": 173, "border": "TOCSMON2.bmp", "area": "TZCSMON2.bmp" },
+			{ "id": 42, "defname": "TBCSUP_5.def", "x": 160, "y": 190, "border": "TOCSCAV2.bmp", "area": "TZCSCAV2.bmp" },
+			{ "id": 43, "defname": "TBCSUP_6.def", "x": 303, "y": 0, "border": "TOCSANG2.bmp", "area": "TZCSANG2.bmp" },
+			{ "id": 20, "defname": "TBCSBOAT.def", "x": 478, "y": 134, "border": "TOCSDKMN.bmp", "area": "TZCSDKMN.bmp" },
 			],
 
 		  "blit_order": [ 1, 2, 3, 10, 11, 12, 13, 5, 22, 30, 37, 16, 6, 20, 18, 19, 34, 41 ]	
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBRMBLAK.def", "x": 558, "y": 105 },
-			{ "id": 9, "defname": "TBRMCAS3.def", "x": 79, "y": 18 },
-			{ "id": 8, "defname": "TBRMCAS2.def", "x": 79, "y": 18 },
-			{ "id": 7, "defname": "TBRMCSTL.def", "x": 63, "y": 25 },
-			{ "id": 30, "defname": "TBRMDW_0.def", "x": 0, "y": 236 },
-			{ "id": 31, "defname": "TBRMDW_1.def", "x": 0, "y": 154 },
-			{ "id": 32, "defname": "TBRMDW_2.def", "x": 668, "y": 101 },
-			{ "id": 33, "defname": "TBRMDW_3.def", "x": 287, "y": 73 },
-			{ "id": 34, "defname": "TBRMDW_4.def", "x": 68, "y": 146 },
-			{ "id": 35, "defname": "TBRMDW_5.def", "x": 362, "y": 90 },
-			{ "id": 36, "defname": "TBRMDW_6.def", "x": 502, "y": 27 },
-			{ "id": 21, "defname": "TBRMEXT0.def", "x": 555, "y": 297 },
-			{ "id": 22, "defname": "TBRMEXT1.def", "x": 0, "y": 181 },
+		{
+		  // Castle 1
+		  "defnames": [
+			{ "id": 16, "defname": "TBRMBLAK.def", "x": 558, "y": 105, "border": "TORAID.bmp", "area": "TZRAID.bmp" },
+			{ "id": 9, "defname": "TBRMCAS3.def", "x": 79, "y": 18, "border": "TORCAS2.bmp", "area": "TZRCAS2.bmp" },
+			{ "id": 8, "defname": "TBRMCAS2.def", "x": 79, "y": 18, "border": "TORCAS3.bmp", "area": "TZRCAS3.bmp" },
+			{ "id": 7, "defname": "TBRMCSTL.def", "x": 63, "y": 25, "border": "TORCAS1.bmp", "area": "TZRCAS1.bmp" },
+			{ "id": 30, "defname": "TBRMDW_0.def", "x": 0, "y": 236, "border": "TORCEN1A.bmp", "area": "TZRCEN1A.bmp" },
+			{ "id": 31, "defname": "TBRMDW_1.def", "x": 0, "y": 154, "border": "TORDWF1.bmp", "area": "TZRDWF1.bmp" },
+			{ "id": 32, "defname": "TBRMDW_2.def", "x": 668, "y": 101, "border": "TORELF1.bmp", "area": "TZRELF1.bmp" },
+			{ "id": 33, "defname": "TBRMDW_3.def", "x": 287, "y": 73, "border": "TORPEG1A.bmp", "area": "TZRPEG1A.bmp" },
+			{ "id": 34, "defname": "TBRMDW_4.def", "x": 68, "y": 146, "border": "TORTRE1.bmp", "area": "TZRTRE1.bmp" },
+			{ "id": 35, "defname": "TBRMDW_5.def", "x": 362, "y": 90, "border": "TORUNI1.bmp", "area": "TZRUNI1.bmp" },
+			{ "id": 36, "defname": "TBRMDW_6.def", "x": 502, "y": 27, "border": "TORDR1AA.bmp", "area": "TZRDR1AA.bmp" },
+			{ "id": 21, "defname": "TBRMEXT0.def", "x": 555, "y": 297, "border": "TORGAR2A.bmp", "area": "TZRGAR2A.bmp" },
+			{ "id": 22, "defname": "TBRMEXT1.def", "x": 0, "y": 181, "border": "TORDWFT.bmp", "area": "TZRDWFT.bmp" },
 			{ "id": -1, "defname": "TBRMEXT2.def", "x": 327, "y": 236 },
 			{ "id": 27, "defname": "TBRMEXT3.def", "x": 293, "y": 235 },
 			{ "id": 28, "defname": "TBRMEXT4.def", "x": 295, "y": 191 },
 			{ "id": 29, "defname": "TBRMEXT5.def", "x": 260, "y": 171 },
-			{ "id": 43, "defname": "TBRMUP_6.def", "x": 502, "y": 5 },
-			{ "id": 42, "defname": "TBRMUP_5.def", "x": 362, "y": 90 },
-			{ "id": 41, "defname": "TBRMUP_4.def", "x": 63, "y": 146 },
-			{ "id": 40, "defname": "TBRMUP_3.def", "x": 287, "y": 28 },
-			{ "id": 39, "defname": "TBRMUP_2.def", "x": 665, "y": 101 },
-			{ "id": 38, "defname": "TBRMUP_1.def", "x": 0, "y": 143 },
-			{ "id": 37, "defname": "TBRMUP_0.def", "x": 0, "y": 236 },
-			{ "id": 5, "defname": "TBRMTVRN.def", "x": 181, "y": 229 },
-			{ "id": 17, "defname": "TBRMSPEC.def", "x": 555, "y": 297 },
-			{ "id": 15, "defname": "TBRMSILO.def", "x": 245, "y": 324 },
-			{ "id": 14, "defname": "TBRMMARK.def", "x": 129, "y": 301 },
-			{ "id": 0, "defname": "TBRMMAGE.def", "x": 454, "y": 200 },
-			{ "id": 1, "defname": "TBRMMAG2.def", "x": 438, "y": 178 },
-			{ "id": 2, "defname": "TBRMMAG3.def", "x": 418, "y": 153 },
-			{ "id": 3, "defname": "TBRMMAG4.def", "x": 406, "y": 129 },
-			{ "id": 4, "defname": "TBRMMAG5.def", "x": 384, "y": 104 },
-			{ "id": 25, "defname": "TBRMHRD4.def", "x": 47, "y": 142 },
-			{ "id": 24, "defname": "TBRMHRD3.def", "x": 47, "y": 142 },
-			{ "id": 19, "defname": "TBRMHRD2.def", "x": 0, "y": 143 },
-			{ "id": 18, "defname": "TBRMHRD1.def", "x": 0, "y": 154 },
-			{ "id": 26, "defname": "TBRMHOLY.def", "x": 0, "y": 54 },
-			{ "id": 10, "defname": "TBRMHALL.def", "x": 565, "y": 216 },
-			{ "id": 13, "defname": "TBRMHAL4.def", "x": 534, "y": 187 },
-			{ "id": 12, "defname": "TBRMHAL3.def", "x": 538, "y": 187 },
-			{ "id": 11, "defname": "TBRMHAL2.def", "x": 538, "y": 187 },
+			{ "id": 43, "defname": "TBRMUP_6.def", "x": 502, "y": 5, "border": "TORDR2AA.bmp", "area": "TZRDR2AA.bmp" },
+			{ "id": 42, "defname": "TBRMUP_5.def", "x": 362, "y": 90, "border": "TORUNI2.bmp", "area": "TZRUNI2.bmp" },
+			{ "id": 41, "defname": "TBRMUP_4.def", "x": 63, "y": 146, "border": "TORTRE2.bmp", "area": "TZRTRE2.bmp" },
+			{ "id": 40, "defname": "TBRMUP_3.def", "x": 287, "y": 28, "border": "TORPEG2A.bmp", "area": "TZRPEG2A.bmp" },
+			{ "id": 39, "defname": "TBRMUP_2.def", "x": 665, "y": 101, "border": "TORELF2.bmp", "area": "TZRELF2.bmp" },
+			{ "id": 38, "defname": "TBRMUP_1.def", "x": 0, "y": 143, "border": "TORDWF2.bmp", "area": "TZRDWF2.bmp" },
+			{ "id": 37, "defname": "TBRMUP_0.def", "x": 0, "y": 236, "border": "TORCEN2A.bmp", "area": "TZRCEN2A.bmp" },
+			{ "id": 5, "defname": "TBRMTVRN.def", "x": 181, "y": 229 "border": "TORTAV.bmp", "area": "TZRTAV.bmp" },
+			{ "id": 17, "defname": "TBRMSPEC.def", "x": 555, "y": 297, "border": "TORGAR1A.bmp", "area": "TZRGAR1A.bmp" },
+			{ "id": 15, "defname": "TBRMSILO.def", "x": 245, "y": 324, "border": "TORMRK2.bmp", "area": "TZRMRK2.bmp" },
+			{ "id": 14, "defname": "TBRMMARK.def", "x": 129, "y": 301, "border": "TORMRK1.bmp", "area": "TZRMRK1.bmp" },
+			{ "id": 0, "defname": "TBRMMAGE.def", "x": 454, "y": 200 "border": "TORMAG1.bmp", "area": "TZRMAG1.bmp" },
+			{ "id": 1, "defname": "TBRMMAG2.def", "x": 438, "y": 178 "border": "TORMAG2.bmp", "area": "TZRMAG2.bmp" },
+			{ "id": 2, "defname": "TBRMMAG3.def", "x": 418, "y": 153 "border": "TORMAG3.bmp", "area": "TZRMAG3.bmp" },
+			{ "id": 3, "defname": "TBRMMAG4.def", "x": 406, "y": 129 "border": "TORMAG4.bmp", "area": "TZRMAG4.bmp" },
+			{ "id": 4, "defname": "TBRMMAG5.def", "x": 384, "y": 104 "border": "TORMAG5.bmp", "area": "TZRMAG5.bmp" },
+			{ "id": 25, "defname": "TBRMHRD4.def", "x": 47, "y": 142, "border": "TORTRE2H.bmp", "area": "TZRTRE2H.bmp" },
+			{ "id": 24, "defname": "TBRMHRD3.def", "x": 47, "y": 142, "border": "TORTRE1H.bmp", "area": "TZRTRE1H.bmp" },
+			{ "id": 19, "defname": "TBRMHRD2.def", "x": 0, "y": 143, "border": "TORDWF2H.bmp", "area": "TZRDWF2H.bmp" },
+			{ "id": 18, "defname": "TBRMHRD1.def", "x": 0, "y": 154, "border": "TORDWF1H.bmp", "area": "TZRDWF1H.bmp" },
+			{ "id": 26, "defname": "TBRMHOLY.def", "x": 0, "y": 54, "border": "TORHOLY.bmp", "area": "TZRHOLY.bmp" },
+			{ "id": 10, "defname": "TBRMHALL.def", "x": 565, "y": 216, "border": "TORHAL1.bmp", "area": "TZRHAL1.bmp" },
+			{ "id": 13, "defname": "TBRMHAL4.def", "x": 534, "y": 187, "border": "TORHAL4.bmp", "area": "TZRHAL4.bmp" },
+			{ "id": 12, "defname": "TBRMHAL3.def", "x": 538, "y": 187, "border": "TORHAL3.bmp", "area": "TZRHAL3.bmp" },
+			{ "id": 11, "defname": "TBRMHAL2.def", "x": 538, "y": 187, "border": "TORHAL2.bmp", "area": "TZRHAL2.bmp" },
 		  ],
 
 		  "blit_order": [ 33, 40, 35, 42, 16, 32, 39, 0, 1, 2, 3, 4, 31, 18, 38, 19, 34, 24, 41, 25, 5, 30, 37, 14, 10, 11, 12, 13, 17, 21, 22, -1, 27, 28, 29, 15 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBTWBLAK.def", "x": 478, "y": 211 },
-			{ "id": 9, "defname": "TBTWCAS3.def", "x": 301, "y": 0 },
-			{ "id": 7, "defname": "TBTWCSTL.def", "x": 304, "y": 0 },
-			{ "id": 30, "defname": "TBTWDW_0.def", "x": 453, "y": 221 },
-			{ "id": 31, "defname": "TBTWDW_1.def", "x": 4, "y": 46 },
-			{ "id": 32, "defname": "TBTWDW_2.def", "x": 209, "y": 177 },
-			{ "id": 33, "defname": "TBTWDW_3.def", "x": 613, "y": 95 },
-			{ "id": 34, "defname": "TBTWDW_4.def", "x": 511, "y": 75 },
-			{ "id": 35, "defname": "TBTWDW_5.def", "x": 681, "y": 208 },
-			{ "id": 36, "defname": "TBTWDW_6.def", "x": 75, "y": 144 },
-			{ "id": 21, "defname": "TBTWEXT0.def", "x": 409, "y": 82 },
-			{ "id": 22, "defname": "TBTWEXT1.def", "x": 702, "y": 115 },
-			{ "id": 23, "defname": "TBTWEXT2.def", "x": 592, "y": 189 },
-			{ "id": 11, "defname": "TBTWHAL2.def", "x": 0, "y": 220 },
-			{ "id": 12, "defname": "TBTWHAL3.def", "x": 0, "y": 82 },
-			{ "id": 13, "defname": "TBTWHAL4.def", "x": 0, "y": 82 },
-			{ "id": 10, "defname": "TBTWHALL.def", "x": 0, "y": 259 },
-			{ "id": 26, "defname": "TBTWHOLY.def", "x": 237, "y": 14 },
-			{ "id": 18, "defname": "TBTWHRD1.def", "x": 0, "y": 47 },
-			{ "id": 19, "defname": "TBTWHRD2.def", "x": 0, "y": 28 },
-			{ "id": 1, "defname": "TBTWMAG2.def", "x": 593, "y": 65 },
-			{ "id": 2, "defname": "TBTWMAG3.def", "x": 593, "y": 48 },
-			{ "id": 3, "defname": "TBTWMAG4.def", "x": 593, "y": 31 },
-			{ "id": 4, "defname": "TBTWMAG5.def", "x": 593, "y": 14 },
-			{ "id": 0, "defname": "TBTWMAGE.def", "x": 597, "y": 82 },
-			{ "id": 14, "defname": "TBTWMARK.def", "x": 614, "y": 292 },
-			{ "id": 15, "defname": "TBTWSILO.def", "x": 763, "y": 214 },
-			{ "id": 17, "defname": "TBTWSPEC.def", "x": 674, "y": 276 },
-			{ "id": 5, "defname": "TBTWTVRN.def", "x": 375, "y": 278 },
-			{ "id": 37, "defname": "TBTWUP_0.def", "x": 446, "y": 221 },
-			{ "id": 38, "defname": "TBTWUP_1.def", "x": 4, "y": 28 },
-			{ "id": 39, "defname": "TBTWUP_2.def", "x": 209, "y": 177 },
-			{ "id": 40, "defname": "TBTWUP_3.def", "x": 613, "y": 74 },
-			{ "id": 41, "defname": "TBTWUP_4.def", "x": 511, "y": 8 },
-			{ "id": 42, "defname": "TBTWUP_5.def", "x": 681, "y": 157 },
-			{ "id": 43, "defname": "TBTWUP_6.def", "x": 75, "y": 91 },
-			{ "id": 8, "defname": "TBTWCAS2.def", "x": 301, "y": 0 },
+		{
+		  // Castle 2
+		  "defnames": [
+			{ "id": 16, "defname": "TBTWBLAK.def", "x": 478, "y": 211, "border": "TOTBLKA.bmp", "area": "TZTBLKA.bmp" },
+			{ "id": 9, "defname": "TBTWCAS3.def", "x": 301, "y": 0, "border": "TOTCAS3.bmp", "area": "TZTCAS3.bmp" },
+			{ "id": 7, "defname": "TBTWCSTL.def", "x": 304, "y": 0, "border": "TOTCAS1.bmp", "area": "TZTCAS1.bmp" },
+			{ "id": 30, "defname": "TBTWDW_0.def", "x": 453, "y": 221, "border": "TOTGRM1A.bmp", "area": "TZTGRM1A.bmp" },
+			{ "id": 31, "defname": "TBTWDW_1.def", "x": 4, "y": 46, "border": "TOTGAR1.bmp", "area": "TZTGAR1.bmp" },
+			{ "id": 32, "defname": "TBTWDW_2.def", "x": 209, "y": 177, "border": "TOTGOL1A.bmp", "area": "TZTGOL1A.bmp" },
+			{ "id": 33, "defname": "TBTWDW_3.def", "x": 613, "y": 95, "border": "TOTMAG1.bmp", "area": "TZTMAG1.bmp" },
+			{ "id": 34, "defname": "TBTWDW_4.def", "x": 511, "y": 75, "border": "TOTGEN1.bmp", "area": "TZTGEN1.bmp" },
+			{ "id": 35, "defname": "TBTWDW_5.def", "x": 681, "y": 208, "border": "TOTNAG1.bmp", "area": "TZTNAG1.bmp" },
+			{ "id": 36, "defname": "TBTWDW_6.def", "x": 75, "y": 144, "border": "TOTTIT1.bmp", "area": "TZTTIT1.bmp" },
+			{ "id": 21, "defname": "TBTWEXT0.def", "x": 409, "y": 82, "border": "TOTCASW.bmp", "area": "TZTCASW.bmp" },
+			{ "id": 22, "defname": "TBTWEXT1.def", "x": 702, "y": 115, "border": "TOTGLDL.bmp", "area": "TZTGLDL.bmp" },
+			{ "id": 23, "defname": "TBTWEXT2.def", "x": 592, "y": 189, "border": "TOTGLDW.bmp", "area": "TZTGLDW.bmp" },
+			{ "id": 11, "defname": "TBTWHAL2.def", "x": 0, "y": 220, "border": "TOTHAL2.bmp", "area": "TZTHAL2.bmp" },
+			{ "id": 12, "defname": "TBTWHAL3.def", "x": 0, "y": 82, "border": "TOTHAL3.bmp", "area": "TZTHAL3.bmp" },
+			{ "id": 13, "defname": "TBTWHAL4.def", "x": 0, "y": 82, "border": "TOTHAL4.bmp", "area": "TZTHAL4.bmp" },
+			{ "id": 10, "defname": "TBTWHALL.def", "x": 0, "y": 259, "border": "TOTHAL1.bmp", "area": "TZTHAL1.bmp" },
+			{ "id": 26, "defname": "TBTWHOLY.def", "x": 237, "y": 14, "border": "TOTHOLYA.bmp", "area": "TZTHOLYA.bmp" },
+			{ "id": 18, "defname": "TBTWHRD1.def", "x": 0, "y": 47, "border": "TOTGAR1H.bmp", "area": "TZTGAR1H.bmp" },
+			{ "id": 19, "defname": "TBTWHRD2.def", "x": 0, "y": 28, "border": "TOTGAR2H.bmp", "area": "TZTGAR2H.bmp" },
+			{ "id": 1, "defname": "TBTWMAG2.def", "x": 593, "y": 65, "border": "TOTGLD2.bmp", "area": "TZTGLD2.bmp" },
+			{ "id": 2, "defname": "TBTWMAG3.def", "x": 593, "y": 48, "border": "TOTGLD3.bmp", "area": "TZTGLD3.bmp" },
+			{ "id": 3, "defname": "TBTWMAG4.def", "x": 593, "y": 31, "border": "TOTGLD4.bmp", "area": "TZTGLD4.bmp" },
+			{ "id": 4, "defname": "TBTWMAG5.def", "x": 593, "y": 14, "border": "TOTGLD5.bmp", "area": "TZTGLD5.bmp" },
+			{ "id": 0, "defname": "TBTWMAGE.def", "x": 597, "y": 82, "border": "TOTGLD1.bmp", "area": "TZTGLD1.bmp" },
+			{ "id": 14, "defname": "TBTWMARK.def", "x": 614, "y": 292, "border": "TOTMRK.bmp", "area": "TZTMRK.bmp" },
+			{ "id": 15, "defname": "TBTWSILO.def", "x": 763, "y": 214, "border": "TOTMRKS.bmp", "area": "TZTMRKS.bmp" },
+			{ "id": 17, "defname": "TBTWSPEC.def", "x": 674, "y": 276, "border": "TOTMRKA.bmp", "area": "TZTMRKA.bmp" },
+			{ "id": 5, "defname": "TBTWTVRN.def", "x": 375, "y": 278, "border": "TOTTAV.bmp", "area": "TZTTAV.bmp" },
+			{ "id": 37, "defname": "TBTWUP_0.def", "x": 446, "y": 221, "border": "TOTGRM2A.bmp", "area": "TZTGRM2A.bmp" },
+			{ "id": 38, "defname": "TBTWUP_1.def", "x": 4, "y": 28, "border": "TOTGAR2.bmp", "area": "TZTGAR2.bmp" },
+			{ "id": 39, "defname": "TBTWUP_2.def", "x": 209, "y": 177, "border": "TOTGOL2A.bmp", "area": "TZTGOL2A.bmp" },
+			{ "id": 40, "defname": "TBTWUP_3.def", "x": 613, "y": 74, "border": "TOTMAG2.bmp", "area": "TZTMAG2.bmp" },
+			{ "id": 41, "defname": "TBTWUP_4.def", "x": 511, "y": 8, "border": "TOTGEN2.bmp", "area": "TZTGEN2.bmp" },
+			{ "id": 42, "defname": "TBTWUP_5.def", "x": 681, "y": 157, "border": "TOTNAG2.bmp", "area": "TZTNAG2.bmp" },
+			{ "id": 43, "defname": "TBTWUP_6.def", "x": 75, "y": 91, "border": "TOTTIT2.bmp", "area": "TZTTIT2.bmp" },
+			{ "id": 8, "defname": "TBTWCAS2.def", "x": 301, "y": 0, "border": "TOTCAS2.bmp", "area": "TZTCAS2.bmp" },
 		  ],
 		  "blit_order": [ 36, 43, 32, 39, 10, 11, 12, 13, 32, 35, 42, 15, 5, 18, 19 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBINBLAK.def", "x": 684, "y": 253 },
-			{ "id": 9, "defname": "TBINCAS3.def", "x": 222, "y": 18 },
-			{ "id": 7, "defname": "TBINCSTL.def", "x": 222, "y": 44 },
-			{ "id": 30, "defname": "TBINDW_0.def", "x": 614, "y": 256 },
-			{ "id": 31, "defname": "TBINDW_1.def", "x": 187, "y": 248 },
-			{ "id": 32, "defname": "TBINDW_2.def", "x": 9, "y": 325 },
-			{ "id": 33, "defname": "TBINDW_3.def", "x": 414, "y": 204 },
-			{ "id": 34, "defname": "TBINDW_4.def", "x": 359, "y": 296 },
-			{ "id": 35, "defname": "TBINDW_5.def", "x": 220, "y": 350 },
-			{ "id": 36, "defname": "TBINDW_6.def", "x": 420, "y": 153 },
-			{ "id": 21, "defname": "TBINEXT0.def", "x": 297, "y": 0 },
-			{ "id": 22, "defname": "TBINEXT1.def", "x": 227, "y": 174 },
-			{ "id": 23, "defname": "TBINEXT2.def", "x": 593, "y": 104 },
-			{ "id": 11, "defname": "TBINHAL2.def", "x": 0, "y": 174 },
-			{ "id": 12, "defname": "TBINHAL3.def", "x": 0, "y": 174 },
-			{ "id": 13, "defname": "TBINHAL4.def", "x": 0, "y": 131 },
-			{ "id": 10, "defname": "TBINHALL.def", "x": 0, "y": 174 },
-			{ "id": 26, "defname": "TBINHOLY.def", "x": 24, "y": 10 },
-			{ "id": 18, "defname": "TBINHRD1.def", "x": 614, "y": 256 },
-			{ "id": 19, "defname": "TBINHRD2.def", "x": 614, "y": 221 },
-			{ "id": 24, "defname": "TBINHRD3.def", "x": 10, "y": 301 },
-			{ "id": 25, "defname": "TBINHRD4.def", "x": 9, "y": 273 },
-			{ "id": 1, "defname": "TBINMAG2.def", "x": 667, "y": 101 },
-			{ "id": 2, "defname": "TBINMAG3.def", "x": 667, "y": 83 },
-			{ "id": 3, "defname": "TBINMAG4.def", "x": 667, "y": 56 },
-			{ "id": 4, "defname": "TBINMAG5.def", "x": 667, "y": 35 },
-			{ "id": 0, "defname": "TBINMAGE.def", "x": 667, "y": 127 },
-			{ "id": 14, "defname": "TBINMARK.def", "x": 511, "y": 301 },
-			{ "id": 15, "defname": "TBINSILO.def", "x": 497, "y": 337 },
-			{ "id": 5, "defname": "TBINTVRN.def", "x": 105, "y": 219 },
-			{ "id": 37, "defname": "TBINUP_0.def", "x": 614, "y": 221 },
-			{ "id": 38, "defname": "TBINUP_1.def", "x": 187, "y": 212 },
-			{ "id": 39, "defname": "TBINUP_2.def", "x": 9, "y": 273 },
-			{ "id": 40, "defname": "TBINUP_3.def", "x": 412, "y": 197 },
-			{ "id": 41, "defname": "TBINUP_4.def", "x": 359, "y": 244 },
-			{ "id": 42, "defname": "TBINUP_5.def", "x": 220, "y": 282 },
-			{ "id": 43, "defname": "TBINUP_6.def", "x": 420, "y": 105 },
-			{ "id": 8, "defname": "TBINCAS2.def", "x": 222, "y": 44 },
+		{
+		  // Castle 3
+		  "defnames": [
+			{ "id": 16, "defname": "TBINBLAK.def", "x": 684, "y": 253, "border": "TOIBLKA.bmp", "area": "TZIBLKA.bmp" },
+			{ "id": 9, "defname": "TBINCAS3.def", "x": 222, "y": 18, "border": "TOICAS3A.bmp", "area": "TZICAS3A.bmp" },
+			{ "id": 7, "defname": "TBINCSTL.def", "x": 222, "y": 44, "border": "TOICAS2A.bmp", "area": "TZICAS2A.bmp" },
+			{ "id": 30, "defname": "TBINDW_0.def", "x": 614, "y": 256, "border": "TOIMP1A.bmp", "area": "TZIMP1A.bmp" },
+			{ "id": 31, "defname": "TBINDW_1.def", "x": 187, "y": 248, "border": "TOIGOG1A.bmp", "area": "TZIGOG1A.bmp" },
+			{ "id": 32, "defname": "TBINDW_2.def", "x": 9, "y": 325, "border": "TOIHND1.bmp", "area": "TZIHND1.bmp" },
+			{ "id": 33, "defname": "TBINDW_3.def", "x": 414, "y": 204, "border": "TOIDMN1.bmp", "area": "TZIDMN1.bmp" },
+			{ "id": 34, "defname": "TBINDW_4.def", "x": 359, "y": 296, "border": "TOIPIT1.bmp", "area": "TZIPIT1.bmp" },
+			{ "id": 35, "defname": "TBINDW_5.def", "x": 220, "y": 350, "border": "TOIEFR1.bmp", "area": "TZIEFR1.bmp" },
+			{ "id": 36, "defname": "TBINDW_6.def", "x": 420, "y": 153, "border": "TOIDVL1.bmp", "area": "TZIDVL1.bmp" },
+			{ "id": 21, "defname": "TBINEXT0.def", "x": 297, "y": 0, "border": "TOICAB1A.bmp", "area": "TZICAB1A.bmp" },
+			{ "id": 22, "defname": "TBINEXT1.def", "x": 227, "y": 174, "border": "TOICASGA.bmp", "area": "TZICASGA.bmp" },
+			{ "id": 23, "defname": "TBINEXT2.def", "x": 593, "y": 104, "border": "TOIPAIN.bmp", "area": "TZIPAIN.bmp" },
+			{ "id": 11, "defname": "TBINHAL2.def", "x": 0, "y": 174, "border": "TOIHAL2.bmp", "area": "TZIHAL2.bmp" },
+			{ "id": 12, "defname": "TBINHAL3.def", "x": 0, "y": 174, "border": "TOIHAL3.bmp", "area": "TZIHAL3.bmp" },
+			{ "id": 13, "defname": "TBINHAL4.def", "x": 0, "y": 131, "border": "TOIHAL4.bmp", "area": "TZIHAL4.bmp" },
+			{ "id": 10, "defname": "TBINHALL.def", "x": 0, "y": 174, "border": "TOIHAL1.bmp", "area": "TZIHAL1.bmp" },
+			{ "id": 26, "defname": "TBINHOLY.def", "x": 24, "y": 10, "border": "TOIHOLY.bmp", "area": "TZIHOLY.bmp" },
+			{ "id": 18, "defname": "TBINHRD1.def", "x": 614, "y": 256, "border": "TOIMP1HA.bmp", "area": "TZIMP1HA.bmp" },
+			{ "id": 19, "defname": "TBINHRD2.def", "x": 614, "y": 221, "border": "TOIMP2HA.bmp", "area": "TZIMP2HA.bmp" },
+			{ "id": 24, "defname": "TBINHRD3.def", "x": 10, "y": 301, "border": "TOIHND1H.bmp", "area": "TZIHND1H.bmp" },
+			{ "id": 25, "defname": "TBINHRD4.def", "x": 9, "y": 273, "border": "TOIHND2H.bmp", "area": "TZIHND2H.bmp" },
+			{ "id": 1, "defname": "TBINMAG2.def", "x": 667, "y": 101, "border": "TOIMAG2A.bmp", "area": "TZIMAG2A.bmp" },
+			{ "id": 2, "defname": "TBINMAG3.def", "x": 667, "y": 83, "border": "TOIMAG3A.bmp", "area": "TZIMAG3A.bmp" },
+			{ "id": 3, "defname": "TBINMAG4.def", "x": 667, "y": 56, "border": "TOIMAG4A.bmp", "area": "TZIMAG4A.bmp" },
+			{ "id": 4, "defname": "TBINMAG5.def", "x": 667, "y": 35, "border": "TOIMAG5A.bmp", "area": "TZIMAG5A.bmp" },
+			{ "id": 0, "defname": "TBINMAGE.def", "x": 667, "y": 127, "border": "TOIMAG1A.bmp", "area": "TZIMAG1A.bmp" },
+			{ "id": 14, "defname": "TBINMARK.def", "x": 511, "y": 301, "border": "TOIMAR1.bmp", "area": "TZIMAR1.bmp" },
+			{ "id": 15, "defname": "TBINSILO.def", "x": 497, "y": 337, "border": "TOIMAR2.bmp", "area": "TZIMAR2.bmp" },
+			{ "id": 5, "defname": "TBINTVRN.def", "x": 105, "y": 219, "border": "TOITAV.bmp", "area": "TZITAV.bmp" },
+			{ "id": 37, "defname": "TBINUP_0.def", "x": 614, "y": 221, "border": "TOIMP2A.bmp", "area": "TZIMP2A.bmp" },
+			{ "id": 38, "defname": "TBINUP_1.def", "x": 187, "y": 212, "border": "TOIGOG2A.bmp", "area": "TZIGOG2A.bmp" },
+			{ "id": 39, "defname": "TBINUP_2.def", "x": 9, "y": 273, "border": "TOIHND2.bmp", "area": "TZIHND2.bmp" },
+			{ "id": 40, "defname": "TBINUP_3.def", "x": 412, "y": 197, "border": "TOIDMN2.bmp", "area": "TZIDMN2.bmp" },
+			{ "id": 41, "defname": "TBINUP_4.def", "x": 359, "y": 244, "border": "TOIPIT2.bmp", "area": "TZIPIT2.bmp" },
+			{ "id": 42, "defname": "TBINUP_5.def", "x": 220, "y": 282, "border": "TOIEFR2.bmp", "area": "TZIEFR2.bmp" },
+			{ "id": 43, "defname": "TBINUP_6.def", "x": 420, "y": 105, "border": "TOIDVL2.bmp", "area": "TZIDVL2.bmp" },
+			{ "id": 8, "defname": "TBINCAS2.def", "x": 222, "y": 44, "border": "TOICAS1A.bmp", "area": "TZICAS1A.bmp" },
 		  ],
 		  "blit_order": [ 26, 21, 7, 8, 9, 22, 31, 38, 36, 43, 10, 11, 12, 13, 5, 32, 39, 24, 25, 33, 40, 34, 41, 30, 37, 18, 19, 14, 15, 16, 35, 42 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBNCBLAK.def", "x": 382, "y": 252 },
-			{ "id": 8, "defname": "TBNCCAS2.def", "x": 139, "y": 66 },
-			{ "id": 9, "defname": "TBNCCAS3.def", "x": 34, "y": 18 },
-			{ "id": 7, "defname": "TBNCCSTL.def", "x": 138, "y": 66 },
-			{ "id": 6, "defname": "TBNCDOCK.def", "x": 617, "y": 265 },
-			{ "id": 30, "defname": "TBNCDW_0.def", "x": 80, "y": 222 },
-			{ "id": 31, "defname": "TBNCDW_1.def", "x": 502, "y": 223 },
-			{ "id": 32, "defname": "TBNCDW_2.def", "x": 0, "y": 187 },
-			{ "id": 33, "defname": "TBNCDW_3.def", "x": 607, "y": 212 },
-			{ "id": 34, "defname": "TBNCDW_4.def", "x": 206, "y": 207 },
-			{ "id": 35, "defname": "TBNCDW_5.def", "x": 0, "y": 31 },
-			{ "id": 36, "defname": "TBNCDW_6.def", "x": 663, "y": 25 },
-			{ "id": 21, "defname": "TBNCEXT0.def", "x": 307, "y": 61 },
-			{ "id": 22, "defname": "TBNCEXT1.def", "x": 247, "y": 275 },
+		{
+		  // Castle 4
+		  "defnames": [
+			{ "id": 16, "defname": "TBNCBLAK.def", "x": 382, "y": 252, "border": "TONSMITA.bmp", "area": "TZNSMITA.bmp" },
+			{ "id": 8, "defname": "TBNCCAS2.def", "x": 139, "y": 66, "border": "TONCAS2.bmp", "area": "TZNCAS2.bmp" },
+			{ "id": 9, "defname": "TBNCCAS3.def", "x": 34, "y": 18, "border": "TONCAS3.bmp", "area": "TZNCAS3.bmp" },
+			{ "id": 7, "defname": "TBNCCSTL.def", "x": 138, "y": 66, "border": "TONCAS1.bmp", "area": "TZNCAS1.bmp" },
+			{ "id": 6, "defname": "TBNCDOCK.def", "x": 617, "y": 265, "border": "TONSHPBA.bmp", "area": "TZNSHPBA.bmp" },
+			{ "id": 30, "defname": "TBNCDW_0.def", "x": 80, "y": 222, "border": "TONSKEL1.bmp", "area": "TZNSKEL1.bmp" },
+			{ "id": 31, "defname": "TBNCDW_1.def", "x": 502, "y": 223, "border": "TONZOMB1.bmp", "area": "TZNZOMB1.bmp" },
+			{ "id": 32, "defname": "TBNCDW_2.def", "x": 0, "y": 187, "border": "TONWIGH1.bmp", "area": "TZNWIGH1.bmp" },
+			{ "id": 33, "defname": "TBNCDW_3.def", "x": 607, "y": 212, "border": "TONVAM1.bmp", "area": "TZNVAM1.bmp" },
+			{ "id": 34, "defname": "TBNCDW_4.def", "x": 206, "y": 207, "border": "TONLICH1.bmp", "area": "TZNLICH1.bmp" },
+			{ "id": 35, "defname": "TBNCDW_5.def", "x": 0, "y": 31, "border": "TONBKN1.bmp", "area": "TZNBKN1.bmp" },
+			{ "id": 36, "defname": "TBNCDW_6.def", "x": 663, "y": 25, "border": "TONBON1.bmp", "area": "TZNBON1.bmp" },
+			{ "id": 21, "defname": "TBNCEXT0.def", "x": 307, "y": 61, "border": "TONNECRA.bmp", "area": "TZNNECRA.bmp" },
+			{ "id": 22, "defname": "TBNCEXT1.def", "x": 247, "y": 275, "border": "TONSKELT.bmp", "area": "TZNSKELT.bmp" },
 			{ "id": -1, "defname": "TBNCEXT2.def", "x": 25, "y": 279 },
 			{ "id": 27, "defname": "TBNCEXT3.def", "x": 0, "y": 241 },
 			{ "id": 28, "defname": "TBNCEXT4.def", "x": 321, "y": 255 },
 			{ "id": 29, "defname": "TBNCEXT5.def", "x": 475, "y": 257 },
-			{ "id": 11, "defname": "TBNCHAL2.def", "x": 482, "y": 56 },
-			{ "id": 12, "defname": "TBNCHAL3.def", "x": 478, "y": 26 },
-			{ "id": 13, "defname": "TBNCHAL4.def", "x": 481, "y": 26 },
-			{ "id": 10, "defname": "TBNCHALL.def", "x": 468, "y": 76 },
-			{ "id": 26, "defname": "TBNCHOLY.def", "x": 410, "y": 88 },
-			{ "id": 18, "defname": "TBNCHRD1.def", "x": 80, "y": 222 },
-			{ "id": 19, "defname": "TBNCHRD2.def", "x": 64, "y": 222 },
-			{ "id": 1, "defname": "TBNCMAG2.def", "x": 341, "y": 97 },
-			{ "id": 2, "defname": "TBNCMAG3.def", "x": 341, "y": 78 },
-			{ "id": 3, "defname": "TBNCMAG4.def", "x": 340, "y": 62 },
-			{ "id": 4, "defname": "TBNCMAG5.def", "x": 343, "y": 35 },
-			{ "id": 0, "defname": "TBNCMAGE.def", "x": 341, "y": 116 },
-			{ "id": 14, "defname": "TBNCMARK.def", "x": 347, "y": 215 },
-			{ "id": 15, "defname": "TBNCSILO.def", "x": 276, "y": 185 },
-			{ "id": 17, "defname": "TBNCSPEC.def", "x": 18, "y": 0 },
-			{ "id": 5, "defname": "TBNCTVRN.def", "x": 508, "y": 189 },
-			{ "id": 37, "defname": "TBNCUP_0.def", "x": 64, "y": 222 },
-			{ "id": 38, "defname": "TBNCUP_1.def", "x": 498, "y": 224 },
-			{ "id": 39, "defname": "TBNCUP_2.def", "x": 0, "y": 179 },
-			{ "id": 40, "defname": "TBNCUP_3.def", "x": 615, "y": 193 },
-			{ "id": 41, "defname": "TBNCUP_4.def", "x": 222, "y": 171 },
-			{ "id": 42, "defname": "TBNCUP_5.def", "x": 0, "y": 30 },
-			{ "id": 43, "defname": "TBNCUP_6.def", "x": 662, "y": 23 },
-			{ "id": 20, "defname": "TBNCBOAT.def", "x": 617, "y": 265 },
+			{ "id": 11, "defname": "TBNCHAL2.def", "x": 482, "y": 56, "border": "TONHAL2.bmp", "area": "TZNHAL2.bmp" },
+			{ "id": 12, "defname": "TBNCHAL3.def", "x": 478, "y": 26, "border": "TONHAL3.bmp", "area": "TZNHAL3.bmp" },
+			{ "id": 13, "defname": "TBNCHAL4.def", "x": 481, "y": 26, "border": "TONHAL4.bmp", "area": "TZNHAL4.bmp" },
+			{ "id": 10, "defname": "TBNCHALL.def", "x": 468, "y": 76, "border": "TONHAL1.bmp", "area": "TZNHAL1.bmp" },
+			{ "id": 26, "defname": "TBNCHOLY.def", "x": 410, "y": 88, "border": "TONHOLYA.bmp", "area": "TZNHOLYA.bmp" },
+			{ "id": 18, "defname": "TBNCHRD1.def", "x": 80, "y": 222, "border": "TONSKE1H.bmp", "area": "TZNSKE1H.bmp" },
+			{ "id": 19, "defname": "TBNCHRD2.def", "x": 64, "y": 222, "border": "TONSKE2H.bmp", "area": "TZNSKE2H.bmp" },
+			{ "id": 1, "defname": "TBNCMAG2.def", "x": 341, "y": 97, "border": "TONMAG2.bmp", "area": "TZNMAG2.bmp" },
+			{ "id": 2, "defname": "TBNCMAG3.def", "x": 341, "y": 78, "border": "TONMAG3.bmp", "area": "TZNMAG3.bmp" },
+			{ "id": 3, "defname": "TBNCMAG4.def", "x": 340, "y": 62, "border": "TONMAG4.bmp", "area": "TZNMAG4.bmp" },
+			{ "id": 4, "defname": "TBNCMAG5.def", "x": 343, "y": 35, "border": "TONMAG5.bmp", "area": "TZNMAG5.bmp" },
+			{ "id": 0, "defname": "TBNCMAGE.def", "x": 341, "y": 116, "border": "TONMAG1.bmp", "area": "TZNMAG1.bmp" },
+			{ "id": 14, "defname": "TBNCMARK.def", "x": 347, "y": 215, "border": "TONMRK1.bmp", "area": "TZNMRK1.bmp" },
+			{ "id": 15, "defname": "TBNCSILO.def", "x": 276, "y": 185, "border": "TONMRK2.bmp", "area": "TZNMRK2.bmp" },
+			{ "id": 17, "defname": "TBNCSPEC.def", "x": 18, "y": 0, "border": "TONSHRDA.bmp", "area": "TZNSHRDA.bmp" },
+			{ "id": 5, "defname": "TBNCTVRN.def", "x": 508, "y": 189, "border": "TONTAV.bmp", "area": "TZNTAV.bmp" },
+			{ "id": 37, "defname": "TBNCUP_0.def", "x": 64, "y": 222, "border": "TONSKEL2.bmp", "area": "TZNSKEL2.bmp" },
+			{ "id": 38, "defname": "TBNCUP_1.def", "x": 498, "y": 224, "border": "TONZOMB2.bmp", "area": "TZNZOMB2.bmp" },
+			{ "id": 39, "defname": "TBNCUP_2.def", "x": 0, "y": 179, "border": "TONWIGH2.bmp", "area": "TZNWIGH2.bmp" },
+			{ "id": 40, "defname": "TBNCUP_3.def", "x": 615, "y": 193, "border": "TONVAM2.bmp", "area": "TZNVAM2.bmp" },
+			{ "id": 41, "defname": "TBNCUP_4.def", "x": 222, "y": 171, "border": "TONLICH2.bmp", "area": "TZNLICH2.bmp" },
+			{ "id": 42, "defname": "TBNCUP_5.def", "x": 0, "y": 30, "border": "TONBKN2.bmp", "area": "TZNBKN2.bmp" },
+			{ "id": 43, "defname": "TBNCUP_6.def", "x": 662, "y": 23, "border": "TONBON2.bmp", "area": "TZNBON2.bmp" },
+			{ "id": 20, "defname": "TBNCBOAT.def", "x": 617, "y": 265, "border": "TONSHPNA.bmp", "area": "TZNSHPNA.bmp" },
 		  ],
 		  "blit_order": [ 17, 0, 1, 2, 3, 4, 7, 8, 9, 32, 39, 26, 15, 14, 34, 41, 16, 5, 33, 40, 31, 38, 6, 30, 18, 37, 19, 22, 20 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBDNBLAK.def", "x": 544, "y": 248 },
-			{ "id": 9, "defname": "TBDNCAS3.def", "x": 363, "y": 87 },
-			{ "id": 7, "defname": "TBDNCSTL.def", "x": 363, "y": 87 },
-			{ "id": 30, "defname": "TBDNDW_0.def", "x": 0, "y": 326 },
-			{ "id": 31, "defname": "TBDNDW_1.def", "x": 0, "y": 26 },
-			{ "id": 32, "defname": "TBDNDW_2.def", "x": 118, "y": 308 },
-			{ "id": 33, "defname": "TBDNDW_3.def", "x": 300, "y": 29 },
-			{ "id": 34, "defname": "TBDNDW_4.def", "x": 551, "y": 186 },
-			{ "id": 35, "defname": "TBDNDW_5.def", "x": 270, "y": 253 },
-			{ "id": 36, "defname": "TBDNDW_6.def", "x": 550, "y": 0 },
-			{ "id": 21, "defname": "TBDNEXT0.def", "x": 131, "y": 26 },
-			{ "id": 22, "defname": "TBDNEXT1.def", "x": 687, "y": 177 },
-			{ "id": 23, "defname": "TBDNEXT2.def", "x": 313, "y": 298 },
-			{ "id": 11, "defname": "TBDNHAL2.def", "x": 0, "y": 223 },
-			{ "id": 12, "defname": "TBDNHAL3.def", "x": 0, "y": 223 },
-			{ "id": 13, "defname": "TBDNHAL4.def", "x": 0, "y": 203 },
-			{ "id": 10, "defname": "TBDNHALL.def", "x": 0, "y": 234 },
-			{ "id": 26, "defname": "TBDNHOLY.def", "x": 562, "y": 24 },
-			{ "id": 18, "defname": "TBDNHRD1.def", "x": 0, "y": 326 },
-			{ "id": 19, "defname": "TBDNHRD2.def", "x": 0, "y": 300 },
-			{ "id": 1, "defname": "TBDNMAG2.def", "x": 164, "y": 97 },
-			{ "id": 2, "defname": "TBDNMAG3.def", "x": 164, "y": 77 },
-			{ "id": 3, "defname": "TBDNMAG4.def", "x": 164, "y": 61 },
-			{ "id": 4, "defname": "TBDNMAG5.def", "x": 164, "y": 15 },
-			{ "id": 0, "defname": "TBDNMAGE.def", "x": 164, "y": 119 },
-			{ "id": 14, "defname": "TBDNMARK.def", "x": 590, "y": 318 },
-			{ "id": 15, "defname": "TBDNSILO.def", "x": 624, "y": 335 },
-			{ "id": 17, "defname": "TBDNSPEC.def", "x": 746, "y": 294 },
-			{ "id": 5, "defname": "TBDNTVRN.def", "x": 211, "y": 297 },
-			{ "id": 37, "defname": "TBDNUP_0.def", "x": 0, "y": 300 },
-			{ "id": 38, "defname": "TBDNUP_1.def", "x": 0, "y": 26 },
-			{ "id": 39, "defname": "TBDNUP_2.def", "x": 118, "y": 256 },
-			{ "id": 40, "defname": "TBDNUP_3.def", "x": 300, "y": 29 },
-			{ "id": 41, "defname": "TBDNUP_4.def", "x": 519, "y": 172 },
-			{ "id": 42, "defname": "TBDNUP_5.def", "x": 270, "y": 253 },
-			{ "id": 43, "defname": "TBDNUP_6.def", "x": 550, "y": 0 },
-			{ "id": 8, "defname": "TBDNCAS2.def", "x": 363, "y": 87 },
+		{
+		  // Castle 5
+		  "defnames": [
+			{ "id": 16, "defname": "TBDNBLAK.def", "x": 544, "y": 248, "border": "TODSMITH.bmp", "area": "TZDSMITH.bmp" },
+			{ "id": 9, "defname": "TBDNCAS3.def", "x": 363, "y": 87, "border": "TODCAS3.bmp", "area": "TZDCAS3.bmp" },
+			{ "id": 7, "defname": "TBDNCSTL.def", "x": 363, "y": 87, "border": "TODCAS1.bmp", "area": "TZDCAS1.bmp" },
+			{ "id": 30, "defname": "TBDNDW_0.def", "x": 0, "y": 326, "border": "TODTRG1A.bmp", "area": "TZDTRG1A.bmp" },
+			{ "id": 31, "defname": "TBDNDW_1.def", "x": 0, "y": 26, "border": "TODHAR1.bmp", "area": "TZDHAR1.bmp" },
+			{ "id": 32, "defname": "TBDNDW_2.def", "x": 118, "y": 308, "border": "TODBEH1A.bmp", "area": "TZDBEH1A.bmp" },
+			{ "id": 33, "defname": "TBDNDW_3.def", "x": 300, "y": 29, "border": "TODMED1.bmp", "area": "TZDMED1.bmp" },
+			{ "id": 34, "defname": "TBDNDW_4.def", "x": 551, "y": 186, "border": "TODMIN1.bmp", "area": "TZDMIN1.bmp" },
+			{ "id": 35, "defname": "TBDNDW_5.def", "x": 270, "y": 253, "border": "TODMAN1.bmp", "area": "TZDMAN1.bmp" },
+			{ "id": 36, "defname": "TBDNDW_6.def", "x": 550, "y": 0, "border": "TODDRA1A.bmp", "area": "TZDDRA1A.bmp" },
+			{ "id": 21, "defname": "TBDNEXT0.def", "x": 131, "y": 26, "border": "TODVOR1A.bmp", "area": "TZDVOR1A.bmp" },
+			{ "id": 22, "defname": "TBDNEXT1.def", "x": 687, "y": 177, "border": "TODPORTA.bmp", "area": "TZDPORTA.bmp" },
+			{ "id": 23, "defname": "TBDNEXT2.def", "x": 313, "y": 298, "border": "TODACAD.bmp", "area": "TZDACAD.bmp" },
+			{ "id": 11, "defname": "TBDNHAL2.def", "x": 0, "y": 223, "border": "TODHALL2.bmp", "area": "TZDHALL2.bmp" },
+			{ "id": 12, "defname": "TBDNHAL3.def", "x": 0, "y": 223, "border": "TODHALL3.bmp", "area": "TZDHALL3.bmp" },
+			{ "id": 13, "defname": "TBDNHAL4.def", "x": 0, "y": 203, "border": "TODHALL4.bmp", "area": "TZDHALL4.bmp" },
+			{ "id": 10, "defname": "TBDNHALL.def", "x": 0, "y": 234, "border": "TODHALL1.bmp", "area": "TZDHALL1.bmp" },
+			{ "id": 26, "defname": "TBDNHOLY.def", "x": 562, "y": 24, "border": "TODHOLY.bmp", "area": "TZDHOLY.bmp" },
+			{ "id": 18, "defname": "TBDNHRD1.def", "x": 0, "y": 326, "border": "TODTR1HA.bmp", "area": "TZDTR1HA.bmp" },
+			{ "id": 19, "defname": "TBDNHRD2.def", "x": 0, "y": 300, "border": "TODTR2HA.bmp", "area": "TZDTR2HA.bmp" },
+			{ "id": 1, "defname": "TBDNMAG2.def", "x": 164, "y": 97, "border": "TODMAG2.bmp", "area": "TZDMAG2.bmp" },
+			{ "id": 2, "defname": "TBDNMAG3.def", "x": 164, "y": 77, "border": "TODMAG3.bmp", "area": "TZDMAG3.bmp" },
+			{ "id": 3, "defname": "TBDNMAG4.def", "x": 164, "y": 61, "border": "TODMAG4.bmp", "area": "TZDMAG4.bmp" },
+			{ "id": 4, "defname": "TBDNMAG5.def", "x": 164, "y": 15, "border": "TODMAG5.bmp", "area": "TZDMAG5.bmp" },
+			{ "id": 0, "defname": "TBDNMAGE.def", "x": 164, "y": 119, "border": "TODMAG1.bmp", "area": "TZDMAG1.bmp" },
+			{ "id": 14, "defname": "TBDNMARK.def", "x": 590, "y": 318, "border": "TODMARK.bmp", "area": "TZDMARK.bmp" },
+			{ "id": 15, "defname": "TBDNSILO.def", "x": 624, "y": 335, "border": "TODSILO.bmp", "area": "TZDSILO.bmp" },
+			{ "id": 17, "defname": "TBDNSPEC.def", "x": 746, "y": 294, "border": "TODART.bmp", "area": "TZDART.bmp" },
+			{ "id": 5, "defname": "TBDNTVRN.def", "x": 211, "y": 297, "border": "TODTAV.bmp", "area": "TZDTAV.bmp" },
+			{ "id": 37, "defname": "TBDNUP_0.def", "x": 0, "y": 300, "border": "TODTRG2A.bmp", "area": "TZDTRG2A.bmp" },
+			{ "id": 38, "defname": "TBDNUP_1.def", "x": 0, "y": 26, "border": "TODHAR2.bmp", "area": "TZDHAR2.bmp" },
+			{ "id": 39, "defname": "TBDNUP_2.def", "x": 118, "y": 256, "border": "TODBEH2A.bmp", "area": "TZDBEH2A.bmp" },
+			{ "id": 40, "defname": "TBDNUP_3.def", "x": 300, "y": 29, "border": "TODMED2.bmp", "area": "TZDMED2.bmp" },
+			{ "id": 41, "defname": "TBDNUP_4.def", "x": 519, "y": 172, "border": "TODMIN2.bmp", "area": "TZDMIN2.bmp" },
+			{ "id": 42, "defname": "TBDNUP_5.def", "x": 270, "y": 253, "border": "TODMAN2.bmp", "area": "TZDMAN2.bmp" },
+			{ "id": 43, "defname": "TBDNUP_6.def", "x": 550, "y": 0, "border": "TODDRA2A.bmp", "area": "TZDDRA2A.bmp" },
+			{ "id": 8, "defname": "TBDNCAS2.def", "x": 363, "y": 87, "border": "TODCAS2.bmp", "area": "TZDCAS2.bmp" },
 		  ],
 		  "blit_order": [ 0, 1, 2, 3, 4, 21, 35, 42, 5, 30, 18, 37, 19, 32, 39, 26, 7, 8, 9, 23 ]
 		},
 
-		{ "defnames": [
-			{ "id": 31, "defname": "TBSTDW_1.def", "x": 266, "y": 246 },
-			{ "id": 43, "defname": "TBSTUP_6.def", "x": 604, "y": 0 },
-			{ "id": 8, "defname": "TBSTCAS2.def", "x": 402, "y": 114 },
-			{ "id": 9, "defname": "TBSTCAS3.def", "x": 402, "y": 114 },
-			{ "id": 7, "defname": "TBSTCSTL.def", "x": 402, "y": 148 },
-			{ "id": 30, "defname": "TBSTDW_0.def", "x": 373, "y": 239 },
-			{ "id": 32, "defname": "TBSTDW_2.def", "x": 566, "y": 232 },
-			{ "id": 33, "defname": "TBSTDW_3.def", "x": 197, "y": 204 },
-			{ "id": 34, "defname": "TBSTDW_4.def", "x": 137, "y": 30 },
-			{ "id": 35, "defname": "TBSTDW_5.def", "x": 622, "y": 160 },
-			{ "id": 36, "defname": "TBSTDW_6.def", "x": 604, "y": 0 },
-			{ "id": 21, "defname": "TBSTEXT0.def", "x": 473, "y": 282 },
-			{ "id": 22, "defname": "TBSTEXT1.def", "x": 617, "y": 286 },
-			{ "id": 23, "defname": "TBSTEXT2.def", "x": 313, "y": 13 },
+		{
+		  // Castle 6
+		  "defnames": [
+			{ "id": 31, "defname": "TBSTDW_1.def", "x": 266, "y": 246, "border": "TOSWOL1.bmp", "area": "TZSWOL1.bmp" },
+			{ "id": 43, "defname": "TBSTUP_6.def", "x": 604, "y": 0, "border": "TOSBEH2A.bmp", "area": "TZSBEH2A.bmp" },
+			{ "id": 8, "defname": "TBSTCAS2.def", "x": 402, "y": 114, "border": "TOSCA2.bmp", "area": "TZSCA2.bmp" },
+			{ "id": 9, "defname": "TBSTCAS3.def", "x": 402, "y": 114, "border": "TOSCA3.bmp", "area": "TZSCA3.bmp" },
+			{ "id": 7, "defname": "TBSTCSTL.def", "x": 402, "y": 148, "border": "TOSCA1.bmp", "area": "TZSCA1.bmp" },
+			{ "id": 30, "defname": "TBSTDW_0.def", "x": 373, "y": 239, "border": "TOSGOB1.bmp", "area": "TZSGOB1.bmp" },
+			{ "id": 32, "defname": "TBSTDW_2.def", "x": 566, "y": 232, "border": "TOSORC1.bmp", "area": "TZSORC1.bmp" },
+			{ "id": 33, "defname": "TBSTDW_3.def", "x": 197, "y": 204, "border": "TOSOGR1.bmp", "area": "TZSOGR1.bmp" },
+			{ "id": 34, "defname": "TBSTDW_4.def", "x": 137, "y": 30, "border": "TOSROC1.bmp", "area": "TZSROC1.bmp" },
+			{ "id": 35, "defname": "TBSTDW_5.def", "x": 622, "y": 160, "border": "TOSCYC1.bmp", "area": "TZSCYC1.bmp" },
+			{ "id": 36, "defname": "TBSTDW_6.def", "x": 604, "y": 0, "border": "TOSBEH1A.bmp", "area": "TZSBEH1A.bmp" },
+			{ "id": 21, "defname": "TBSTEXT0.def", "x": 473, "y": 282, "border": "TOSMRK1C.bmp", "area": "TZSMRK1C.bmp" },
+			{ "id": 22, "defname": "TBSTEXT1.def", "x": 617, "y": 286, "border": "TOSBLK2.bmp", "area": "TZSBLK2.bmp" },
+			{ "id": 23, "defname": "TBSTEXT2.def", "x": 313, "y": 13, "border": "TOSVAH.bmp", "area": "TZSVAH.bmp" },
 			{ "id": -1, "defname": "TBSTEXT3.def", "x": 23, "y": 20 },
-			{ "id": 11, "defname": "TBSTHAL2.def", "x": 0, "y": 225 },
-			{ "id": 12, "defname": "TBSTHAL3.def", "x": 0, "y": 201 },
-			{ "id": 13, "defname": "TBSTHAL4.def", "x": 0, "y": 148 },
-			{ "id": 10, "defname": "TBSTHALL.def", "x": 0, "y": 259 },
-			{ "id": 26, "defname": "TBSTHOLY.def", "x": 321, "y": 105 },
-			{ "id": 18, "defname": "TBSTHRD1.def", "x": 373, "y": 239 },
-			{ "id": 19, "defname": "TBSTHRD2.def", "x": 373, "y": 220 },
-			{ "id": 1, "defname": "TBSTMAG2.def", "x": 473, "y": 37 },
-			{ "id": 2, "defname": "TBSTMAG3.def", "x": 473, "y": 1 },
-			{ "id": 0, "defname": "TBSTMAGE.def", "x": 473, "y": 67 },
-			{ "id": 14, "defname": "TBSTMARK.def", "x": 397, "y": 308 },
-			{ "id": 15, "defname": "TBSTSILO.def", "x": 458, "y": 248 },
-			{ "id": 17, "defname": "TBSTSPEC.def", "x": 550, "y": 229 },
-			{ "id": 5, "defname": "TBSTTVRN.def", "x": 170, "y": 280 },
-			{ "id": 37, "defname": "TBSTUP_0.def", "x": 373, "y": 220 },
-			{ "id": 38, "defname": "TBSTUP_1.def", "x": 266, "y": 225 },
-			{ "id": 39, "defname": "TBSTUP_2.def", "x": 566, "y": 158 },
-			{ "id": 40, "defname": "TBSTUP_3.def", "x": 197, "y": 137 },
-			{ "id": 41, "defname": "TBSTUP_4.def", "x": 129, "y": 15 },
-			{ "id": 42, "defname": "TBSTUP_5.def", "x": 616, "y": 93 },
-			{ "id": 16, "defname": "TBSTBLAK.def", "x": 660, "y": 286 },
+			{ "id": 11, "defname": "TBSTHAL2.def", "x": 0, "y": 225, "border": "TOSHAL2A.bmp", "area": "TZSHAL2A.bmp" },
+			{ "id": 12, "defname": "TBSTHAL3.def", "x": 0, "y": 201, "border": "TOSHAL3A.bmp", "area": "TZSHAL3A.bmp" },
+			{ "id": 13, "defname": "TBSTHAL4.def", "x": 0, "y": 148, "border": "TOSHAL4A.bmp", "area": "TZSHAL4A.bmp" },
+			{ "id": 10, "defname": "TBSTHALL.def", "x": 0, "y": 259, "border": "TOSHAL1A.bmp", "area": "TZSHAL1A.bmp" },
+			{ "id": 26, "defname": "TBSTHOLY.def", "x": 321, "y": 105, "border": "TOSHOLYA.bmp", "area": "TZSHOLYA.bmp" },
+			{ "id": 18, "defname": "TBSTHRD1.def", "x": 373, "y": 239, "border": "TOSGOB1H.bmp", "area": "TZSGOB1H.bmp" },
+			{ "id": 19, "defname": "TBSTHRD2.def", "x": 373, "y": 220, "border": "TOSGOB2H.bmp", "area": "TZSGOB2H.bmp" },
+			{ "id": 1, "defname": "TBSTMAG2.def", "x": 473, "y": 37, "border": "TOSMAG2.bmp", "area": "TZSMAG2.bmp" },
+			{ "id": 2, "defname": "TBSTMAG3.def", "x": 473, "y": 1, "border": "TOSMAG3.bmp", "area": "TZSMAG3.bmp" },
+			{ "id": 0, "defname": "TBSTMAGE.def", "x": 473, "y": 67, "border": "TOSMAG1.bmp", "area": "TZSMAG1.bmp" },
+			{ "id": 14, "defname": "TBSTMARK.def", "x": 397, "y": 308, "border": "TOSMRK1.bmp", "area": "TZSMRK1.bmp" },
+			{ "id": 15, "defname": "TBSTSILO.def", "x": 458, "y": 248, "border": "TOSMRK2.bmp", "area": "TZSMRK2.bmp" },
+			{ "id": 17, "defname": "TBSTSPEC.def", "x": 550, "y": 229, "border": "TOSCA1EA.bmp", "area": "TZSCA1EA.bmp" },
+			{ "id": 5, "defname": "TBSTTVRN.def", "x": 170, "y": 280, "border": "TOSTAV.bmp", "area": "TZSTAV.bmp" },
+			{ "id": 37, "defname": "TBSTUP_0.def", "x": 373, "y": 220, "border": "TOSGOB2.bmp", "area": "TZSGOB2.bmp" },
+			{ "id": 38, "defname": "TBSTUP_1.def", "x": 266, "y": 225, "border": "TOSWOL2.bmp", "area": "TZSWOL2.bmp" },
+			{ "id": 39, "defname": "TBSTUP_2.def", "x": 566, "y": 158, "border": "TOSORC2.bmp", "area": "TZSORC2.bmp" },
+			{ "id": 40, "defname": "TBSTUP_3.def", "x": 197, "y": 137, "border": "TOSOGR2.bmp", "area": "TZSOGR2.bmp" },
+			{ "id": 41, "defname": "TBSTUP_4.def", "x": 129, "y": 15, "border": "TOSROC2.bmp", "area": "TZSROC2.bmp" },
+			{ "id": 42, "defname": "TBSTUP_5.def", "x": 616, "y": 93, "border": "TOSCYC2A.bmp", "area": "TZSCYC2A.bmp" },
+			{ "id": 16, "defname": "TBSTBLAK.def", "x": 660, "y": 286, "border": "TOSBLK1.bmp", "area": "TZSBLK1.bmp" },
 		  ],
 		  "blit_order": [ 33, 40, 30, 18, 37, 19, 31, 38, 23, 26, 5, 32, 39, 15, 14, 21, 16, 22 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBFRBLAK.def", "x": 360, "y": 160 },
-			{ "id": 8, "defname": "TBFRCAS2.def", "x": 368, "y": 98 },
-			{ "id": 9, "defname": "TBFRCAS3.def", "x": 368, "y": 55 },
-			{ "id": 7, "defname": "TBFRCSTL.def", "x": 368, "y": 118 },
-			{ "id": 6, "defname": "TBFRDOCK.def", "x": 197, "y": 294 },
-			{ "id": 30, "defname": "TBFRDW_0.def", "x": 641, "y": 168 },
-			{ "id": 31, "defname": "TBFRDW_1.def", "x": 141, "y": 178 },
-			{ "id": 34, "defname": "TBFRDW_2.def", "x": 15, "y": 127 },
-			{ "id": 32, "defname": "TBFRDW_3.def", "x": 192, "y": 85 },
-			{ "id": 33, "defname": "TBFRDW_4.def", "x": 0, "y": 292 },
-			{ "id": 35, "defname": "TBFRDW_5.def", "x": 0, "y": 4 },
-			{ "id": 36, "defname": "TBFRDW_6.def", "x": 612, "y": 291 },
-			{ "id": 21, "defname": "TBFREXT0.def", "x": 341, "y": 174 },
-			{ "id": 22, "defname": "TBFREXT1.def", "x": 349, "y": 79 },
+		{
+		  // Castle 7
+		  "defnames": [
+			{ "id": 16, "defname": "TBFRBLAK.def", "x": 360, "y": 160, "border": "TOFAIDA.bmp", "area": "TZFAIDA.bmp" },
+			{ "id": 8, "defname": "TBFRCAS2.def", "x": 368, "y": 98, "border": "TOFCAS2.bmp", "area": "TZFCAS2.bmp" },
+			{ "id": 9, "defname": "TBFRCAS3.def", "x": 368, "y": 55, "border": "TOFCAS3.bmp", "area": "TZFCAS3.bmp" },
+			{ "id": 7, "defname": "TBFRCSTL.def", "x": 368, "y": 118, "border": "TOFCAS1.bmp", "area": "TZFCAS1.bmp" },
+			{ "id": 6, "defname": "TBFRDOCK.def", "x": 197, "y": 294, "border": "TOFDCK2.bmp", "area": "TZFDCK2.bmp" },
+			{ "id": 30, "defname": "TBFRDW_0.def", "x": 641, "y": 168, "border": "TOFGNL1.bmp", "area": "TZFGNL1.bmp" },
+			{ "id": 31, "defname": "TBFRDW_1.def", "x": 141, "y": 178, "border": "TOFLIZ1.bmp", "area": "TZFLIZ1.bmp" },
+			{ "id": 34, "defname": "TBFRDW_2.def", "x": 15, "y": 127, "border": "TOFGOR1.bmp", "area": "TZFGOR1.bmp" },
+			{ "id": 32, "defname": "TBFRDW_3.def", "x": 192, "y": 85, "border": "TOFFLY1A.bmp", "area": "TZFFLY1A.bmp" },
+			{ "id": 33, "defname": "TBFRDW_4.def", "x": 0, "y": 292, "border": "TOFBAS1.bmp", "area": "TZFBAS1.bmp" },
+			{ "id": 35, "defname": "TBFRDW_5.def", "x": 0, "y": 4, "border": "TOFWYV1.bmp", "area": "TZFWYV1.bmp" },
+			{ "id": 36, "defname": "TBFRDW_6.def", "x": 612, "y": 291, "border": "TOFHYD1A.bmp", "area": "TZFHYD1A.bmp" },
+			{ "id": 21, "defname": "TBFREXT0.def", "x": 341, "y": 174, "border": "TOFCASD.bmp", "area": "TZFCASD.bmp" },
+			{ "id": 22, "defname": "TBFREXT1.def", "x": 349, "y": 79, "border": "TOFCASA.bmp", "area": "TZFCASA.bmp" },
 			{ "id": -1, "defname": "TBFREXT2.def", "x": 372, "y": 227 },
-			{ "id": 11, "defname": "TBFRHAL2.def", "x": 166, "y": 97 },
-			{ "id": 12, "defname": "TBFRHAL3.def", "x": 166, "y": 51 },
-			{ "id": 13, "defname": "TBFRHAL4.def", "x": 166, "y": 2 },
-			{ "id": 10, "defname": "TBFRHALL.def", "x": 166, "y": 128 },
-			{ "id": 26, "defname": "TBFRHOLY.def", "x": 468, "y": 260 },
-			{ "id": 18, "defname": "TBFRHRD1.def", "x": 641, "y": 121 },
-			{ "id": 19, "defname": "TBFRHRD2.def", "x": 641, "y": 68 },
-			{ "id": 1, "defname": "TBFRMAG2.def", "x": 0, "y": 177 },
-			{ "id": 2, "defname": "TBFRMAG3.def", "x": 0, "y": 135 },
-			{ "id": 0, "defname": "TBFRMAGE.def", "x": 0, "y": 200 },
-			{ "id": 14, "defname": "TBFRMARK.def", "x": 382, "y": 219 },
-			{ "id": 15, "defname": "TBFRSILO.def", "x": 448, "y": 210 },
-			{ "id": 17, "defname": "TBFRSPEC.def", "x": 703, "y": 36 },
-			{ "id": 5, "defname": "TBFRTVRN.def", "x": 634, "y": 219 },
-			{ "id": 37, "defname": "TBFRUP_0.def", "x": 641, "y": 107 },
-			{ "id": 38, "defname": "TBFRUP_1.def", "x": 125, "y": 163 },
-			{ "id": 41, "defname": "TBFRUP_2.def", "x": 15, "y": 69 },
-			{ "id": 39, "defname": "TBFRUP_3.def", "x": 159, "y": 19 },
-			{ "id": 40, "defname": "TBFRUP_4.def", "x": 0, "y": 257 },
-			{ "id": 42, "defname": "TBFRUP_5.def", "x": 0, "y": 4 },
-			{ "id": 43, "defname": "TBFRUP_6.def", "x": 587, "y": 263 },
+			{ "id": 11, "defname": "TBFRHAL2.def", "x": 166, "y": 97, "border": "TOFHAL2.bmp", "area": "TZFHAL2.bmp" },
+			{ "id": 12, "defname": "TBFRHAL3.def", "x": 166, "y": 51, "border": "TOFHAL3.bmp", "area": "TZFHAL3.bmp" },
+			{ "id": 13, "defname": "TBFRHAL4.def", "x": 166, "y": 2, "border": "TOFHAL4.bmp", "area": "TZFHAL4.bmp" },
+			{ "id": 10, "defname": "TBFRHALL.def", "x": 166, "y": 128, "border": "TOFHAL1.bmp", "area": "TZFHAL1.bmp" },
+			{ "id": 26, "defname": "TBFRHOLY.def", "x": 468, "y": 260, "border": "TOFHLYAA.bmp", "area": "TZFHLYAA.bmp" },
+			{ "id": 18, "defname": "TBFRHRD1.def", "x": 641, "y": 121, "border": "TOFGNL1H.bmp", "area": "TZFGNL1H.bmp" },
+			{ "id": 19, "defname": "TBFRHRD2.def", "x": 641, "y": 68, "border": "TOFGNL2H.bmp", "area": "TZFGNL2H.bmp" },
+			{ "id": 1, "defname": "TBFRMAG2.def", "x": 0, "y": 177, "border": "TOFMAG2A.bmp", "area": "TZFMAG2A.bmp" },
+			{ "id": 2, "defname": "TBFRMAG3.def", "x": 0, "y": 135, "border": "TOFMAG3A.bmp", "area": "TZFMAG3A.bmp" },
+			{ "id": 0, "defname": "TBFRMAGE.def", "x": 0, "y": 200, "border": "TOFMAG1A.bmp", "area": "TZFMAG1A.bmp" },
+			{ "id": 14, "defname": "TBFRMARK.def", "x": 382, "y": 219, "border": "TOFMRKAA.bmp", "area": "TZFMRKAA.bmp" },
+			{ "id": 15, "defname": "TBFRSILO.def", "x": 448, "y": 210, "border": "TOFMRK2A.bmp", "area": "TZFMRK2A.bmp" },
+			{ "id": 17, "defname": "TBFRSPEC.def", "x": 703, "y": 36, "border": "TOFCAGE.bmp", "area": "TZFCAGE.bmp" },
+			{ "id": 5, "defname": "TBFRTVRN.def", "x": 634, "y": 219, "border": "TOFTAVA.bmp", "area": "TZFTAVA.bmp" },
+			{ "id": 37, "defname": "TBFRUP_0.def", "x": 641, "y": 107, "border": "TOFGNL2.bmp", "area": "TZFGNL2.bmp" },
+			{ "id": 38, "defname": "TBFRUP_1.def", "x": 125, "y": 163, "border": "TOFLIZ2.bmp", "area": "TZFLIZ2.bmp" },
+			{ "id": 41, "defname": "TBFRUP_2.def", "x": 15, "y": 69, "border": "TOFGOR2.bmp", "area": "TZFGOR2.bmp" },
+			{ "id": 39, "defname": "TBFRUP_3.def", "x": 159, "y": 19, "border": "TOFFLY2A.bmp", "area": "TZFFLY2A.bmp" },
+			{ "id": 40, "defname": "TBFRUP_4.def", "x": 0, "y": 257, "border": "TOFBAS2.bmp", "area": "TZFBAS2.bmp" },
+			{ "id": 42, "defname": "TBFRUP_5.def", "x": 0, "y": 4, "border": "TOFWYV2.bmp", "area": "TZFWYV2.bmp" },
+			{ "id": 43, "defname": "TBFRUP_6.def", "x": 587, "y": 263, "border": "TOFHYD2A.bmp", "area": "TZFHYD2A.bmp" },
 			{ "id": 29, "defname": "TBFRWTRW.def", "x": 320, "y": 141 },
-			{ "id": 20, "defname": "TBFRBOAT.def", "x": 197, "y": 294 },
+			{ "id": 20, "defname": "TBFRBOAT.def", "x": 197, "y": 294, "border": "TOFDCK1.bmp", "area": "TZFDCK1.bmp" },
 		  ],
 		  "blit_order": [ 16, 15, 14, 34, 41, 31, 38, 10, 11, 12, 13, 29, 0, 1, 2, 33, 40, 30, 18, 37, 19, 5, 36, 43, 26 ]
 		},
 
-		{ "defnames": [
-			{ "id": 16, "defname": "TBELBLAK.def", "x": 449, "y": 151 },
-			{ "id": 8, "defname": "TBELCAS2.def", "x": 349, "y": 101 },
-			{ "id": 9, "defname": "TBELCAS3.def", "x": 349, "y": 101 },
-			{ "id": 7, "defname": "TBELCSTL.def", "x": 349, "y": 101 },
-			{ "id": 6, "defname": "TBELDOCK.def", "x": 239, "y": 215 },
-			{ "id": 30, "defname": "TBELDW_0.def", "x": 689, "y": 250 },
-			{ "id": 31, "defname": "TBELDW_1.def", "x": 630, "y": 50 },
-			{ "id": 32, "defname": "TBELDW_2.def", "x": 709, "y": 210 },
-			{ "id": 33, "defname": "TBELDW_3.def", "x": 108, "y": 131 },
-			{ "id": 34, "defname": "TBELDW_4.def", "x": 264, "y": 168 },
-			{ "id": 35, "defname": "TBELDW_5.def", "x": 394, "y": 283 },
-			{ "id": 36, "defname": "TBELDW_6.def", "x": 43, "y": 16 },
+		{
+		  // Castle 8
+		  "defnames": [
+			{ "id": 16, "defname": "TBELBLAK.def", "x": 449, "y": 151, "border": "TOELBLAK.bmp", "area": "TZELBLAK.bmp" },
+			{ "id": 8, "defname": "TBELCAS2.def", "x": 349, "y": 101, "border": "TOELCAS2.bmp", "area": "TZELCAS2.bmp" },
+			{ "id": 9, "defname": "TBELCAS3.def", "x": 349, "y": 101, "border": "TOELCAS3.bmp", "area": "TZELCAS3.bmp" },
+			{ "id": 7, "defname": "TBELCSTL.def", "x": 349, "y": 101, "border": "TOELCSTL.bmp", "area": "TZELCSTL.bmp" },
+			{ "id": 6, "defname": "TBELDOCK.def", "x": 239, "y": 215, "border": "TOELDOCK.bmp", "area": "TZELDOCK.bmp" },
+			{ "id": 30, "defname": "TBELDW_0.def", "x": 689, "y": 250, "border": "TOELDW_0.bmp", "area": "TZELDW_0.bmp" },
+			{ "id": 31, "defname": "TBELDW_1.def", "x": 630, "y": 50, "border": "TOELDW_1.bmp", "area": "TZELDW_1.bmp" },
+			{ "id": 32, "defname": "TBELDW_2.def", "x": 709, "y": 210, "border": "TOELDW_2.bmp", "area": "TZELDW_2.bmp" },
+			{ "id": 33, "defname": "TBELDW_3.def", "x": 108, "y": 131, "border": "TOELDW_3.bmp", "area": "TZELDW_3.bmp" },
+			{ "id": 34, "defname": "TBELDW_4.def", "x": 264, "y": 168, "border": "TOELDW_4.bmp", "area": "TZELDW_4.bmp" },
+			{ "id": 35, "defname": "TBELDW_5.def", "x": 394, "y": 283, "border": "TOELDW_5.bmp", "area": "TZELDW_5.bmp" },
+			{ "id": 36, "defname": "TBELDW_6.def", "x": 43, "y": 16, "border": "TOELDW_6.bmp", "area": "TZELDW_6.bmp" },
 			{ "id": -1, "defname": "TBELEXT1.def", "x": 23, "y": 218 },
 			{ "id": 27, "defname": "TBELEXT2.def", "x": 232, "y": 205 },
 			{ "id": 28, "defname": "TBELEXT3.def", "x": 516, "y": 223 },
 			{ "id": 29, "defname": "TBELEXT4.def", "x": 0, "y": 252 },
 			{ "id": -2, "defname": "TBELEXT5.def", "x": 682, "y": 183 },
-			{ "id": 21, "defname": "TBELEXT6.def", "x": 104, "y": 170 },
-			{ "id": 11, "defname": "TBELHAL2.def", "x": 0, "y": 165 },
-			{ "id": 12, "defname": "TBELHAL3.def", "x": 0, "y": 165 },
-			{ "id": 13, "defname": "TBELHAL4.def", "x": 0, "y": 164 },
-			{ "id": 10, "defname": "TBELHALL.def", "x": -1, "y": 164 },
-			{ "id": 26, "defname": "TBELHOLY.def", "x": 307, "y": 2 },
-			{ "id": 18, "defname": "TBELHRD1.def", "x": 689, "y": 250 },
-			{ "id": 19, "defname": "TBELHRD2.def", "x": 689, "y": 250 },
-			{ "id": 1, "defname": "TBELMAG2.def", "x": 206, "y": 58 },
-			{ "id": 2, "defname": "TBELMAG3.def", "x": 206, "y": 58 },
-			{ "id": 3, "defname": "TBELMAG4.def", "x": 206, "y": 58 },
-			{ "id": 4, "defname": "TBELMAG5.def", "x": 206, "y": 58 },
-			{ "id": 0, "defname": "TBELMAGE.def", "x": 206, "y": 58 },
-			{ "id": 14, "defname": "TBELMARK.def", "x": 347, "y": 216 },
-			{ "id": 15, "defname": "TBELSILO.def", "x": 372, "y": 171 },
-			{ "id": 17, "defname": "TBELSPEC.def", "x": 284, "y": 246 },
-			{ "id": 5, "defname": "TBELTVRN.def", "x": 553, "y": 203 },
-			{ "id": 37, "defname": "TBELUP_0.def", "x": 689, "y": 250 },
-			{ "id": 38, "defname": "TBELUP_1.def", "x": 630, "y": 50 },
-			{ "id": 39, "defname": "TBELUP_2.def", "x": 709, "y": 210 },
-			{ "id": 40, "defname": "TBELUP_3.def", "x": 108, "y": 131 },
-			{ "id": 41, "defname": "TBELUP_4.def", "x": 264, "y": 168 },
-			{ "id": 42, "defname": "TBELUP_5.def", "x": 394, "y": 283 },
-			{ "id": 43, "defname": "TBELUP_6.def", "x": 43, "y": 0 },
-			{ "id": 20, "defname": "TBELBOAT.def", "x": 239, "y": 215 }
+			{ "id": 21, "defname": "TBELEXT6.def", "x": 104, "y": 170, "border": "TOELEXT6.bmp", "area": "TZELEXT6.bmp" },
+			{ "id": 11, "defname": "TBELHAL2.def", "x": 0, "y": 165, "border": "TOELHAL2.bmp", "area": "TZELHAL2.bmp" },
+			{ "id": 12, "defname": "TBELHAL3.def", "x": 0, "y": 165, "border": "TOELHAL3.bmp", "area": "TZELHAL3.bmp" },
+			{ "id": 13, "defname": "TBELHAL4.def", "x": 0, "y": 164, "border": "TOELHAL4.bmp", "area": "TZELHAL4.bmp" },
+			{ "id": 10, "defname": "TBELHALL.def", "x": -1, "y": 164, "border": "TOELHALL.bmp", "area": "TZELHALL.bmp" },
+			{ "id": 26, "defname": "TBELHOLY.def", "x": 307, "y": 2, "border": "TOELHOLY.bmp", "area": "TZELHOLY.bmp" },
+			{ "id": 18, "defname": "TBELHRD1.def", "x": 689, "y": 250, "border": "TOELHRD1.bmp", "area": "TZELHRD1.bmp" },
+			{ "id": 19, "defname": "TBELHRD2.def", "x": 689, "y": 250, "border": "TOELHRD2.bmp", "area": "TZELHRD2.bmp" },
+			{ "id": 1, "defname": "TBELMAG2.def", "x": 206, "y": 58, "border": "TOELMAG2.bmp", "area": "TZELMAG2.bmp" },
+			{ "id": 2, "defname": "TBELMAG3.def", "x": 206, "y": 58, "border": "TOELMAG3.bmp", "area": "TZELMAG3.bmp" },
+			{ "id": 3, "defname": "TBELMAG4.def", "x": 206, "y": 58, "border": "TOELMAG4.bmp", "area": "TZELMAG4.bmp" },
+			{ "id": 4, "defname": "TBELMAG5.def", "x": 206, "y": 58, "border": "TOELMAG5.bmp", "area": "TZELMAG5.bmp" },
+			{ "id": 0, "defname": "TBELMAGE.def", "x": 206, "y": 58, "border": "TOELMAGE.bmp", "area": "TZELMAGE.bmp" },
+			{ "id": 14, "defname": "TBELMARK.def", "x": 347, "y": 216, "border": "TOELMARK.bmp", "area": "TZELMARK.bmp" },
+			{ "id": 15, "defname": "TBELSILO.def", "x": 372, "y": 171, "border": "TOELSILO.bmp", "area": "TZELSILO.bmp" },
+			{ "id": 17, "defname": "TBELSPEC.def", "x": 284, "y": 246, "border": "TOELSPEC.bmp", "area": "TZELSPEC.bmp" },
+			{ "id": 5, "defname": "TBELTVRN.def", "x": 553, "y": 203, "border": "TOELTVRN.bmp", "area": "TZELTVRN.bmp" },
+			{ "id": 37, "defname": "TBELUP_0.def", "x": 689, "y": 250, "border": "TOELUP_0.bmp", "area": "TZELUP_0.bmp" },
+			{ "id": 38, "defname": "TBELUP_1.def", "x": 630, "y": 50, "border": "TOELUP_1.bmp", "area": "TZELUP_1.bmp" },
+			{ "id": 39, "defname": "TBELUP_2.def", "x": 709, "y": 210, "border": "TOELUP_2.bmp", "area": "TZELUP_2.bmp" },
+			{ "id": 40, "defname": "TBELUP_3.def", "x": 108, "y": 131, "border": "TOELUP_3.bmp", "area": "TZELUP_3.bmp" },
+			{ "id": 41, "defname": "TBELUP_4.def", "x": 264, "y": 168, "border": "TOELUP_4.bmp", "area": "TZELUP_4.bmp" },
+			{ "id": 42, "defname": "TBELUP_5.def", "x": 394, "y": 283, "border": "TOELUP_5.bmp", "area": "TZELUP_5.bmp" },
+			{ "id": 43, "defname": "TBELUP_6.def", "x": 43, "y": 0, "border": "TOELUP_6.bmp", "area": "TZELUP_6.bmp" },
+			{ "id": 20, "defname": "TBELBOAT.def", "x": 239, "y": 215, "border": "TOELBOAT.bmp", "area": "TZELBOAT.bmp" }
 		  ],
 		  "blit_order": [ -1, 27, 28, 16, 34, 41, 6, 20, 33, 40, 36, 43, 21, 0, 1, 2, 3, 4, 5, 15, 14, 17, 35, 42, 30, 18, 37, 19, 10, 11, 12, 13, 29 ]
 		}

+ 0 - 333
config/buildings3.txt

@@ -1,333 +0,0 @@
-0	16	TBCSBLAK.def	TOCSBLAK.bmp	TZCSBLAK.bmp
-0	20	TBCSBOAT.def	TOCSDKMN.bmp	TZCSDKMN.bmp
-0	8	TBCSCAS2.def	TOCSCAS2.bmp	TZCSCAS2.bmp
-0	9	TBCSCAS3.def	TOCSCAS3.bmp	TZCSCAS3.bmp
-0	7	TBCSCSTL.def	TOCSCAS1.bmp	TZCSCAS1.bmp
-0	6	TBCSDOCK.def	TOCSDKMS.bmp	TZCSDKMS.bmp
-0	30	TBCSDW0_.def	TOCSPIK1.bmp	TZCSPIK1.bmp
-0	31	TBCSDW_1.def	TOCSCRS1.bmp	TZCSCRS1.bmp
-0	32	TBCSDW_2.def	TOCSGR1N.bmp	TZCSGR1N.bmp
-0	33	TBCSDW_3.def	TOCSSWD1.bmp	TZCSSWD1.bmp
-0	34	TBCSDW_4.def	TOCSMON1.bmp	TZCSMON1.bmp
-0	35	TBCSDW_5.def	TOCSC101.bmp	TZCSCAV1.bmp
-0	36	TBCSDW_6.def	TOCSANG1.bmp	TZCSANG1.bmp
-0	21	TBCSEXT0.def	TOCSCAVM.bmp	TZCSCAVM.bmp
-0	22	TBCSEXT1.def	TOCSTAV2.bmp	TZCSTAV2.bmp
-0	11	TBCSHAL2.def	TOCSH201.bmp	TZCSH201.bmp
-0	12	TBCSHAL3.def	TOCSH301.bmp	TZCSH301.bmp
-0	13	TBCSHAL4.def	TOCSH401.bmp	TZCSH401.bmp
-0	10	TBCSHALL.def	TOCSH101.bmp	TZCSH101.bmp
-0	26	TBCSHOLY.def	TOCSHOLY.bmp	TZCSHOLY.bmp
-0	18	TBCSHRD1.def	TOCSGR1H.bmp	TZCSGR1H.bmp
-0	19	TBCSHRD2.def	TOCSGR2H.bmp	TZCSGR2H.bmp
-0	1	TBCSMAG2.def	TOCSMAG2.bmp	TZCSMAG2.bmp
-0	2	TBCSMAG3.def	TOCSM301.bmp	TZCSM301.bmp
-0	3	TBCSMAG4.def	TOCSM401.bmp	TZCSM401.bmp
-0	0	TBCSMAGE.def	TOCSMAG1.bmp	TZCSMAG1.bmp
-0	14	TBCSMARK.def	TOCSMRK1.bmp	TZCSMRK1.bmp
-0	15	TBCSSILO.def	TOCSMRK2.bmp	TZCSMRK2.bmp
-0	17	TBCSSPEC.def	TOCSLT01.bmp	TZCSLT01.bmp
-0	5	TBCSTVRN.def	TOCSTAV1.bmp	TZCSTAV1.bmp
-0	37	TBCSUP0_.def	TOCSPIK2.bmp	TZCSPIK2.bmp
-0	38	TBCSUP_1.def	TOCSCRS2.bmp	TZCSCRS2.bmp
-0	39	TBCSUP_2.def	TOCSGR2N.bmp	TZCSGR2N.bmp
-0	40	TBCSUP_3.def	TOCSSWD2.bmp	TZCSSWD2.bmp
-0	41	TBCSUP_4.def	TOCSMON2.bmp	TZCSMON2.bmp
-0	42	TBCSUP_5.def	TOCSCAV2.bmp	TZCSCAV2.bmp
-0	43	TBCSUP_6.def	TOCSANG2.bmp	TZCSANG2.bmp
-1	16	TBRMBLAK.def	TORAID.bmp	TZRAID.bmp
-1	8	TBRMCAS2.def	TORCAS2.bmp	TZRCAS2.bmp
-1	9	TBRMCAS3.def	TORCAS3.bmp	TZRCAS3.bmp
-1	7	TBRMCSTL.def	TORCAS1.bmp	TZRCAS1.bmp
-1	30	TBRMDW0_.def	TORCEN1A.bmp	TZRCEN1A.bmp
-1	31	TBRMDW_1.def	TORDWF1.bmp	TZRDWF1.bmp
-1	32	TBRMDW_2.def	TORELF1.bmp	TZRELF1.bmp
-1	33	TBRMDW_3.def	TORPEG1A.bmp	TZRPEG1A.bmp
-1	34	TBRMDW_4.def	TORTRE1.bmp	TZRTRE1.bmp
-1	35	TBRMDW_5.def	TORUNI1.bmp	TZRUNI1.bmp
-1	36	TBRMDW_6.def	TORDR1AA.bmp	TZRDR1AA.bmp
-1	21	TBRMEXT0.def	TORGAR2A.bmp	TZRGAR2A.bmp
-1	22	TBRMEXT1.def	TORDWFT.bmp	TZRDWFT.bmp
-1	11	TBRMHAL2.def	TORHAL2.bmp	TZRHAL2.bmp
-1	12	TBRMHAL3.def	TORHAL3.bmp	TZRHAL3.bmp
-1	13	TBRMHAL4.def	TORHAL4.bmp	TZRHAL4.bmp
-1	10	TBRMHALL.def	TORHAL1.bmp	TZRHAL1.bmp
-1	26	TBRMHOLY.def	TORHOLY.bmp	TZRHOLY.bmp
-1	18	TBRMHRD1.def	TORDWF1H.bmp	TZRDWF1H.bmp
-1	19	TBRMHRD2.def	TORDWF2H.bmp	TZRDWF2H.bmp
-1	24	TBRMHRD3.def	TORTRE1H.bmp	TZRTRE1H.bmp
-1	25	TBRMHRD4.def	TORTRE2H.bmp	TZRTRE2H.bmp
-1	1	TBRMMAG2.def	TORMAG2.bmp	TZRMAG2.bmp
-1	2	TBRMMAG3.def	TORMAG3.bmp	TZRMAG3.bmp
-1	3	TBRMMAG4.def	TORMAG4.bmp	TZRMAG4.bmp
-1	4	TBRMMAG5.def	TORMAG5.bmp	TZRMAG5.bmp
-1	0	TBRMMAGE.def	TORMAG1.bmp	TZRMAG1.bmp
-1	14	TBRMMARK.def	TORMRK1.bmp	TZRMRK1.bmp
-1	15	TBRMSILO.def	TORMRK2.bmp	TZRMRK2.bmp
-1	17	TBRMSPEC.def	TORGAR1A.bmp	TZRGAR1A.bmp
-1	5	TBRMTVRN.def	TORTAV.bmp	TZRTAV.bmp
-1	37	TBRMUP0_.def	TORCEN2A.bmp	TZRCEN2A.bmp
-1	38	TBRMUP_1.def	TORDWF2.bmp	TZRDWF2.bmp
-1	39	TBRMUP_2.def	TORELF2.bmp	TZRELF2.bmp
-1	40	TBRMUP_3.def	TORPEG2A.bmp	TZRPEG2A.bmp
-1	41	TBRMUP_4.def	TORTRE2.bmp	TZRTRE2.bmp
-1	42	TBRMUP_5.def	TORUNI2.bmp	TZRUNI2.bmp
-1	43	TBRMUP_6.def	TORDR2AA.bmp	TZRDR2AA.bmp
-2	16	TBTWBLAK.def	TOTBLKA.bmp	TZTBLKA.bmp
-2	8	TBTWCAS2.def	TOTCAS2.bmp	TZTCAS2.bmp
-2	9	TBTWCAS3.def	TOTCAS3.bmp	TZTCAS3.bmp
-2	7	TBTWCSTL.def	TOTCAS1.bmp	TZTCAS1.bmp
-2	30	TBTWDW0_.def	TOTGRM1A.bmp	TZTGRM1A.bmp
-2	31	TBTWDW_1.def	TOTGAR1.bmp	TZTGAR1.bmp
-2	32	TBTWDW_2.def	TOTGOL1A.bmp	TZTGOL1A.bmp
-2	33	TBTWDW_3.def	TOTMAG1.bmp	TZTMAG1.bmp
-2	34	TBTWDW_4.def	TOTGEN1.bmp	TZTGEN1.bmp
-2	35	TBTWDW_5.def	TOTNAG1.bmp	TZTNAG1.bmp
-2	36	TBTWDW_6.def	TOTTIT1.bmp	TZTTIT1.bmp
-2	21	TBTWEXT0.def	TOTCASW.bmp	TZTCASW.bmp
-2	22	TBTWEXT1.def	TOTGLDL.bmp	TZTGLDL.bmp
-2	23	TBTWEXT2.def	TOTGLDW.bmp	TZTGLDW.bmp
-2	11	TBTWHAL2.def	TOTHAL2.bmp	TZTHAL2.bmp
-2	12	TBTWHAL3.def	TOTHAL3.bmp	TZTHAL3.bmp
-2	13	TBTWHAL4.def	TOTHAL4.bmp	TZTHAL4.bmp
-2	10	TBTWHALL.def	TOTHAL1.bmp	TZTHAL1.bmp
-2	26	TBTWHOLY.def	TOTHOLYA.bmp	TZTHOLYA.bmp
-2	18	TBTWHRD1.def	TOTGAR1H.bmp	TZTGAR1H.bmp
-2	19	TBTWHRD2.def	TOTGAR2H.bmp	TZTGAR2H.bmp
-2	1	TBTWMAG2.def	TOTGLD2.bmp	TZTGLD2.bmp
-2	2	TBTWMAG3.def	TOTGLD3.bmp	TZTGLD3.bmp
-2	3	TBTWMAG4.def	TOTGLD4.bmp	TZTGLD4.bmp
-2	4	TBTWMAG5.def	TOTGLD5.bmp	TZTGLD5.bmp
-2	0	TBTWMAGE.def	TOTGLD1.bmp	TZTGLD1.bmp
-2	14	TBTWMARK.def	TOTMRK.bmp	TZTMRK.bmp
-2	15	TBTWSILO.def	TOTMRKS.bmp	TZTMRKS.bmp
-2	17	TBTWSPEC.def	TOTMRKA.bmp	TZTMRKA.bmp
-2	5	TBTWTVRN.def	TOTTAV.bmp	TZTTAV.bmp
-2	37	TBTWUP0_.def	TOTGRM2A.bmp	TZTGRM2A.bmp
-2	38	TBTWUP_1.def	TOTGAR2.bmp	TZTGAR2.bmp
-2	39	TBTWUP_2.def	TOTGOL2A.bmp	TZTGOL2A.bmp
-2	40	TBTWUP_3.def	TOTMAG2.bmp	TZTMAG2.bmp
-2	41	TBTWUP_4.def	TOTGEN2.bmp	TZTGEN2.bmp
-2	42	TBTWUP_5.def	TOTNAG2.bmp	TZTNAG2.bmp
-2	43	TBTWUP_6.def	TOTTIT2.bmp	TZTTIT2.bmp
-3	16	TBINBLAK.def	TOIBLKA.bmp	TZIBLKA.bmp
-3	8	TBINCAS2.def	TOICAS1A.bmp	TZICAS1A.bmp
-3	9	TBINCAS3.def	TOICAS3A.bmp	TZICAS3A.bmp
-3	7	TBINCSTL.def	TOICAS2A.bmp	TZICAS2A.bmp
-3	30	TBINDW0_.def	TOIMP1A.bmp	TZIMP1A.bmp
-3	31	TBINDW_1.def	TOIGOG1A.bmp	TZIGOG1A.bmp
-3	32	TBINDW_2.def	TOIHND1.bmp	TZIHND1.bmp
-3	33	TBINDW_3.def	TOIDMN1.bmp	TZIDMN1.bmp
-3	34	TBINDW_4.def	TOIPIT1.bmp	TZIPIT1.bmp
-3	35	TBINDW_5.def	TOIEFR1.bmp	TZIEFR1.bmp
-3	36	TBINDW_6.def	TOIDVL1.bmp	TZIDVL1.bmp
-3	21	TBINEXT0.def	TOICAB1A.bmp	TZICAB1A.bmp
-3	22	TBINEXT1.def	TOICASGA.bmp	TZICASGA.bmp
-3	23	TBINEXT2.def	TOIPAIN.bmp	TZIPAIN.bmp
-3	11	TBINHAL2.def	TOIHAL2.bmp	TZIHAL2.bmp
-3	12	TBINHAL3.def	TOIHAL3.bmp	TZIHAL3.bmp
-3	13	TBINHAL4.def	TOIHAL4.bmp	TZIHAL4.bmp
-3	10	TBINHALL.def	TOIHAL1.bmp	TZIHAL1.bmp
-3	26	TBINHOLY.def	TOIHOLY.bmp	TZIHOLY.bmp
-3	18	TBINHRD1.def	TOIMP1HA.bmp	TZIMP1HA.bmp
-3	19	TBINHRD2.def	TOIMP2HA.bmp	TZIMP2HA.bmp
-3	24	TBINHRD3.def	TOIHND1H.bmp	TZIHND1H.bmp
-3	25	TBINHRD4.def	TOIHND2H.bmp	TZIHND2H.bmp
-3	1	TBINMAG2.def	TOIMAG2A.bmp	TZIMAG2A.bmp
-3	2	TBINMAG3.def	TOIMAG3A.bmp	TZIMAG3A.bmp
-3	3	TBINMAG4.def	TOIMAG4A.bmp	TZIMAG4A.bmp
-3	4	TBINMAG5.def	TOIMAG5A.bmp	TZIMAG5A.bmp
-3	0	TBINMAGE.def	TOIMAG1A.bmp	TZIMAG1A.bmp
-3	14	TBINMARK.def	TOIMAR1.bmp	TZIMAR1.bmp
-3	15	TBINSILO.def	TOIMAR2.bmp	TZIMAR2.bmp
-3	5	TBINTVRN.def	TOITAV.bmp	TZITAV.bmp
-3	37	TBINUP0_.def	TOIMP2A.bmp	TZIMP2A.bmp
-3	38	TBINUP_1.def	TOIGOG2A.bmp	TZIGOG2A.bmp
-3	39	TBINUP_2.def	TOIHND2.bmp	TZIHND2.bmp
-3	40	TBINUP_3.def	TOIDMN2.bmp	TZIDMN2.bmp
-3	41	TBINUP_4.def	TOIPIT2.bmp	TZIPIT2.bmp
-3	42	TBINUP_5.def	TOIEFR2.bmp	TZIEFR2.bmp
-3	43	TBINUP_6.def	TOIDVL2.bmp	TZIDVL2.bmp
-4	16	TBNCBLAK.def	TONSMITA.bmp	TZNSMITA.bmp
-4	20	TBNCBOAT.def	TONSHPNA.bmp	TZNSHPNA.bmp
-4	8	TBNCCAS2.def	TONCAS2.bmp	TZNCAS2.bmp
-4	9	TBNCCAS3.def	TONCAS3.bmp	TZNCAS3.bmp
-4	7	TBNCCSTL.def	TONCAS1.bmp	TZNCAS1.bmp
-4	6	TBNCDOCK.def	TONSHPBA.bmp	TZNSHPBA.bmp
-4	30	TBNCDW0_.def	TONSKEL1.bmp	TZNSKEL1.bmp
-4	31	TBNCDW_1.def	TONZOMB1.bmp	TZNZOMB1.bmp
-4	32	TBNCDW_2.def	TONWIGH1.bmp	TZNWIGH1.bmp
-4	33	TBNCDW_3.def	TONVAM1.bmp	TZNVAM1.bmp
-4	34	TBNCDW_4.def	TONLICH1.bmp	TZNLICH1.bmp
-4	35	TBNCDW_5.def	TONBKN1.bmp	TZNBKN1.bmp
-4	36	TBNCDW_6.def	TONBON1.bmp	TZNBON1.bmp
-4	21	TBNCEXT0.def	TONNECRA.bmp	TZNNECRA.bmp
-4	22	TBNCEXT1.def	TONSKELT.bmp	TZNSKELT.bmp
-4	11	TBNCHAL2.def	TONHAL2.bmp	TZNHAL2.bmp
-4	12	TBNCHAL3.def	TONHAL3.bmp	TZNHAL3.bmp
-4	13	TBNCHAL4.def	TONHAL4.bmp	TZNHAL4.bmp
-4	10	TBNCHALL.def	TONHAL1.bmp	TZNHAL1.bmp
-4	26	TBNCHOLY.def	TONHOLYA.bmp	TZNHOLYA.bmp
-4	18	TBNCHRD1.def	TONSKE1H.bmp	TZNSKE1H.bmp
-4	19	TBNCHRD2.def	TONSKE2H.bmp	TZNSKE2H.bmp
-4	1	TBNCMAG2.def	TONMAG2.bmp	TZNMAG2.bmp
-4	2	TBNCMAG3.def	TONMAG3.bmp	TZNMAG3.bmp
-4	3	TBNCMAG4.def	TONMAG4.bmp	TZNMAG4.bmp
-4	4	TBNCMAG5.def	TONMAG5.bmp	TZNMAG5.bmp
-4	0	TBNCMAGE.def	TONMAG1.bmp	TZNMAG1.bmp
-4	14	TBNCMARK.def	TONMRK1.bmp	TZNMRK1.bmp
-4	15	TBNCSILO.def	TONMRK2.bmp	TZNMRK2.bmp
-4	17	TBNCSPEC.def	TONSHRDA.bmp	TZNSHRDA.bmp
-4	5	TBNCTVRN.def	TONTAV.bmp	TZNTAV.bmp
-4	37	TBNCUP0_.def	TONSKEL2.bmp	TZNSKEL2.bmp
-4	38	TBNCUP_1.def	TONZOMB2.bmp	TZNZOMB2.bmp
-4	39	TBNCUP_2.def	TONWIGH2.bmp	TZNWIGH2.bmp
-4	40	TBNCUP_3.def	TONVAM2.bmp	TZNVAM2.bmp
-4	41	TBNCUP_4.def	TONLICH2.bmp	TZNLICH2.bmp
-4	42	TBNCUP_5.def	TONBKN2.bmp	TZNBKN2.bmp
-4	43	TBNCUP_6.def	TONBON2.bmp	TZNBON2.bmp
-5	16	TBDNBLAK.def	TODSMITH.bmp	TZDSMITH.bmp
-5	8	TBDNCAS2.def	TODCAS2.bmp	TZDCAS2.bmp
-5	9	TBDNCAS3.def	TODCAS3.bmp	TZDCAS3.bmp
-5	7	TBDNCSTL.def	TODCAS1.bmp	TZDCAS1.bmp
-5	30	TBDNDW0_.def	TODTRG1A.bmp	TZDTRG1A.bmp
-5	31	TBDNDW_1.def	TODHAR1.bmp	TZDHAR1.bmp
-5	32	TBDNDW_2.def	TODBEH1A.bmp	TZDBEH1A.bmp
-5	33	TBDNDW_3.def	TODMED1.bmp	TZDMED1.bmp
-5	34	TBDNDW_4.def	TODMIN1.bmp	TZDMIN1.bmp
-5	35	TBDNDW_5.def	TODMAN1.bmp	TZDMAN1.bmp
-5	36	TBDNDW_6.def	TODDRA1A.bmp	TZDDRA1A.bmp
-5	21	TBDNEXT0.def	TODVOR1A.bmp	TZDVOR1A.bmp
-5	22	TBDNEXT1.def	TODPORTA.bmp	TZDPORTA.bmp
-5	23	TBDNEXT2.def	TODACAD.bmp	TZDACAD.bmp
-5	11	TBDNHAL2.def	TODHALL2.bmp	TZDHALL2.bmp
-5	12	TBDNHAL3.def	TODHALL3.bmp	TZDHALL3.bmp
-5	13	TBDNHAL4.def	TODHALL4.bmp	TZDHALL4.bmp
-5	10	TBDNHALL.def	TODHALL1.bmp	TZDHALL1.bmp
-5	26	TBDNHOLY.def	TODHOLY.bmp	TZDHOLY.bmp
-5	18	TBDNHRD1.def	TODTR1HA.bmp	TZDTR1HA.bmp
-5	19	TBDNHRD2.def	TODTR2HA.bmp	TZDTR2HA.bmp
-5	1	TBDNMAG2.def	TODMAG2.bmp	TZDMAG2.bmp
-5	2	TBDNMAG3.def	TODMAG3.bmp	TZDMAG3.bmp
-5	3	TBDNMAG4.def	TODMAG4.bmp	TZDMAG4.bmp
-5	4	TBDNMAG5.def	TODMAG5.bmp	TZDMAG5.bmp
-5	0	TBDNMAGE.def	TODMAG1.bmp	TZDMAG1.bmp
-5	14	TBDNMARK.def	TODMARK.bmp	TZDMARK.bmp
-5	15	TBDNSILO.def	TODSILO.bmp	TZDSILO.bmp
-5	17	TBDNSPEC.def	TODART.bmp	TZDART.bmp
-5	5	TBDNTVRN.def	TODTAV.bmp	TZDTAV.bmp
-5	37	TBDNUP0_.def	TODTRG2A.bmp	TZDTRG2A.bmp
-5	38	TBDNUP_1.def	TODHAR2.bmp	TZDHAR2.bmp
-5	39	TBDNUP_2.def	TODBEH2A.bmp	TZDBEH2A.bmp
-5	40	TBDNUP_3.def	TODMED2.bmp	TZDMED2.bmp
-5	41	TBDNUP_4.def	TODMIN2.bmp	TZDMIN2.bmp
-5	42	TBDNUP_5.def	TODMAN2.bmp	TZDMAN2.bmp
-5	43	TBDNUP_6.def	TODDRA2A.bmp	TZDDRA2A.bmp
-6	16	TBSTBLAK.def	TOSBLK1.bmp	TZSBLK1.bmp
-6	8	TBSTCAS2.def	TOSCA2.bmp	TZSCA2.bmp
-6	9	TBSTCAS3.def	TOSCA3.bmp	TZSCA3.bmp
-6	7	TBSTCSTL.def	TOSCA1.bmp	TZSCA1.bmp
-6	30	TBSTDW0_.def	TOSGOB1.bmp	TZSGOB1.bmp
-6	31	TBSTDW_1.def	TOSWOL1.bmp	TZSWOL1.bmp
-6	32	TBSTDW_2.def	TOSORC1.bmp	TZSORC1.bmp
-6	33	TBSTDW_3.def	TOSOGR1.bmp	TZSOGR1.bmp
-6	34	TBSTDW_4.def	TOSROC1.bmp	TZSROC1.bmp
-6	35	TBSTDW_5.def	TOSCYC1.bmp	TZSCYC1.bmp
-6	36	TBSTDW_6.def	TOSBEH1A.bmp	TZSBEH1A.bmp
-6	21	TBSTEXT0.def	TOSMRK1C.bmp	TZSMRK1C.bmp
-6	22	TBSTEXT1.def	TOSBLK2.bmp	TZSBLK2.bmp
-6	23	TBSTEXT2.def	TOSVAH.bmp	TZSVAH.bmp
-6	11	TBSTHAL2.def	TOSHAL2A.bmp	TZSHAL2A.bmp
-6	12	TBSTHAL3.def	TOSHAL3A.bmp	TZSHAL3A.bmp
-6	13	TBSTHAL4.def	TOSHAL4A.bmp	TZSHAL4A.bmp
-6	10	TBSTHALL.def	TOSHAL1A.bmp	TZSHAL1A.bmp
-6	26	TBSTHOLY.def	TOSHOLYA.bmp	TZSHOLYA.bmp
-6	18	TBSTHRD1.def	TOSGOB1H.bmp	TZSGOB1H.bmp
-6	19	TBSTHRD2.def	TOSGOB2H.bmp	TZSGOB2H.bmp
-6	1	TBSTMAG2.def	TOSMAG2.bmp	TZSMAG2.bmp
-6	2	TBSTMAG3.def	TOSMAG3.bmp	TZSMAG3.bmp
-6	0	TBSTMAGE.def	TOSMAG1.bmp	TZSMAG1.bmp
-6	14	TBSTMARK.def	TOSMRK1.bmp	TZSMRK1.bmp
-6	15	TBSTSILO.def	TOSMRK2.bmp	TZSMRK2.bmp
-6	17	TBSTSPEC.def	TOSCA1EA.bmp	TZSCA1EA.bmp
-6	5	TBSTTVRN.def	TOSTAV.bmp	TZSTAV.bmp
-6	37	TBSTUP0_.def	TOSGOB2.bmp	TZSGOB2.bmp
-6	38	TBSTUP_1.def	TOSWOL2.bmp	TZSWOL2.bmp
-6	39	TBSTUP_2.def	TOSORC2.bmp	TZSORC2.bmp
-6	40	TBSTUP_3.def	TOSOGR2.bmp	TZSOGR2.bmp
-6	41	TBSTUP_4.def	TOSROC2.bmp	TZSROC2.bmp
-6	42	TBSTUP_5.def	TOSCYC2A.bmp	TZSCYC2A.bmp
-6	43	TBSTUP_6.def	TOSBEH2A.bmp	TZSBEH2A.bmp
-7	16	TBFRBLAK.def	TOFAIDA.bmp	TZFAIDA.bmp
-7	8	TBFRCAS2.def	TOFCAS2.bmp	TZFCAS2.bmp
-7	9	TBFRCAS3.def	TOFCAS3.bmp	TZFCAS3.bmp
-7	7	TBFRCSTL.def	TOFCAS1.bmp	TZFCAS1.bmp
-7	6	TBFRDOCK.def	TOFDCK2.bmp	TZFDCK2.bmp
-7	30	TBFRDW0_.def	TOFGNL1.bmp	TZFGNL1.bmp
-7	31	TBFRDW_1.def	TOFLIZ1.bmp	TZFLIZ1.bmp
-7	34	TBFRDW_2.def	TOFGOR1.bmp	TZFGOR1.bmp
-7	32	TBFRDW_3.def	TOFFLY1A.bmp	TZFFLY1A.bmp
-7	33	TBFRDW_4.def	TOFBAS1.bmp	TZFBAS1.bmp
-7	35	TBFRDW_5.def	TOFWYV1.bmp	TZFWYV1.bmp
-7	36	TBFRDW_6.def	TOFHYD1A.bmp	TZFHYD1A.bmp
-7	21	TBFREXT0.def	TOFCASD.bmp	TZFCASD.bmp
-7	22	TBFREXT1.def	TOFCASA.bmp	TZFCASA.bmp
-7	11	TBFRHAL2.def	TOFHAL2.bmp	TZFHAL2.bmp
-7	12	TBFRHAL3.def	TOFHAL3.bmp	TZFHAL3.bmp
-7	13	TBFRHAL4.def	TOFHAL4.bmp	TZFHAL4.bmp
-7	10	TBFRHALL.def	TOFHAL1.bmp	TZFHAL1.bmp
-7	26	TBFRHOLY.def	TOFHLYAA.bmp	TZFHLYAA.bmp
-7	18	TBFRHRD1.def	TOFGNL1H.bmp	TZFGNL1H.bmp
-7	19	TBFRHRD2.def	TOFGNL2H.bmp	TZFGNL2H.bmp
-7	1	TBFRMAG2.def	TOFMAG2A.bmp	TZFMAG2A.bmp
-7	2	TBFRMAG3.def	TOFMAG3A.bmp	TZFMAG3A.bmp
-7	0	TBFRMAGE.def	TOFMAG1A.bmp	TZFMAG1A.bmp
-7	14	TBFRMARK.def	TOFMRKAA.bmp	TZFMRKAA.bmp
-7	15	TBFRSILO.def	TOFMRK2A.bmp	TZFMRK2A.bmp
-7	17	TBFRSPEC.def	TOFCAGE.bmp	TZFCAGE.bmp
-7	5	TBFRTVRN.def	TOFTAVA.bmp	TZFTAVA.bmp
-7	37	TBFRUP0_.def	TOFGNL2.bmp	TZFGNL2.bmp
-7	38	TBFRUP_1.def	TOFLIZ2.bmp	TZFLIZ2.bmp
-7	41	TBFRUP_2.def	TOFGOR2.bmp	TZFGOR2.bmp
-7	39	TBFRUP_3.def	TOFFLY2A.bmp	TZFFLY2A.bmp
-7	40	TBFRUP_4.def	TOFBAS2.bmp	TZFBAS2.bmp
-7	42	TBFRUP_5.def	TOFWYV2.bmp	TZFWYV2.bmp
-7	43	TBFRUP_6.def	TOFHYD2A.bmp	TZFHYD2A.bmp
-7	20	TBFRBOAT.def	TOFDCK1.bmp	TZFDCK1.bmp
-8	16	TBELBLAK.def	TOELBLAK.bmp	TZELBLAK.bmp
-8	20	TBELBOAT.def	TOELBOAT.bmp	TZELBOAT.bmp
-8	8	TBELCAS2.def	TOELCAS2.bmp	TZELCAS2.bmp
-8	9	TBELCAS3.def	TOELCAS3.bmp	TZELCAS3.bmp
-8	7	TBELCSTL.def	TOELCSTL.bmp	TZELCSTL.bmp
-8	6	TBELDOCK.def	TOELDOCK.bmp	TZELDOCK.bmp
-8	30	TBELDW0_.def	TOELDW_0.bmp	TZELDW_0.bmp
-8	31	TBELDW_1.def	TOELDW_1.bmp	TZELDW_1.bmp
-8	32	TBELDW_2.def	TOELDW_2.bmp	TZELDW_2.bmp
-8	33	TBELDW_3.def	TOELDW_3.bmp	TZELDW_3.bmp
-8	34	TBELDW_4.def	TOELDW_4.bmp	TZELDW_4.bmp
-8	35	TBELDW_5.def	TOELDW_5.bmp	TZELDW_5.bmp
-8	36	TBELDW_6.def	TOELDW_6.bmp	TZELDW_6.bmp
-8	21	TBELEXT6.def	TOELEXT6.bmp	TZELEXT6.bmp
-8	11	TBELHAL2.def	TOELHAL2.bmp	TZELHAL2.bmp
-8	12	TBELHAL3.def	TOELHAL3.bmp	TZELHAL3.bmp
-8	13	TBELHAL4.def	TOELHAL4.bmp	TZELHAL4.bmp
-8	10	TBELHALL.def	TOELHALL.bmp	TZELHALL.bmp
-8	26	TBELHOLY.def	TOELHOLY.bmp	TZELHOLY.bmp
-8	18	TBELHRD1.def	TOELHRD1.bmp	TZELHRD1.bmp
-8	19	TBELHRD2.def	TOELHRD2.bmp	TZELHRD2.bmp
-8	1	TBELMAG2.def	TOELMAG2.bmp	TZELMAG2.bmp
-8	2	TBELMAG3.def	TOELMAG3.bmp	TZELMAG3.bmp
-8	3	TBELMAG4.def	TOELMAG4.bmp	TZELMAG4.bmp
-8	4	TBELMAG5.def	TOELMAG5.bmp	TZELMAG5.bmp
-8	0	TBELMAGE.def	TOELMAGE.bmp	TZELMAGE.bmp
-8	14	TBELMARK.def	TOELMARK.bmp	TZELMARK.bmp
-8	15	TBELSILO.def	TOELSILO.bmp	TZELSILO.bmp
-8	17	TBELSPEC.def	TOELSPEC.bmp	TZELSPEC.bmp
-8	5	TBELTVRN.def	TOELTVRN.bmp	TZELTVRN.bmp
-8	37	TBELUP0_.def	TOELUP_0.bmp	TZELUP_0.bmp
-8	38	TBELUP_1.def	TOELUP_1.bmp	TZELUP_1.bmp
-8	39	TBELUP_2.def	TOELUP_2.bmp	TZELUP_2.bmp
-8	40	TBELUP_3.def	TOELUP_3.bmp	TZELUP_3.bmp
-8	41	TBELUP_4.def	TOELUP_4.bmp	TZELUP_4.bmp
-8	42	TBELUP_5.def	TOELUP_5.bmp	TZELUP_5.bmp
-8	43	TBELUP_6.def	TOELUP_6.bmp	TZELUP_6.bmp

+ 20 - 33
lib/CTownHandler.cpp

@@ -138,32 +138,42 @@ void CTownHandler::loadStructures()
 	// Iterate for each city type
 	for (JsonVector::const_iterator it = town_type_vec.begin(); it!=town_type_vec.end(); ++it, ++townID) {
 		std::map<int, Structure*> &town = structures[townID];
-		const JsonNode &node = *it;
-		const JsonVector &defnames_vec = node["defnames"].Vector();
+		const JsonNode &town_node = *it;
+		const JsonVector &defnames_vec = town_node["defnames"].Vector();
 
 		// Read buildings coordinates for that city
 		for (JsonVector::const_iterator it2 = defnames_vec.begin(); it2!=defnames_vec.end(); ++it2) {
-			const JsonNode &ai = *it2;
+			const JsonNode &node = *it2;
 			Structure *vinya = new Structure;
+			const JsonNode *value;
 
 			vinya->group = -1;
 			vinya->townID = townID;
-			vinya->ID = ai["id"].Float();
-			vinya->defName = ai["defname"].String();
+			vinya->ID = node["id"].Float();
+			vinya->defName = node["defname"].String();
 			vinya->name = vinya->defName; //TODO - use normal names
-			vinya->pos.x = ai["x"].Float();
-			vinya->pos.y = ai["y"].Float();
+			vinya->pos.x = node["x"].Float();
+			vinya->pos.y = node["y"].Float();
 			vinya->pos.z = 0;
+			
+			value = &node["border"];
+			if (!value->isNull())
+				vinya->borderName = value->String();
+
+			value = &node["area"];
+			if (!value->isNull())
+				vinya->areaName = value->String();
+
 			town[vinya->ID] = vinya;
 		}
 
 		// Read buildings blit order for that city
-		const JsonVector &blit_order_vec = node["blit_order"].Vector();
+		const JsonVector &blit_order_vec = town_node["blit_order"].Vector();
 		int itr = 1;
 
 		for (JsonVector::const_iterator it2 = blit_order_vec.begin(); it2!=blit_order_vec.end(); ++it2) {
-			const JsonNode &ai = *it2;
-			int buildingID = ai.Float();
+			const JsonNode &node = *it2;
+			int buildingID = node.Float();
 
 			/* Find the building and set its order. */
 			std::map<int, Structure*>::iterator i2 = town.find(buildingID);
@@ -177,29 +187,6 @@ void CTownHandler::loadStructures()
 	//read borders and areas names
 	int format;
 	std::string s;
-	of.open(DATA_DIR "/config/buildings3.txt");
-	while(!of.eof())
-	{
-		std::vector<std::map<int, Structure*> >::iterator i;
-		std::map<int, Structure*>::iterator i2;
-		int town, id;
-		std::string border, area;
-		of >> town >> id >> border >> border >> area;
-
-		if( (i = structures.begin() + town) != structures.end() )
-			if((i2=(i->find(id)))!=(i->end()))
-			{
-				i2->second->borderName = border;
-				i2->second->areaName = area;
-			}
-			else
-				tlog3 << "Warning2: No building "<<id<<" in the castle "<<town<<std::endl;
-		else
-			tlog3 << "Warning2: Castle "<<town<<" not defined."<<std::endl;
-
-	}
-	of.close();
-	of.clear();
 
 	//read groups
 	of.open(DATA_DIR "/config/buildings4.txt");