Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@FarseerVeraenthis
FarseerVeraenthis authored Jan 12, 2023
2 parents 115ffe3 + 30aa8c7 commit ad81006
Show file tree
Hide file tree
Showing 13 changed files with 433 additions and 202 deletions.
7 changes: 1 addition & 6 deletions Chaos - Chaos Space Marines.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="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" revision="210" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="236" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" revision="210" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="237" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<publications>
<publication id="cb54-c035-pubN125652" name="Codex: Heretic Astartes - Chaos Space Marines"/>
<publication id="cb54-c035-pubN153092" name="Imperium Nihilus: Vigilus Ablaze"/>
Expand Down Expand Up @@ -3608,9 +3608,6 @@ All units in your army with the HERETIC ASTARTES Faction keyword (excluding CHAO
<entryLink id="fdbd-452c-70a4-ac91" name="Traitor Enforcer" hidden="false" collective="false" import="true" targetId="6301-f6f6-1187-63ec" type="selectionEntry"/>
<entryLink id="95ee-0c0e-6df4-699b" name="Traitor Guardsman Squad" hidden="false" collective="false" import="true" targetId="711d-8d8a-3a5e-cfc0" type="selectionEntry"/>
</entryLinks>
<infoLinks>
<infoLink id="df2a-ec24-af5e-15f9" name="Armour of Contempt" hidden="false" targetId="ab12-fdad-19bf-29d7" type="rule"/>
</infoLinks>
<sharedSelectionEntries>
<selectionEntry id="2c93-74cb-4b9d-42c2" name="Abaddon the Despoiler" publicationId="3c0a-f104-07c4-3949" page="146" hidden="false" collective="false" import="true" type="model">
<modifiers>
Expand Down Expand Up @@ -11854,7 +11851,6 @@ All units in your army with the HERETIC ASTARTES Faction keyword (excluding CHAO
</profile>
</profiles>
<costs>
<cost name="pts" typeId="points" value="5.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -25230,7 +25226,6 @@ Each model can only be corrupted once per turn.</characteristic>
</profile>
</profiles>
<costs>
<cost name="pts" typeId="points" value="5.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down
31 changes: 20 additions & 11 deletions Chaos - Daemons.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="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" revision="140" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="236" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="422a-a40e-3f7c-e8b3" name="Chaos - Daemons" revision="140" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="237" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<publications>
<publication id="422a-a40e-pubN71142" name="Dataslate: Be&apos;lakor"/>
</publications>
Expand Down Expand Up @@ -2894,7 +2894,7 @@
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="2.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="30.0"/>
<cost name="pts" typeId="points" value="35.0"/>
</costs>
</selectionEntry>
<selectionEntry id="a893-60f4-487d-5480" name="Nexus of Fate" hidden="false" collective="false" import="true" type="upgrade">
Expand Down Expand Up @@ -6834,6 +6834,7 @@ These powers are considered to have been manifested with a roll equal to their w
<entryLink id="5b86-6dee-4982-4e82" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
<entryLink id="6b29-6f0a-e081-9501" name="Relics of Slaanesh" hidden="false" collective="false" import="true" targetId="532e-5b2b-c449-213a" type="selectionEntryGroup"/>
<entryLink id="b7e3-61c4-99b8-f485" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
<entryLink id="2a19-54c8-9b64-4c80" name="Stratagem: Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="100.0"/>
Expand Down Expand Up @@ -6960,7 +6961,7 @@ These powers are considered to have been manifested with a roll equal to their w
<entryLink id="fc7b-30e6-1b41-137e" name="Warlord Traits (Slaanesh)" hidden="false" collective="false" import="true" targetId="a671-d25a-4ef4-3e5d" type="selectionEntryGroup"/>
<entryLink id="2fdd-e752-c0a6-8788" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
<entryLink id="f1c6-457b-b285-01a1" name="Exalted Seeker tongues" hidden="false" collective="false" import="true" targetId="61d4-3aaa-beb8-2ede" type="selectionEntry"/>
<entryLink id="ba95-10d4-d091-ecc8" name="Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
<entryLink id="ba95-10d4-d091-ecc8" name="Stratagem: Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
<entryLink id="7610-ccf9-112d-96fe" name="Stratagem: Relic" hidden="false" collective="false" import="true" targetId="c470-54ac-0863-8848" type="selectionEntry"/>
<entryLink id="a0d6-5724-3a1c-fb5f" name="Relics of Slaanesh" hidden="false" collective="false" import="true" targetId="532e-5b2b-c449-213a" type="selectionEntryGroup"/>
<entryLink id="f860-3cdb-bcfc-d870" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
Expand Down Expand Up @@ -8679,6 +8680,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -8689,7 +8691,7 @@ These powers are considered to have been manifested with a roll equal to their w
</entryLink>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="500.0"/>
<cost name="pts" typeId="points" value="450.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="28.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -8795,8 +8797,9 @@ These powers are considered to have been manifested with a roll equal to their w
<conditionGroups>
<conditionGroup type="and">
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -8809,7 +8812,7 @@ These powers are considered to have been manifested with a roll equal to their w
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="8.0"/>
<cost name="pts" typeId="points" value="145.0"/>
<cost name="pts" typeId="points" value="130.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -9115,6 +9118,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -9126,7 +9130,7 @@ These powers are considered to have been manifested with a roll equal to their w
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="35.0"/>
<cost name="pts" typeId="points" value="650.0"/>
<cost name="pts" typeId="points" value="600.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -9299,6 +9303,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -9310,7 +9315,7 @@ These powers are considered to have been manifested with a roll equal to their w
<entryLink id="8938-e9ba-3f4f-39da" name="Stratagem: Warlord Trait" hidden="false" collective="false" import="true" targetId="6771-6ab3-1672-6a39" type="selectionEntry"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="400.0"/>
<cost name="pts" typeId="points" value="360.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="23.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -9422,6 +9427,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand Down Expand Up @@ -9576,6 +9582,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -9586,7 +9593,7 @@ These powers are considered to have been manifested with a roll equal to their w
</entryLink>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="180.0"/>
<cost name="pts" typeId="points" value="160.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="9.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -10324,6 +10331,7 @@ These powers are considered to have been manifested with a roll equal to their w
<conditions>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e77a-cc54-efcf-a09a" type="equalTo"/>
<condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c488-0afe-c67e-2606" type="equalTo"/>
<condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="76d2-6e71-243f-ad3d" type="equalTo"/>
</conditions>
</conditionGroup>
</conditionGroups>
Expand All @@ -10334,7 +10342,7 @@ These powers are considered to have been manifested with a roll equal to their w
</entryLink>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="425.0"/>
<cost name="pts" typeId="points" value="380.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="24.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -12998,6 +13006,7 @@ At the end of your Movement phase, this model can start to perform this action.
<entryLink id="0baa-e9f2-b07b-ba87" name="Relics of Slaanesh" hidden="false" collective="false" import="true" targetId="532e-5b2b-c449-213a" type="selectionEntryGroup"/>
<entryLink id="cf65-aaa0-fc20-e8e5" name="Bladed axle" hidden="false" collective="false" import="true" targetId="0ab4-a73b-7e93-51ae" type="selectionEntry"/>
<entryLink id="bc15-fefc-d2fb-52ce" name="Battle Honours" hidden="false" collective="false" import="true" targetId="e21d-5a52-e47a-49b9" type="selectionEntryGroup"/>
<entryLink id="df2d-2b8a-0814-eedc" name="Stratagem: Exquisite Gifts" hidden="false" collective="false" import="true" targetId="f1f8-32e4-4e85-29ea" type="selectionEntry"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="110.0"/>
Expand Down Expand Up @@ -13551,7 +13560,7 @@ At the end of your Movement phase, this model can start to perform this action.
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="f1f8-32e4-4e85-29ea" name="Exquisite Gifts" hidden="false" collective="false" import="true" type="upgrade">
<selectionEntry id="f1f8-32e4-4e85-29ea" name="Stratagem: Exquisite Gifts" hidden="false" collective="false" import="true" type="upgrade">
<modifiers>
<modifier type="set" field="3a2b-e309-b3a4-a7e0" value="2.0">
<conditions>
Expand Down
6 changes: 1 addition & 5 deletions Chaos - Death Guard.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="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="152" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="236" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="152" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="237" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<publications>
<publication id="ce57-cc1c-pubN85391" name="Index: Chaos FAQ"/>
<publication id="ce57-cc1c-pubN108736" name="Codex: Heretic Astartes - Death Guard" publicationDate="23/01/2021"/>
Expand Down Expand Up @@ -2680,9 +2680,6 @@ Battle Round 3 - 6&quot;
Battle Round 4 - 9&quot;</description>
</rule>
</rules>
<infoLinks>
<infoLink id="1192-dd3e-3036-fdfa" name="Armour of Contempt" hidden="false" targetId="ab12-fdad-19bf-29d7" type="rule"/>
</infoLinks>
<sharedSelectionEntries>
<selectionEntry id="9765-6363-9d49-b571" name="Chaos Predator Destructor" page="0" hidden="false" collective="false" import="true" type="model">
<modifierGroups>
Expand Down Expand Up @@ -7187,7 +7184,6 @@ plague companies in the same Detachment, without preventing other units in that
</profile>
</profiles>
<costs>
<cost name="pts" typeId="points" value="15.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down
Loading

0 comments on commit ad81006

Please sign in to comment.