adding to fix #1478 #1479 #1480

src/factions/ogor_mawtribes/units.ts

@@ -29,10 +29,8 @@ const ThundertuskEffects = [
   {
     name: `Blasts of Frost-wreathed Ice`,
     desc: `Do not use the attack sequence for an attack made with Frost-wreathed Ice. Instead, pick 1 enemy unit within 18" of this model that is visible to it and roll the number of dice shown on the damage table on the warscroll.
-
       Add 1 to each roll if the target unit has 10 or more models.
       Add 2 to each roll instead if the target unit has 20 or more models.
-
       For each 6+, that enemy unit suffers 1 mortal wound.`,
     when: [SHOOTING_PHASE],
     shared: true,
@@ -312,13 +310,9 @@ const Units = {
       {
         name: `Been There, Done That`,
         desc: `After armies have been set up but before the first battle round begins, pick 1 ability to apply to this unit from the following list:
-
             Brawlers: You can reroll hit rolls of 1 for attacks made with melee weapons by this unit.
-
             Crack Shots: You can reroll hit rolls of 1 for attacks made with missile weapons by this unit.
-
             Striders: This unit can run and still charge later in the same turn.
-
             Stubborn: Do not take battleshock tests for this unit.`,
         when: [END_OF_SETUP],
       },
@@ -402,13 +396,9 @@ const Units = {
       {
         name: `Great Cauldron`,
         desc: `In your hero phase, you can say that this model will reach into its cauldron and feast on the contents. If you do so, roll a D6 and consult the table below.
-
             1: Bad Meat: This model suffers D3 mortal wounds.
-
             2: Troggoth Guts: You can heal D3 wounds allocated to this model. In addition, you can heal 1 wound allocated to each friendly Ogor unit wholly within 12" of this model.
-
             3-4: Spinemarrow: Pick a friendly Ogor unit wholly within 12" of this model. Add 1 to hit rolls for attacks made with melee weapons by that unit until the start of your next hero phase.
-
             5-6: Bonecrusher: Roll a D6 for each enemy unit within 6" of this model. On a 4+, that unit suffers D3 mortal wounds.`,
         when: [HERO_PHASE],
       },
@@ -447,7 +437,6 @@ const Units = {
       {
         name: `Hidden Trap`,
         desc: `At the start of the first hero phase, if this unit is in your army, you can pick 1 terrain feature or objective that is not wholly within enemy territory and say that it is trapped. If you do so, place 1 Bushwakka's Trap marker next to that terrain feature or objective.
-
           The first time a unit finishes a move within 1" of the trapped terrain feature or objective, roll a D6. On a 2+, that unit suffers D6 mortal wounds and the Bushwakka's Trap marker is removed.`,
         when: [TURN_ONE_START_OF_HERO_PHASE],
       },

src/factions/orruk_warclans/ironjawz/units.ts

@@ -12,6 +12,7 @@ import {
   SAVES_PHASE,
   START_OF_CHARGE_PHASE,
   START_OF_COMBAT_PHASE,
+  START_OF_HERO_PHASE,
 } from 'types/phases'
 import rule_sources from '../rule_sources'
 import spells from './spells'
@@ -148,7 +149,7 @@ const IronjawzUnits = {
       {
         name: `Drawn to the Waaagh!`,
         desc: `If this unit's champion issues the Rally command to this unit while this unit is wholly within 12" of a friendly Warchanter, you can return 1 slain model to this unit for each roll of a 4+ instead of a 6.`,
-        when: [BATTLESHOCK_PHASE],
+        when: [START_OF_HERO_PHASE],
       },
       {
         name: `Orruk-forged Shields!`,

src/factions/slaves_to_darkness/battle_traits.ts

@@ -82,48 +82,66 @@ const BattleTraits = {
       },
       {
         name: `Eye of the Gods: Spawndom`,
-        desc: `You can add 1 Slaves to Darkness Chaos Spawn to your army. Set up the new model within 1" of the hero then remove the hero as slain.
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        You can add 1 Slaves to Darkness Chaos Spawn to your army. Set up the new model within 1" of the hero then remove the hero as slain.
                If you don't add a spawn, the hero suffers D3 mortal wounds instead.`,
         when: [END_OF_COMBAT_PHASE],
       },
       {
         name: `Eye of the Gods: Slaughterer's Strength`,
-        desc: `Improve the selected melee weapon's rend characteristic by 1.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Improve the selected melee weapon's rend characteristic by 1.`,
         when: [COMBAT_PHASE],
       },
       {
         name: `Eye of the Gods: Murderous Mutation`,
-        desc: `Add 1 to the selected melee weapon's attacks characteristic.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Add 1 to the selected melee weapon's attacks characteristic.`,
         when: [COMBAT_PHASE],
       },
       {
         name: `Eye of the Gods: Iron Flesh`,
-        desc: `Add 1 to save rolls for attacks targeting this hero.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Add 1 to save rolls for attacks targeting this hero.`,
         when: [SAVES_PHASE],
       },
       {
         name: `Eye of the Gods: Flames of Chaos`,
-        desc: `Each time this hero is affected by a spell or endless spell you can roll a D6. On a 4+ ignore the effects on this hero.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Each time this hero is affected by a spell or endless spell you can roll a D6. On a 4+ ignore the effects on this hero.`,
         when: [HERO_PHASE],
       },
       {
         name: `Eye of the Gods: Snubbed by the Gods`,
-        desc: `This reward has no effect.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        This reward has no effect.`,
         when: [END_OF_COMBAT_PHASE],
       },
       {
         name: `Eye of the Gods: Unholy Resilience`,
-        desc: `Roll a D6 each time you allocate a wound or mortal wound to this hero. On a 5+ it is negated.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Roll a D6 each time you allocate a wound or mortal wound to this hero. On a 5+ it is negated.`,
         when: [WOUND_ALLOCATION_PHASE],
       },
       {
         name: `Eye of the Gods: Daemonic Legions`,
-        desc: `Summon 1 unit of the following to the battlefield based on the hero's Mark of Chaos: 10 Bloodletters, 10 Plaguebearers, 10 Daemonettes, 10 Pink Horrors or 6 Furies. The summoned unit must be set up wholly within 9" of a this model and more than 9" from any enemy units.`,
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        Summon 1 unit of the following to the battlefield based on the hero's Mark of Chaos: 10 Bloodletters, 10 Plaguebearers, 10 Daemonettes, 10 Pink Horrors or 6 Furies. The summoned unit must be set up wholly within 9" of a this model and more than 9" from any enemy units.`,
         when: [END_OF_COMBAT_PHASE],
       },
       {
         name: `Eye of the Gods: Dark Apotheosis`,
-        desc: `You can add 1 Slaves to Darkness Daemon Prince to your army. Set up the new model within 1" of the hero then remove the hero from play.
+        desc: `Note: See the Eye of the Gods - End of Combat Ability 
+
+        You can add 1 Slaves to Darkness Daemon Prince to your army. Set up the new model within 1" of the hero then remove the hero from play.
                The Daemon Prince has the same Mark of Chaos as the hero (select a new one if the hero was Undivided).
                The Daemon Prince keeps any command traits and artefacts owned by the hero.
                If the hero was a wizard this Daemon Prince is also a wizard making the same number of casting, dispelling, and unbinding rolls while also knowing the same spells as the hero.

src/generic_rules/endless_spells.ts

@@ -276,7 +276,7 @@ export const LauchonTheSoulseekerEffects = [
 export const SoulscreamBridgeEffects = [
   {
     name: `Summoning`,
-    desc: `Casting value of 6 and a range of 18". Set up the parts of the endless spell wholly within range of the caster.`,
+    desc: `Casting value of 6 and a range of 18". If successfully cast, set up the parts of the endless spell wholly within range of the caster.`,
     when: [HERO_PHASE],
     rule_sources: [meta_rule_sources.GHB_2021],
   },
@@ -288,12 +288,6 @@ export const SoulscreamBridgeEffects = [
     when: [START_OF_MOVEMENT_PHASE],
     rule_sources: [meta_rule_sources.GHB_2021],
   },
-  {
-    name: `Deathly Passage`,
-    desc: `A unit removed and set up again in this way cannot make a normal move or run in the charge phase.`,
-    when: [MOVEMENT_PHASE, CHARGE_PHASE],
-    rule_sources: [meta_rule_sources.GHB_2021],
-  },
 ]
 export const HorrorghastEffects = [
   {