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

Migrate to 1.06 patch content.

Browse Source
This commit is contained in:
Paul Chote
2016-07-05 22:30:19 +01:00
parent 53f284c35a
commit fdc74353fc
36 changed files with 526 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs
View File

@@ -68,6 +68,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var map = new Map(modData, package); var map = new Map(modData, package);
ProcessYaml(modData, map, map.WeaponDefinitions, engineDate, UpgradeRules.UpgradeWeaponRules); ProcessYaml(modData, map, map.WeaponDefinitions, engineDate, UpgradeRules.UpgradeWeaponRules);
ProcessYaml(modData, map, map.RuleDefinitions, engineDate, UpgradeRules.UpgradeActorRules); ProcessYaml(modData, map, map.RuleDefinitions, engineDate, UpgradeRules.UpgradeActorRules);
ProcessYaml(modData, map, map.SequenceDefinitions, engineDate, UpgradeRules.UpgradeSequences);
UpgradeRules.UpgradePlayers(modData, engineDate, ref map.PlayerDefinitions, null, 0); UpgradeRules.UpgradePlayers(modData, engineDate, ref map.PlayerDefinitions, null, 0);
UpgradeRules.UpgradeActors(modData, engineDate, ref map.ActorDefinitions, null, 0); UpgradeRules.UpgradeActors(modData, engineDate, ref map.ActorDefinitions, null, 0);
map.Save(package); map.Save(package);

1
OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs
View File

@@ -69,6 +69,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
ProcessYaml("Rules", modData.Manifest.Rules, modData, engineDate, UpgradeRules.UpgradeActorRules); ProcessYaml("Rules", modData.Manifest.Rules, modData, engineDate, UpgradeRules.UpgradeActorRules);
ProcessYaml("Weapons", modData.Manifest.Weapons, modData, engineDate, UpgradeRules.UpgradeWeaponRules); ProcessYaml("Weapons", modData.Manifest.Weapons, modData, engineDate, UpgradeRules.UpgradeWeaponRules);
ProcessYaml("Sequences", modData.Manifest.Sequences, modData, engineDate, UpgradeRules.UpgradeSequences);
ProcessYaml("Tilesets", modData.Manifest.TileSets, modData, engineDate, UpgradeRules.UpgradeTileset); ProcessYaml("Tilesets", modData.Manifest.TileSets, modData, engineDate, UpgradeRules.UpgradeTileset);
ProcessYaml("Cursors", modData.Manifest.Cursors, modData, engineDate, UpgradeRules.UpgradeCursors); ProcessYaml("Cursors", modData.Manifest.Cursors, modData, engineDate, UpgradeRules.UpgradeCursors);
ProcessYaml("Chrome Metrics", modData.Manifest.ChromeMetrics, modData, engineDate, UpgradeRules.UpgradeChromeMetrics); ProcessYaml("Chrome Metrics", modData.Manifest.ChromeMetrics, modData, engineDate, UpgradeRules.UpgradeChromeMetrics);

