Merge remote-tracking branch 'origin/master'

Conflicts:
	Khador-_Forces_of_Warmachine(2010).cat
This commit is contained in:
Kenneth Fjelleng 2015-04-26 23:39:25 +02:00
commit 51f7f7419e

View file

@ -419,7 +419,7 @@
<entryGroups/>
<modifiers/>
<rules>
<rule id="e7635d66-6ecb-cb67-5ede-038a9b913bf7" name="No Sleepin on the Job [Privateer]" hidden="false">
<rule id="e7635d66-6ecb-cb67-5ede-038a9b913bf7" name="No Sleeping on the Job [Privateer]" hidden="false">
<description>This model and friendly Privateer models in its command range cannot be knocked down.</description>
<modifiers/>
</rule>
@ -8518,6 +8518,31 @@
</profiles>
<links/>
</entry>
<entry id="129d-b9a6-8cee-ec4a" name="Occultation" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="684e-2e24-63c0-cdf7" name="Occultation" hidden="false">
<description>Target friendly model/unit gains Stealth.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="b619-30a5-f72c-e749" profileTypeId="5370656c6c23232344415441232323" name="Occultation" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="YES"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
<entry id="1fc7-ae62-f8e2-3130" name="Onslaught" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine - Convergence of Cyriss" page="46">
<entries/>
<entryGroups/>
@ -8543,6 +8568,31 @@
</profiles>
<links/>
</entry>
<entry id="41c5-04d8-bdf8-7a00" name="Overrun" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="501a-86c0-97a9-8a76" name="Overrun" hidden="false">
<description>When target model in this model&apos;s battlegroup destroys one or more enemy models with an attack, immediately after the atack is resolved one model in this model&apos;s battlegroup that is in its control area can make a full advance, then Overrun expires. Overrun can be cast only once per turn and lasts for one turn.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="a220-a4b8-31cc-c882" profileTypeId="5370656c6c23232344415441232323" name="Overrun" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="NO"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
<entry id="83e4-ea2f-8867-43ba" name="Phantasm" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Mercenaries - Forces of Warmachine" page="100">
<entries/>
<entryGroups/>
@ -9041,6 +9091,31 @@
</profiles>
<links/>
</entry>
<entry id="cf65-4a10-da9a-9e60" name="Sentry" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="76de-30f6-7ab1-34aa" name="Sentry" hidden="false">
<description>When an enemy model advances and ends its movement in the LOS of a target friendly Faction model, the affected model can immediately make one normal ranged attack, then Sentry expires.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="88b7-6526-d5ad-19b1" profileTypeId="5370656c6c23232344415441232323" name="Sentry" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="YES"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
<entry id="9d93-ee32-39b3-77c5" name="Shatter Storm" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="54">
<entries/>
<entryGroups/>
@ -9938,81 +10013,6 @@
</profiles>
<links/>
</entry>
<entry id="129d-b9a6-8cee-ec4a" name="Occultation" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="684e-2e24-63c0-cdf7" name="Occultation" hidden="false">
<description>Target friendly model/unit gains Stealth.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="b619-30a5-f72c-e749" profileTypeId="5370656c6c23232344415441232323" name="Occultation" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="YES"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
<entry id="41c5-04d8-bdf8-7a00" name="Overrun" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="501a-86c0-97a9-8a76" name="Overrun" hidden="false">
<description>When target model in this model&apos;s battlegroup destroys one or more enemy models with an attack, immediately after the atack is resolved one model in this model&apos;s battlegroup that is in its control area can make a full advance, then Overrun expires. Overrun can be cast only once per turn and lasts for one turn.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="a220-a4b8-31cc-c882" profileTypeId="5370656c6c23232344415441232323" name="Overrun" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="NO"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
<entry id="cf65-4a10-da9a-9e60" name="Sentry" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forces of Warmachine: Khador" page="56">
<entries/>
<entryGroups/>
<modifiers/>
<rules>
<rule id="76de-30f6-7ab1-34aa" name="Sentry" hidden="false">
<description>When an enemy model advances and ends its movement in the LOS of a target friendly Faction model, the affected model can immediately make one normal ranged attack, then Sentry expires.</description>
<modifiers/>
</rule>
</rules>
<profiles>
<profile id="88b7-6526-d5ad-19b1" profileTypeId="5370656c6c23232344415441232323" name="Sentry" hidden="false">
<characteristics>
<characteristic characteristicId="434f535423232344415441232323" name="COST" value="2"/>
<characteristic characteristicId="524e4723232344415441232323" name="RNG" value="6"/>
<characteristic characteristicId="414f4523232344415441232323" name="AOE" value="-"/>
<characteristic characteristicId="504f5723232344415441232323" name="POW" value="-"/>
<characteristic characteristicId="555023232344415441232323" name="UP" value="YES"/>
<characteristic characteristicId="4f464623232344415441232323" name="OFF" value="NO"/>
</characteristics>
<modifiers/>
</profile>
</profiles>
<links/>
</entry>
</sharedEntries>
<sharedEntryGroups/>
<sharedRules>
@ -10707,6 +10707,10 @@ Damaging a colossal
<description>A model directly hit by this weapon cannot cast spells for one round.</description>
<modifiers/>
</rule>
<rule id="fa5c-3a32-1403-c4f0" name="Smoke" hidden="false" book="Forces of Warmachine: Khador" page="56">
<description>This weapon&apos;s AOE is a cloud effect that remains in play for one round.</description>
<modifiers/>
</rule>
<rule id="3300c3df-350e-9d5b-094a-ffae33419f0d" name="Sniper" hidden="false" book="Mercenaries - Forces of Warmachine" page="64">
<description>When damaging a warjack or warbeast with a ranged attack, choose which column or branch suffers damage. Instead of rolling damage on a ranged attack, this model can inflict 1 damage point. A model that participates in a combined ranged attack loses Sniper until the attack is resolved.</description>
<modifiers/>
@ -10727,6 +10731,10 @@ Damaging a colossal
<description>While its warcaster is in this model&apos;s command range, when the warcaster casts a spell and is the point of origin for the spell, the spell gains +2 RNG.</description>
<modifiers/>
</rule>
<rule id="5282-da44-29bd-0100" name="Sprint" hidden="false" book="Forces of Warmachine: Khador" page="56">
<description>At the end of this model&apos;s activation, if it destroyed one or more enemy models with melee attacks this activation it can make a full advance.</description>
<modifiers/>
</rule>
<rule id="c6bcf30f-c558-19a6-d099-8a6213aa189e" name="Stall" hidden="false" book="Mercenaries - Forces of Warmachine" page="43">
<description>A warjack hit by this attack suffers the Stall continuous effect. While a warjack is suffering Stall, its base DEF becomes 7 and it cannot run or charge.</description>
<modifiers/>
@ -10818,14 +10826,6 @@ Damaging a colossal
<description>If a model in this model&apos;s battlegroup in its control area is hit by an enemy magic attack, immediately after the attack is resolved one model in this model&apos;s battlegroup in its control area can make a full advance and make one normal attack.</description>
<modifiers/>
</rule>
<rule id="5282-da44-29bd-0100" name="Sprint" hidden="false" book="Forces of Warmachine: Khador" page="56">
<description>At the end of this model&apos;s activation, if it destroyed one or more enemy models with melee attacks this activation it can make a full advance.</description>
<modifiers/>
</rule>
<rule id="fa5c-3a32-1403-c4f0" name="Smoke" hidden="false" book="Forces of Warmachine: Khador" page="56">
<description>This weapon&apos;s AOE is a cloud effect that remains in play for one round.</description>
<modifiers/>
</rule>
</sharedRules>
<sharedProfiles/>
</catalogue>