warscript 0.0.1-dev.4363c65 → 0.0.1-dev.56d888d

package/engine/behaviour/ability/apply-buff.d.ts

@@ -1,11 +1,9 @@
 /** @noSelfInFile */
 import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
-import { Buff, BuffConstructor, BuffParameters, BuffTypeIdSelectionPolicy } from "../../buff";
+import { Buff, BuffConstructor, BuffParameters, BuffPolarityParameterType, BuffResistanceTypeParameterType, BuffTypeIdSelectionPolicy } from "../../buff";
 import { Unit } from "../../internal/unit";
 import { ApplicableBuffTypeId } from "../../object-data/entry/buff-type/applicable";
-import { BuffResistanceType } from "../../object-data/auxiliary/buff-resistance-type";
-import { BuffPolarity } from "../../object-data/auxiliary/buff-polarity";
 import { Widget } from "../../../core/types/widget";
 type BuffParametersType<T extends BuffConstructor> = BuffParameters & Omit<BuffAdditionalParametersType<T>, keyof BuffParameters>;
 type BuffAdditionalParametersType<T extends BuffConstructor> = T extends BuffConstructor<Buff<infer AdditionalParameters>> ? AdditionalParameters : never;
@@ -17,8 +15,8 @@ export declare abstract class ApplyBuffAbilityBehavior<T extends BuffConstructor
             typeIds: [ApplicableBuffTypeId, ...ApplicableBuffTypeId[]],
             typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
         ],
-        polarity: BuffPolarity,
-        resistanceType: BuffResistanceType,
+        polarity: BuffPolarityParameterType,
+        resistanceType: BuffResistanceTypeParameterType,
         parameters?: BuffParametersType<T>
     ]);
 }

package/engine/buff.d.ts

@@ -5,16 +5,19 @@ import { Ability } from "./internal/ability";
 import { AbilityTypeId } from "./object-data/entry/ability-type";
 import { BuffPolarity } from "./object-data/auxiliary/buff-polarity";
 import { BuffResistanceType } from "./object-data/auxiliary/buff-resistance-type";
-import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
+import { AbilityBooleanField, AbilityBooleanLevelField, AbilityCombatClassificationsLevelField, AbilityDependentValue, AbilityEnumLevelField, AbilityIntegerField, AbilityIntegerLevelField, AbilityNumberField, AbilityNumberLevelField } from "./object-field/ability";
 import { CombatClassifications } from "./object-data/auxiliary/combat-classification";
-import { IsExactlyAny, NonEmptyArray, Prohibit } from "../utility/types";
+import { IsExactlyAny, Prohibit, ReadonlyNonEmptyArray } from "../utility/types";
 import { UnitBehavior } from "./behaviour/unit";
 import type { Widget } from "../core/types/widget";
 import { Destructor } from "../destroyable";
 export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
+type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
 type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
 type IntegerParameterValueType = number | AbilityIntegerField | AbilityIntegerLevelField;
 type BooleanParameterValueType = boolean | AbilityBooleanField | AbilityBooleanLevelField;
+export type BuffPolarityParameterType = EnumParameterValueType<BuffPolarity>;
+export type BuffResistanceTypeParameterType = EnumParameterValueType<BuffResistanceType>;
 export declare class BuffUniqueGroup {
 }
 export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
@@ -51,6 +54,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     armorIncreaseFactor?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
+    damageFactor?: NumberParameterValueType;
     receivedDamageFactor?: NumberParameterValueType;
     receivedMagicDamageFactor?: NumberParameterValueType;
     durationIncreaseOnAutoAttack?: NumberParameterValueType;