30
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -329,6 +329,36 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
static int RemapD2k106Sequence(int frame)
{
if (frame < 2518)
return frame;
if (frame < 3370)
return frame + 248;
if (frame < 4011)
return frame + 253;
if (frame < 4036)
return frame + 261;
return frame + 264;
}
internal static void UpgradeSequences(ModData modData, int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
{
foreach (var node in nodes)
{
if (engineVersion < 20160730 && modData.Manifest.Mod.Id == "d2k" && depth == 2)
{
if (node.Key == "Start")
node.Value.Value = RemapD2k106Sequence(FieldLoader.GetValue<int>("", node.Value.Value)).ToString();
if (node.Key == "Frames")
node.Value.Value = FieldLoader.GetValue<int[]>("", node.Value.Value)
.Select(RemapD2k106Sequence).JoinWith(", ");
}
UpgradeSequences(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}
internal static void UpgradeTileset(ModData modData, int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth) internal static void UpgradeTileset(ModData modData, int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
{ {
foreach (var node in nodes) foreach (var node in nodes)

BIN
mods/d2k/bits/xmas/bloxxmas00.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas01.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas02.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas03.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas04.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas05.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas06.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas07.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas08.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas09.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas10.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas11.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas12.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas13.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas14.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas15.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas16.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas17.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas18.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas19.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/bloxxmas20.tmp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/grenade.shp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/grenadier.shp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/grenadiericon.shp
View File

Binary file not shown.

BIN
mods/d2k/bits/xmas/raidersicon.shp
View File

Binary file not shown.

1
mods/d2k/mod.yaml
View File

@@ -21,7 +21,6 @@ Packages:
~SOUND.RS ~SOUND.RS
d2k|bits d2k|bits
d2k|bits/tex d2k|bits/tex
d2k|bits/xmas
d2k|uibits d2k|uibits
MapFolders: MapFolders:

2
mods/d2k/rules/palettes.yaml
View File

@@ -35,7 +35,7 @@
PaletteFromR8@moveflash: PaletteFromR8@moveflash:
Name: moveflash Name: moveflash
Filename: DATA.R8 Filename: DATA.R8
Offset: 2572352 Offset: 2652107
InvertColor: true InvertColor: true
AllowModifiers: false AllowModifiers: false
PaletteFromRGBA@disabled: PaletteFromRGBA@disabled:

6
mods/d2k/sequences/aircraft.yaml
View File

@@ -3,7 +3,7 @@ carryall:
Start: 1923 Start: 1923
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4029 Start: 4290
Offset: -30,-24 Offset: -30,-24
ornithopter: ornithopter:
@@ -14,10 +14,10 @@ ornithopter:
Tick: 120 Tick: 120
Transpose: true Transpose: true
icon: DATA.R8 icon: DATA.R8
Start: 4031 Start: 4292
Offset: -30,-24 Offset: -30,-24
frigate: frigate:
idle: DATA.R8 idle: DATA.R8
Start: 2517 Start: 2517
Facings: 1 Facings: 1

117
mods/d2k/sequences/infantry.yaml
View File

@@ -56,7 +56,7 @@ light_inf:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4011 Start: 4272
Offset: -30,-24 Offset: -30,-24
trooper: trooper:
@@ -116,7 +116,7 @@ trooper:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4012 Start: 4273
Offset: -30,-24 Offset: -30,-24
engineer: engineer:
@@ -167,7 +167,7 @@ engineer:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4013 Start: 4274
Offset: -30,-24 Offset: -30,-24
thumper: thumper:
@@ -201,7 +201,7 @@ thumper:
Length: 5 Length: 5
Tick: 480 Tick: 480
thump-sand: DATA.R8 thump-sand: DATA.R8
Frames: 3629, 3630, 3626, 3627, 3628 Frames: 3882, 3883, 3879, 3880, 3881
Length: 5 Length: 5
Tick: 480 Tick: 480
BlendMode: Multiply BlendMode: Multiply
@@ -227,7 +227,7 @@ thumper:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4014 Start: 4275
Offset: -30,-24 Offset: -30,-24
thumping: thumping:
@@ -243,7 +243,7 @@ thumping:
Length: 5 Length: 5
Tick: 150 Tick: 150
icon: DATA.R8 icon: DATA.R8
Frames: 4014 Frames: 4275
Offset: -30,-24 Offset: -30,-24
fremen: fremen:
@@ -304,7 +304,7 @@ fremen:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4032 Start: 4293
Offset: -30,-24 Offset: -30,-24
saboteur: saboteur:
@@ -355,7 +355,7 @@ saboteur:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4034 Start: 4295
Offset: -30,-24 Offset: -30,-24
sardaukar: sardaukar:
@@ -416,100 +416,105 @@ sardaukar:
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
icon: DATA.R8 icon: DATA.R8
Start: 4015 Start: 4276
Offset: -30,-24 Offset: -30,-24
grenadier: # 2502 - 2749 in 1.06 DATA.R8 grenadier:
Defaults: stand: DATA.R8
Offset: 1,-4 Start: 2518
stand: grenadier.shp
Facings: -8 Facings: -8
idle: grenadier.shp Transpose: true
Start: 203 idle: DATA.R8
Length: 16 Frames: 2700, 2707, 2714, 2721, 2728, 2735, 2742, 2749
run: grenadier.shp
Start: 8
Length: 6
Facings: 8
Tick: 120
throw: grenadier.shp
Start: 56
Length: 6
Facings: 8
Tick: 120
die1: grenadier.shp
Start: 176
Length: 19
die2: grenadier.shp
Start: 176
Length: 19
die3: grenadier.shp
Start: 176
Length: 19
die4: grenadier.shp
Start: 176
Length: 19
die-crushed: grenadier.shp
Start: 195
Length: 8 Length: 8
idle2: DATA.R8
Frames: 2699, 2706, 2713, 2720, 2727, 2734, 2741, 2748
Length: 8
run: DATA.R8
Start: 2526
Length: 6
Facings: -8
Transpose: true
Tick: 120
throw: DATA.R8
Start: 2574
Length: 6
Facings: -8
Transpose: true
Tick: 120
die1: DATA.R8
Frames: 2694, 2701, 2708, 2715, 2722, 2729, 2736, 2743
Length: 19
die2: DATA.R8
Frames: 2695, 2702, 2709, 2716, 2723, 2730, 2737, 2744
Length: 19
die3: DATA.R8
Frames: 2696, 2703, 2710, 2717, 2724, 2731, 2738, 2745
Length: 19
die4: DATA.R8
Frames: 2697, 2704, 2711, 2718, 2725, 2732, 2738, 2746
Length: 19
die-crushed: DATA.R8
Frames: 2698, 2705, 2712, 2719, 2726, 2733, 2740, 2747
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
prone-stand: grenadier.shp prone-stand: DATA.R8
Start: 104 Start: 2622
Length: 4 Length: 4
Facings: 8 Facings: 8
prone-run: grenadier.shp prone-run: DATA.R8
Start: 104 Start: 2654
Length: 4 Length: 4
Facings: 8 Facings: 8
Tick: 120 Tick: 120
prone-throw: grenadier.shp prone-throw: DATA.R8
Start: 136 Start: 136
Length: 5 Length: 5
Facings: 8 Facings: 8
Tick: 120 Tick: 120
icon: grenadiericon.shp # 4281 in 1.06 DATA.R8 icon: DATA.R8
Offset: 0,0 Start: 4297
Offset: -30,-24
sandworm: sandworm:
mouth: DATA.R8 mouth: DATA.R8
Start: 3549 Start: 3802
Length: 15 Length: 15
Tick: 100 Tick: 100
sand: DATA.R8 sand: DATA.R8
Start: 3565 Start: 3818
Length: 20 Length: 20
Tick: 100 Tick: 100
idle: DATA.R8 idle: DATA.R8
Start: 39 Start: 39
lightninga: DATA.R8 lightninga: DATA.R8
Start: 3591 Start: 3844
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
lightningb: DATA.R8 lightningb: DATA.R8
Start: 3596 Start: 3849
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
lightningc: DATA.R8 lightningc: DATA.R8
Start: 3601 Start: 3854
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
lightningd: DATA.R8 lightningd: DATA.R8
Start: 3606 Start: 3859
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
lightninge: DATA.R8 lightninge: DATA.R8
Start: 3611 Start: 3864
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
lightningf: DATA.R8 lightningf: DATA.R8
Start: 3616 Start: 3869
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
icon: wormicon.shp icon: wormicon.shp

109
mods/d2k/sequences/misc.yaml
View File

@@ -4,51 +4,51 @@ explosion:
Tick: 80 Tick: 80
ZOffset: 511 ZOffset: 511
piff: DATA.R8 piff: DATA.R8
Start: 3626 Start: 3879
Length: 5 Length: 5
piffs: DATA.R8 piffs: DATA.R8
Start: 3429 Start: 3682
Length: 4 Length: 4
small_explosion: DATA.R8 small_explosion: DATA.R8
Start: 3403 Start: 3656
Length: 15 Length: 15
med_explosion: DATA.R8 med_explosion: DATA.R8
Start: 3390 Start: 3643
Length: 12 Length: 12
tiny_explosion: DATA.R8 tiny_explosion: DATA.R8
Start: 3386 Start: 3639
Length: 4 Length: 4
nuke: DATA.R8 nuke: DATA.R8
Start: 3965 Start: 4218
Length: 14 Length: 14
self_destruct: DATA.R8 self_destruct: DATA.R8
Start: 3433 Start: 3686
Length: 15 Length: 15
building: DATA.R8 building: DATA.R8
Start: 3448 Start: 3701
Length: 22 Length: 22
large_explosion: DATA.R8 large_explosion: DATA.R8
Start: 3988 Start: 4241
Length: 22 Length: 22
small_napalm: DATA.R8 small_napalm: DATA.R8
Start: 3421 Start: 3674
Length: 8 Length: 8
rocket_explosion: DATA.R8 rocket_explosion: DATA.R8
Start: 3381 Start: 3634
Length: 5 Length: 5
BlendMode: Alpha BlendMode: Alpha
shockwave: DATA.R8 shockwave: DATA.R8
Start: 3687 Start: 3940
Length: 6 Length: 6
Tick: 120 Tick: 120
deviator: DATA.R8 deviator: DATA.R8
Start: 3512 Start: 3765
Length: 23 Length: 23
BlendMode: Alpha BlendMode: Alpha
Offset: 12, -10 Offset: 12, -10
Tick: 120 Tick: 120
bloomspawn: DATA.R8 bloomspawn: DATA.R8
Start: 3980 Start: 4233
Length: 8 Length: 8
Tick: 120 Tick: 120
Offset: 0, -16 Offset: 0, -16
@@ -58,9 +58,9 @@ explosion:
Length: 12 Length: 12
Tick: 1600 Tick: 1600
large_trail: large_trail:
idle: DATA.R8 idle: DATA.R8
Start: 3873 Start: 4126
Length: 4 Length: 4
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
@@ -68,42 +68,42 @@ large_trail:
small_trail: small_trail:
idle: DATA.R8 idle: DATA.R8
Start: 3735 Start: 3988
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
small_trail2: small_trail2:
idle: DATA.R8 idle: DATA.R8
Start: 3540 Start: 3793
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
bazooka_trail: bazooka_trail:
idle: DATA.R8 idle: DATA.R8
Start: 3381 Start: 3634
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
bazooka_trail2: bazooka_trail2:
idle: DATA.R8 idle: DATA.R8
Start: 3544 Start: 3797
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
deviator_trail: deviator_trail:
idle: DATA.R8 idle: DATA.R8
Start: 3535 Start: 3788
Length: 5 Length: 5
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
laserfire: laserfire:
idle: DATA.R8 idle: DATA.R8
Start: 3386 Start: 3639
Length: 4 Length: 4
Tick: 80 Tick: 80
BlendMode: Additive BlendMode: Additive
@@ -192,38 +192,38 @@ beacon:
rpg: rpg:
idle: DATA.R8 idle: DATA.R8
Start: 3015 Start: 3263
Facings: -32 Facings: -32
ZOffset: 1023 ZOffset: 1023
120mm: 120mm:
idle: DATA.R8 idle: DATA.R8
Start: 3014 Start: 3262
BlendMode: Additive BlendMode: Additive
ZOffset: 1023 ZOffset: 1023
155mm: 155mm:
idle: DATA.R8 idle: DATA.R8
Start: 3081 Start: 3329
ZOffset: 1023 ZOffset: 1023
crate-effects: crate-effects:
Defaults: Defaults:
ZOffset: 2047 ZOffset: 2047
dollar: DATA.R8 dollar: DATA.R8
Start: 3679 Start: 3932
Length: 8 Length: 8
reveal-map: DATA.R8 reveal-map: DATA.R8
Start: 3947 Start: 4200
Length: 18 Length: 18
hide-map: DATA.R8 hide-map: DATA.R8
Frames: 3965, 3964, 3963, 3962, 3961, 3960, 3959, 3958, 3957, 3956, 3955, 3954, 3953, 3952, 3951, 3950, 3949, 3948 Frames: 4218, 4217, 4216, 4215, 4214, 4213, 4212, 4211, 4210, 4209, 4208, 4207, 4206, 4205, 4204, 4203, 4202, 4201
Length: 18 Length: 18
levelup: levelup.shp levelup: levelup.shp
Length: * Length: *
Tick: 200 Tick: 200
cloak: DATA.R8 cloak: DATA.R8
Start: 3911 Start: 4164
Lenght: 36 Lenght: 36
allyrepair: allyrepair:
@@ -236,13 +236,13 @@ allyrepair:
missile: missile:
idle: DATA.R8 idle: DATA.R8
Start: 3088 Start: 3336
Facings: -32 Facings: -32
ZOffset: 1023 ZOffset: 1023
missile2: missile2:
idle: DATA.R8 idle: DATA.R8
Start: 3306 Start: 3554
Facings: -32 Facings: -32
ZOffset: 1023 ZOffset: 1023
@@ -256,25 +256,25 @@ atomic:
fire: fire:
1: DATA.R8 1: DATA.R8
Start: 3712 Start: 3965
Length: 10 Length: 10
Offset: 4,-17 Offset: 4,-17
ZOffset: 1023 ZOffset: 1023
BlendMode: Additive BlendMode: Additive
2: DATA.R8 2: DATA.R8
Start: 3723 Start: 3976
Length: 11 Length: 11
Offset: 0,-3 Offset: 0,-3
ZOffset: 1023 ZOffset: 1023
BlendMode: Additive BlendMode: Additive
3: DATA.R8 3: DATA.R8
Start: 3885 Start: 4138
Length: 13 Length: 13
Offset: 0,-3 Offset: 0,-3
ZOffset: 1023 ZOffset: 1023
BlendMode: Additive BlendMode: Additive
4: DATA.R8 4: DATA.R8
Start: 3712 Start: 3965
Length: 10 Length: 10
Offset: 0,-3 Offset: 0,-3
ZOffset: 1023 ZOffset: 1023
@@ -284,54 +284,55 @@ smoke_m:
Defaults: Defaults:
ZOffset: 511 ZOffset: 511
idle: DATA.R8 idle: DATA.R8
Start: 3418 Start: 3671
Length: 2 Length: 2
BlendMode: Additive BlendMode: Additive
loop: DATA.R8 loop: DATA.R8
Start: 3418 Start: 3671
Length: 2 Length: 2
BlendMode: Additive BlendMode: Additive
end: DATA.R8 end: DATA.R8
Start: 3418 Start: 3671
Length: 3 Length: 3
BlendMode: Additive BlendMode: Additive
bombs: bombs:
idle: DATA.R8 idle: DATA.R8
Start: 3280 Start: 3528
Length: 4 Length: 4
ZOffset: 1023 ZOffset: 1023
grenade: grenade:
idle: grenade.shp # frames 3618-3621 from patch 1.06 DATA.R8 idle: DATA.R8
Start: 3618
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 1023 ZOffset: 1023
shrapnel: shrapnel:
idle: DATA.R8 idle: DATA.R8
Start: 3290 Start: 3538
Length: 4 Length: 4
ZOffset: 1023 ZOffset: 1023
shrapnel2: shrapnel2:
idle: DATA.R8 idle: DATA.R8
Start: 3294 Start: 3542
Length: 1 Length: 1
ZOffset: 1023 ZOffset: 1023
shrapnel3: shrapnel3:
idle: DATA.R8 idle: DATA.R8
Start: 3295 Start: 3543
Length: 8 Length: 8
ZOffset: 1023 ZOffset: 1023
shrapnel4: shrapnel4:
idle: DATA.R8 idle: DATA.R8
Start: 3303 Start: 3551
Length: 1 Length: 1
ZOffset: 1023 ZOffset: 1023
mpspawn: mpspawn:
idle: mpspawn.shp idle: mpspawn.shp
Length: * Length: *
@@ -350,35 +351,35 @@ wormspawner:
sietch: sietch:
idle: DATA.R8 idle: DATA.R8
Start: 2998 Start: 3246
Offset: -32,32 Offset: -32,32
doubleblast: doubleblast:
idle: DATA.R8 idle: DATA.R8
Start: 3279 Start: 3527
Facings: -16 Facings: -16
BlendMode: Additive BlendMode: Additive
ZOffset: 511 ZOffset: 511
doubleblastbullet: doubleblastbullet:
idle: DATA.R8 idle: DATA.R8
Start: 3248 Start: 3496
Facings: -16 Facings: -16
BlendMode: Additive BlendMode: Additive
ZOffset: 1023 ZOffset: 1023
icon: icon:
ornistrike: DATA.R8 ornistrike: DATA.R8
Start: 4031 Start: 4292
Offset: -30,-24 Offset: -30,-24
fremen: DATA.R8 fremen: DATA.R8
Start: 4032 Start: 4293
Offset: -30,-24 Offset: -30,-24
saboteur: DATA.R8 saboteur: DATA.R8
Start: 4034 Start: 4295
Offset: -30,-24 Offset: -30,-24
deathhand: DATA.R8 deathhand: DATA.R8
Start: 4035 Start: 4296
Offset: -30,-24 Offset: -30,-24
crate: crate:
@@ -411,7 +412,7 @@ spicebloom:
moveflsh: moveflsh:
idle: DATA.R8 idle: DATA.R8
Start: 3621 Start: 3874
Length: 5 Length: 5
Tick: 80 Tick: 80
BlendMode: Multiply BlendMode: Multiply
@@ -478,4 +479,4 @@ sandcraters:
null: null:
idle: DATA.R8 idle: DATA.R8
Start: 3304 Start: 3552

610
mods/d2k/sequences/structures.yaml
View File

File diff suppressed because it is too large Load Diff

52
mods/d2k/sequences/vehicles.yaml
View File

@@ -3,7 +3,7 @@ mcv:
Start: 1795 Start: 1795
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4023 Start: 4284
Offset: -30,-24 Offset: -30,-24
mcv.husk: mcv.husk:
@@ -17,19 +17,19 @@ harvester:
Start: 1699 Start: 1699
Facings: -32 Facings: -32
harvest: DATA.R8 harvest: DATA.R8
Start: 3631 Start: 3884
Length: 6 Length: 6
Facings: -8 Facings: -8
Tick: 80 Tick: 80
ZOffset: 1 ZOffset: 1
BlendMode: Multiply BlendMode: Multiply
dock: DATA.R8 dock: DATA.R8
Start: 3370 Start: 3623
Length: 10 Length: 10
dock-loop: DATA.R8 dock-loop: DATA.R8
Start: 3380 Start: 3633
icon: DATA.R8 icon: DATA.R8
Start: 4019 Start: 4280
Offset: -30,-24 Offset: -30,-24
harvester.husk: harvester.husk:
@@ -43,12 +43,12 @@ trike:
Start: 1635 Start: 1635
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3839 Start: 4092
Tick: 50 Tick: 50
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4041 Start: 4305
Offset: -30,-24 Offset: -30,-24
quad: quad:
@@ -56,7 +56,7 @@ quad:
Start: 1667 Start: 1667
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4018 Start: 4279
Offset: -30,-24 Offset: -30,-24
siege_tank: siege_tank:
@@ -67,11 +67,11 @@ siege_tank:
Start: 1891 Start: 1891
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3418 Start: 3671
Length: 3 Length: 3
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4026 Start: 4287
Offset: -30,-24 Offset: -30,-24
siege_tank.husk: siege_tank.husk:
@@ -89,7 +89,7 @@ missile_tank:
Start: 1603 Start: 1603
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4024 Start: 4285
Offset: -30,-24 Offset: -30,-24
missile_tank.husk: missile_tank.husk:
@@ -103,7 +103,7 @@ sonic_tank:
Start: 1827 Start: 1827
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4027 Start: 4288
Offset: -30,-24 Offset: -30,-24
sonic_tank.husk: sonic_tank.husk:
@@ -120,12 +120,12 @@ combat_tank_a:
Start: 1859 Start: 1859
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3775 Start: 4028
Tick: 60 Tick: 60
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4020 Start: 4281
Offset: -30,-24 Offset: -30,-24
combat_tank_a.husk: combat_tank_a.husk:
@@ -146,12 +146,12 @@ combat_tank_h:
Start: 2115 Start: 2115
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3775 Start: 4028
Tick: 60 Tick: 60
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4021 Start: 4282
Offset: -30,-24 Offset: -30,-24
combat_tank_h.husk: combat_tank_h.husk:
@@ -172,12 +172,12 @@ combat_tank_o:
Start: 2485 Start: 2485
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3775 Start: 4028
Tick: 60 Tick: 60
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4022 Start: 4283
Offset: -30,-24 Offset: -30,-24
combat_tank_o.husk: combat_tank_o.husk:
@@ -195,12 +195,12 @@ devastator:
Start: 2083 Start: 2083
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3807 Start: 4060
Tick: 80 Tick: 80
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4028 Start: 4289
Offset: -30,-24 Offset: -30,-24
devastator.husk: devastator.husk:
@@ -214,12 +214,12 @@ raider:
Start: 2421 Start: 2421
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3743 Start: 3996
Tick: 50 Tick: 50
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: DATA.R8 icon: DATA.R8
Start: 4017 Start: 4278
Offset: -30,-24 Offset: -30,-24
stealth_raider: stealth_raider:
@@ -227,18 +227,20 @@ stealth_raider:
Start: 2421 Start: 2421
Facings: -32 Facings: -32
muzzle: DATA.R8 muzzle: DATA.R8
Start: 3743 Start: 3996
Tick: 50 Tick: 50
Facings: -32 Facings: -32
BlendMode: Additive BlendMode: Additive
icon: raidersicon.shp # 4282 in 1.06 DATA.R8 icon: DATA.R8
Start: 4298
Offset: -30,-24
deviator: deviator:
idle: DATA.R8 idle: DATA.R8
Start: 2389 Start: 2389
Facings: -32 Facings: -32
icon: DATA.R8 icon: DATA.R8
Start: 4025 Start: 4286
Offset: -30,-24 Offset: -30,-24
deviator.husk: deviator.husk:

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

@@ -4235,56 +4235,64 @@ Templates:
1: Rough 1: Rough
Template@500: Template@500:
Id: 500 Id: 500
Images: bloxxmas00.tmp Images: BLOXXMAS.R8
Frames: 305
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@501: Template@501:
Id: 501 Id: 501
Images: bloxxmas01.tmp Images: BLOXXMAS.R8
Frames: 325
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@502: Template@502:
Id: 502 Id: 502
Images: bloxxmas02.tmp Images: BLOXXMAS.R8
Frames: 311
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@503: Template@503:
Id: 503 Id: 503
Images: bloxxmas03.tmp Images: BLOXXMAS.R8
Frames: 312
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@504: Template@504:
Id: 504 Id: 504
Images: bloxxmas04.tmp Images: BLOXXMAS.R8
Frames: 330
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@505: Template@505:
Id: 505 Id: 505
Images: bloxxmas05.tmp Images: BLOXXMAS.R8
Frames: 316
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@506: Template@506:
Id: 506 Id: 506
Images: bloxxmas06.tmp Images: BLOXXMAS.R8
Frames: 297
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@507: Template@507:
Id: 507 Id: 507
Images: bloxxmas07.tmp Images: BLOXXMAS.R8
Frames: 356, 357
Size: 2,1 Size: 2,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
@@ -4292,28 +4300,32 @@ Templates:
1: Cliff 1: Cliff
Template@508: Template@508:
Id: 508 Id: 508
Images: bloxxmas08.tmp Images: BLOXXMAS.R8
Frames: 355
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@509: Template@509:
Id: 509 Id: 509
Images: bloxxmas09.tmp Images: BLOXXMAS.R8
Frames: 375
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@510: Template@510:
Id: 510 Id: 510
Images: bloxxmas10.tmp Images: BLOXXMAS.R8
Frames: 395
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@511: Template@511:
Id: 511 Id: 511
Images: bloxxmas11.tmp Images: BLOXXMAS.R8
Frames: 414, 415, 434, 435
Size: 2,2 Size: 2,2
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
@@ -4323,7 +4335,8 @@ Templates:
3: Cliff 3: Cliff
Template@512: Template@512:
Id: 512 Id: 512
Images: bloxxmas12.tmp Images: BLOXXMAS.R8
Frames: 353, 354, 373, 374, 393, 394
Size: 2,3 Size: 2,3
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
@@ -4335,7 +4348,8 @@ Templates:
5: Cliff 5: Cliff
Template@513: Template@513:
Id: 513 Id: 513
Images: bloxxmas13.tmp Images: BLOXXMAS.R8
Frames: 350, 351, 352, 370, 371, 372, 390, 391, 392
Size: 3,3 Size: 3,3
Category: Rock-Detail Category: Rock-Detail
Tiles: Tiles:
@@ -4350,7 +4364,8 @@ Templates:
8: Cliff 8: Cliff
Template@514: Template@514:
Id: 514 Id: 514
Images: bloxxmas14.tmp Images: BLOXXMAS.R8
Frames: 347, 348, 349, 367, 368, 369, 387, 388, 389
Size: 3,3 Size: 3,3
Category: Rock-Detail Category: Rock-Detail
Tiles: Tiles:
@@ -4365,7 +4380,8 @@ Templates:
8: Rock 8: Rock
Template@515: Template@515:
Id: 515 Id: 515
Images: bloxxmas15.tmp Images: BLOXXMAS.R8
Frames: 340, 341, 342, 343, 360, 361, 362, 363, 380, 381, 382, 383
Size: 4,3 Size: 4,3
Category: Rock-Detail Category: Rock-Detail
Tiles: Tiles:
@@ -4383,28 +4399,32 @@ Templates:
11: Cliff 11: Cliff
Template@516: Template@516:
Id: 516 Id: 516
Images: bloxxmas16.tmp Images: BLOXXMAS.R8
Frames: 717
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@517: Template@517:
Id: 517 Id: 517
Images: bloxxmas17.tmp Images: BLOXXMAS.R8
Frames: 718
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@518: Template@518:
Id: 518 Id: 518
Images: bloxxmas18.tmp Images: BLOXXMAS.R8
Frames: 737
Size: 1,1 Size: 1,1
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
0: Cliff 0: Cliff
Template@519: Template@519:
Id: 519 Id: 519
Images: bloxxmas19.tmp Images: BLOXXMAS.R8
Frames: 738, 739, 758, 759
Size: 2,2 Size: 2,2
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles:
@@ -4414,7 +4434,8 @@ Templates:
3: Cliff 3: Cliff
Template@520: Template@520:
Id: 520 Id: 520
Images: bloxxmas20.tmp Images: BLOXXMAS.R8
Frames: 652, 653, 672, 673
Size: 2,2 Size: 2,2
Category: Sand-Detail Category: Sand-Detail
Tiles: Tiles: