Fix sequence inheritance defined in yaml

Nodes need to be placed after "Inherits" nodes so that they take
precedence over the inherited nodes.
This commit is contained in:
abcdefg30
2023-02-14 00:20:41 +01:00
committed by Matthias Mailänder
parent 040fbf9694
commit 64933ed04b
6 changed files with 111 additions and 111 deletions

View File

@@ -53,54 +53,54 @@ c1:
Tick: 1600 Tick: 1600
c2: c2:
Inherits: c1
Defaults: Defaults:
Filename: c2.shp Filename: c2.shp
Inherits: c1
c3: c3:
Inherits: c1
Defaults: Defaults:
Filename: c3.shp Filename: c3.shp
Inherits: c1
c4: c4:
Inherits: c1
Defaults: Defaults:
Filename: c4.shp Filename: c4.shp
Inherits: c1
c5: c5:
Inherits: c1
Defaults: Defaults:
Filename: c5.shp Filename: c5.shp
Inherits: c1
c6: c6:
Inherits: c1
Defaults: Defaults:
Filename: c6.shp Filename: c6.shp
Inherits: c1
c7: c7:
Inherits: c1
Defaults: Defaults:
Filename: c7.shp Filename: c7.shp
Inherits: c1
c8: c8:
Inherits: c1
Defaults: Defaults:
Filename: c8.shp Filename: c8.shp
Inherits: c1
c9: c9:
Inherits: c1
Defaults: Defaults:
Filename: c9.shp Filename: c9.shp
Inherits: c1
c10: c10:
Inherits: c1
Defaults: Defaults:
Filename: c10.shp Filename: c10.shp
Inherits: c1
delphi: delphi:
Inherits: c1
Defaults: Defaults:
Filename: delphi.shp Filename: delphi.shp
Inherits: c1
moebius: moebius:
Defaults: Defaults:
@@ -146,6 +146,6 @@ moebius:
Tick: 1600 Tick: 1600
chan: chan:
Inherits: moebius
Defaults: Defaults:
Filename: chan.shp Filename: chan.shp
Inherits: moebius

View File

@@ -46,9 +46,9 @@ vice:
Filename: viceicnh.shp Filename: viceicnh.shp
pvice: pvice:
Inherits: vice
Defaults: Defaults:
Filename: pvice.shp Filename: pvice.shp
Inherits: vice
e1: e1:
Defaults: Defaults:

View File

@@ -44,14 +44,14 @@ harv:
Start: 0 Start: 0
harvempty: harvempty:
Inherits: harv
Defaults: Defaults:
Filename: harvempty.shp Filename: harvempty.shp
Inherits: harv
harvhalf: harvhalf:
Inherits: harv
Defaults: Defaults:
Filename: harvhalf.shp Filename: harvhalf.shp
Inherits: harv
hhusk: hhusk:
idle: idle:

View File

