@maka/maka-cli 5.152.0 → 5.153.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.152.0",
+  "version": "5.153.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

package/bundle/typescript/src/commands/game/sideQuest/commands/attack.js

@@ -211,12 +211,15 @@ export class AttackCommand extends Command {
         }
         // A deliberately INITIATED attack with a dry gun is blocked with a
         // reload prompt -- the involuntary strikes (retaliation) auto-fall-back
-        // to fists instead (see CombatExchange.weaponProfile).
+        // to fists instead (see CombatExchange.weaponProfile). Only a DRAWN
+        // gun is actually "in play" for this swing (2jbprbSYqF7EPXrkR) -- a
+        // holstered dry/jammed piece is not what's being attacked with, so it
+        // must not block a bare-fisted attack the player never asked to fail.
         const weaponItem = this.actor.equipment.rightHand?.weapon ?? this.actor.equipment.leftHand?.weapon;
-        if (this.usesEquippedWeapon() && weaponItem?.isFirearm() && weaponItem.jammed) {
+        if (this.usesEquippedWeapon() && this.actor.weaponDrawn && weaponItem?.isFirearm() && weaponItem.jammed) {
             return `The ${weaponItem.name}'s smartlink is LOCKED -- someone cracked your PAN. "reboot" to clear it, or go in swinging.`;
         }
-        if (this.usesEquippedWeapon() && weaponItem?.isFirearm() && weaponItem.ammo <= 0) {
+        if (this.usesEquippedWeapon() && this.actor.weaponDrawn && weaponItem?.isFirearm() && weaponItem.ammo <= 0) {
             return `Click -- the ${weaponItem.name} is dry. "reload" (needs ammunition), or go in swinging with something else.`;
         }
         // THE COMBAT TURN (utilities/combat-turn.ts): on the physical planes
@@ -360,11 +363,15 @@ export class AttackCommand extends Command {
             return notYourPhase(enc, actor);
         }
         enc.noteAttack(actor, target);
-        // READY WEAPON (p.165) is an action, not a beat.
-        if (this.usesEquippedWeapon() && weaponItem && !actor.weaponDrawn) {
-            return `The ${weaponItem.name} is holstered -- "draw" it first (Ready Weapon, a Simple Action, SR5 p.165).${phaseHint(this.scene, actor)}`;
-        }
-        const isMelee = !this.usesEquippedWeapon() || !weaponItem?.isFirearm();
+        // A holstered weapon doesn't back this attack -- SR5 always allows a
+        // bare-handed strike, and weaponProfile() already resolves the punch's
+        // own pool/damage the moment the weapon isn't drawn (the character
+        // sheet advertises it: "Attack ... (bare fists) -- holstered"). Only a
+        // DRAWN weapon is what this swing is actually attacking WITH; want to
+        // shoot or swing the blade instead? READY WEAPON (p.165) is its own
+        // Simple Action -- "draw" first (2jbprbSYqF7EPXrkR).
+        const activeWeapon = this.usesEquippedWeapon() && actor.weaponDrawn ? weaponItem : undefined;
+        const isMelee = !activeWeapon || !activeWeapon.isFirearm();
         const report = [];
         // MELEE REACH: ground costs (p.161-162).
         if (isMelee) {

package/bundle/typescript/src/commands/game/sideQuest/models/scene.js

@@ -592,10 +592,21 @@ export class Scene extends AbstractScene {
         this.logger.write(`Removed actor: ${name}`);
         // A fallen participant's Action Phase, if it was live, moves on;
         // the encounter itself re-checks who is still standing on its next
-        // step (utilities/combat-turn.ts run).
+        // step (utilities/combat-turn.ts run). But run()'s own stillHostile()
+        // check only fires from ITS OWN loop, which never runs again while a
+        // human's Action Phase stays open (they can still move/loot before
+        // "end turn") -- so killing the last hostile mid-phase left the fight
+        // "still going" until the human explicitly ended their turn
+        // (5aqFRn2xPtRYDvNxR). Mirrors leave()'s own direct stillHostile()
+        // check for the same "nobody left to fight" shape.
         const enc = room ? this.encounterIn(room) : undefined;
-        if (enc && enc.phaseActor === actor) {
-            void enc.dropPhaseActor(actor);
+        if (enc && !enc.ended) {
+            if (enc.phaseActor === actor) {
+                void enc.dropPhaseActor(actor);
+            }
+            else if (!enc.stillHostile()) {
+                void enc.end('over');
+            }
         }
         // Tell the Game an actor left the world -- the companion roster
         // (Game.onActorRemoved) prunes shells and settles their bound

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

@@ -956,6 +956,15 @@ export class CombatExchange {
             // icon must drop to ☹ the moment they go down, not on the
             // player's next step.
             this.scene.updateExits(room);
+            // Same "combat sat there until 'end turn'" gap as removeActor
+            // below (5aqFRn2xPtRYDvNxR): a KO'd-not-killed last hostile also
+            // stops being present() (isIncapacitated), but nothing re-runs
+            // run()'s own stillHostile() check while the killer's own Action
+            // Phase stays open. End it directly, the same way leave() does.
+            const koEnc = this.scene.encounterFor?.(fallen);
+            if (koEnc && !koEnc.ended && koEnc.phaseActor !== fallen && !koEnc.stillHostile()) {
+                void koEnc.end('over');
+            }
             return ['', ...lines];
         }
         // A BODY ALWAYS FORMS (except for companion shells, which leave

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.152.0",
+  "version": "5.153.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",