@maka/maka-cli 5.134.0 → 5.135.0

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js

@@ -308,6 +308,8 @@ export class CombatExchange {
         if (lines.length > 0)
             this.logger.log(`\n${lines.join('\n')}`, fightScope);
         this.scene.updateStatus();
+        if (process.env.MAKA_NO_BEATS === '1')
+            return;
         await new Promise(resolve => setTimeout(resolve, CombatExchange.BEAT_MS));
     }
     /**
@@ -454,6 +456,94 @@ export class CombatExchange {
      * rebuild AI-history reports as [...world, ...meta] so an NPC's
      * memory of the fight keeps the dice.
      */
+    /**
+     * WHAT THE COMBAT TURN ADDS TO ONE STRIKE (RAG-checked 2026-09-06):
+     *   - TAKE AIM (p.166): +1 per aim on the shot it was for, capped at
+     *     half Willpower; consumed here whether or not it was for this
+     *     target (aiming at one person then shooting another wastes it).
+     *   - CHARGING (p.186): a running attacker closing into melee gets +4
+     *     -- net +2 with the -2 running penalty already in the pool.
+     *   - DEFENDER RUNNING (p.189 Defense Modifiers): +2 to defend
+     *     against a ranged attack.
+     *   - SURPRISE (p.192): a surprised defender gets no Defense Test at
+     *     all against someone who is not.
+     *   - FULL DEFENSE (p.191): +Willpower for the rest of the turn.
+     *   - DODGE / BLOCK / PARRY (p.168): -5 Initiative each, +Gymnastics /
+     *     +Unarmed / +weapon skill on this one test, by the defender's
+     *     standing policy (commands/defend.ts), and only when the score
+     *     can pay.
+     * Outside an encounter only the aim, charge and running lines apply --
+     * they are properties of the actors, not of the turn structure.
+     */
+    turnModifiers(attacker, defender, isMelee, strike, meta) {
+        let attack = 0;
+        let defense = 0;
+        if (attacker.aimBonus > 0 && !isMelee && !strike.isSpell) {
+            if (!attacker.aimTarget || attacker.aimTarget === defender.name) {
+                const aimed = Math.min(attacker.aimBonus, attacker.aimCap);
+                attack += aimed;
+                meta.push(`  Aimed: +${aimed} (Take Aim, p.166)`);
+            }
+            else {
+                meta.push(`  The aim on ${attacker.aimTarget} is wasted on ${defender.name}.`);
+            }
+            attacker.clearAim();
+        }
+        if (isMelee && !strike.isSpell && attacker.isRunningThisTurn) {
+            attack += 4;
+            meta.push(`  Charging: +4 (p.186; the -2 for running is already in the pool)`);
+        }
+        if (!isMelee && defender.isRunningThisTurn) {
+            defense += 2;
+            meta.push(`  ${defender.name} is running: +2 to defend (p.189)`);
+        }
+        const enc = this.scene.encounterFor?.(defender) ?? this.scene.encounterFor?.(attacker);
+        if (!enc)
+            return { attack, defense, noDefense: false };
+        if (enc.isSurprised(defender) && !enc.isSurprised(attacker)) {
+            meta.push(`  ${defender.name} is SURPRISED -- no Defense Test (p.192).`);
+            return { attack, defense, noDefense: true };
+        }
+        if (enc.fullDefenseActive(defender)) {
+            defense += defender.willpower;
+            meta.push(`  Full Defense: +${defender.willpower} Willpower (p.191)`);
+        }
+        const policy = defender.defensePolicy;
+        if (policy !== 'none' && (defender.plane === 'meat' || defender.plane === 'drone')) {
+            let skill = 0;
+            let label = '';
+            let source = '';
+            if (policy === 'dodge') {
+                skill = defender.skillRating('gymnastics');
+                label = 'Dodge';
+                source = 'Gymnastics';
+            }
+            else if (policy === 'block' && isMelee) {
+                skill = defender.skillRating('unarmed');
+                label = 'Block';
+                source = 'Unarmed Combat';
+            }
+            else if (policy === 'parry' && isMelee) {
+                const held = defender.weaponDrawn ? defender.getCarriedWeapon() : null;
+                if (held && !held.isFirearm()) {
+                    skill = defender.skillRating(defender.activeCombatSkill());
+                    label = 'Parry';
+                    source = 'weapon skill';
+                }
+            }
+            if (label && skill > 0) {
+                const refusal = enc.spendInterrupt(defender, 5, label);
+                if (refusal) {
+                    meta.push(`  ${label} not taken: ${refusal}`);
+                }
+                else {
+                    defense += skill;
+                    meta.push(`  ${label}: +${skill} (${source}, -5 Initiative, p.168)`);
+                }
+            }
+        }
+        return { attack, defense, noDefense: false };
+    }
     resolveStrike(attacker, defender, profile) {
         const strike = profile ?? this.weaponProfile(attacker, defender);
         const world = [];
@@ -564,10 +654,16 @@ export class CombatExchange {
         const attackLimit = strike.isSpell
             ? strike.limit
             : (strike.limit ?? attacker.getAttackLimit(strike.weaponItem));
-        const attack = rollPool(strike.pool + directed + rangeMod + attackerFloor + targetDown, attackLimit);
-        const defense = rollPool(defender.getDefensePool() + inspired + counterspell + coverDice + proneDefence);
         const header = `${attacker.name} attacks ${defender.name} ${strike.label}`;
         meta.push(`${header}:`);
+        // THE COMBAT TURN'S MODIFIERS (utilities/combat-turn.ts): Take Aim,
+        // charging, a running defender, surprise, Full Defense and the
+        // dodge/block/parry interrupts -- see turnModifiers below.
+        const turn = this.turnModifiers(attacker, defender, isMelee, strike, meta);
+        const attack = rollPool(strike.pool + directed + rangeMod + attackerFloor + targetDown + turn.attack, attackLimit);
+        const defense = turn.noDefense
+            ? rollPool(0)
+            : rollPool(defender.getDefensePool() + inspired + counterspell + coverDice + proneDefence + turn.defense);
         const rangeNote = weaponClass && spatial.meters > 0
             ? ` (${rangeMod !== 0 ? `${rangeMod} range` : `${rangeBracketName(spatial.meters, weaponClass)} range`} -- ~${Math.round(spatial.meters)} m)`
             : '';
@@ -908,7 +1004,7 @@ export class CombatExchange {
         if (this.scene.isHumanControlled(this.actor)) {
             return '';
         }
-        if (this.playerWitnesses()) {
+        if (this.playerWitnesses() && process.env.MAKA_NO_BEATS !== '1') {
             await new Promise(resolve => setTimeout(resolve, CombatExchange.NPC_FOLLOWUP_PAUSE_MS));
         }
         return report.join('\n');