bugs to dev

Author: jarena3

src/classes/components/combat/CombatController.ts

@@ -460,18 +460,20 @@ class CombatController implements ICounterContainer, IStatContainer {
     value: number,
     ap: boolean = false,
     irreducible = false,
-    reliable = 0
+    reliable = 0,
+    direct = false
   ): { total: number; resist: string[]; condition: string[] } {
-    return this.DamageController.CalculateDamage(type, value, ap, irreducible, reliable)
+    return this.DamageController.CalculateDamage(type, value, ap, irreducible, reliable, direct)
   }
 
   public TakeDamage(
     type: DamageType,
     value: number,
     ap: boolean = false,
-    irreducible = false
+    irreducible = false,
+    direct = false
   ): void {
-    this.DamageController.TakeDamage(type, value, ap, irreducible)
+    this.DamageController.TakeDamage(type, value, ap, irreducible, direct)
   }
 
   public ApplyDamage(type: DamageType, value: number): void {

src/classes/components/combat/DamageController.ts

@@ -13,11 +13,16 @@ class DamageController {
     return this._parent.ActiveActor.CombatController
   }
 
+  private resolveTarget(direct: boolean): CombatController {
+    return direct ? this._parent : this._parent.ActiveActor.CombatController
+  }
+
   public CalculateArmorReduction(
     type: DamageType,
     value: number,
     ap: boolean,
-    irreducible: boolean
+    irreducible: boolean,
+    direct = false
   ): number {
     if (
       irreducible ||
@@ -27,15 +32,16 @@ class DamageController {
       type === DamageType.AppliedBurn
     )
       return 0
-    return this._parent.ActiveActor.StatController.getCurrent(StatKey.ARMOR) || 0
+    return this.resolveTarget(direct).StatController.getCurrent(StatKey.ARMOR) || 0
   }
 
   public CalculateDamage(
     type: DamageType,
     value: number,
     ap: boolean = false,
     irreducible = false,
-    reliable = 0
+    reliable = 0,
+    direct = false
   ): { total: number; resist: string[]; condition: string[] } {
     const out = { total: value, resist: [] as string[], condition: [] as string[] }
 
@@ -60,9 +66,14 @@ class DamageController {
 
     if (irreducible) return out
 
-    out.total = Math.max(0, out.total - this.CalculateArmorReduction(type, value, ap, irreducible))
+    out.total = Math.max(
+      0,
+      out.total - this.CalculateArmorReduction(type, value, ap, irreducible, direct)
+    )
 
-    const resist = this._active.Resistances.find(r => r.type === type.toLowerCase())
+    const resist = this.resolveTarget(direct).Resistances.find(
+      r => r.type === type.toLowerCase()
+    )
 
     if (resist) {
       if (resist.condition === 'vulnerable') {
@@ -88,30 +99,33 @@ class DamageController {
     type: DamageType,
     value: number,
     ap: boolean = false,
-    irreducible = false
+    irreducible = false,
+    direct = false
   ): void {
     if (this._parent.SaveLock) return
 
+    const target = this.resolveTarget(direct)
+
     if (
       type === DamageType.Heat.toLowerCase() &&
-      !this._parent.ActiveActor.StatController.getMax(StatKey.STRESS)
+      !target.StatController.getMax(StatKey.STRESS)
     ) {
       type = DamageType.Energy
     }
 
-    const damage = this.CalculateDamage(type, value, ap, irreducible)
+    const damage = this.CalculateDamage(type, value, ap, irreducible, 0, direct)
 
-    this.ApplyDamage(type, damage.total)
+    this.ApplyDamage(type, damage.total, direct)
 
     this._parent.CombatLog.TakeDamage(value, type)
     this._parent.CombatLog.ArmorReduced(
-      this.CalculateArmorReduction(type, value, ap, irreducible)
+      this.CalculateArmorReduction(type, value, ap, irreducible, direct)
     )
     if (this._parent.IsDestroyed) this._parent.CombatLog.LoseMech()
   }
 
-  public ApplyDamage(type: DamageType, value: number): void {
-    const target = this._active
+  public ApplyDamage(type: DamageType, value: number, direct = false): void {
+    const target = this.resolveTarget(direct)
 
     if (type.toLowerCase() === DamageType.Heat.toLowerCase()) {
       target.ApplyHeat(value)
@@ -139,9 +153,9 @@ class DamageController {
       }
     }
 
-    this._parent.ActiveActor.StatController.setCurrentStat(
+    target.StatController.setCurrentStat(
       StatKey.HP,
-      this._parent.ActiveActor.StatController.getCurrent(StatKey.HP) - value
+      target.StatController.getCurrent(StatKey.HP) - value
     )
     this._parent.log(`Took ${value} ${type} damage`)
     this._parent.CombatLog.StatChange(-value, 'hp')

src/classes/components/combat/ICombatant.ts

@@ -24,6 +24,7 @@ interface ICombatant {
   SaveController: SaveController
   FeatureController: FeatureController
   CombatController: CombatController
+  StatController: StatController
 
   SetStats(): void
 
@@ -40,7 +41,6 @@ interface ICombatant {
   ActiveLayerIndex?: number
   IsLinked?: boolean
   IsNameless?: boolean
-  StatController?: StatController
   ActiveMech?: Mech
   Mechs?: Mech[]
   ActiveLayer?: EidolonLayer

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

@@ -35,6 +35,7 @@ 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
@@ -74,7 +75,7 @@ class Bonus {
       return str
     }
 
-    if (this.Overwrite) str = str.replace(/{INC_DEC}/g, 'Sets').replace('by', 'to')
+    if (this.Overwrite) str = str.replace(/{BY_TO}/g, 'Sets').replace('by', 'to')
 
     const repNum = Array.isArray(this.Value)
       ? Number(this.Value[0])

src/classes/enums.ts

@@ -154,6 +154,7 @@ enum DamageType {
   Burn = 'Burn',
   AppliedBurn = 'Applied Burn', // for dealing burn damage without incrementing burn stack
   Variable = 'Variable',
+  AoE = 'AoE',
 }
 
 enum MechType {

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

@@ -137,21 +137,15 @@ import PanelBase from './_PanelBase.vue';
 import PilotActionsPanel from './_components/PilotActionsPanel.vue';
 import PilotCombatLoadout from './_components/loadouts/PilotCombatLoadout.vue';
 import DeployButton from './_components/loadouts/_deployButton.vue';
-import { EncounterInstance } from '@/classes/encounter/EncounterInstance.js';
+import type { EncounterInstance } from '@/classes/encounter/EncounterInstance';
 
-const props = defineProps({
-  combatant: {
-    type: Object,
-    required: true,
-  },
-  encounterInstance: {
-    type: EncounterInstance,
-    required: true,
-  },
-})
+const props = defineProps<{
+  combatant: CombatantData
+  encounterInstance: EncounterInstance
+}>()
 
 provide(EncounterContextKey, {
-  owner: computed(() => props.combatant as CombatantData),
+  owner: computed(() => props.combatant),
   encounterInstance: computed(() => props.encounterInstance),
 })