Merge pull request #12784 from abcdefg30/d2kTiles

Add missing tiles to arrakis.yaml and fixed the map import
This commit is contained in:
reaperrr
2017-03-18 13:58:12 +01:00
committed by GitHub
2 changed files with 727 additions and 1 deletions

View File

@@ -380,6 +380,85 @@ namespace OpenRA.Mods.D2k.UtilityCommands
TerrainTile GetTile(int tileIndex)
{
// Some tiles are duplicates of other tiles, just on a different tileset
if (tilesetName.ToLower() == "bloxbgbs.r8")
{
if (tileIndex == 355)
return new TerrainTile(441, 0);
if (tileIndex == 375)
return new TerrainTile(442, 0);
}
if (tilesetName.ToLower() == "bloxtree.r8")
{
var indices = new[] { 683, 684, 685, 706, 703, 704, 705, 726, 723, 724, 725, 746, 743, 744, 745, 747 };
for (var i = 0; i < 16; i++)
if (tileIndex == indices[i])
return new TerrainTile(474, (byte)i);
indices = new[] { 369, 370, 389, 390 };
for (var i = 0; i < 4; i++)
if (tileIndex == indices[i])
return new TerrainTile(117, (byte)i);
indices = new[] { 661, 662, 681, 682 };
for (var i = 0; i < 4; i++)
if (tileIndex == indices[i])
return new TerrainTile(251, (byte)i);
}
if (tilesetName.ToLower() == "bloxwast.r8")
{
if (tileIndex == 342)
return new TerrainTile(250, 0);
if (tileIndex == 383)
return new TerrainTile(121, 1);
if (tileIndex == 384)
return new TerrainTile(1046, 0);
if (tileIndex == 579)
return new TerrainTile(80, 0);
if (tileIndex == 597)
return new TerrainTile(80, 0);
if (tileIndex == 598)
return new TerrainTile(470, 0);
if (tileIndex == 599)
return new TerrainTile(470, 1);
if (tileIndex == 608)
return new TerrainTile(58, 0);
if (tileIndex == 627)
return new TerrainTile(248, 0);
if (tileIndex == 628)
return new TerrainTile(248, 1);
if (tileIndex == 719)
return new TerrainTile(275, 0);
var indices = new[] { 340, 341, 360, 361 };
for (var i = 0; i < 4; i++)
if (tileIndex == indices[i])
return new TerrainTile(308, (byte)i);
indices = new[] { 660, 661, 662, 680, 681, 682 };
for (var i = 0; i < 6; i++)
if (tileIndex == indices[i])
return new TerrainTile(443, (byte)i);
indices = new[] { 609, 610, 629, 630 };
for (var i = 0; i < 4; i++)
if (tileIndex == indices[i])
return new TerrainTile(251, (byte)i);
}
// Get the first tileset template that contains the Frame ID of the original map's tile with the requested index
var template = tileSetsFromYaml.FirstOrDefault(x => x.Frames.Contains(tileIndex));

View File

@@ -3,7 +3,7 @@ General:
Id: ARRAKIS
SheetSize: 1024
Palette: PALETTE.BIN
EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Bridge, Unidentified
IgnoreTileSpriteOffsets: True
HeightDebugColors: 880000
@@ -5671,3 +5671,650 @@ Templates:
Category: Sand-Detail
Tiles:
0: Rough
Template@1031:
Id: 1031
Images: BLOXBGBS.R8
Frames: 710, 711, 730, 630
Size: 2,2
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
2: Rough
Template@1032:
Id: 1032
Images: BLOXBGBS.R8
Frames: 709, 729
Size: 1,2
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
Template@1033:
Id: 1033
Images: BLOXBGBS.R8
Frames: 714, 715
Size: 2,1
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
Template@1034:
Id: 1034
Images: BLOXBGBS.R8
Frames: 611, 612, 613, 631, 632, 633
Size: 3,2
Category: Rock-Detail
Tiles:
0: Rock
1: Rock
2: Rock
3: Rock
4: Rock
5: Rock
Template@1035:
Id: 1035
Images: BLOXBGBS.R8
Frames: 614, 615, 616, 634, 635, 636, 654, 655, 656
Size: 3,3
Category: Rock-Detail
Tiles:
0: Rock
1: Rock
2: Rock
3: Rock
4: Rock
5: Rock
6: Rock
7: Rock
8: Rock
Template@1036:
Id: 1036
Images: BLOXBGBS.R8
Frames: 684, 685, 704, 705
Size: 2,2
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
2: Rough
3: Rough
Template@1037:
Id: 1037
Images: BLOXBGBS.R8
Frames: 662, 630, 682, 683
Size: 2,2
Category: Rock-Detail
Tiles:
0: Rough
2: Rough
3: Rough
Template@1040:
Id: 1040
Images: BLOXICE.R8
Frames: 359
Size: 1,1
Category: Rock-Detail
Tiles:
0: Cliff
Template@1041:
Id: 1041
Images: BLOXICE.R8
Frames: 339
Size: 1,1
Category: Rock-Detail
Tiles:
0: Cliff
Template@1042:
Id: 1042
Images: BLOXICE.R8
Frames: 319
Size: 1,1
Category: Rock-Detail
Tiles:
0: Cliff
Template@1043:
Id: 1043
Images: BLOXICE.R8
Frames: 538
Size: 1,1
Category: Sand-Detail
Tiles:
0: Sand
Template@1046:
Id: 1046
Images: BLOXTREE.R8
Frames: 700
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1047:
Id: 1047
Images: BLOXBGBS.R8
Frames: 681
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1048:
Id: 1048
Images: BLOXBGBS.R8
Frames: 661
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1049:
Id: 1049
Images: BLOXBGBS.R8
Frames: 680
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1050:
Id: 1050
Images: BLOXTREE.R8
Frames: 392
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1051:
Id: 1051
Images: BLOXTREE.R8
Frames: 393
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1052:
Id: 1052
Images: BLOXTREE.R8
Frames: 346, 366
Size: 1,2
Category: Sand-Detail
Tiles:
0: Rough
1: Rough
Template@1053:
Id: 1053
Images: BLOXTREE.R8
Frames: 365
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1054:
Id: 1054
Images: BLOXTREE.R8
Frames: 386
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1055:
Id: 1055
Images: BLOXTREE.R8
Frames: 639
Size: 1,1
Category: Rock-Detail
Tiles:
0: Rock
Template@1057:
Id: 1057
Images: BLOXTREE.R8
Frames: 382
Size: 1,1
Category: Rock-Detail
Tiles:
0: Cliff
Template@1058:
Id: 1058
Images: BLOXWAST.R8
Frames: 393, 394, 470, 395
Size: 2,2
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
3: Rough
Template@1059:
Id: 1059
Images: BLOXBGBS.R8
Frames: 660
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1060:
Id: 1060
Images: BLOXWAST.R8
Frames: 164, 165, 184, 185
Size: 2,2
Category: Dead-Worm
Tiles:
0: Sand
1: Sand
2: Sand
3: Sand
Template@1061:
Id: 1061
Images: BLOXWAST.R8
Frames: 382
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1062:
Id: 1062
Images: BLOXWAST.R8
Frames: 368
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1063:
Id: 1063
Images: BLOXWAST.R8
Frames: 380
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1064:
Id: 1064
Images: BLOXWAST.R8
Frames: 290
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1068:
Id: 1068
Images: BLOXWAST.R8
Frames: 367
Size: 1,1
Category: Sand-Detail
Tiles:
0: Sand
Template@1069:
Id: 1069
Images: BLOXWAST.R8
Frames: 381
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1070:
Id: 1070
Images: BLOXWAST.R8
Frames: 343
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1074:
Id: 1074
Images: BLOXWAST.R8
Frames: 289
Size: 1,1
Category: Sand-Detail
Tiles:
0: Sand
Template@1075:
Id: 1075
Images: BLOXWAST.R8
Frames: 344
Size: 1,1
Category: Sand-Detail
Tiles:
0: Sand
Template@1076:
Id: 1076
Images: BLOXWAST.R8
Frames: 362, 363, 364
Size: 3,1
Category: Sand-Detail
Tiles:
0: Cliff
1: Rough
2: Cliff
Template@1077:
Id: 1077
Images: BLOXWAST.R8
Frames: 607
Size: 1,1
Category: Sand-Detail
Tiles:
0: Sand
Template@1078:
Id: 1078
Images: BLOXBAT.R8
Frames: 311, 312
Size: 2,1
Category: Sand-Detail
Tiles:
0: Cliff
1: Cliff
Template@1079:
Id: 1079
Images: BLOXBAT.R8
Frames: 185
Size: 1,1
Category: Sand-Detail
Tiles:
0: Rough
Template@1080:
Id: 1080
Images: BLOXBGBS.R8
Frames: 713, 733
Size: 1,2
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
Template@1081:
Id: 1081
Images: BLOXBGBS.R8
Frames: 712
Size: 1,1
Category: Rock-Detail
Tiles:
0: Rough
Template@1082:
Id: 1082
Images: BLOXBGBS.R8
Frames: 728
Size: 1,1
Category: Rock-Detail
Tiles:
0: Rough
Template@1083:
Id: 1083
Images: BLOXBGBS.R8
Frames: 707, 708
Size: 2,1
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
Template@1084:
Id: 1084
Images: BLOXBGBS.R8
Frames: 731, 732
Size: 2,1
Category: Rock-Detail
Tiles:
0: Rough
1: Rough
Template@1085:
Id: 1085
Images: BLOXXMAS.R8
Frames: 344, 345
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Transition
Template@1086:
Id: 1086
Images: BLOXXMAS.R8
Frames: 345, 346
Size: 2,1
Category: Bridge
Tiles:
0: Transition
1: Cliff
Template@1087:
Id: 1087
Images: BLOXXMAS.R8
Frames: 364, 365
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Transition
Template@1088:
Id: 1088
Images: BLOXXMAS.R8
Frames: 365, 366
Size: 2,1
Category: Bridge
Tiles:
0: Transition
1: Cliff
Template@1089:
Id: 1089
Images: BLOXXMAS.R8
Frames: 384, 385
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Transition
Template@1090:
Id: 1090
Images: BLOXXMAS.R8
Frames: 385, 386
Size: 2,1
Category: Bridge
Tiles:
0: Transition
1: Cliff
Template@1091:
Id: 1091
Images: BLOXXMAS.R8
Frames: 1, 340, 2, 360
Size: 2,2
Category: Bridge
Tiles:
0: Cliff
1: Cliff
2: Rock
3: Transition
Template@1092:
Id: 1092
Images: BLOXXMAS.R8
Frames: 343, 4, 363, 5
Size: 2,2
Category: Bridge
Tiles:
0: Cliff
1: Cliff
2: Transition
3: Rock
Template@1093:
Id: 1093
Images: BLOXXMAS.R8
Frames: 2, 360, 3, 380
Size: 2,2
Category: Bridge
Tiles:
0: Rock
1: Transition
2: Cliff
3: Cliff
Template@1094:
Id: 1094
Images: BLOXXMAS.R8
Frames: 363, 5, 383, 6
Size: 2,2
Category: Bridge
Tiles:
0: Transition
1: Rock
2: Cliff
3: Cliff
Template@1095:
Id: 1095
Images: BLOXXMAS.R8
Frames: 350, 351, 370, 371
Size: 2,2
Category: Bridge
Tiles:
0: Cliff
1: Rock
2: Cliff
3: Transition
Template@1096:
Id: 1096
Images: BLOXXMAS.R8
Frames: 351, 352, 371, 372
Size: 2,2
Category: Bridge
Tiles:
0: Rock
1: Cliff
2: Transition
3: Cliff
Template@1097:
Id: 1097
Images: BLOXXMAS.R8
Frames: 367, 368, 387, 388
Size: 2,2
Category: Bridge
Tiles:
0: Cliff
1: Transition
2: Cliff
3: Rock
Template@1098:
Id: 1098
Images: BLOXXMAS.R8
Frames: 368, 369, 388, 389
Size: 2,2
Category: Bridge
Tiles:
0: Transition
1: Cliff
2: Rock
3: Cliff
Template@1099:
Id: 1099
Images: BLOXXMAS.R8
Frames: 341, 361
Size: 1,2
Category: Bridge
Tiles:
0: Cliff
1: Transition
Template@1100:
Id: 1100
Images: BLOXXMAS.R8
Frames: 342, 362
Size: 1,2
Category: Bridge
Tiles:
0: Cliff
1: Transition
Template@1101:
Id: 1101
Images: BLOXXMAS.R8
Frames: 353, 373
Size: 1,2
Category: Bridge
Tiles:
0: Cliff
1: Rough
Template@1102:
Id: 1102
Images: BLOXXMAS.R8
Frames: 354, 374
Size: 1,2
Category: Bridge
Tiles:
0: Cliff
1: Rough
Template@1103:
Id: 1103
Images: BLOXXMAS.R8
Frames: 361, 381
Size: 1,2
Category: Bridge
Tiles:
0: Transition
1: Cliff
Template@1104:
Id: 1104
Images: BLOXXMAS.R8
Frames: 362, 382
Size: 1,2
Category: Bridge
Tiles:
0: Transition
1: Cliff
Template@1105:
Id: 1105
Images: BLOXXMAS.R8
Frames: 297, 393
Size: 1,2
Category: Bridge
Tiles:
0: Rough
1: Cliff
Template@1106:
Id: 1106
Images: BLOXXMAS.R8
Frames: 316, 394
Size: 1,2
Category: Bridge
Tiles:
0: Rough
1: Cliff
Template@1107:
Id: 1107
Images: BLOXTREE.R8
Frames: 381
Size: 1,1
Category: Rock-Detail
Tiles:
0: Rock
Template@1108:
Id: 1108
Images: BLOXXMAS.R8
Frames: 289, 290, 309, 310
Size: 2,2
Category: Sand-Detail
Tiles:
0: Cliff
1: Cliff
2: Cliff
3: Cliff
Template@1109:
Id: 1109
Images: BLOXXMAS.R8
Frames: 347, 348
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Cliff
Template@1110:
Id: 1110
Images: BLOXXMAS.R8
Frames: 348, 349
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Cliff
Template@1111:
Id: 1111
Images: BLOXXMAS.R8
Frames: 390, 391
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Cliff
Template@1112:
Id: 1112
Images: BLOXXMAS.R8
Frames: 391, 392
Size: 2,1
Category: Bridge
Tiles:
0: Cliff
1: Cliff