more fixes/qol requests

Author: jarena3

src/classes/Statblock.ts

@@ -303,7 +303,7 @@ class Statblock {
     } else return '>> NO MECH SELECTED <<'
   }
 
-  public static GenerateNPC(npc: Unit, includeNarrative: boolean): string {
+  public static GenerateNPC(npc: Unit, includeNarrative: boolean, includeFeatures = false): string {
     let output = `// ${npc.Name} //\n`
     if (npc.NpcTemplateController.Templates)
       output += `${npc.NpcTemplateController.Templates.map(t => t.Name).join(' ')}`
@@ -345,9 +345,9 @@ class Statblock {
       (item, index) => `${item.Name}${linebreak(index, npc.NpcFeatureController.Features.length)}`
     ).join('')
 
-    if (includeNarrative) {
-      output += this.generateNarrativeBlock(npc)
-    }
+    if (includeNarrative) output += this.generateNarrativeBlock(npc)
+
+    if (includeFeatures) output += this.getFeatures(npc, true)
 
     return output
   }
@@ -379,10 +379,16 @@ class Statblock {
       'SensorRange'
     )} | TECH_ATK: ${npc.StatController.getMax('Tech Attack')} | SIZE: ${npc.StatController.getMax('Size')} \n\n`
 
-    output += '[ FEATURES ]\n'
-    if (includeFeatures) {
+    output += this.getFeatures(npc, includeFeatures)
+
+    return output
+  }
+
+  private static getFeatures(npc: Unit, showFeatureDetails = false): string {
+    let output = '[ FEATURES ]\n'
+    if (showFeatureDetails) {
       output += npc.NpcFeatureController.Features.map(
-        (item, index) =>
+        item =>
           `${item.Name}\n  ${(item.Description || item.EffectByTier(npc.Tier) || '')?.replace(/<[^>]*>/gi, '') || ''}${item.Actions ? mapNpcActions(item.Actions, npc.Tier) : ''}${mapNpcWeaponStats(item as NpcWeapon, npc.Tier)}`
       ).join('\n')
     } else {
@@ -391,7 +397,6 @@ class Statblock {
         (item, index) => `${item.Name}${linebreak(index, npc.NpcFeatureController.Features.length)}`
       ).join('\n')
     }
-
     return output
   }
 

src/classes/components/feature/active_effects/ActiveEffectEvent.ts

@@ -11,6 +11,7 @@ import { StatusEvent } from './effect_events/statusEvent'
 import { OtherEvent } from './effect_events/otherEvent'
 import { SpecialEvent } from './effect_events/specialEvent'
 import { ActionSummary } from './EffectActionSummary'
+import { NpcWeapon } from '@/classes/npc/feature/NpcItem/NpcWeapon'
 
 class ActiveEffectEvent {
   public ID: string
@@ -62,20 +63,17 @@ class ActiveEffectEvent {
         initiator.actor.CombatController?.ActiveActor.CombatController?.TechAttackBonus || 0
     }
 
-    // For NPC actors, add the feature-level tier accuracy/attack_bonus (e.g. NpcTech arrays).
-    // NpcWeapon already bakes these into the ActiveEffectData via toActiveEffectData(), so the
-    // lookup will find no match and is a no-op for weapon attacks.
     const npcFeatures = initiator.actor.NpcFeatureController?.Features
     if (npcFeatures?.length) {
       const tier = initiator.actor.CombatController.Tier
       const matchingFeature = npcFeatures.find(
         (f: any) => f.ID === effect.ID || f.Actions?.some((a: any) => a.ID === effect.ID)
       )
       if (matchingFeature) {
-        if (typeof matchingFeature.Accuracy === 'function')
-          this.Accuracy += matchingFeature.Accuracy(tier) || 0
-        if (typeof matchingFeature.AttackBonus === 'function')
-          this.AttackBonus += matchingFeature.AttackBonus(tier) || 0
+        if (typeof (matchingFeature as NpcWeapon).Accuracy === 'function')
+          this.Accuracy += (matchingFeature as NpcWeapon).Accuracy(tier) || 0
+        if (typeof (matchingFeature as NpcWeapon).AttackBonus === 'function')
+          this.AttackBonus += (matchingFeature as NpcWeapon).AttackBonus(tier) || 0
       }
     }
 
@@ -172,6 +170,7 @@ class ActiveEffectEvent {
 
   // add a new target slot
   public AddTarget() {
+    console.log('Adding target slot')
     if (this.IsPcLocal)
       this._targets.push(new ActiveEventTarget(this, null as unknown as CombatantData, this.Effect))
     else this._targets.push(null as unknown as ActiveEventTarget)

src/classes/components/feature/active_effects/WeaponAttackEvent.ts

@@ -65,6 +65,14 @@ class WeaponAttackEvent {
       this.OnAttackEvent = new ActiveEffectEvent(owner, weapon.OnAttack, instance)
     if (weapon.OnHit) this.OnHitEvent = new ActiveEffectEvent(owner, weapon.OnHit, instance)
     if (weapon.OnCrit) this.OnCritEvent = new ActiveEffectEvent(owner, weapon.OnCrit, instance)
+
+    if ((weapon as NpcWeapon).getAttacks(owner.actor.CombatController.Tier) > 1) {
+      const attackCount = (weapon as NpcWeapon).getAttacks(owner.actor.CombatController.Tier) - 1
+      for (let i = 0; i < attackCount; i++) {
+        console.log('Adding additional attack event')
+        this.BaseEvent.AddTarget()
+      }
+    }
   }
 
   public get TargetEvents(): ActiveEffectEvent[] {

src/classes/components/feature/bonus/Bonus.ts

@@ -35,7 +35,6 @@ class Bonus {
   public readonly Condition: string | undefined
 
   public constructor(data: IBonusData, source: string) {
-    if (data.id === 'size') console.log(data)
     const entry = getBonusDictionary().find(x => x.id === data.id)
     this.ID = data.id || 'UNKNOWN_BONUS'
     this.Source = source

src/classes/narrative/elements/Clock.ts

@@ -58,6 +58,8 @@ class Clock {
       resolution: c.Resolution,
       segments: c.Segments,
       progress: c.Progress,
+      linear: c.Linear,
+      gm_only: c.GmOnly,
     }
   }
 

src/classes/npc/feature/NpcItem/NpcWeapon.ts

@@ -71,6 +71,12 @@ export class NpcWeapon extends NpcFeature {
     return this.WeaponType.toLowerCase().includes('superheavy')
   }
 
+  public getAttacks(tier: number): number {
+    if (!this.Attacks) return 1
+    if (!Array.isArray(this.Attacks)) return this.Attacks
+    return this.Attacks[tier - 1] || 1
+  }
+
   // public get IsLimited(): boolean {
   //   return this.Tags.some((x) => x.IsLimited);
   // }

src/composables/useExternalItemBonuses.ts

@@ -1,15 +1,18 @@
+import type { Bonus } from '@/classes/components'
 import { BonusController } from '@/classes/components/feature/bonus/BonusController'
+import type { CompendiumItem } from '@/classes/CompendiumItem'
+import type { IFeatureController } from '@/classes/components/feature/IFeatureController'
 
 export const ITEM_BONUS_IDS = BonusController.ITEM_BONUS_IDS
 
-export function externalItemBonuses(this: any): any[] {
-  return BonusController.filterForItem(this.mech, this.item)
+export function externalItemBonuses(mech: IFeatureController, item: CompendiumItem): Bonus[] {
+  return BonusController.filterForItem(mech, item)
 }
 
-export function externalPilotItemBonuses(this: any): any[] {
-  return BonusController.filterForItem(this.pilot, this.item)
+export function externalPilotItemBonuses(pilot: IFeatureController, item: CompendiumItem): Bonus[] {
+  return BonusController.filterForItem(pilot, item)
 }
 
-export function externalUnitItemBonuses(this: any): any[] {
-  return BonusController.filterForItem(this.unit, this.item)
+export function externalUnitItemBonuses(unit: IFeatureController, item: CompendiumItem): Bonus[] {
+  return BonusController.filterForItem(unit, item)
 }

src/features/active_mode/runner/gm/EncounterPanels/EidolonPanel.vue

@@ -141,7 +141,7 @@ import type { CombatantData } from '@/classes/encounter/Encounter';
 import UnitFeatureCard from './_components/loadouts/_unitFeatureCard.vue';
 import PanelBase from './_PanelBase.vue';
 import PersistentTraits from '@/classes/npc/eidolon/persistent_traits.json';
-import { EncounterInstance } from '@/classes/encounter/EncounterInstance.js';
+import { EncounterInstance } from '@/classes/encounter/EncounterInstance';
 
 const props = defineProps({
   combatant: {

src/features/active_mode/runner/gm/EncounterPanels/MechPanel.vue

@@ -230,7 +230,7 @@ import MechCorePanel from './_components/loadouts/MechCorePanel.vue';
 import MechActionsPanel from './_components/MechActionsPanel.vue';
 import DeployButton from './_components/loadouts/_deployButton.vue';
 import CombatActionsBlock from './_CombatActionsBlock.vue';
-import { Deployable } from '@/classes/components/feature/deployable/Deployable.js';
+import { Deployable } from '@/classes/components/feature/deployable/Deployable';
 
 const props = defineProps<{
   combatant: CombatantData

src/features/active_mode/runner/gm/EncounterPanels/_CombatActionsBlock.vue

@@ -21,9 +21,9 @@ import { useEncounterContext } from './encounterContext'
 import type { EncounterInstance } from '@/classes/encounter/EncounterInstance'
 import type { CombatantData } from '@/classes/encounter/Encounter'
 import DeployButton from './_components/loadouts/_deployButton.vue'
-import { Deployable } from '@/classes/components/feature/deployable/Deployable.js';
-import { FrameTrait } from '@/classes/mech/components/frame/FrameTrait.js';
-import { CoreBonus } from '@/classes/pilot/components/corebonus/CoreBonus.js';
+import { Deployable } from '@/classes/components/feature/deployable/Deployable';
+import { FrameTrait } from '@/classes/mech/components/frame/FrameTrait';
+import { CoreBonus } from '@/classes/pilot/components/corebonus/CoreBonus';
 
 const { encounterInstance } = useEncounterContext()