Skip to content

Commit

Permalink
Merge pull request #3007 from BSData/4d6/aetheric-fix-redux
Browse files Browse the repository at this point in the history 
Merging to create release branch
  • Loading branch information
@The4D6
The4D6 authored Nov 15, 2023
2 parents a6a215a + 249c606 commit 095db79
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 30 deletions.
16 changes: 15 additions & 1 deletion 2022 - Daemons - Daemons of the Ruinstorm.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 library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="6" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue library="false" id="ac63-5340-2e9e-1eb6" name="2022 - Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="7" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<entryLinks>
<entryLink import="false" name="Daemons of the Ruinstorm" hidden="false" type="selectionEntry" id="e271-f450-1c28-5b7b" targetId="afca-3047-fb26-d097">
<constraints>
Expand Down Expand Up @@ -2011,6 +2011,20 @@ The End and the Death – When fighting in a Challenge, successful Invulnerable
<constraints>
<constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ee05-19f1-809e-d0a0"/>
</constraints>
<selectionEntryGroups>
<selectionEntryGroup name="Psychic Discipline" hidden="false" id="1e24-9782-7fd9-9fe2">
<constraints>
<constraint type="min" value="1" field="selections" scope="parent" shared="true" id="6a6e-f5da-92d7-93c0"/>
<constraint type="max" value="1" field="selections" scope="parent" shared="true" id="7b70-6b79-ac99-1650"/>
</constraints>
<entryLinks>
<entryLink import="true" name="Psychic Discipline: Biomancy" hidden="false" type="selectionEntry" id="5b55-33a3-ebc1-906d" targetId="861c-3744-c4ff-ef6c"/>
<entryLink import="true" name="Psychic Discipline: Pyromancy" hidden="false" type="selectionEntry" id="ed57-38da-c088-8da5" targetId="c73a-8c52-4780-71e1"/>
<entryLink import="true" name="Psychic Discipline: Telepathy" hidden="false" type="selectionEntry" id="3eb1-c56b-1469-1ff6" targetId="b751-a605-75e8-dd6f"/>
<entryLink import="true" name="Psychic Discipline: Diabolism" hidden="false" type="selectionEntry" id="8be8-8673-ba2d-29a5" targetId="7517-a238-aecb-60e9"/>
</entryLinks>
</selectionEntryGroup>
</selectionEntryGroups>
</selectionEntry>
<selectionEntry type="upgrade" import="true" name="Ætheric Flight" hidden="false" id="7647-8112-eaf7-fbea">
<profiles>
Expand Down
25 changes: 25 additions & 0 deletions 2022 - Horus Heresy.gst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10497,6 +10497,31 @@ Once all models in the unit have moved onto the battlefield, the Warp Rift marke
<cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="7517-a238-aecb-60e9" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
<profile id="c739-c662-d9f1-c146" name="A Dark and Terrible Power" hidden="false" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power">
<characteristics>
<characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assult Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
</characteristics>
</profile>
<profile id="4c31-2f32-2d30-fc5e" name="Hellfire" hidden="false" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon">
<characteristics>
<characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
<characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
<characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
<characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
</characteristics>
</profile>
</profiles>
<infoLinks>
<infoLink id="3380-3ab-8c69-61d8" name="Hammer of Wrath (X)" hidden="false" targetId="aec0-c3aa-1e4e-1779" type="rule"/>
<infoLink id="72e1-d6ce-337d-fbee" name="Rending (X)" hidden="false" targetId="0ac9-fab7-aef3-de1d" type="rule"/>
<infoLink id="1804-acb9-a81b-1cd1" name="Psychic Focus (?? Where is this?)" hidden="false" targetId="bff3-3548-b2b8-72f1" type="rule"/>
</infoLinks>
<costs>
<cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
</costs>
</selectionEntry>
</sharedSelectionEntries>
<sharedSelectionEntryGroups>
<selectionEntryGroup id="4a48-4935-246d-0c2e" name="Legion" hidden="false" collective="false" import="true">
Expand Down
4 changes: 2 additions & 2 deletions 2022 - LA - Word Bearers.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="1df7-bbbc-b70e-6a3f" name="LA - XVII: Word Bearers" revision="31" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
<catalogue id="1df7-bbbc-b70e-6a3f" name="LA - XVII: Word Bearers" revision="32" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
<categoryEntries>
<categoryEntry id="821c-0c83-5ed0-ff6b" name="Harbinger of Chaos Restriction" hidden="false">
<modifiers>
Expand Down Expand Up @@ -3969,7 +3969,7 @@ In addition, once per battle, one friendly unit composed entirely of models with
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5441-6776-963e-d456" type="min"/>
</constraints>
</entryLink>
<entryLink id="816c-e774-eae3-5cd8" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
<entryLink id="816c-e774-eae3-5cd8" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
<constraints>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a3b9-16bc-12b5-b645" type="max"/>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="77ae-9d37-22eb-568b" type="min"/>
Expand Down
29 changes: 2 additions & 27 deletions 2022 - Legiones Astartes.cat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3624,31 +3624,6 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
<cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="cc56-0599-fe21-9352" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" type="upgrade">
<profiles>
<profile id="b121-c216-00a4-2334" name="A Dark and Terrible Power" hidden="false" typeId="5405-b3c6-e8d0-4e77" typeName="Psychic Power">
<characteristics>
<characteristic name="Description" typeId="4c0f-7e2f-586c-9305">When a Charge is declared for a model with this power, or for a unit that includes a model with this power, the Controlling player may choose to make a Psychic check for the model before any dice are rolled to determine the Charge Distance of that Charge. If the Psychic check is successful then the model with this power gains the Hammer of Wrath (3) special rule and increases both their Strength and Toughness characteristics by +1 for the duration of that Assult Phase. If the Check is failed then the model suffers Perils of the Warp, and once that has been resolved gains +1 to both its Strength and Toughness Characteristics until the start of the controlling players next turn</characteristic>
</characteristics>
</profile>
<profile id="91cf-469e-cfb1-6961" name="Hellfire" hidden="false" typeId="cede-0217-1b10-2a34" typeName="Psychic Weapon">
<characteristics>
<characteristic name="Range" typeId="62ec-fbf5-5252-0d17">Template</characteristic>
<characteristic name="Strength" typeId="17ff-12e7-77d3-2fbe">7</characteristic>
<characteristic name="AP" typeId="f431-a7b9-d9d0-36c9">4</characteristic>
<characteristic name="Type" typeId="2159-62b6-4337-d516">Assault 1, Rending (6+), Deflagrate, Psychic Focus</characteristic>
</characteristics>
</profile>
</profiles>
<infoLinks>
<infoLink id="e16b-d1b5-84ce-cbbb" name="Hammer of Wrath (X)" hidden="false" targetId="aec0-c3aa-1e4e-1779" type="rule"/>
<infoLink id="9100-4393-e67f-ab61" name="Rending (X)" hidden="false" targetId="0ac9-fab7-aef3-de1d" type="rule"/>
<infoLink id="155a-1364-a726-a78e" name="Psychic Focus (?? Where is this?)" hidden="false" targetId="bff3-3548-b2b8-72f1" type="rule"/>
</infoLinks>
<costs>
<cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
</costs>
</selectionEntry>
<selectionEntry id="7d72-7f6d-6330-6871" name="Shrapnel Pistol" hidden="true" collective="false" import="true" type="upgrade">
<modifiers>
<modifier type="set" field="hidden" value="false">
Expand Down Expand Up @@ -54419,7 +54394,7 @@ Invulnerable saves granted by a combat shield or boarding shield do not stack wi
</rule>
</rules>
<entryLinks>
<entryLink id="50a6-a14c-19d1-2502" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
<entryLink id="50a6-a14c-19d1-2502" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
<constraints>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8054-2eff-b1ff-3870" type="min"/>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1326-4f89-ddbf-ce5e" type="max"/>
Expand Down Expand Up @@ -55968,7 +55943,7 @@ Legion Only: Paladin of Hekatonystika (Dark Angels), Phoenix Warden (Emperor&apo
</modifier>
</modifiers>
<entryLinks>
<entryLink id="dd82-61d5-165c-b8ce" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="cc56-0599-fe21-9352" type="selectionEntry">
<entryLink id="dd82-61d5-165c-b8ce" name="Psychic Discipline: Diabolism" hidden="false" collective="false" import="true" targetId="7517-a238-aecb-60e9" type="selectionEntry">
<constraints>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0e63-f0d1-ca74-cc1f" type="min"/>
<constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a780-cb6f-45f1-b563" type="max"/>
Expand Down

0 comments on commit 095db79

Please sign in to comment.