@@ -120,11 +124,11 @@ export declare const enum BuffTypeIdSelectionPolicy {
 export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
 export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
     ...typeId: [ApplicableBuffTypeId] | [
-        typeIds: NonEmptyArray<ApplicableBuffTypeId>,
+        typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
         typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
     ],
-    polarity: BuffPolarity,
-    resistanceType: BuffResistanceType,
+    polarity: BuffPolarityParameterType,
+    resistanceType: BuffResistanceTypeParameterType,
     ...abilityOrParameters: [
         ability: Ability,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
@@ -213,6 +217,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set damageOnExpiration(damageOnExpiration: number);
     get healingOnExpiration(): number;
     set healingOnExpiration(healingOnExpiration: number);
+    get damageFactor(): number;
+    set damageFactor(damageFactor: number);
     get receivedDamageFactor(): number;
     set receivedDamageFactor(receivedDamageFactor: number);
     get armorIncrease(): number;

package/engine/buff.lua

@@ -94,6 +94,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
@@ -176,6 +177,7 @@ local buffNumberParameters = {
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
     "armorIncrease",
+    "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
     "maximumDamageDealtEventCount",
@@ -668,7 +670,7 @@ function Buff.prototype.onDamageDealt(self, target, event)
             self:destroy()
         end
     end
-    if event.amount ~= 0 then
+    if event.originalAmount ~= 0 then
         local damageDealtEventCount = (self[130] or 0) + 1
         self[130] = damageDealtEventCount
         if damageDealtEventCount == self[131] then
@@ -677,7 +679,7 @@ function Buff.prototype.onDamageDealt(self, target, event)
     end
 end
 function Buff.prototype.onDamageReceived(self, source, event)
-    if event.amount ~= 0 then
+    if event.originalAmount ~= 0 then
         local damageReceivedEventCount = (self[132] or 0) + 1
         self[132] = damageReceivedEventCount
         if damageReceivedEventCount == self[133] then
@@ -888,6 +890,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.DAMAGE_FACTOR)
+        end,
+        set = function(self, damageFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.DAMAGE_FACTOR, damageFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "receivedDamageFactor",

package/engine/internal/unit/bonus.d.ts

@@ -8,7 +8,8 @@ export type UnitBonusId<Brand extends string = any> = number & {
 export type UnitArmorBonusId = UnitBonusId<"armor">;
 export type UnitAttackSpeedFactorBonusId = UnitBonusId<"attackSpeedFactor">;
 export type UnitMovementSpeedFactorBonusId = UnitBonusId<"movementSpeedFactor">;
-export type UnitDamageBonusId = UnitBonusId<"damage">;
+export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
+export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
 export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
@@ -30,7 +31,8 @@ export declare namespace UnitBonusType {
     const ARMOR: UnitBonusType<UnitArmorBonusId>;
     const ATTACK_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
     const MOVEMENT_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
-    const DAMAGE: UnitBonusType<UnitDamageBonusId>;
+    const AUTO_ATTACK_DAMAGE: UnitBonusType<UnitAutoAttackDamageBonusId>;
+    const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
 }
 export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;

package/engine/internal/unit/bonus.lua

@@ -21,6 +21,7 @@ local AUTO_ATTACK_DAMAGE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____auto_2Dattack_2Dda
 local ____movement_2Dspeed_2Dincrease_2Dfactor = require("engine.internal.object-data.movement-speed-increase-factor")
 local MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_ABILITY_FIELD
 local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspeed_2Dincrease_2Dfactor.MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
+local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 ____exports.UnitBonusType = {}
 local UnitBonusType = ____exports.UnitBonusType
@@ -46,13 +47,14 @@ do
         reduce = sum,
         initialValue = 0
     }
-    UnitBonusType.DAMAGE = {
+    UnitBonusType.AUTO_ATTACK_DAMAGE = {
         abilityTypeId = AUTO_ATTACK_DAMAGE_INCREASE_DUMMY_ABILITY_TYPE_ID,
         field = AUTO_ATTACK_DAMAGE_INCREASE_ABILITY_FIELD,
         integer = false,
         reduce = sum,
         initialValue = 0
     }
+    UnitBonusType.DAMAGE_FACTOR = {reduce = product, valueByUnit = damageFactorByUnit, initialValue = 1}
     UnitBonusType.RECEIVED_DAMAGE_FACTOR = {reduce = product, valueByUnit = receivedDamageFactorByUnit, initialValue = 1}
 end
 local bonusesByUnitByBonusType = {}
@@ -180,6 +182,9 @@ end
 Unit.onDamage:addListener(
     4,
     function(source, target, event)
+        if source ~= nil and damageFactorByUnit[source] ~= nil then
+            event.amount = event.amount * damageFactorByUnit[source]
+        end
         if receivedDamageFactorByUnit[target] ~= nil then
             event.amount = event.amount * receivedDamageFactorByUnit[target]
         end

package/engine/internal/unit.d.ts

@@ -42,6 +42,7 @@ export interface DamagingEvent {
     damageType: jdamagetype;
     weaponType: jweapontype;
     readonly isAttack: boolean;
+    readonly originalAmount: number;
 }
 export type DamageEvent = DamagingEvent & {
     preventDeath<P extends any[]>(this: DamageEvent, callback: (this: void, ...parameters: P) => any, ...parameters: P): void;

package/engine/internal/unit.lua

@@ -2452,6 +2452,7 @@ Unit.onDamage = __TS__New(
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
                     isAttack = BlzGetEventIsAttack(),
+                    originalAmount = GetEventDamage(),
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.4363c65",
+    "version": "0.0.1-dev.56d888d",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",