Skip to content

Commit ba08fb8

Browse files
authored
fix: EntryLinks that have FilterBy/childId of Link (BSData#5918)
* fix EntryLinks that have FilterBy/childId of Link The lookup of issues and fixing was done using C# scripting and `wham` library The summary and details of fixes applied (including paths to changed conditions) is available at: https://gist.github.com/amis92/cdd68efeb436b7586b0d1aad7cfdd8ab#summary * ci: Bump wham version to 0.7-beta.3 * Version increment
1 parent b24a615 commit ba08fb8

8 files changed

+34
-34
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v1
1515
- name: Install wham
16-
run: dotnet tool install wham --version 0.7.0-beta.1 --tool-path ../tools
16+
run: dotnet tool install wham --version 0.7.0-beta.3 --tool-path ../tools
1717
- name: Publish snapshot.bsr
1818
run: ../tools/wham publish -f snapshot -o artifacts/snapshot --verbosity detailed
1919
- name: Upload snapshot.bsr as workflow artifact

Aeldari - Craftworlds.cat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<catalogue id="30b2-6f64-b85e-b4dc" name="Aeldari - Craftworlds" revision="86" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
2+
<catalogue id="30b2-6f64-b85e-b4dc" name="Aeldari - Craftworlds" revision="87" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
33
<publications>
44
<publication id="30b2-6f64-pubN119081" name="Imperial Armour - Index: Xenos"/>
55
<publication id="30b2-6f64-pubN137513" name="Codex: Craftworlds"/>
@@ -14286,7 +14286,7 @@ unit can emerge from the webway – set this unit up anywhere on the battlefield
1428614286
<modifiers>
1428714287
<modifier type="set" field="hidden" value="true">
1428814288
<conditions>
14289-
<condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4544-0498-7c31-519d" type="notInstanceOf"/>
14289+
<condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7a74-f56b-28ad-cd55" type="notInstanceOf"/>
1429014290
</conditions>
1429114291
</modifier>
1429214292
</modifiers>

Aeldari - Drukhari.cat

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" revision="57" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
2+
<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" revision="58" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
33
<publications>
44
<publication id="e0a4-2172-pubN65537" name="Codex: Drukhari"/>
55
<publication id="e0a4-2172-pubN86981" name="Codex: Dark Eldar 2010"/>
@@ -8247,7 +8247,7 @@
82478247
<conditionGroups>
82488248
<conditionGroup type="or">
82498249
<conditions>
8250-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9cf3-09b4-05fe-4ec9" type="notInstanceOf"/>
8250+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3ea9-f42c-d816-b91a" type="notInstanceOf"/>
82518251
<condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b1f7-b1c1-5b1d-d499" type="equalTo"/>
82528252
</conditions>
82538253
</conditionGroup>
@@ -8560,7 +8560,7 @@
85608560
<conditionGroups>
85618561
<conditionGroup type="or">
85628562
<conditions>
8563-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b9b4-b3d6-589c-b694" type="notInstanceOf"/>
8563+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="bcaa-5a3b-de61-6f41" type="notInstanceOf"/>
85648564
</conditions>
85658565
<conditionGroups>
85668566
<conditionGroup type="and">

Imperium - Dark Angels.cat

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<catalogue id="b8fe-8d38-37ec-90e8" name="Imperium - Dark Angels" revision="113" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Thairne" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
2+
<catalogue id="b8fe-8d38-37ec-90e8" name="Imperium - Dark Angels" revision="114" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Thairne" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
33
<publications>
44
<publication id="b8fe-8d38-pubN65537" name="Codex: Dark Angels"/>
55
</publications>
@@ -3317,7 +3317,7 @@
33173317
<modifiers>
33183318
<modifier type="set" field="hidden" value="false">
33193319
<conditions>
3320-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2f9d-9cfa-2d72-dbfe" type="instanceOf"/>
3320+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a648-ad2f-fbdf-b180" type="instanceOf"/>
33213321
</conditions>
33223322
</modifier>
33233323
</modifiers>
@@ -6911,7 +6911,7 @@ Matched Play: This model and any units embarked aboard it are exempt from the Ta
69116911
<conditionGroups>
69126912
<conditionGroup type="or">
69136913
<conditions>
6914-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f898-37e9-0ce3-1dbf" type="instanceOf"/>
6914+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="93f0-5272-7b0c-f986" type="instanceOf"/>
69156915
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d5ec-3ee9-3440-0768" type="instanceOf"/>
69166916
</conditions>
69176917
</conditionGroup>
@@ -14657,7 +14657,7 @@ wounds.</characteristic>
1465714657
<conditionGroups>
1465814658
<conditionGroup type="and">
1465914659
<conditions>
14660-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="0af4-8fb6-5a9d-e965" type="instanceOf"/>
14660+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="e178-fe8e-6928-48c2" type="instanceOf"/>
1466114661
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ae09-117e-a6fa-316b" type="equalTo"/>
1466214662
</conditions>
1466314663
</conditionGroup>
@@ -14747,7 +14747,7 @@ wounds.</characteristic>
1474714747
<conditionGroups>
1474814748
<conditionGroup type="and">
1474914749
<conditions>
14750-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="153c-2250-d024-389d" type="instanceOf"/>
14750+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="7d3f-a10f-0a57-d488" type="instanceOf"/>
1475114751
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ae09-117e-a6fa-316b" type="equalTo"/>
1475214752
</conditions>
1475314753
</conditionGroup>
@@ -14779,13 +14779,13 @@ wounds.</characteristic>
1477914779
<conditionGroups>
1478014780
<conditionGroup type="and">
1478114781
<conditions>
14782-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d7fb-1ed0-970a-58d0" type="instanceOf"/>
14782+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="1eca-e59b-cd4e-d3d6" type="instanceOf"/>
1478314783
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ae09-117e-a6fa-316b" type="equalTo"/>
1478414784
</conditions>
1478514785
</conditionGroup>
1478614786
<conditionGroup type="and">
1478714787
<conditions>
14788-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="c086-ffb6-0621-accb" type="instanceOf"/>
14788+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="28b1-58d0-9871-9f8a" type="instanceOf"/>
1478914789
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ae09-117e-a6fa-316b" type="equalTo"/>
1479014790
</conditions>
1479114791
</conditionGroup>
@@ -14989,7 +14989,7 @@ wounds.</characteristic>
1498914989
<conditionGroup type="and">
1499014990
<conditions>
1499114991
<condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5d09-415f-8f33-073f" type="equalTo"/>
14992-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e46d-f194-7fae-7c04" type="instanceOf"/>
14992+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b138-43e3-b9c2-6daa" type="instanceOf"/>
1499314993
</conditions>
1499414994
</conditionGroup>
1499514995
</conditionGroups>

Imperium - Deathwatch.cat

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<catalogue id="203b-f8dd-2a64-2676" name="Imperium - Deathwatch" revision="77" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Acebaur" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
2+
<catalogue id="203b-f8dd-2a64-2676" name="Imperium - Deathwatch" revision="78" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Acebaur" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
33
<publications>
44
<publication id="203b-f8dd-pubN65537" name="Codex: Deathwatch"/>
55
<publication id="203b-f8dd-pubN98915" name="Chapter Approved 2017"/>
@@ -6068,7 +6068,7 @@ For the purposes of setting up on or moving through Battlefield Terrain, this un
60686068
<modifiers>
60696069
<modifier type="set" field="hidden" value="true">
60706070
<conditions>
6071-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="53bc-077a-de73-6611" type="notInstanceOf"/>
6071+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2567-072d-fea5-7e3e" type="notInstanceOf"/>
60726072
</conditions>
60736073
</modifier>
60746074
</modifiers>
@@ -6141,7 +6141,7 @@ For the purposes of setting up on or moving through Battlefield Terrain, this un
61416141
<modifiers>
61426142
<modifier type="set" field="hidden" value="true">
61436143
<conditions>
6144-
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="53bc-077a-de73-6611" type="notInstanceOf"/>
6144+
<condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2567-072d-fea5-7e3e" type="notInstanceOf"/>
61456145
</conditions>
61466146
</modifier>
61476147
</modifiers>

0 commit comments

Comments
 (0)