Skip to content

Commit

Permalink
Misc cleanup
Browse files Browse the repository at this point in the history
Remove space in Pungari Thresher and Centurion profile modifiers. Set Battlegroup SEs to unit-group. Move Scourge Cloaking Crest modifier logic into Cloaking Crest SE. Shaltari link name fixes.
  • Loading branch information
Kemp-J committed Sep 6, 2024
1 parent 4e32595 commit ae9f242
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 120 deletions.
6 changes: 2 additions & 4 deletions Multi-faction.cat
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@
<characteristic name="Special" typeId="4717-adad-0be5-3c60">Launch, Rare, Reinforced Armour</characteristic>
</characteristics>
<modifiers>
<modifier type="append" value="/6+" field="41bf-5c81-5b4b-0aec">
<modifier type="append" value="/6+" field="41bf-5c81-5b4b-0aec" join="">
<conditions>
<condition type="instanceOf" value="1" field="selections" scope="primary-catalogue" childId="c240-e6a9-6a41-8643" shared="true" includeChildSelections="false" includeChildForces="false"/>
</conditions>
<comment>nospace</comment>
</modifier>
</modifiers>
</profile>
Expand Down Expand Up @@ -87,11 +86,10 @@
<characteristic name="Special" typeId="4717-adad-0be5-3c60">Ablative Armour</characteristic>
</characteristics>
<modifiers>
<modifier type="append" value=", Rare" field="0574-9897-4dc9-48e8">
<modifier type="append" value=", Rare" field="4717-adad-0be5-3c60" join="">
<conditions>
<condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
</conditions>
<comment>nospace</comment>
</modifier>
</modifiers>
</profile>
Expand Down
10 changes: 5 additions & 5 deletions Post-Human Republic.cat
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="aaea-90f5-3f4d-226e" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="aaea-90f5-3f4d-226e" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down Expand Up @@ -2377,7 +2377,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="90bf-ff54-7eea-9298" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="90bf-ff54-7eea-9298" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="902f-b6a6-0e54-e90f" name="Line Battlegroups" hidden="false" targetId="8407-32c8-5444-80af" primary="false"/>
<categoryLink id="4a3c-8789-8ace-91fc" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
Expand Down Expand Up @@ -2487,7 +2487,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="d8fe-4cfb-dd80-e5a6" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="d8fe-4cfb-dd80-e5a6" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="8527-e57b-2dd9-3853" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="91cb-2781-0f46-cb11" name="Pathfinder Battlegroups" hidden="false" targetId="b754-76e4-e1a6-8e7f" primary="false"/>
Expand Down Expand Up @@ -2583,7 +2583,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="8ad3-2e53-b8be-473f" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="8ad3-2e53-b8be-473f" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="79b9-bf2d-b15a-cf6d" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="0ea7-520f-312f-f1c8" name="Vanguard Battlegroups" hidden="false" targetId="973e-e4cf-bf42-e98f" primary="false"/>
Expand Down Expand Up @@ -2679,7 +2679,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="ee3d-39f3-5ebc-eef7" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="ee3d-39f3-5ebc-eef7" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down
10 changes: 5 additions & 5 deletions Resistance.cat
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<infoLink id="edcf-195e-5d46-5ef4" name="Warning" hidden="false" targetId="c67b-d702-0902-6de0" type="rule"/>
</infoLinks>
<sharedSelectionEntries>
<selectionEntry id="87a0-1c94-fbaa-504a" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="87a0-1c94-fbaa-504a" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down Expand Up @@ -75,7 +75,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="335e-0ae5-3510-48d3" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="335e-0ae5-3510-48d3" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down Expand Up @@ -164,7 +164,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="5148-adcc-05b6-a87f" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="5148-adcc-05b6-a87f" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="e5b8-0c40-68d0-df19" name="Line Battlegroups" hidden="false" targetId="8407-32c8-5444-80af" primary="false"/>
<categoryLink id="422e-9e84-d67e-b8c1" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
Expand Down Expand Up @@ -274,7 +274,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="72ac-a6ff-cb7e-c6a8" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="72ac-a6ff-cb7e-c6a8" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="4f3b-c545-ab5e-90e6" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="8fef-1d0e-2249-dd11" name="Pathfinder Battlegroups" hidden="false" targetId="b754-76e4-e1a6-8e7f" primary="false"/>
Expand Down Expand Up @@ -370,7 +370,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="4022-ae08-599a-9164" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="4022-ae08-599a-9164" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="8ceb-ee7f-ad9a-8c7f" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="d554-b997-0117-8f57" name="Vanguard Battlegroups" hidden="false" targetId="973e-e4cf-bf42-e98f" primary="false"/>
Expand Down
2 changes: 2 additions & 0 deletions Scourge - Weapons.cat
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,8 @@
<repeat value="1" repeats="1" field="selections" scope="parent" childId="model" shared="true" roundUp="false"/>
</repeats>
</modifier>
<modifier type="append" value="Stealth, Partial Cloak" field="4717-adad-0be5-3c60" affects="childs.recursive.model.profiles.Ship" scope="parent" join=", "/>
<modifier type="set" value="false" field="hidden" scope="parent" affects="childs.recursive.model.rules"/>
</modifiers>
<profiles>
<profile name="Cloaking Crest" typeId="6555-0acd-7514-65a9" typeName="Equipment" hidden="false" id="9192-466b-b976-5f2f">
Expand Down
91 changes: 11 additions & 80 deletions Scourge.cat
Original file line number Diff line number Diff line change
Expand Up @@ -974,13 +974,6 @@
<selectionEntry id="ccb8-1df2-12a8-e962" name="Incubus Destroyer" hidden="false" collective="false" import="true" type="model" publicationId="cb98-b8e2-3a32-a3d7" page="33">
<profiles>
<profile id="6cc4-ee31-b165-7c52" name="Incubus" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
<modifiers>
<modifier type="set" field="4717-adad-0be5-3c60" value="Stealth, Partial Cloak">
<conditions>
<condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f160-1a9d-ad3f-2780" type="equalTo"/>
</conditions>
</modifier>
</modifiers>
<characteristics>
<characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
<characteristic name="Sig" typeId="1402-313c-914d-f053">5&quot;</characteristic>
Expand Down Expand Up @@ -1008,36 +1001,13 @@
<entryLink import="true" name="Plasma Squall" hidden="false" id="2011-a3ca-4409-ce6c" type="selectionEntry" targetId="280b-b814-fff6-a723" sortIndex="3"/>
</entryLinks>
<infoLinks>
<infoLink name="Stealth" id="2844-6ece-1ce6-9e58" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Partial Cloak" id="3b21-b65a-d41d-54b9" hidden="true" targetId="1390-6580-87b5-33ff" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Stealth" id="2844-6ece-1ce6-9e58" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule"/>
<infoLink name="Partial Cloak" id="3b21-b65a-d41d-54b9" hidden="true" targetId="1390-6580-87b5-33ff" type="rule"/>
</infoLinks>
</selectionEntry>
<selectionEntry id="b742-5992-28c9-d81a" name="Succubus Destroyer" hidden="false" collective="false" import="true" type="model" publicationId="cb98-b8e2-3a32-a3d7" page="34">
<profiles>
<profile id="17b0-57d1-fae2-88c2" name="Succubus" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
<modifiers>
<modifier type="set" field="4717-adad-0be5-3c60" value="Stealth, Partial Cloak">
<conditions>
<condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f160-1a9d-ad3f-2780" type="equalTo"/>
</conditions>
</modifier>
</modifiers>
<characteristics>
<characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
<characteristic name="Sig" typeId="1402-313c-914d-f053">5&quot;</characteristic>
Expand All @@ -1064,36 +1034,13 @@
<entryLink import="true" name="Seekers" hidden="false" id="07b7-855c-5505-1798" type="selectionEntry" targetId="3ed3-c802-95b9-bd30" sortIndex="2"/>
</entryLinks>
<infoLinks>
<infoLink name="Stealth" id="bc05-30dd-d016-84bd" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Partial Cloak" id="22bf-810c-d94c-6255" hidden="true" targetId="1390-6580-87b5-33ff" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Stealth" id="bc05-30dd-d016-84bd" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule"/>
<infoLink name="Partial Cloak" id="22bf-810c-d94c-6255" hidden="true" targetId="1390-6580-87b5-33ff" type="rule"/>
</infoLinks>
</selectionEntry>
<selectionEntry id="c49c-ab83-c5c2-15a2" name="Revenant Destroyer" hidden="false" collective="false" import="true" type="model" publicationId="cb98-b8e2-3a32-a3d7" page="35">
<profiles>
<profile id="52a3-b5f5-9386-a3b8" name="Revenant" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
<modifiers>
<modifier type="set" field="4717-adad-0be5-3c60" value="Stealth, Partial Cloak">
<conditions>
<condition field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f160-1a9d-ad3f-2780" type="equalTo"/>
</conditions>
</modifier>
</modifiers>
<characteristics>
<characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
<characteristic name="Sig" typeId="1402-313c-914d-f053">5&quot;</characteristic>
Expand Down Expand Up @@ -1121,24 +1068,8 @@
<entryLink import="true" name="Fighters &amp; Bombers" hidden="false" id="b2c7-0308-bbdb-65f9" type="selectionEntry" targetId="0620-a3c0-df38-2e12" sortIndex="3"/>
</entryLinks>
<infoLinks>
<infoLink name="Stealth" id="6476-1729-b80c-9c5d" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Partial Cloak" id="b2f9-e9fd-0395-343c" hidden="true" targetId="1390-6580-87b5-33ff" type="rule">
<modifiers>
<modifier type="set" value="false" field="hidden">
<conditions>
<condition type="equalTo" value="1" field="selections" scope="parent" childId="f160-1a9d-ad3f-2780" shared="true"/>
</conditions>
</modifier>
</modifiers>
</infoLink>
<infoLink name="Stealth" id="6476-1729-b80c-9c5d" hidden="true" targetId="8670-fbd9-e48c-da59" type="rule"/>
<infoLink name="Partial Cloak" id="b2f9-e9fd-0395-343c" hidden="true" targetId="1390-6580-87b5-33ff" type="rule"/>
</infoLinks>
</selectionEntry>
<selectionEntry id="8f8e-f221-49df-af0d" name="Wraith Cutter" hidden="false" collective="false" import="true" type="model" publicationId="cb98-b8e2-3a32-a3d7" page="36">
Expand Down Expand Up @@ -2174,7 +2105,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="ba01-8bdf-2251-b138" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="ba01-8bdf-2251-b138" name="Flag Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down Expand Up @@ -2252,7 +2183,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="1373-9bea-e6ce-ed5f" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="1373-9bea-e6ce-ed5f" name="Line Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="3004-97de-3ba3-da32" name="Line Battlegroups" hidden="false" targetId="8407-32c8-5444-80af" primary="false"/>
<categoryLink id="27cb-ee41-f187-5487" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
Expand Down Expand Up @@ -2362,7 +2293,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="aa4c-86cf-be87-41a1" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="aa4c-86cf-be87-41a1" name="Pathfinder Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="4380-9ab2-100b-395e" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="f895-9627-5d33-c3ab" name="Pathfinder Battlegroups" hidden="false" targetId="b754-76e4-e1a6-8e7f" primary="false"/>
Expand Down Expand Up @@ -2458,7 +2389,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="ba61-df8a-0c03-49be" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="ba61-df8a-0c03-49be" name="Vanguard Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<categoryLinks>
<categoryLink id="5d55-e529-dd89-bbe3" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="true"/>
<categoryLink id="7074-23fa-66b6-d9d2" name="Vanguard Battlegroups" hidden="false" targetId="973e-e4cf-bf42-e98f" primary="false"/>
Expand Down Expand Up @@ -2554,7 +2485,7 @@
<cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="c6ce-9f9b-392e-9a19" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit">
<selectionEntry id="c6ce-9f9b-392e-9a19" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" type="unit" subType="unit-group">
<modifiers>
<modifier type="set" field="hidden" value="true">
<conditions>
Expand Down
Loading

0 comments on commit ae9f242

Please sign in to comment.