@@ -55,44 +55,44 @@ ammocrat:
DepthSpriteOffset: -24, 0 DepthSpriteOffset: -24, 0
aban01: aban01:
Inherits: ^aban2x6
Defaults: Defaults:
Filename: aban01.shp Filename: aban01.shp
Inherits: ^aban2x6
aban02: aban02:
Inherits: ^aban5x3
Defaults: Defaults:
Filename: aban02.shp Filename: aban02.shp
Inherits: ^aban5x3
aban03: aban03:
Inherits: ^aban2x5
Defaults: Defaults:
Filename: aban03.shp Filename: aban03.shp
Inherits: ^aban2x5
aban04: aban04:
Inherits: ^aban4x2
Defaults: Defaults:
Filename: aban04.shp Filename: aban04.shp
Inherits: ^aban4x2
aban05: aban05:
Inherits: ^aban3x2
Defaults: Defaults:
Filename: aban05.shp Filename: aban05.shp
Inherits: ^aban3x2
aban06: aban06:
Inherits: ^aban2x2
Defaults: Defaults:
Filename: aban06.shp Filename: aban06.shp
Inherits: ^aban2x2
aban07: aban07:
Inherits: ^aban2x2
Defaults: Defaults:
Filename: aban07.shp Filename: aban07.shp
Inherits: ^aban2x2
aban08: aban08:
Inherits: ^aban2x2
Defaults: Defaults:
Filename: aban08.shp Filename: aban08.shp
Inherits: ^aban2x2
aban09: aban09:
Inherits: ^aban2x2 Inherits: ^aban2x2
@@ -101,9 +101,9 @@ aban09:
Offset: 2, -20, 24 Offset: 2, -20, 24
aban10: aban10:
Inherits: ^aban2x2
Defaults: Defaults:
Filename: aban10.shp Filename: aban10.shp
Inherits: ^aban2x2
aban11: aban11:
Inherits: ^aban2x2 Inherits: ^aban2x2
@@ -124,9 +124,9 @@ aban13:
Offset: 0, -10, 12 Offset: 0, -10, 12
aban14: aban14:
Inherits: ^aban1x1
Defaults: Defaults:
Filename: aban14.shp Filename: aban14.shp
Inherits: ^aban1x1
aban15: aban15:
Inherits: ^aban1x1 Inherits: ^aban1x1
@@ -135,19 +135,19 @@ aban15:
Offset: 0, -10, 12 Offset: 0, -10, 12
aban16: aban16:
Inherits: ^aban2x2
Defaults: Defaults:
Filename: aban16.shp Filename: aban16.shp
Inherits: ^aban2x2
aban17: aban17:
Inherits: ^aban1x1
Defaults: Defaults:
Filename: aban17.shp Filename: aban17.shp
Inherits: ^aban1x1
aban18: aban18:
Inherits: ^aban1x1
Defaults: Defaults:
Filename: aban18.shp Filename: aban18.shp
Inherits: ^aban1x1
^bboard1x1: ^bboard1x1:
Defaults: Defaults:
@@ -177,84 +177,84 @@ aban18:
ShadowStart: 3 ShadowStart: 3
bboard01: bboard01:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard01.shp Filename: bboard01.shp
Inherits: ^bboard1x1
bboard02: bboard02:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard02.shp Filename: bboard02.shp
Inherits: ^bboard1x1
bboard03: bboard03:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard03.shp Filename: bboard03.shp
Inherits: ^bboard1x1
bboard04: bboard04:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard04.shp Filename: bboard04.shp
Inherits: ^bboard1x1
bboard05: bboard05:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard05.shp Filename: bboard05.shp
Inherits: ^bboard1x1
bboard06: bboard06:
Inherits: ^bboard1x2
Defaults: Defaults:
Filename: bboard06.shp Filename: bboard06.shp
Inherits: ^bboard1x2
bboard07: bboard07:
Inherits: ^bboard1x2
Defaults: Defaults:
Filename: bboard07.shp Filename: bboard07.shp
Inherits: ^bboard1x2
bboard08: bboard08:
Inherits: ^bboard1x2
Defaults: Defaults:
Filename: bboard08.shp Filename: bboard08.shp
Inherits: ^bboard1x2
bboard09: bboard09:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard09.shp Filename: bboard09.shp
Inherits: ^bboard1x1
bboard10: bboard10:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard10.shp Filename: bboard10.shp
Inherits: ^bboard1x1
bboard11: bboard11:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard11.shp Filename: bboard11.shp
Inherits: ^bboard1x1
bboard12: bboard12:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard12.shp Filename: bboard12.shp
Inherits: ^bboard1x1
bboard13: bboard13:
Inherits: ^bboard1x1
Defaults: Defaults:
Filename: bboard13.shp Filename: bboard13.shp
Inherits: ^bboard1x1
bboard14: bboard14:
Inherits: ^bboard2x1
Defaults: Defaults:
Filename: bboard14.shp Filename: bboard14.shp
Inherits: ^bboard2x1
bboard15: bboard15:
Inherits: ^bboard2x1
Defaults: Defaults:
Filename: bboard15.shp Filename: bboard15.shp
Inherits: ^bboard2x1
bboard16: bboard16:
Inherits: ^bboard2x1
Defaults: Defaults:
Filename: bboard16.shp Filename: bboard16.shp
Inherits: ^bboard2x1
^cabase: ^cabase:
Defaults: Defaults:
@@ -299,151 +299,151 @@ bboard16:
Offset: 0, -24, 24 Offset: 0, -24, 24
ca0001: ca0001:
Inherits: ^ca3x3
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0001.shp TEMPERATE: ct0001.shp
SNOW: ca0001.shp SNOW: ca0001.shp
Inherits: ^ca3x3
ca0002: ca0002:
Inherits: ^ca3x3
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0002.shp TEMPERATE: ct0002.shp
SNOW: ca0002.shp SNOW: ca0002.shp
Inherits: ^ca3x3
ca0003: ca0003:
Inherits: ^ca2x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0003.shp TEMPERATE: ct0003.shp
SNOW: ca0003.shp SNOW: ca0003.shp
Inherits: ^ca2x2
ca0004: ca0004:
Inherits: ^ca2x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0004.shp TEMPERATE: ct0004.shp
SNOW: ca0004.shp SNOW: ca0004.shp
Inherits: ^ca2x2
ca0005: ca0005:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0005.shp TEMPERATE: ct0005.shp
SNOW: ca0005.shp SNOW: ca0005.shp
Inherits: ^ca1x2
ca0006: ca0006:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0006.shp TEMPERATE: ct0006.shp
SNOW: ca0006.shp SNOW: ca0006.shp
Inherits: ^ca1x2
ca0007: ca0007:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0007.shp TEMPERATE: ct0007.shp
SNOW: ca0007.shp SNOW: ca0007.shp
Inherits: ^ca1x2
ca0008: ca0008:
Inherits: ^ca2x3
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0008.shp TEMPERATE: ct0008.shp
SNOW: ca0008.shp SNOW: ca0008.shp
Inherits: ^ca2x3
ca0009: ca0009:
Inherits: ^ca2x3
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0009.shp TEMPERATE: ct0009.shp
SNOW: ca0009.shp SNOW: ca0009.shp
Inherits: ^ca2x3
ca0010: ca0010:
Inherits: ^ca2x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0010.shp TEMPERATE: ct0010.shp
SNOW: ca0010.shp SNOW: ca0010.shp
Inherits: ^ca2x2
ca0011: ca0011:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0011.shp TEMPERATE: ct0011.shp
SNOW: ca0011.shp SNOW: ca0011.shp
Inherits: ^ca1x2
ca0012: ca0012:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0012.shp TEMPERATE: ct0012.shp
SNOW: ca0012.shp SNOW: ca0012.shp
Inherits: ^ca1x2
ca0013: ca0013:
Inherits: ^ca2x1
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0013.shp TEMPERATE: ct0013.shp
SNOW: ca0013.shp SNOW: ca0013.shp
Inherits: ^ca2x1
ca0014: ca0014:
Inherits: ^ca1x1
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0014.shp TEMPERATE: ct0014.shp
SNOW: ca0014.shp SNOW: ca0014.shp
Inherits: ^ca1x1
ca0015: ca0015:
Inherits: ^ca1x1
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0015.shp TEMPERATE: ct0015.shp
SNOW: ca0015.shp SNOW: ca0015.shp
Inherits: ^ca1x1
ca0016: ca0016:
Inherits: ^ca1x1
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0016.shp TEMPERATE: ct0016.shp
SNOW: ca0016.shp SNOW: ca0016.shp
Inherits: ^ca1x1
ca0017: ca0017:
Inherits: ^ca1x1
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0017.shp TEMPERATE: ct0017.shp
SNOW: ca0017.shp SNOW: ca0017.shp
Inherits: ^ca1x1
ca0018: ca0018:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0018.shp TEMPERATE: ct0018.shp
SNOW: ca0018.shp SNOW: ca0018.shp
Inherits: ^ca1x2
ca0019: ca0019:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0019.shp TEMPERATE: ct0019.shp
SNOW: ca0019.shp SNOW: ca0019.shp
Inherits: ^ca1x2
ca0020: ca0020:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0020.shp TEMPERATE: ct0020.shp
SNOW: ca0020.shp SNOW: ca0020.shp
Inherits: ^ca1x2
ca0021: ca0021:
Inherits: ^ca1x2
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: ct0021.shp TEMPERATE: ct0021.shp
SNOW: ca0021.shp SNOW: ca0021.shp
Inherits: ^ca1x2
caarmr: caarmr:
Defaults: Defaults:
@@ -638,29 +638,29 @@ city01:
Offset: -12, -30, 36 Offset: -12, -30, 36
city02: city02:
Inherits: ^city2x3
Defaults: Defaults:
Filename: city02.shp Filename: city02.shp
Inherits: ^city2x3
city03: city03:
Inherits: ^city3x2
Defaults: Defaults:
Filename: city03.shp Filename: city03.shp
Inherits: ^city3x2
city04: city04:
Inherits: ^city3x2
Defaults: Defaults:
Filename: city04.shp Filename: city04.shp
Inherits: ^city3x2
city05: city05:
Inherits: ^city3x2
Defaults: Defaults:
Filename: city05.shp Filename: city05.shp
Inherits: ^city3x2
city06: city06:
Inherits: ^city4x2
Defaults: Defaults:
Filename: city06.shp Filename: city06.shp
Inherits: ^city4x2
city07: city07:
Inherits: ^city4x2 Inherits: ^city4x2
@@ -669,44 +669,44 @@ city07:
Offset: -12, -30, 36 Offset: -12, -30, 36
city08: city08:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city08.shp Filename: city08.shp
Inherits: ^city2x2
city09: city09:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city09.shp Filename: city09.shp
Inherits: ^city2x2
city10: city10:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city10.shp Filename: city10.shp
Inherits: ^city2x2
city11: city11:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city11.shp Filename: city11.shp
Inherits: ^city2x2
city12: city12:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city12.shp Filename: city12.shp
Inherits: ^city2x2
city13: city13:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city13.shp Filename: city13.shp
Inherits: ^city2x2
city14: city14:
Inherits: ^city1x1
Defaults: Defaults:
Filename: city14.shp Filename: city14.shp
Inherits: ^city1x1
city15: city15:
Inherits: ^city4x2
Defaults: Defaults:
Filename: city15.shp Filename: city15.shp
Inherits: ^city4x2
city16: city16:
Inherits: ^city4x2 Inherits: ^city4x2
@@ -715,34 +715,34 @@ city16:
Offset: -24, -30, 36 Offset: -24, -30, 36
city17: city17:
Inherits: ^city4x3
Defaults: Defaults:
Filename: city17.shp Filename: city17.shp
Inherits: ^city4x3
city18: city18:
Inherits: ^city3x5
Defaults: Defaults:
Filename: city18.shp Filename: city18.shp
Inherits: ^city3x5
city19: city19:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city19.shp Filename: city19.shp
Inherits: ^city2x2
city20: city20:
Inherits: ^city1x1
Defaults: Defaults:
Filename: city20.shp Filename: city20.shp
Inherits: ^city1x1
city21: city21:
Inherits: ^city1x1
Defaults: Defaults:
Filename: city21.shp Filename: city21.shp
Inherits: ^city1x1
city22: city22:
Inherits: ^city2x2
Defaults: Defaults:
Filename: city22.shp Filename: city22.shp
Inherits: ^city2x2
ctdam: ctdam:
Defaults: Defaults:

