epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4427 from Mailaender/d2k-tileset-cleanup

Browse Source 
ARRAKIS tileset cleanup
This commit is contained in:
Paul Chote
2014-01-16 22:03:07 -08:00
parent 151f7dc9c6 d939d5183c
commit 617012bd36
6 changed files with 188 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Editor/Surface.cs
View File

@@ -491,7 +491,7 @@ namespace OpenRA.Editor
if (currentTool == null) if (currentTool == null)
{ {
var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation()); var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
if (x.Key != null) if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]); DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
} }
} }

BIN
mods/d2k/maps/brimstone/map.bin
View File

Binary file not shown.

BIN
mods/d2k/maps/death-depths.oramap
View File

Binary file not shown.

BIN
mods/d2k/maps/the-duell.oramap
View File

Binary file not shown.

BIN
mods/d2k/maps/venac-ditch.oramap
View File

Binary file not shown.

341
mods/d2k/tilesets/arrakis.yaml
View File

@@ -4,6 +4,7 @@ General:
SheetSize: 1024 SheetSize: 1024
Palette: d2k.pal Palette: d2k.pal
Extensions: .R8, .r8, .shp, .tmp Extensions: .R8, .r8, .shp, .tmp
EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
Terrain: Terrain:
TerrainType@Clear: # TODO: workaround for the stupid WinForms editor TerrainType@Clear: # TODO: workaround for the stupid WinForms editor
@@ -73,6 +74,7 @@ Templates:
Frames: 0, 8, 9, 48, 49, 50, 51, 52, 68, 69, 70, 71, 72 Frames: 0, 8, 9, 48, 49, 50, 51, 52, 68, 69, 70, 71, 72
Size: 1,1 Size: 1,1
PickAny: True PickAny: True
Category: Basic
Tiles: Tiles:
0: Sand 0: Sand
1: Sand 1: Sand
@@ -1023,41 +1025,42 @@ Templates:
Template@88: Template@88:
Id: 88 Id: 88
Image: BLOXBASE Image: BLOXBASE
Frames: 657,658,659 Frames: 657,658,659,691
Size: 3,1 Size: 1,1
Category: Brick Category: Brick
PickAny: False PickAny: True
Tiles: Tiles:
0: Concrete 0: Concrete
1: Concrete 1: Concrete
2: Concrete 2: Concrete
Template@89: 3: Concrete
Template@89: # TODO: This should go away
Id: 89 Id: 89
Image: BLOXBASE Image: BLOXBASE
Frames: 691 Frames: 1
Size: 1,1 Size: 1,1
Category: Brick Category: Brick
PickAny: False PickAny: False
Tiles: Tiles:
0: Concrete 0: Clear
Template@90: Template@90: # TODO: This should go away
Id: 90 Id: 90
Image: BLOXBASE Image: BLOXBASE
Frames: 649,650,651,669,670,671 Frames: 1,1,1,1,1,1
Size: 3,2 Size: 3,2
Category: Brick Category: Brick
PickAny: False PickAny: False
Tiles: Tiles:
0: Concrete 0: Clear
3: Concrete 3: Clear
4: Concrete 4: Clear
5: Concrete 5: Clear
2: Concrete 2: Clear
1: Concrete 1: Clear
Template@91: Template@91: # TODO: This should go away
Id: 91 Id: 91
Image: BLOXBASE Image: BLOXBASE
Frames: 646,647,648,666,667,668,686,687,688 Frames: 1,1,1,1,1,1,1,1,1
Size: 3,3 Size: 3,3
Category: Brick Category: Brick
PickAny: False PickAny: False
@@ -1080,20 +1083,20 @@ Templates:
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Rough
Template@93: Template@93: # TODO: This should go away
Id: 93 Id: 93
Image: BLOXBASE Image: BLOXBASE
Frames: 643,644,645,663,664,665 Frames: 1,1,1,1,1,1
Size: 3,2 Size: 3,2
Category: Brick Category: Brick
PickAny: False PickAny: False
Tiles: Tiles:
5: Concrete 5: Clear
4: Concrete 4: Clear
3: Concrete 3: Clear
0: Concrete 0: Clear
1: Concrete 1: Clear
2: Concrete 2: Clear
Template@94: Template@94:
Id: 94 Id: 94
Image: BLOXBASE Image: BLOXBASE
@@ -1116,36 +1119,36 @@ Templates:
Tiles: Tiles:
0: Rough 0: Rough
1: Rock 1: Rock
Template@96: Template@96: # TODO: This should go away
Id: 96 Id: 96
Image: BLOXBASE Image: BLOXBASE
Frames: 614,615,616,634,635,636,654,655,656 Frames: 1,1,1,1,1,1,1,1,1
Size: 3,3 Size: 3,3
Category: Rock-Detail Category: Rock-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Rock 0: Clear
1: Rock 1: Clear
2: Rock 2: Clear
5: Rock 5: Clear
4: Rock 4: Clear
3: Rock 3: Clear
6: Rock 6: Clear
7: Rock 7: Clear
8: Rock 8: Clear
Template@97: Template@97: # TODO: This should go away
Id: 97 Id: 97
Image: BLOXBASE Image: BLOXBASE
Frames: 617,618,637,638 Frames: 1,1,1,1
Size: 2,2 Size: 2,2
Category: Rock-Detail Category: Rock-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Rock 0: Clear
1: Rock 1: Clear
3: Rock 3: Clear
2: Rock 2: Clear
Template@98: Template@98: # TODO: This should go away
Id: 98 Id: 98
Image: BLOXBASE Image: BLOXBASE
Frames: 619,639 Frames: 619,639
@@ -1193,17 +1196,17 @@ Templates:
Template@102: Template@102:
Id: 102 Id: 102
Image: BLOXBASE Image: BLOXBASE
Frames: 611,612,613,631,632,633 Frames: 1,1,1,1,1,1
Size: 3,2 Size: 3,2
Category: Rock-Detail Category: Rock-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Rock 0: Clear
1: Rock 1: Clear
2: Rock 2: Clear
5: Rock 5: Clear
4: Rock 4: Clear
3: Rock 3: Clear
Template@103: Template@103:
Id: 103 Id: 103
Image: BLOXBASE Image: BLOXBASE
@@ -1261,7 +1264,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 677 Frames: 677
Size: 1,1 Size: 1,1
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1451,7 +1454,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 600,601,602,620,621,622,640,641,642 Frames: 600,601,602,620,621,622,640,641,642
Size: 3,3 Size: 3,3
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Rock 0: Rock
@@ -1492,7 +1495,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 564,565,584,585 Frames: 564,565,584,585
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1504,7 +1507,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 566,567,586,587 Frames: 566,567,586,587
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1516,7 +1519,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 562,563,582,583 Frames: 562,563,582,583
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1528,7 +1531,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 560,561,580,581 Frames: 560,561,580,581
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1564,7 +1567,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 568,569,588,589 Frames: 568,569,588,589
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1576,7 +1579,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 570,571,590,591 Frames: 570,571,590,591
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1588,7 +1591,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 529,530,549,550 Frames: 529,530,549,550
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Rock 3: Rock
@@ -1600,7 +1603,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 527,528,547,548 Frames: 527,528,547,548
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Rock 3: Rock
@@ -1612,7 +1615,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 525,526,545,546 Frames: 525,526,545,546
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Rock 3: Rock
@@ -1624,7 +1627,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 523,524,543,544 Frames: 523,524,543,544
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Sand 3: Sand
@@ -1636,7 +1639,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 520,521,522,540,541,542 Frames: 520,521,522,540,541,542
Size: 3,2 Size: 3,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
5: Cliff 5: Cliff
@@ -1650,7 +1653,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 480,481,482,500,501,502 Frames: 480,481,482,500,501,502
Size: 3,2 Size: 3,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
2: Cliff 2: Cliff
@@ -1664,7 +1667,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 440,441,460,461 Frames: 440,441,460,461
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Sand-Smooth
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1676,7 +1679,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 402,403,422,423,442,443 Frames: 402,403,422,423,442,443
Size: 2,3 Size: 2,3
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1690,7 +1693,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 400,401,420,421 Frames: 400,401,420,421
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1702,7 +1705,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 408,409,428,429 Frames: 408,409,428,429
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1714,7 +1717,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 410,411,430,431,450,451 Frames: 410,411,430,431,450,451
Size: 2,3 Size: 2,3
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1728,7 +1731,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 412,413,432,433 Frames: 412,413,432,433
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1740,7 +1743,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 452,453 Frames: 452,453
Size: 2,1 Size: 2,1
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1750,7 +1753,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 454,455,474,475,494,495 Frames: 454,455,474,475,494,495
Size: 2,3 Size: 2,3
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1764,7 +1767,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 489,490,509,510 Frames: 489,490,509,510
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1776,7 +1779,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 448,449,468,469 Frames: 448,449,468,469
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Sand-Smooth
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1788,7 +1791,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 487,488,507,508 Frames: 487,488,507,508
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1800,7 +1803,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 446,447,466,467 Frames: 446,447,466,467
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1812,7 +1815,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 444,445,464,465 Frames: 444,445,464,465
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Rock 1: Rock
@@ -1824,7 +1827,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 456,457,476,477,496,497 Frames: 456,457,476,477,496,497
Size: 2,3 Size: 2,3
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1862,7 +1865,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 418,419,438,439 Frames: 418,419,438,439
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -1874,7 +1877,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 378,379,398,399 Frames: 378,379,398,399
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Cliff 3: Cliff
@@ -1886,7 +1889,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 416,417,436,437 Frames: 416,417,436,437
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -1898,7 +1901,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 376,377,396,397 Frames: 376,377,396,397
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Cliff 3: Cliff
@@ -2017,7 +2020,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 483,484,503,504 Frames: 483,484,503,504
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Sand-Smooth
PickAny: False PickAny: False
Tiles: Tiles:
1: Transition 1: Transition
@@ -2029,7 +2032,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 485,486,505,506 Frames: 485,486,505,506
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Sand
@@ -2063,6 +2066,7 @@ Templates:
Frames: 1 Frames: 1
Size: 1,1 Size: 1,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
Template@227: # TODO: this should go away Template@227: # TODO: this should go away
@@ -2071,6 +2075,7 @@ Templates:
Frames: 1 Frames: 1
Size: 1,1 Size: 1,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
Template@228: # TODO: this should go away Template@228: # TODO: this should go away
@@ -2079,6 +2084,7 @@ Templates:
Frames: 1 Frames: 1
Size: 1,1 Size: 1,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
Template@229: Template@229:
@@ -2311,7 +2317,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 254,255,274,275 Frames: 254,255,274,275
Size: 2,2 Size: 2,2
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -2347,7 +2353,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 404,405,424,425 Frames: 404,405,424,425
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -2359,7 +2365,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 406,407,426,427 Frames: 406,407,426,427
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
2: Cliff 2: Cliff
@@ -2372,6 +2378,7 @@ Templates:
Frames: 1,1,1,1,1,1,1,1,1,1 Frames: 1,1,1,1,1,1,1,1,1,1
Size: 5,2 Size: 5,2
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
1: Clear 1: Clear
@@ -2388,7 +2395,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 676,696 Frames: 676,696
Size: 1,2 Size: 1,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -2434,7 +2441,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 511,512,513,531,532,533 Frames: 511,512,513,531,532,533
Size: 3,2 Size: 3,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -2448,7 +2455,7 @@ Templates:
Image: BLOXBASE Image: BLOXBASE
Frames: 471,472,473,491,492,493 Frames: 471,472,473,491,492,493
Size: 3,2 Size: 3,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Cliff 3: Cliff
@@ -2463,6 +2470,7 @@ Templates:
Frames: 1,1,1,1,1,1,1,1,1,1 Frames: 1,1,1,1,1,1,1,1,1,1
Size: 5,2 Size: 5,2
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
5: Clear 5: Clear
@@ -2480,6 +2488,7 @@ Templates:
Frames: 306,307,552,553,554,555,556,572,573,574,575,576,592,593,594,595,596 Frames: 306,307,552,553,554,555,556,572,573,574,575,576,592,593,594,595,596
Size: 1,1 Size: 1,1
PickAny: True PickAny: True
Category: Basic
Tiles: Tiles:
0: Rock 0: Rock
1: Rock 1: Rock
@@ -2504,6 +2513,7 @@ Templates:
Frames: 1 Frames: 1
Size: 1,1 Size: 1,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
Template@268: # TODO: this should go away Template@268: # TODO: this should go away
@@ -2512,6 +2522,7 @@ Templates:
Frames: 1,1 Frames: 1,1
Size: 2,1 Size: 2,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
1: Clear 1: Clear
@@ -2531,6 +2542,7 @@ Templates:
Frames: 1,1,1 Frames: 1,1,1
Size: 3,1 Size: 3,1
PickAny: False PickAny: False
Category: Unidentified
Tiles: Tiles:
0: Clear 0: Clear
1: Clear 1: Clear
@@ -2902,7 +2914,7 @@ Templates:
Image: BLOXBAT Image: BLOXBAT
Frames: 609,610,629,630 Frames: 609,610,629,630
Size: 2,2 Size: 2,2
Category: Rotten-Base Category: Dead-Worm
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Rough
@@ -3512,29 +3524,29 @@ Templates:
Tiles: Tiles:
1: Rough 1: Rough
0: Rough 0: Rough
Template@361: Template@361: # TODO: this should go away
Id: 361 Id: 361
Image: BLOXICE Image: BLOXBASE
Frames: 1,2,3,4 Frames: 1,1,1,1
Size: 4,1 Size: 4,1
Category: Sand-Detail Category: Sand-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Clear
1: Cliff 1: Clear
2: Cliff 2: Clear
3: Cliff 3: Clear
Template@362: Template@362: # TODO: this should go away
Id: 362 Id: 362
Image: BLOXICE Image: BLOXBASE
Frames: 5,6,7 Frames: 1,1,1
Size: 3,1 Size: 3,1
Category: Sand-Detail Category: Sand-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Clear
1: Sand 1: Clear
2: Sand 2: Clear
Template@363: Template@363:
Id: 363 Id: 363
Image: BLOXICE Image: BLOXICE
@@ -3570,8 +3582,8 @@ Templates:
Template@366: Template@366:
Id: 366 Id: 366
Image: BLOXICE Image: BLOXICE
Frames: 309,310,311,312 Frames: 309,310,311,312,355,356,357,358,1,2,3,4,5,6,7,8
Size: 4,1 Size: 4,4
Category: Ice-Detail Category: Ice-Detail
PickAny: False PickAny: False
Tiles: Tiles:
@@ -3579,6 +3591,18 @@ Templates:
1: Cliff 1: Cliff
2: Cliff 2: Cliff
3: Sand 3: Sand
4: Sand
5: Sand
6: Sand
7: Sand
8: Cliff
9: Cliff
10: Cliff
11: Cliff
12: Sand
13: Sand
14: Sand
15: Sand
Template@367: Template@367:
Id: 367 Id: 367
Image: BLOXICE Image: BLOXICE
@@ -3706,18 +3730,18 @@ Templates:
1: Ice 1: Ice
5: Cliff 5: Cliff
6: Cliff 6: Cliff
Template@377: Template@377: # TODO: this should go away
Id: 377 Id: 377
Image: BLOXICE Image: BLOXBASE
Frames: 355,356,357,358 Frames: 1,1,1,1
Size: 4,1 Size: 4,1
Category: Ice-Detail Category: Ice-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Clear
1: Sand 1: Clear
2: Sand 2: Clear
3: Sand 3: Clear
Template@378: Template@378:
Id: 378 Id: 378
Image: BLOXICE Image: BLOXICE
@@ -3755,28 +3779,28 @@ Templates:
Image: BLOXICE Image: BLOXICE
Frames: 551 Frames: 551
Size: 1,1 Size: 1,1
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Sand
Template@382: Template@382:
Id: 382 Id: 382
Image: BLOXICE Image: BLOXBASE
Frames: 579,599,619,639 Frames: 1,1,1,1
Size: 1,4 Size: 1,4
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Clear
1: Cliff 1: Clear
2: Cliff 2: Clear
3: Cliff 3: Clear
Template@383: Template@383:
Id: 383 Id: 383
Image: BLOXICE Image: BLOXICE
Frames: 539,559 Frames: 539,559
Size: 1,2 Size: 1,2
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
1: Cliff 1: Cliff
@@ -3994,7 +4018,7 @@ Templates:
Image: BLOXICE Image: BLOXICE
Frames: 660,661,662 Frames: 660,661,662
Size: 3,1 Size: 3,1
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Rough
@@ -4302,7 +4326,7 @@ Templates:
Image: BLOXTREE Image: BLOXTREE
Frames: 747 Frames: 747
Size: 1,1 Size: 1,1
Category: Z-Crap(Unusual) Category: Unidentified
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Rough
@@ -4643,22 +4667,22 @@ Templates:
2: Rough 2: Rough
3: Rough 3: Rough
1: Rough 1: Rough
Template@461: Template@461: # TODO: this should go away
Id: 461 Id: 461
Image: BLOXWAST Image: BLOXBASE
Frames: 373,374,375 Frames: 1,1,1
Size: 3,1 Size: 3,1
Category: Rotten-Base Category: Rotten-Base
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Clear
1: Rough 1: Clear
2: Rough 2: Clear
Template@462: Template@462:
Id: 462 Id: 462
Image: BLOXWAST Image: BLOXWAST
Frames: 355,356,357,358,359 Frames: 355,356,357,358,359,373,374,375,338,339
Size: 5,1 Size: 5,2
Category: Rotten-Base Category: Rotten-Base
PickAny: False PickAny: False
Tiles: Tiles:
@@ -4667,22 +4691,27 @@ Templates:
2: Rough 2: Rough
3: Rough 3: Rough
4: Rough 4: Rough
Template@463: 5: Rough
6: Rough
7: Rough
8: Rough
9: Rough
Template@463: # TODO this should go away
Id: 463 Id: 463
Image: BLOXWAST Image: BLOXBASE
Frames: 338,339 Frames: 1,1
Size: 2,1 Size: 2,1
Category: Rotten-Base Category: Rotten-Base
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Clear
1: Rough 1: Clear
Template@464: Template@464:
Id: 464 Id: 464
Image: BLOXWAST Image: BLOXWAST
Frames: 97,117 Frames: 97,117
Size: 1,2 Size: 1,2
Category: Dead-Wurm Category: Dead-Worm
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -4748,7 +4777,7 @@ Templates:
Image: BLOXWAST Image: BLOXWAST
Frames: 312 Frames: 312
Size: 1,1 Size: 1,1
Category: Dead-Wurm Category: Dead-Worm
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Sand
@@ -4757,7 +4786,7 @@ Templates:
Image: BLOXWAST Image: BLOXWAST
Frames: 310,311 Frames: 310,311
Size: 2,1 Size: 2,1
Category: Dead-Wurm Category: Dead-Worm
PickAny: False PickAny: False
Tiles: Tiles:
1: Sand 1: Sand
@@ -4767,15 +4796,15 @@ Templates:
Image: BLOXWAST Image: BLOXWAST
Frames: 309 Frames: 309
Size: 1,1 Size: 1,1
Category: Dead-Wurm Category: Dead-Worm
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Sand
Template@474: Template@474:
Id: 474 Id: 474
Image: BLOXWAST Image: BLOXWAST
Frames: 349,350,351,352,369,370,371,372,389,390,391,392 Frames: 349,350,351,352,369,370,371,372,389,390,391,392,385,386,387,388
Size: 4,3 Size: 4,4
Category: Sand-Detail Category: Sand-Detail
PickAny: False PickAny: False
Tiles: Tiles:
@@ -4791,12 +4820,16 @@ Templates:
1: Cliff 1: Cliff
5: Cliff 5: Cliff
6: Cliff 6: Cliff
12: Sand
13: Cliff
14: Cliff
15: Rough
Template@475: Template@475:
Id: 475 Id: 475
Image: BLOXWAST Image: BLOXWAST
Frames: 706,707,726,727 Frames: 706,707,726,727
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
3: Cliff 3: Cliff
@@ -4808,7 +4841,7 @@ Templates:
Image: BLOXWAST Image: BLOXWAST
Frames: 557,558,559,577,578,579 Frames: 557,558,559,577,578,579
Size: 3,2 Size: 3,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -4845,24 +4878,24 @@ Templates:
PickAny: False PickAny: False
Tiles: Tiles:
0: Rough 0: Rough
Template@480: Template@480: # TODO: this should go away
Id: 480 Id: 480
Image: BLOXWAST Image: BLOXBASE
Frames: 385,386,387,388 Frames: 1,1,1,1
Size: 4,1 Size: 4,1
Category: Sand-Detail Category: Sand-Detail
PickAny: False PickAny: False
Tiles: Tiles:
0: Sand 0: Clear
1: Cliff 1: Clear
2: Cliff 2: Clear
3: Rough 3: Clear
Template@481: Template@481:
Id: 481 Id: 481
Image: BLOXWAST Image: BLOXWAST
Frames: 414,415,434,435 Frames: 414,415,434,435
Size: 2,2 Size: 2,2
Category: BaseBorder-Cliff Category: Rock-Cliff
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -6026,7 +6059,7 @@ Templates:
Id: 842 Id: 842
Image: t842 Image: t842
Size: 2,2 Size: 2,2
Category: Rock-Cliff-Sand Category: Sand-Smooth
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff
@@ -6037,7 +6070,7 @@ Templates:
Id: 843 Id: 843
Image: t843 Image: t843
Size: 2,2 Size: 2,2
Category: Rock-Cliff-Sand Category: Sand-Smooth
PickAny: False PickAny: False
Tiles: Tiles:
0: Cliff 0: Cliff