Skip to content
This repository has been archived by the owner on Oct 27, 2023. It is now read-only.

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
closes #12565
closes #12567
closes #12453
Closes #12559
  • Loading branch information
acebaur committed Mar 6, 2023
1 parent d6a8ab6 commit e4d266b
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Imperium - Grey Knights.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="0cc2-3545-6762-a3f7" name="Imperium - Grey Knights" revision="117" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Tekton" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="0cc2-3545-6762-a3f7" name="Imperium - Grey Knights" revision="118" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Tekton" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="248" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<publications>
<publication id="0cc2-3545-pubN112001" name="Codex: Grey Knights"/>
</publications>
Expand Down Expand Up @@ -5900,7 +5900,7 @@
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="-1.0"/>
</costs>
</selectionEntry>
<selectionEntry id="00a1-b9cd-e2e7-7871" name="Flamestorm Cannon (Forgeworld)" hidden="false" collective="false" import="true" type="upgrade">
Expand Down
109 changes: 97 additions & 12 deletions Imperium - Space Marines.cat
Original file line number Diff line number Diff line change
Expand Up @@ -6767,7 +6767,7 @@ This ability cannot be used with a Relic which replaces any of these weapons. </
</conditionGroup>
</conditionGroups>
</modifier>
<modifier type="increment" field="9d52-475a-6312-33fc" value="1">
<modifier type="increment" field="9d52-475a-6312-33fc" value="1.0">
<conditionGroups>
<conditionGroup type="and">
<conditions>
Expand All @@ -6779,16 +6779,15 @@ This ability cannot be used with a Relic which replaces any of these weapons. </
</modifier>
</modifiers>
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9d52-475a-6312-33fc" type="min"/>
<constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="9d52-475a-6312-33fc" type="min"/>
<constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4964-0419-9b96-83e2" type="max"/>
</constraints>
<selectionEntries>
<selectionEntry id="fc95-b292-be25-a73d" name="Bolt pistol/Chainsword" hidden="false" collective="false" import="true" type="upgrade">
<selectionEntry id="fc95-b292-be25-a73d" name="Chainsword" hidden="false" collective="false" import="true" type="upgrade">
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b52-46b4-3359-1027" type="max"/>
</constraints>
<infoLinks>
<infoLink id="7915-c69a-439d-6e5b" name="Bolt pistol" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile"/>
<infoLink id="290b-aaba-4562-ec89" name="Astartes Chainsword" hidden="false" targetId="9155-5815-056b-9fd9" type="profile"/>
</infoLinks>
<costs>
Expand All @@ -6798,17 +6797,32 @@ This ability cannot be used with a Relic which replaces any of these weapons. </
</costs>
</selectionEntry>
</selectionEntries>
<selectionEntryGroups>
<selectionEntryGroup id="652e-ab22-3127-459c" name="Pistols" hidden="false" collective="false" import="true" defaultSelectionEntryId="5ec0-80c3-f1d6-b820">
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="66e1-adde-0c4d-64d9" type="max"/>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="96a6-abd7-2037-a6aa" type="min"/>
</constraints>
<selectionEntries>
<selectionEntry id="2272-7335-7669-74c6" name="Plasma Pistol" hidden="false" collective="false" import="true" type="upgrade">
<infoLinks>
<infoLink id="ce2c-a50f-b61a-f70c" name="Plasma pistol, Standard" hidden="false" targetId="ff12-161a-ca85-339f" type="profile"/>
<infoLink id="9fb1-bfff-b667-40a7" name="Plasma pistol, Supercharge" hidden="false" targetId="5779-2931-fe17-2b27" type="profile"/>
</infoLinks>
</selectionEntry>
</selectionEntries>
<entryLinks>
<entryLink id="5ec0-80c3-f1d6-b820" name="Bolt pistol" hidden="false" collective="false" import="true" targetId="de35-9da4-047c-a147" type="selectionEntry"/>
<entryLink id="7ced-c62d-c008-17e9" name="Grav-pistol" hidden="false" collective="false" import="true" targetId="7b66-cac7-e582-a518" type="selectionEntry"/>
</entryLinks>
</selectionEntryGroup>
</selectionEntryGroups>
<entryLinks>
<entryLink id="ae12-57c1-6915-a8c5" name="Melee Weapons" hidden="false" collective="false" import="true" targetId="ce40-8190-5033-a0c1" type="selectionEntryGroup">
<constraints>
<constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6836-0977-492b-0b1b" type="max"/>
</constraints>
</entryLink>
<entryLink id="f136-168f-f04e-6401" name="Pistols" hidden="false" collective="false" import="true" targetId="fb38-f29c-b8de-3ba6" type="selectionEntryGroup">
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d647-6d47-155b-2c80" type="max"/>
</constraints>
</entryLink>
<entryLink id="dcfc-46b0-baa1-2b41" name="Eviscerator" hidden="false" collective="false" import="true" targetId="b993-57b7-93c6-9acb" type="selectionEntry">
<modifiers>
<modifier type="decrement" field="91d3-a10a-ae14-b8c2" value="1">
Expand Down Expand Up @@ -6984,6 +6998,13 @@ This ability cannot be used with a Relic which replaces any of these weapons. </
</constraints>
</entryLink>
<entryLink id="54b4-e6cf-2e62-f039" name="Plasma pistol" hidden="false" collective="false" import="true" targetId="83be-1ba9-c326-4760" type="selectionEntry">
<modifiers>
<modifier type="increment" field="052c-67b9-e81b-bca4" value="1.0">
<conditions>
<condition field="selections" scope="7c16-1429-b6d5-e6f1" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c8f6-e9ec-3fdc-9126" type="equalTo"/>
</conditions>
</modifier>
</modifiers>
<constraints>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1c2-7e3a-f09f-f1c0" type="max"/>
<constraint field="selections" scope="7c16-1429-b6d5-e6f1" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="052c-67b9-e81b-bca4" type="max"/>
Expand Down Expand Up @@ -16248,9 +16269,6 @@ Weapon: Purgatorus</characteristic>
</conditions>
</modifier>
</modifiers>
<costs>
<cost name="pts" typeId="points" value="5.0"/>
</costs>
</entryLink>
</entryLinks>
</selectionEntryGroup>
Expand Down Expand Up @@ -32010,6 +32028,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</constraints>
</entryLink>
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="d492-3107-dcb1-27ae" name="2 Brutalis Talons" hidden="false" collective="false" import="true" type="upgrade">
<entryLinks>
Expand All @@ -32020,6 +32043,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</constraints>
</entryLink>
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
</selectionEntries>
</selectionEntryGroup>
Expand All @@ -32038,6 +32066,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</constraints>
</entryLink>
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="f71c-0d6e-7f30-ad65" name="2 Multi-melta" hidden="false" collective="false" import="true" type="upgrade">
<entryLinks>
Expand All @@ -32051,6 +32084,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</costs>
</entryLink>
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
</selectionEntries>
</selectionEntryGroup>
Expand All @@ -32067,6 +32105,7 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
<costs>
<cost name="pts" typeId="points" value="170.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="10.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="119d-d699-830f-1c6d" name="Brutalis Fist" hidden="false" collective="false" import="true" type="upgrade">
Expand All @@ -32082,6 +32121,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="6971-f780-cb78-090c" name="Brutalis Talon" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
Expand Down Expand Up @@ -32111,6 +32155,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="782f-931f-1303-e2c9" name="Desolation Squad" hidden="false" collective="false" import="true" type="unit">
<modifiers>
Expand Down Expand Up @@ -32186,6 +32235,8 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="35.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="f27d-2ff7-372e-3936" name="Desolation Sgt" hidden="false" collective="false" import="true" type="upgrade">
Expand Down Expand Up @@ -32218,6 +32269,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</constraints>
</entryLink>
</entryLinks>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
</selectionEntries>
<entryLinks>
Expand All @@ -32236,6 +32292,8 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</entryLinks>
<costs>
<cost name="pts" typeId="points" value="35.0"/>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
</costs>
</selectionEntry>
</selectionEntries>
Expand All @@ -32253,6 +32311,8 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</selectionEntryGroups>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="8.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="607a-e195-135e-e543" name="Superfrag Rocket Launcher" hidden="false" collective="false" import="true" type="upgrade">
Expand All @@ -32268,6 +32328,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="7066-49ea-e3e8-e013" name="Superkrak Rocket Launcher" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
Expand All @@ -32282,6 +32347,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="3cfc-5b00-024c-80bf" name="Castellan Launcher" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
Expand All @@ -32296,6 +32366,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="49b6-b08d-76f4-9c60" name="Vengor Launcher" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
Expand All @@ -32310,6 +32385,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
<selectionEntry id="6dde-3a97-4d4b-6306" name="Targeter Optics" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
Expand All @@ -32319,6 +32399,11 @@ This model also has a transport capacity of two &lt;CHAPTER&gt; VEHICLE models f
</characteristics>
</profile>
</profiles>
<costs>
<cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
<cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
<cost name="pts" typeId="points" value="0.0"/>
</costs>
</selectionEntry>
</sharedSelectionEntries>
<sharedSelectionEntryGroups>
Expand Down
2 changes: 2 additions & 0 deletions Imperium - Ultramarines.cat
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@
<categoryLink id="e6fe-a4ed-b0ce-4d61" name="New CategoryLink" hidden="false" targetId="4a50-11f0-9ab2-9c8a" primary="false"/>
<categoryLink id="8f94-3a4a-668b-38cd" name="Chapter Ancient" hidden="false" targetId="1b89-4aed-3b44-8d0c" primary="false"/>
<categoryLink id="20d0-12c9-b6e1-5c50" name="New CategoryLink" hidden="false" targetId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2" primary="true"/>
<categoryLink id="e409-b294-ce2f-0536" name="Elite Character" hidden="false" targetId="62d3-9871-9675-a63b" primary="false"/>
</categoryLinks>
<entryLinks>
<entryLink id="e26e-4d81-2414-29b7" name="Power sword" hidden="false" collective="false" import="true" targetId="bc9e-551d-9afb-78d5" type="selectionEntry">
Expand Down Expand Up @@ -494,6 +495,7 @@
<categoryLink id="c19a-7e65-8afd-b943" name="New CategoryLink" hidden="false" targetId="84e2-9fa9-ebe6-1d18" primary="false"/>
<categoryLink id="eeb9-b369-8107-2735" name="Chapter Champion" hidden="false" targetId="7610-ab25-5216-7450" primary="false"/>
<categoryLink id="7750-d093-4d32-95ed" name="New CategoryLink" hidden="false" targetId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2" primary="true"/>
<categoryLink id="dcbe-62cc-4b1c-a1d6" name="Elite Character" hidden="false" targetId="62d3-9871-9675-a63b" primary="false"/>
</categoryLinks>
<selectionEntryGroups>
<selectionEntryGroup id="4fe1-54f7-b060-68c2" name="Weapon 1" hidden="false" collective="false" import="true" defaultSelectionEntryId="cfa4-a6f8-27fd-f1ca">
Expand Down

0 comments on commit e4d266b

Please sign in to comment.