View File

@@ -94,18 +94,18 @@ e1.nod:
Filename: sidebar-nod|e1icon.shp Filename: sidebar-nod|e1icon.shp
e2: e2:
Defaults:
Filename: e2.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: e2.shp
icon: icon:
Filename: e2icon.shp Filename: e2icon.shp
e3: e3:
Defaults:
Filename: e3.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: e3.shp
icon: icon:
Filename: e4icon.shp Filename: e4icon.shp
@@ -124,82 +124,82 @@ engineer.nod:
Filename: sidebar-nod|engnicon.shp Filename: sidebar-nod|engnicon.shp
umagon: umagon:
Defaults:
Filename: umagon.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: umagon.shp
icon: icon:
Filename: umagicon.shp Filename: umagicon.shp
ghost: ghost:
Defaults:
Filename: ghost.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: ghost.shp
icon: icon:
Filename: gosticon.shp Filename: gosticon.shp
mhijack: mhijack:
Inherits: ^BasicInfantry
Defaults: Defaults:
Filename: mhijack.shp Filename: mhijack.shp
Inherits: ^BasicInfantry
icon: icon:
Filename: chamicon.shp Filename: chamicon.shp
chamspy: chamspy:
Inherits: ^BasicInfantry
Defaults: Defaults:
Filename: chamspy.shp Filename: chamspy.shp
Inherits: ^BasicInfantry
icon: icon:
Filename: chamicon.shp Filename: chamicon.shp
mutant: mutant:
Defaults:
Filename: mutant.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: mutant.shp
icon: icon:
Filename: mutcicon.shp Filename: mutcicon.shp
mwmn: mwmn:
Defaults:
Filename: mwmn.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: mwmn.shp
icon: icon:
Filename: mutcicon.shp Filename: mutcicon.shp
mutant3: mutant3:
Defaults:
Filename: mutant3.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: mutant3.shp
icon: icon:
Filename: mutcicon.shp Filename: mutcicon.shp
tratos: tratos:
Inherits: ^BasicInfantry
Defaults: Defaults:
Filename: tratos.shp Filename: tratos.shp
Inherits: ^BasicInfantry
icon: icon:
Filename: mutcicon.shp Filename: mutcicon.shp
oxanna: oxanna:
Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack
Defaults: Defaults:
Filename: oxanna.shp Filename: oxanna.shp
Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack
slav: slav:
Defaults:
Filename: slav.shp
Inherits: ^BasicInfantry Inherits: ^BasicInfantry
Inherits@attack: ^BasicInfantryAttack Inherits@attack: ^BasicInfantryAttack
Defaults:
Filename: slav.shp
civ1: civ1:
Inherits: ^BasicInfantry
Defaults: Defaults:
Filename: civ1.shp Filename: civ1.shp
Inherits: ^BasicInfantry
attack: attack:
Start: 164 Start: 164
Length: 6 Length: 6
@@ -221,9 +221,9 @@ civ1:
ShadowStart: 292 ShadowStart: 292
civ2: civ2:
Inherits: ^BasicInfantry
Defaults: Defaults:
Filename: civ2.shp Filename: civ2.shp
Inherits: ^BasicInfantry
panic-run: panic-run:
Start: 86 Start: 86
Length: 6 Length: 6
@@ -234,9 +234,9 @@ civ2:
ShadowStart: 292 ShadowStart: 292
civ3: civ3:
Inherits: civ1
Defaults: Defaults:
Filename: civ3.shp Filename: civ3.shp
Inherits: civ1
cyborg: cyborg:
Defaults: Defaults:

View File

@@ -10,25 +10,25 @@
Tick: 160 Tick: 160
tibtre01: tibtre01:
Inherits: ^tibtree
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: tibtre01.tem TEMPERATE: tibtre01.tem
SNOW: tibtre01.sno SNOW: tibtre01.sno
Inherits: ^tibtree
tibtre02: tibtre02:
Inherits: ^tibtree
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: tibtre02.tem TEMPERATE: tibtre02.tem
SNOW: tibtre02.sno SNOW: tibtre02.sno
Inherits: ^tibtree
tibtre03: tibtre03:
Inherits: ^tibtree
Defaults: Defaults:
TilesetFilenames: TilesetFilenames:
TEMPERATE: tibtre03.tem TEMPERATE: tibtre03.tem
SNOW: tibtre03.sno SNOW: tibtre03.sno
Inherits: ^tibtree
bigblue: bigblue:
Defaults: Defaults: