- Added Power Strike

- Added Kai Weapon bonuses

src/ts/controller/mechanics/combatMechanics.ts

@@ -1,4 +1,4 @@
-import { state, mechanicsEngine, Combat, template, SpecialObjectsUse, CombatTurn, GndDiscipline, translations, BookSeriesId, NewOrderDiscipline } from "../..";
+import { state, mechanicsEngine, Combat, template, SpecialObjectsUse, CombatTurn, GndDiscipline, translations, BookSeriesId, NewOrderDiscipline, BookSeries } from "../..";
 import striptags from 'striptags';
 
 /**
@@ -18,12 +18,15 @@ export class CombatMechanics {
     /** Selector for XXX surge checkbox */
     public static readonly SURGE_CHECK_SELECTOR = ".psisurgecheck input";
 
-    /** Selector for XXX surge checkbox */
+    /** Selector for XXX Blast checkbox */
     public static readonly BLAST_CHECK_SELECTOR = ".kaiblastcheck input";
 
-    /** Selector for XXX surge checkbox */
+    /** Selector for XXX Ray checkbox */
     public static readonly RAY_CHECK_SELECTOR = ".kairaycheck input";
 
+    /** Selector for XXX Power Strike checkbox */
+    public static readonly POWER_STRIKE_CHECK_SELECTOR = ".powerstrikecheck input";
+
     /**
      * Render section combats
      */
@@ -122,6 +125,7 @@ export class CombatMechanics {
             CombatMechanics.setupSurgeUI($combatUI, combat);
             CombatMechanics.setupBlastUI($combatUI, combat);
             CombatMechanics.setupRayUI($combatUI, combat);
+            CombatMechanics.setupPowerStrikeUI($combatUI, combat);
         });
     }
 
@@ -304,6 +308,8 @@ export class CombatMechanics {
 
             // Check if the XXX-surge should be disabled after this turn
             CombatMechanics.checkSurgeEnabled();
+            // Check if Power Strike checkbox should be locked in
+            CombatMechanics.disablePowerStrikeCheck();
 
             // For testing, add marker to notify to the test we are ready
             template.addSectionReadyMarker();
@@ -391,6 +397,50 @@ export class CombatMechanics {
         template.addSectionReadyMarker();
     }
 
+    /**
+     * Setup the Power Strike checkbox for a given combat
+     * @param $combatUI Combat UI main tag
+     * @param combat Related combat info
+     */
+    private static setupPowerStrikeUI($combatUI: JQuery<HTMLElement>, combat: Combat) {
+
+        // Check if player can use Power Strike
+        const hasPowerStrike = state.actionChart.hasNewOrderDiscipline(NewOrderDiscipline.MagiMagic);
+        if (state.book.getBookSeries().id !== BookSeriesId.NewOrder ||
+            !hasPowerStrike || state.actionChart.getDisciplines().length < 13 || combat.mentalOnly) {
+            // Hide Power Strike check
+            $combatUI.find(".powerstrikecheck").hide();
+            return;
+        }
+
+        const $powerStrikeCheck = $combatUI.find(CombatMechanics.POWER_STRIKE_CHECK_SELECTOR);
+        const currentSection = state.sectionStates.getSectionState();
+        $powerStrikeCheck.prop("disabled", currentSection.areCombatsStarted());
+        $powerStrikeCheck.prop("checked", combat.powerStrike);
+
+        // Power Strike selection
+        const powerStrikeText = translations.text("mechanics-combat-powerstrike" );
+        $combatUI.find(".mechanics-combat-powerstrike").text( powerStrikeText );
+        $powerStrikeCheck.on("click", (e: JQuery.Event) => CombatMechanics.onPowerStrikeClick(e, $powerStrikeCheck));
+    }
+
+    /**
+     * Power Strike checkbox event handler
+     */
+    private static onPowerStrikeClick(e: JQuery.Event, $powerStrikeCheck: JQuery<HTMLElement>) {
+        const $combatUI = $powerStrikeCheck.parents(".mechanics-combatUI").first();
+        const combatIndex = Number( $combatUI.attr( "data-combatIdx" ) );
+        const sectionState = state.sectionStates.getSectionState();
+        const combat = sectionState.combats[ combatIndex ];
+
+        const selected: boolean = $powerStrikeCheck.prop( "checked" ) ? true : false;
+        combat.powerStrike = selected;
+
+        CombatMechanics.updateCombatRatio( $combatUI , combat);
+
+        template.addSectionReadyMarker();
+    }
+
     /**
      * Setup the Kai-blast checkbox for a given combat
      * @param $combatUI Combat UI main tag
@@ -538,6 +588,20 @@ export class CombatMechanics {
         }
     }
 
+    /**
+     * Disable the Power Strike checkbox if combats have started
+     */
+    public static disablePowerStrikeCheck() {
+        const sectionState = state.sectionStates.getSectionState();
+        for ( let i = 0; i < sectionState.combats.length; i++ ) {
+            const $combatUI = $(`.mechanics-combatUI:eq(${i})`);
+            const $powerStrikeCheck = $combatUI.find(CombatMechanics.POWER_STRIKE_CHECK_SELECTOR);
+            const currentSection = state.sectionStates.getSectionState();
+            $powerStrikeCheck.prop("disabled", currentSection.areCombatsStarted());
+            $powerStrikeCheck.prop("checked", sectionState.combats[i].powerStrike);
+        }
+    }
+
     /**
      * Check if the XXX-Surge can be enabled on a given combat
      * @param $combatUI Combat UI main tag

src/ts/model/actionChart.ts

@@ -1004,7 +1004,6 @@ export class ActionChart {
                     increment: combat.getFinalSurgeBonus(MgnDiscipline.PsiSurge)
                 });
             }
-
         } else if (!combat.noMindblast) {
             if (((this.hasKaiDiscipline(KaiDiscipline.Mindblast) || this.hasMgnDiscipline(MgnDiscipline.PsiSurge) ||
                 this.hasGndDiscipline(GndDiscipline.KaiSurge)) && state.book.getBookSeries().id !== BookSeriesId.NewOrder)
@@ -1018,6 +1017,15 @@ export class ActionChart {
             }
         }
 
+        if (!combat.mentalOnly) {
+            if (combat.powerStrike) {
+                bonuses.push({
+                    concept: translations.text("powerstrike"),
+                    increment: +1
+                });
+            }
+        }
+
         // Other objects (not weapons). Ex. shield. They are not applied for bow combats
         if (!combat.mentalOnly && !combat.bowCombat && !combat.noObjectBonuses) {
             this.enumerateObjectsAsItems((o: Item) => {

src/ts/model/combat.ts

@@ -61,7 +61,7 @@ export class Combat {
 
     /** The state of the kai-ray usage (0: not used, 1: selected, 2: used) */
     public kaiRayUse = 0;
-
+    
     /** The CS multiplier to apply to Mindblast/Psi-Surge attacks. It can have decimals (ex. 0.5) */
     public mindblastMultiplier = 1;
 
@@ -143,6 +143,9 @@ export class Combat {
     /** Kai-blast is activated on this combat? */
     public kaiBlast = false;
 
+    /** Power Strike is activated on this combat? */
+    public powerStrike = false;
+
     /** Kai-blast rolls */
     public kaiBlastRolls = 2;
 

src/ts/views/viewsUtils/translations.ts

@@ -70,6 +70,7 @@ export class Translations {
         "mindblast" : "Mindblast",
         "psisurge" : "Psi-surge",
         "kaisurge" : "Kai-surge",
+        "powerstrike" : "Power Strike",
         "countAsObjects"  : "(Counts as {0} items)",
         "circleFire" : "Circle of Fire",
         "circleLight" : "Circle of Light",
@@ -105,6 +106,7 @@ export class Translations {
         "mechanics-combat-kaisurge" : "Kai-surge: +{0} CS, -{1} EP per round",
         "mechanics-combat-kaiblast" : "Kai-blast: -4EP, enemy loses a Random Number{0} of EP {1} times",
         "mechanics-combat-kairay" : "Kai-ray: -4EP, enemy loses {0}EP (one time per combat)",
+        "mechanics-combat-powerstrike" : "Power Strike: -3 EP (once), +1 CS, -1 EP to enemy per round",
         "sectionModifier" : "Section modifier",
         "objectsUse" : "Objects use",
         "enemyMindblast" : "Enemy mindblast",