Skip to content
This repository has been archived by the owner on Feb 4, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into alphalas
Browse files Browse the repository at this point in the history
  • Loading branch information
@alphalas
alphalas authored Feb 7, 2017
2 parents 5846e7b + c4e8723 commit 616e09e
Show file tree
Hide file tree
Showing 9 changed files with 1,933 additions and 585 deletions.
9 changes: 8 additions & 1 deletion Adepta Sororitas.cat
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<catalogue id="818a0a0f-43c3-6587-c690-9b14d0a7ba96" name="Adepta Sororitas: Codex (2013)" book="Adepta Sororitas: Codex (2013)" revision="2015" battleScribeVersion="2.00" authorName="Alphalas" authorContact="Gitter: @Alphalas, twitter: @kingoverlord" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="818a0a0f-43c3-6587-c690-9b14d0a7ba96" name="Adepta Sororitas: Codex (2013)" book="Adepta Sororitas: Codex (2013)" revision="2016" battleScribeVersion="2.00" authorName="Alphalas" authorContact="Gitter: @Alphalas, twitter: @kingoverlord" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -337,6 +337,13 @@
</conditions>
<conditionGroups/>
</modifier>
<modifier type="set" field="1cec-ecab-58fe-b914" value="0.0">
<repeats/>
<conditions>
<condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="bdee-f95e-fcbd-01ec" type="equalTo"/>
</conditions>
<conditionGroups/>
</modifier>
</modifiers>
<constraints/>
</entryLink>
Expand Down
25 changes: 20 additions & 5 deletions Blood Angels - Codex (2014).cat
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<catalogue id="6cacb5fc-d6bf-078d-307e-6f16c72d5f2a" name="Blood Angels: Codex (2014)" book="Codex: Blood Angels" revision="2011" battleScribeVersion="2.00" authorName="Alphalas" authorContact="Gitter: @Alphalas, twitter: @kingoverlord" authorUrl="http://battlescribedata.appspot.com/#/repos" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="6cacb5fc-d6bf-078d-307e-6f16c72d5f2a" name="Blood Angels: Codex (2014)" book="Codex: Blood Angels" revision="2012" battleScribeVersion="2.00" authorName="Alphalas" authorContact="Gitter: @Alphalas, twitter: @kingoverlord" authorUrl="http://battlescribedata.appspot.com/#/repos" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -17534,7 +17534,7 @@
<modifiers/>
<constraints/>
</entryLink>
<entryLink id="b059-46e0-5c28-43d2" name="New EntryLink" hidden="false" targetId="5bc2-e061-a439-c689" type="selectionEntry">
<entryLink id="b059-46e0-5c28-43d2" name="New EntryLink" hidden="false" targetId="5bc2-e061-a439-c689" type="selectionEntry" categoryEntryId="848a6ff2-0def-4c72-8433-ff7da70e6bc7">
<profiles/>
<rules/>
<infoLinks/>
Expand All @@ -17555,7 +17555,7 @@
</modifiers>
<constraints/>
</entryLink>
<entryLink id="df6d-77f8-5ac3-6c8b" name="New EntryLink" hidden="false" targetId="bdee-f95e-fcbd-01ec" type="selectionEntry">
<entryLink id="df6d-77f8-5ac3-6c8b" name="New EntryLink" hidden="false" targetId="bdee-f95e-fcbd-01ec" type="selectionEntry" categoryEntryId="848a6ff2-0def-4c72-8433-ff7da70e6bc7">
<profiles/>
<rules/>
<infoLinks/>
Expand All @@ -17576,7 +17576,7 @@
</modifiers>
<constraints/>
</entryLink>
<entryLink id="90e4-763c-a017-5c31" name="New EntryLink" hidden="false" targetId="6755-ac2f-6fcf-d8ac" type="selectionEntry">
<entryLink id="90e4-763c-a017-5c31" name="New EntryLink" hidden="false" targetId="6755-ac2f-6fcf-d8ac" type="selectionEntry" categoryEntryId="848a6ff2-0def-4c72-8433-ff7da70e6bc7">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -17604,6 +17604,19 @@
<modifiers/>
<constraints/>
</entryLink>
<entryLink id="1a74-bf29-1686-0260" name="New EntryLink" hidden="false" targetId="df58-def7-a0b2-f493" type="selectionEntry" categoryEntryId="28b94f51-e66b-4096-aa59-0c9df620a77d">
<profiles/>
<rules/>
<infoLinks/>
<modifiers>
<modifier type="set" field="hidden" value="false">
<repeats/>
<conditions/>
<conditionGroups/>
</modifier>
</modifiers>
<constraints/>
</entryLink>
</entryLinks>
<sharedSelectionEntries>
<selectionEntry id="a6ac-e9cd-d203-59d0" name="&quot;10th Company Ambush Force&quot;" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
Expand Down Expand Up @@ -37991,7 +38004,9 @@
<selectionEntries/>
<selectionEntryGroups/>
<entryLinks/>
<costs/>
<costs>
<cost name="pts" costTypeId="points" value="0.0"/>
</costs>
</selectionEntry>
</selectionEntries>
<selectionEntryGroups>
Expand Down
4 changes: 2 additions & 2 deletions Cult Mechanicus Codex 2015.cat
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<catalogue id="4fe1-8588-ca35-920b" name="Cult Mechanicus: Codex (2015)" book="Codex: Cult Mechanicus" revision="2011" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="4fe1-8588-ca35-920b" name="Cult Mechanicus: Codex (2015)" book="Codex: Cult Mechanicus" revision="2012" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -4551,7 +4551,7 @@ This Formation counts as three units for the purposes of Canticles of the Omniss
<modifier type="set" field="hidden" value="false">
<repeats/>
<conditions>
<condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5bc2-e061-a439-c689" type="equalTo"/>
<condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5bc2-e061-a439-c689" type="equalTo"/>
</conditions>
<conditionGroups/>
</modifier>
Expand Down
50 changes: 1 addition & 49 deletions Deathwatch - Codex.cat
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<catalogue id="ee8b-68c8-02226-2d18" name="Deathwatch: Codex (2016)" book="Codex: Adeptus Astartes Deathwatch" revision="2028" battleScribeVersion="2.00" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="ee8b-68c8-02226-2d18" name="Deathwatch: Codex (2016)" book="Codex: Adeptus Astartes Deathwatch" revision="2029" battleScribeVersion="2.00" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -3506,7 +3506,6 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
<conditionGroup type="and">
<conditions>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d138-e94c-ba35-2ac9" type="notEqualTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9650-fa3a-071c-00a1" type="notEqualTo"/>
</conditions>
<conditionGroups/>
</conditionGroup>
Expand All @@ -3519,7 +3518,6 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
<conditionGroup type="or">
<conditions>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d138-e94c-ba35-2ac9" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9650-fa3a-071c-00a1" type="equalTo"/>
</conditions>
<conditionGroups/>
</conditionGroup>
Expand All @@ -3531,28 +3529,6 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="734d-4587-5a64-d7f6" type="min"/>
</constraints>
<selectionEntries>
<selectionEntry id="9650-fa3a-071c-00a1" name="Heavy Thunder Hammer" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
<profiles/>
<rules/>
<infoLinks>
<infoLink id="e786-524f-fb46-d175" hidden="false" targetId="c5a3-0133-5d5e-2ddc" type="profile">
<profiles/>
<rules/>
<infoLinks/>
<modifiers/>
</infoLink>
</infoLinks>
<modifiers/>
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e57a-26af-272e-0113" type="max"/>
</constraints>
<selectionEntries/>
<selectionEntryGroups/>
<entryLinks/>
<costs>
<cost name="pts" costTypeId="points" value="30.0"/>
</costs>
</selectionEntry>
<selectionEntry id="d138-e94c-ba35-2ac9" name="Boltgun &amp; Chainsword" hidden="false" collective="false" type="upgrade">
<profiles/>
<rules/>
Expand Down Expand Up @@ -13258,7 +13234,6 @@ This is NOT validated through BattleScribe.</description>
<conditionGroup type="and">
<conditions>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5619-f63b-c517-6230" type="notEqualTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2cd0-4b38-c2d9-0294" type="notEqualTo"/>
</conditions>
<conditionGroups/>
</conditionGroup>
Expand All @@ -13271,7 +13246,6 @@ This is NOT validated through BattleScribe.</description>
<conditionGroup type="or">
<conditions>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5619-f63b-c517-6230" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2cd0-4b38-c2d9-0294" type="equalTo"/>
</conditions>
<conditionGroups/>
</conditionGroup>
Expand All @@ -13283,28 +13257,6 @@ This is NOT validated through BattleScribe.</description>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7292-6bd1-a80c-d99b" type="min"/>
</constraints>
<selectionEntries>
<selectionEntry id="2cd0-4b38-c2d9-0294" name="Heavy Thunder Hammer" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
<profiles/>
<rules/>
<infoLinks>
<infoLink id="8644-7863-4a36-a1e9" hidden="false" targetId="c5a3-0133-5d5e-2ddc" type="profile">
<profiles/>
<rules/>
<infoLinks/>
<modifiers/>
</infoLink>
</infoLinks>
<modifiers/>
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1176-9efb-32af-f9fe" type="max"/>
</constraints>
<selectionEntries/>
<selectionEntryGroups/>
<entryLinks/>
<costs>
<cost name="pts" costTypeId="points" value="30.0"/>
</costs>
</selectionEntry>
<selectionEntry id="5619-f63b-c517-6230" name="Boltgun &amp; Chainsword" hidden="false" collective="false" type="upgrade">
<profiles/>
<rules/>
Expand Down
Loading

0 comments on commit 616e09e

Please sign in to comment.