Skip to content

Commit

Permalink
Merge branch 'master' into PointsUpdate/SistersofSilence
Browse files Browse the repository at this point in the history
  • Loading branch information
jmkk11 committed Dec 9, 2019
2 parents 749f5c9 + 438aeb5 commit 93057df
Show file tree
Hide file tree
Showing 19 changed files with 1,737 additions and 648 deletions.
74 changes: 43 additions & 31 deletions Aeldari - Drukhari.cat

Large diffs are not rendered by default.

136 changes: 62 additions & 74 deletions Aeldari - FW Corsairs.cat

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Aeldari - Harlequins.cat
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="7d24-b92f-c5d5-3bf0" name="Aeldari - Harlequins" revision="34" 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">
<catalogue id="7d24-b92f-c5d5-3bf0" name="Aeldari - Harlequins" revision="35" 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">
<publications>
<publication id="7d24-b92f-pubN65537" name="Codex: Harlequins"/>
<publication id="7d24-b92f-pubN72737" name="Chapter Approved 2017"/>
Expand Down Expand Up @@ -195,7 +195,7 @@
</profile>
</profiles>
<costs>
<cost name="pts" typeId="points" value="20.0"/>
<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 All @@ -214,7 +214,7 @@
</profile>
</profiles>
<costs>
<cost name="pts" typeId="points" value="10.0"/>
<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 @@ -460,7 +460,7 @@
</entryLink>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="13.0"/>
<cost name="pts" typeId="points" value="11.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="1.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -627,7 +627,7 @@
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="4.0"/>
<cost name="pts" typeId="points" value="70.0"/>
<cost name="pts" typeId="points" value="60.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -857,7 +857,7 @@
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="7.0"/>
<cost name="pts" typeId="points" value="125.0"/>
<cost name="pts" typeId="points" value="110.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -1019,7 +1019,7 @@
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="5.0"/>
<cost name="pts" typeId="points" value="79.0"/>
<cost name="pts" typeId="points" value="60.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -1079,7 +1079,7 @@
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="6.0"/>
<cost name="pts" typeId="points" value="68.0"/>
<cost name="pts" typeId="points" value="55.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -1156,7 +1156,7 @@
</selectionEntryGroup>
</selectionEntryGroups>
<costs>
<cost name="pts" typeId="points" value="30.0"/>
<cost name="pts" typeId="points" value="25.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
144 changes: 72 additions & 72 deletions Chaos - Chaos Space Marines.cat

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions Chaos - Daemons.cat

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions Chaos - Death Guard.cat
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="74" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="75" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://discord.gg/KqPVhds" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<publications>
<publication id="ce57-cc1c-pubN85391" name="Index: Chaos FAQ"/>
<publication id="ce57-cc1c-pubN85402" name="Index: Chaos"/>
Expand Down Expand Up @@ -546,7 +546,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="ef05-f8eb-7289-2cbe" name="Battle Honours" hidden="false" collective="false" import="true" targetId="5518-d0f5-a880-d71c" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="90.0"/>
<cost name="pts" typeId="points" value="85.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 @@ -638,7 +638,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntry>
</selectionEntries>
<costs>
<cost name="pts" typeId="points" value="25.0"/>
<cost name="pts" typeId="points" value="20.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="2.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -1127,7 +1127,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntry>
</selectionEntries>
<costs>
<cost name="pts" typeId="points" value="6.0"/>
<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 @@ -1717,7 +1717,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="3521-e6a0-d309-27a4" name="Custom Character Selections" hidden="false" collective="false" import="true" targetId="8774-e003-4a50-56c7" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="102.0"/>
<cost name="pts" typeId="points" value="100.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="8.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -2009,7 +2009,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntry>
</selectionEntries>
<costs>
<cost name="pts" typeId="points" value="20.0"/>
<cost name="pts" typeId="points" value="17.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 @@ -2175,7 +2175,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</entryLink>
<entryLink id="85ce-15c4-c71c-3ae7" name="Helbrute fist" hidden="false" collective="false" import="true" targetId="a7f3-c34e-be7d-d3c2" type="selectionEntry">
<modifiers>
<modifier type="set" field="points" value="20">
<modifier type="set" field="points" value="15.0">
<conditions>
<condition field="selections" scope="5cae-15dc-4a5d-0b9b" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a7f3-c34e-be7d-d3c2" type="greaterThan"/>
</conditions>
Expand Down Expand Up @@ -2226,7 +2226,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</entryLink>
<entryLink id="33e6-c588-61c0-a761" name="Helbrute fist" hidden="false" collective="false" import="true" targetId="a7f3-c34e-be7d-d3c2" type="selectionEntry">
<modifiers>
<modifier type="set" field="points" value="20">
<modifier type="set" field="points" value="15.0">
<conditions>
<condition field="selections" scope="5cae-15dc-4a5d-0b9b" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a7f3-c34e-be7d-d3c2" type="greaterThan"/>
</conditions>
Expand Down Expand Up @@ -2337,7 +2337,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="6297-2b3d-f0e9-8ed4" name="Battle Honours" hidden="false" collective="false" import="true" targetId="5518-d0f5-a880-d71c" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="70.0"/>
<cost name="pts" typeId="points" value="65.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="4.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -2477,7 +2477,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</entryLink>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="175.0"/>
<cost name="pts" typeId="points" value="155.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 @@ -2700,7 +2700,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="4e39-ebed-05cb-a2b2" name="Custom Character Selections" hidden="false" collective="false" import="true" targetId="8774-e003-4a50-56c7" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="110.0"/>
<cost name="pts" typeId="points" value="95.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="6.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -2792,7 +2792,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntryGroup>
</selectionEntryGroups>
<costs>
<cost name="pts" typeId="points" value="5.0"/>
<cost name="pts" typeId="points" value="4.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 @@ -2829,7 +2829,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntryGroup>
</selectionEntryGroups>
<costs>
<cost name="pts" typeId="points" value="5.0"/>
<cost name="pts" typeId="points" value="4.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 @@ -2875,7 +2875,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="pts" typeId="points" value="5.0"/>
<cost name="pts" typeId="points" value="4.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -2913,7 +2913,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntries>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="pts" typeId="points" value="5.0"/>
<cost name="pts" typeId="points" value="4.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -3127,7 +3127,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="b521-ad23-3278-307d" name="Battle Honours" hidden="false" collective="false" import="true" targetId="5518-d0f5-a880-d71c" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="200.0"/>
<cost name="pts" typeId="points" value="180.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="19.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down Expand Up @@ -3767,7 +3767,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntries>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="pts" typeId="points" value="35.0"/>
<cost name="pts" typeId="points" value="25.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -3831,7 +3831,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntry>
</selectionEntries>
<costs>
<cost name="pts" typeId="points" value="35.0"/>
<cost name="pts" typeId="points" value="25.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 @@ -4908,7 +4908,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="7.0"/>
<cost name="pts" typeId="points" value="75.0"/>
<cost name="pts" typeId="points" value="60.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
Expand Down Expand Up @@ -5524,7 +5524,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntry>
<selectionEntry id="b785-15f0-966e-73c4" name="Lightning Claw" hidden="false" collective="false" import="true" type="upgrade">
<modifiers>
<modifier type="set" field="points" value="6">
<modifier type="set" field="points" value="5.0">
<conditions>
<condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b785-15f0-966e-73c4" type="equalTo"/>
</conditions>
Expand All @@ -5534,7 +5534,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<infoLink id="7030-3181-964e-4390" name="Lightning claw" hidden="false" targetId="7584-238f-3174-4529" type="profile"/>
</infoLinks>
<costs>
<cost name="pts" typeId="points" value="8.0"/>
<cost name="pts" typeId="points" value="6.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 @@ -5929,7 +5929,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
</selectionEntryGroup>
</selectionEntryGroups>
<costs>
<cost name="pts" typeId="points" value="30.0"/>
<cost name="pts" typeId="points" value="20.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 @@ -6495,7 +6495,7 @@ For the purposes of this ability, a Rapid Fire bolt weapon is any weapon with th
<entryLink id="fcb9-4759-c498-ec89" name="Custom Character Selections" hidden="false" collective="false" import="true" targetId="8774-e003-4a50-56c7" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="90.0"/>
<cost name="pts" typeId="points" value="80.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="6.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
Expand Down
Loading

0 comments on commit 93057df

Please sign in to comment.