Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
- Fixes #353
- Fixes Deathwatch having chapter selection for imported models.
  • Loading branch information
Mad-Spy committed Jul 6, 2019
1 parent 1e9b4bc commit 2fa3578
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 13 deletions.
47 changes: 46 additions & 1 deletion Adeptus Astartes.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="6112-edb9-977c-198e" name="Adeptus Astartes" revision="17" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="6112-edb9-977c-198e" name="Adeptus Astartes" revision="18" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<categoryEntries>
<categoryEntry id="51fd-2592-44bd-2226" name="Intercessor" hidden="false"/>
<categoryEntry id="200c-8203-0e5a-0f41" name="Primaris" hidden="false"/>
Expand Down Expand Up @@ -378,11 +378,17 @@
<categoryLinks>
<categoryLink id="2f3c-dac7-190e-fd69" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="1d49-ac80-8be2-4394" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="9a7e-db1a-da36-3167" name="Chaplain in Terminator Armour" hidden="false" collective="false" targetId="72df-333f-d44f-e598" type="selectionEntry">
<categoryLinks>
<categoryLink id="2a8b-5357-aa86-8b18" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="c29e-1b72-7620-6486" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="bab4-aba6-7c61-0746" name="Librarian in Phobos Armour" hidden="false" collective="false" targetId="0def-8e36-3a16-ab63" type="selectionEntry">
<categoryLinks>
Expand All @@ -393,6 +399,9 @@
<categoryLinks>
<categoryLink id="3c9b-99b2-4313-100e" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="1055-00e7-b36a-1d25" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="3548-694b-24c3-d6a1" name="Infiltrator Fire Team" hidden="false" collective="false" targetId="0cb9-3adf-ec25-8bcb" type="selectionEntry">
<modifiers>
Expand Down Expand Up @@ -429,6 +438,9 @@
<categoryLink id="d6ab-bb60-ee06-2049" name="New CategoryLink" hidden="false" targetId="79c6-76fc-47ee-c005" primary="true"/>
<categoryLink id="d541-3a1f-5a3c-a334" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="e50e-46b6-7092-dc0d" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="afae-ca13-8d78-0a8a" name="Terminator" hidden="false" collective="false" targetId="ca38-d54c-3ff9-5c1c" type="selectionEntry">
<modifiers>
Expand All @@ -442,6 +454,9 @@
<categoryLink id="ac8a-dbc7-8b92-d915" name="New CategoryLink" hidden="false" targetId="29e7-d60f-5acd-4d99" primary="true"/>
<categoryLink id="80aa-c33c-d673-947c" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="f6ac-ef78-b7d8-aa24" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="3f44-15c2-103a-f959" name="Terminator Gunner" hidden="false" collective="false" targetId="8adc-9d8c-0bf8-6bc3" type="selectionEntry">
<modifiers>
Expand All @@ -455,6 +470,9 @@
<categoryLink id="4e53-f92b-2e95-c229" name="New CategoryLink" hidden="false" targetId="29e7-d60f-5acd-4d99" primary="true"/>
<categoryLink id="b582-28b1-39b9-ce3e" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="4221-1846-578f-326d" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="d5d1-aff1-8f00-2f72" name="Terminator Gunner" hidden="false" collective="false" targetId="8adc-9d8c-0bf8-6bc3" type="selectionEntry">
<modifiers>
Expand All @@ -473,6 +491,9 @@
<categoryLink id="ed39-d78f-8db0-a536" name="New CategoryLink" hidden="false" targetId="79c6-76fc-47ee-c005" primary="true"/>
<categoryLink id="f023-e823-7dfa-05a8" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="1492-9889-552f-801a" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="3a29-6915-cf82-0c1e" name="Terminator Sergeant" hidden="false" collective="false" targetId="4c64-f195-7269-1fff" type="selectionEntry">
<modifiers>
Expand All @@ -486,6 +507,9 @@
<categoryLink id="798a-91fb-2b0b-c65b" name="New CategoryLink" hidden="false" targetId="ade4-0710-e40e-be3f" primary="true"/>
<categoryLink id="5004-d379-59c4-fd51" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="e4cf-7c8d-0a33-d5b2" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="832e-8ae5-5e55-09f9" name="Terminator Sergeant" hidden="false" collective="false" targetId="4c64-f195-7269-1fff" type="selectionEntry">
<modifiers>
Expand All @@ -504,6 +528,9 @@
<categoryLink id="0166-fa66-0750-d55a" name="New CategoryLink" hidden="false" targetId="79c6-76fc-47ee-c005" primary="true"/>
<categoryLink id="7694-c450-e662-70e7" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="6c53-4637-f71d-6bdd" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="8591-646b-f1a1-704c" name="Terminator Sergeant" hidden="false" collective="false" targetId="4c64-f195-7269-1fff" type="selectionEntry">
<modifiers>
Expand All @@ -517,6 +544,9 @@
<categoryLink id="efe5-729c-7c07-b0f5" name="New CategoryLink" hidden="false" targetId="29e7-d60f-5acd-4d99" primary="true"/>
<categoryLink id="575f-cb19-2472-e92e" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="a13f-32d0-0f4c-9a76" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="c814-3102-b7bb-33e4" name="Space Wolf Terminator" hidden="false" collective="false" targetId="5dfb-22dd-dee3-7841" type="selectionEntry">
<categoryLinks>
Expand Down Expand Up @@ -708,6 +738,9 @@
<categoryLink id="8b28-585a-ae92-01e7" name="New CategoryLink" hidden="false" targetId="ade4-0710-e40e-be3f" primary="true"/>
<categoryLink id="b0f9-30d4-71da-04a9" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="833a-ef5c-0059-85c1" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="de5c-84aa-d28c-315d" name="Vanguard Sergeant" hidden="false" collective="false" targetId="d6ce-1709-dc19-0736" type="selectionEntry">
<modifiers>
Expand All @@ -726,6 +759,9 @@
<categoryLink id="1b0c-ff8c-cac9-e389" name="New CategoryLink" hidden="false" targetId="79c6-76fc-47ee-c005" primary="true"/>
<categoryLink id="5950-c375-8186-0ed3" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="1da5-2689-dacd-2af9" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="1f2e-12fd-cc84-35a1" name="Vanguard Sergeant" hidden="false" collective="false" targetId="d6ce-1709-dc19-0736" type="selectionEntry">
<modifiers>
Expand All @@ -739,6 +775,9 @@
<categoryLink id="cf41-d357-b2e0-6bd5" name="New CategoryLink" hidden="false" targetId="29e7-d60f-5acd-4d99" primary="true"/>
<categoryLink id="6bfc-f407-082b-7d57" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="8f8b-de67-6a13-feac" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="30fe-bd38-6825-61c0" name="Vanguard Veteran" hidden="false" collective="false" targetId="a7e2-4c13-d51c-1551" type="selectionEntry">
<modifiers>
Expand All @@ -757,6 +796,9 @@
<categoryLink id="57e0-ae62-eeb7-13a9" name="New CategoryLink" hidden="false" targetId="79c6-76fc-47ee-c005" primary="true"/>
<categoryLink id="361e-fecc-6ed4-f6f4" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="e5b7-1830-68a2-7491" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="2388-55b0-d988-f453" name="Vanguard Veteran" hidden="false" collective="false" targetId="a7e2-4c13-d51c-1551" type="selectionEntry">
<modifiers>
Expand All @@ -770,6 +812,9 @@
<categoryLink id="318f-e166-3582-c50b" name="New CategoryLink" hidden="false" targetId="29e7-d60f-5acd-4d99" primary="true"/>
<categoryLink id="3e65-59ba-7227-ffd8" name="Faction: Adeptus Astartes" hidden="false" targetId="f0ef-d104-7cde-57ed" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="e0e1-c4e0-0bfb-d15d" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
</entryLink>
<entryLink id="d8e3-1db7-941b-159a" name="Veteran Fire Team" hidden="false" collective="false" targetId="0b60-ea49-8925-e95d" type="selectionEntry">
<modifiers>
Expand Down
4 changes: 2 additions & 2 deletions Asuryani.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="a796-a947-905e-205c" name="Asuryani" revision="18" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="a796-a947-905e-205c" name="Asuryani" revision="19" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<categoryEntries>
<categoryEntry id="efd1-273e-3910-f3e8" name="Warhost" hidden="false"/>
<categoryEntry id="5bef-7545-be74-0e33" name="Guardian" hidden="false"/>
Expand Down Expand Up @@ -2556,7 +2556,7 @@
<profile id="9b69-649e-8769-980e" name="Scorpion&apos;s claw - ranged" hidden="false" typeId="c067-7929-f4dc-7825" typeName="Weapon">
<characteristics>
<characteristic name="Range" typeId="5410-0b42-87cc-bbc6">12&quot;</characteristic>
<characteristic name="Type" typeId="38ea-c4e0-d3bb-d1e9">Assault 4</characteristic>
<characteristic name="Type" typeId="38ea-c4e0-d3bb-d1e9">Assault 2</characteristic>
<characteristic name="S" typeId="fcc6-35ea-38b6-f4ca">4</characteristic>
<characteristic name="AP" typeId="fc0e-2874-184d-9f64">0</characteristic>
<characteristic name="D" typeId="cc1f-e463-c014-2251">1</characteristic>
Expand Down
11 changes: 1 addition & 10 deletions Space Marines.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="fce0-30e5-a4fc-8736" name="Space Marines" revision="11" battleScribeVersion="2.02" library="true" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="25" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="fce0-30e5-a4fc-8736" name="Space Marines" revision="12" battleScribeVersion="2.02" library="true" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="25" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profileTypes>
<profileType id="6c15-6156-5ba7-10f3" name="Special Issue Ammunition">
<characteristicTypes>
Expand Down Expand Up @@ -913,7 +913,6 @@
</constraints>
</entryLink>
<entryLink id="25ba-4ff1-d954-84dc" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="ef65-d854-c76e-c48a" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="88.0"/>
Expand Down Expand Up @@ -1178,7 +1177,6 @@
</selectionEntryGroups>
<entryLinks>
<entryLink id="24bf-e5b3-7a87-9afe" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="b8c6-b517-ed23-632a" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="74.0"/>
Expand Down Expand Up @@ -1334,7 +1332,6 @@
</constraints>
</entryLink>
<entryLink id="04bf-fad3-441a-7791" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="4daf-9794-e481-d9f4" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="80.0"/>
Expand Down Expand Up @@ -2156,7 +2153,6 @@
</constraints>
</entryLink>
<entryLink id="34a5-9b4d-14fe-2669" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="2d98-ab0d-3de8-d754" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="25.0"/>
Expand Down Expand Up @@ -2291,7 +2287,6 @@
</constraints>
</entryLink>
<entryLink id="6f75-e787-b06d-7bda" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="585e-af6c-3ca5-1ffd" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="27.0"/>
Expand Down Expand Up @@ -2409,7 +2404,6 @@
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9e17-f769-1fb5-d989" type="max"/>
</constraints>
</entryLink>
<entryLink id="defc-8bee-dacd-5c13" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="26.0"/>
Expand Down Expand Up @@ -3397,7 +3391,6 @@
</constraints>
</entryLink>
<entryLink id="58ad-38dc-b480-edd2" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="37c7-4fee-73ed-1c55" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="13.0"/>
Expand Down Expand Up @@ -3498,7 +3491,6 @@
</constraints>
</entryLink>
<entryLink id="8baf-daab-51df-6d91" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="e64f-37f6-490c-ada1" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="14.0"/>
Expand Down Expand Up @@ -3814,7 +3806,6 @@
</entryLink>
<entryLink id="493d-8116-0160-f8a9" name="Frag and krak grenades" hidden="false" collective="false" targetId="c0eb-48a8-64a0-8635" type="selectionEntry"/>
<entryLink id="2397-76fe-d233-5303" name="Specialism" hidden="false" collective="false" targetId="ba29-ffa4-b77c-6b17" type="selectionEntryGroup"/>
<entryLink id="f154-e677-3406-4324" name="Chapter" hidden="false" collective="false" targetId="72dc-01ba-36f1-563f" type="selectionEntryGroup"/>
</entryLinks>
<costs>
<cost name="pts" typeId="5291-dc2c-cfa5-a77f" value="14.0"/>
Expand Down

0 comments on commit 2fa3578

Please sign in to comment.