warscript 0.0.1-dev.f40f923 → 0.0.1-dev.f4350ae

package/engine/object-field.lua

@@ -20,6 +20,11 @@ local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLe
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
 local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local ____linked_2Dset = require("utility.linked-set")
+local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
 local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
 local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
 local objectFieldById = {}
@@ -75,7 +80,7 @@ ____exports.ObjectField = __TS__Class()
 local ObjectField = ____exports.ObjectField
 ObjectField.name = "ObjectField"
 __TS__ClassExtends(ObjectField, ObjectFieldBase)
-function ObjectField.prototype.getValue(self, entry)
+function ObjectField.prototype.getValue(self, entry, includeModifiers)
     if __TS__InstanceOf(entry, ObjectDataEntry) then
         local defaultValueByObjectDataEntryId = (warpack.compiletime and compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId or defaultValueByObjectDataEntryIdByObjectFieldId)[self.id]
         if defaultValueByObjectDataEntryId ~= nil then
@@ -86,22 +91,16 @@ function ObjectField.prototype.getValue(self, entry)
         end
         return self.defaultValue
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_entry_0 = self.valueByInstance[entry]
-            if ____self_valueByInstance_entry_0 == nil then
-                ____self_valueByInstance_entry_0 = defaultValue
+    if includeModifiers == false then
+        local originalValueByInstance = self.originalValueByInstance
+        if originalValueByInstance ~= nil then
+            local originalValue = originalValueByInstance[entry]
+            if originalValue ~= nil then
+                return originalValue
             end
-            return ____self_valueByInstance_entry_0
         end
     end
-    local ____temp_1 = self:getNativeFieldValue(entry)
-    if ____temp_1 == nil then
-        ____temp_1 = self.defaultValue
-    end
-    return ____temp_1
+    return self:getActualValue(entry)
 end
 function ObjectField.prototype.setValue(self, entry, value)
     if __TS__InstanceOf(entry, ObjectDataEntry) then
@@ -116,37 +115,53 @@ function ObjectField.prototype.setValue(self, entry, value)
         defaultValueByObjectDataEntryId[entry.id] = value
         return true
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_entry_2 = self.valueByInstance[entry]
-            if ____self_valueByInstance_entry_2 == nil then
-                ____self_valueByInstance_entry_2 = defaultValue
-            end
-            local ____self_valueByInstance_entry_2_3 = ____self_valueByInstance_entry_2
-            if ____self_valueByInstance_entry_2_3 == nil then
-                ____self_valueByInstance_entry_2_3 = self.defaultValue
-            end
-            local previousValue = ____self_valueByInstance_entry_2_3
-            if value ~= previousValue then
-                self.valueByInstance[entry] = value
-                self:invokeValueChangeEvent(entry, self, previousValue, value)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[entry]
+        if modifiers ~= nil and modifiers.size ~= 0 then
+            local originalValueByInstance = self.originalValueByInstance
+            if originalValueByInstance == nil then
+                originalValueByInstance = mutableWeakLuaMap()
+                self.originalValueByInstance = originalValueByInstance
             end
-            return true
+            originalValueByInstance[entry] = value
+            value = self:calculateActualValue(entry)
         end
     end
-    if not self:hasNativeFieldValue(entry) then
-        return false
+    return self:setActualValue(entry, value)
+end
+function ObjectField.prototype.applyModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance == nil then
+        modifiersByInstance = mutableWeakLuaMap()
+        self.modifiersByInstance = modifiersByInstance
+    end
+    if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
+        local originalValueByInstance = self.originalValueByInstance
+        if originalValueByInstance == nil then
+            originalValueByInstance = mutableWeakLuaMap()
+            self.originalValueByInstance = originalValueByInstance
+        end
+        originalValueByInstance[instance] = self:getActualValue(instance)
+        self:setActualValue(
+            instance,
+            self:calculateActualValue(instance)
+        )
     end
-    local previousValue = self:getNativeFieldValue(entry)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(entry, value) then
-            return false
+end
+function ObjectField.prototype.removeModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[instance]
+        if modifiers ~= nil and modifiers:remove(modifier) then
+            self:setActualValue(
+                instance,
+                self:calculateActualValue(instance)
+            )
+            return true
         end
-        self:invokeValueChangeEvent(entry, self, previousValue, value)
     end
-    return true
+    return false
 end
 function ObjectField.prototype.removeValue(self, entry)
     if not warpack.compiletime then
@@ -168,6 +183,73 @@ function ObjectField.prototype.trySetValue(self, entry, value)
     end
     return self:setValue(entry, value)
 end
+function ObjectField.prototype.getActualValue(self, instance)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil then
+        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil then
+            local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_0 == nil then
+                ____self_valueByInstance_instance_0 = defaultValue
+            end
+            return ____self_valueByInstance_instance_0
+        end
+    end
+    local ____temp_1 = self:getNativeFieldValue(instance)
+    if ____temp_1 == nil then
+        ____temp_1 = self.defaultValue
+    end
+    return ____temp_1
+end
+function ObjectField.prototype.setActualValue(self, instance, value)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil then
+        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil then
+            local ____self_valueByInstance_instance_2 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_2 == nil then
+                ____self_valueByInstance_instance_2 = defaultValue
+            end
+            local ____self_valueByInstance_instance_2_3 = ____self_valueByInstance_instance_2
+            if ____self_valueByInstance_instance_2_3 == nil then
+                ____self_valueByInstance_instance_2_3 = self.defaultValue
+            end
+            local previousValue = ____self_valueByInstance_instance_2_3
+            if value ~= previousValue then
+                self.valueByInstance[instance] = value
+                self:invokeValueChangeEvent(instance, self, previousValue, value)
+            end
+            return true
+        end
+    end
+    if not self:hasNativeFieldValue(instance) then
+        return false
+    end
+    local previousValue = self:getNativeFieldValue(instance)
+    if value ~= previousValue then
+        if not self:setNativeFieldValue(instance, value) then
+            return false
+        end
+        self:invokeValueChangeEvent(instance, self, previousValue, value)
+    end
+    return true
+end
+function ObjectField.prototype.calculateActualValue(self, instance)
+    local ____opt_4 = self.originalValueByInstance
+    local originalValue = ____opt_4 and ____opt_4[instance]
+    local ____opt_6 = self.modifiersByInstance
+    local modifiers = ____opt_6 and ____opt_6[instance]
+    if originalValue ~= nil then
+        local value = originalValue
+        if modifiers ~= nil then
+            for modifier in pairs(modifiers) do
+                value = modifier(instance, value, originalValue)
+            end
+        end
+        return value
+    end
+    return self.defaultValue
+end
 function ObjectField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(self),
@@ -221,17 +303,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_5
+                local ____temp_9
                 if index == nil then
-                    ____temp_5 = value
+                    ____temp_9 = value
                 else
-                    local ____value_index_4 = value[index + 1]
-                    if ____value_index_4 == nil then
-                        ____value_index_4 = self.defaultValue
+                    local ____value_index_8 = value[index + 1]
+                    if ____value_index_8 == nil then
+                        ____value_index_8 = self.defaultValue
                     end
-                    ____temp_5 = ____value_index_4
+                    ____temp_9 = ____value_index_8
                 end
-                return ____temp_5
+                return ____temp_9
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -241,17 +323,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
         if defaultValue ~= nil then
             local value = self.valueByInstance[entry] or defaultValue
-            local ____temp_7
+            local ____temp_11
             if index == nil then
-                ____temp_7 = value
+                ____temp_11 = value
             else
-                local ____value_index_6 = value[index + 1]
-                if ____value_index_6 == nil then
-                    ____value_index_6 = self.defaultValue
+                local ____value_index_10 = value[index + 1]
+                if ____value_index_10 == nil then
+                    ____value_index_10 = self.defaultValue
                 end
-                ____temp_7 = ____value_index_6
+                ____temp_11 = ____value_index_10
             end
-            return ____temp_7
+            return ____temp_11
         end
     end
     if index ~= nil then
@@ -296,11 +378,11 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_8 = valueByLevel[level + 1]
-                if ____valueByLevel_index_8 == nil then
-                    ____valueByLevel_index_8 = self.defaultValue
+                local ____valueByLevel_index_12 = valueByLevel[level + 1]
+                if ____valueByLevel_index_12 == nil then
+                    ____valueByLevel_index_12 = self.defaultValue
                 end
-                return ____valueByLevel_index_8
+                return ____valueByLevel_index_12
             end
         end
         return self.defaultValue
@@ -309,23 +391,23 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
         if defaultValueByLevel ~= nil then
-            local ____opt_9 = self.valueByInstance[entry]
-            local ____temp_11 = ____opt_9 and ____opt_9[level + 1]
-            if ____temp_11 == nil then
-                ____temp_11 = defaultValueByLevel[level + 1]
+            local ____opt_13 = self.valueByInstance[entry]
+            local ____temp_15 = ____opt_13 and ____opt_13[level + 1]
+            if ____temp_15 == nil then
+                ____temp_15 = defaultValueByLevel[level + 1]
             end
-            local ____temp_11_12 = ____temp_11
-            if ____temp_11_12 == nil then
-                ____temp_11_12 = self.defaultValue
+            local ____temp_15_16 = ____temp_15
+            if ____temp_15_16 == nil then
+                ____temp_15_16 = self.defaultValue
             end
-            return ____temp_11_12
+            return ____temp_15_16
         end
     end
-    local ____temp_13 = self:getNativeFieldValue(entry, level)
-    if ____temp_13 == nil then
-        ____temp_13 = self.defaultValue
+    local ____temp_17 = self:getNativeFieldValue(entry, level)
+    if ____temp_17 == nil then
+        ____temp_17 = self.defaultValue
     end
-    return ____temp_13
+    return ____temp_17
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -374,15 +456,15 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
                 valueByLevel = {}
                 self.valueByInstance[entry] = valueByLevel
             end
-            local ____valueByLevel_index_14 = valueByLevel[level + 1]
-            if ____valueByLevel_index_14 == nil then
-                ____valueByLevel_index_14 = defaultValueByLevel[level + 1]
+            local ____valueByLevel_index_18 = valueByLevel[level + 1]
+            if ____valueByLevel_index_18 == nil then
+                ____valueByLevel_index_18 = defaultValueByLevel[level + 1]
             end
-            local ____valueByLevel_index_14_15 = ____valueByLevel_index_14
-            if ____valueByLevel_index_14_15 == nil then
-                ____valueByLevel_index_14_15 = self.defaultValue
+            local ____valueByLevel_index_18_19 = ____valueByLevel_index_18
+            if ____valueByLevel_index_18_19 == nil then
+                ____valueByLevel_index_18_19 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_14_15
+            local previousValue = ____valueByLevel_index_18_19
             if value ~= previousValue then
                 valueByLevel[level + 1] = value
                 self:invokeValueChangeEvent(

package/engine/standard/entries/buff-type.d.ts

@@ -0,0 +1,3 @@
+/** @noSelfInFile */
+import { StandardBuffTypeId } from "../../object-data/entry/buff-type";
+export declare const CHEMICAL_RAGE_BUFF_TYPE_ID: StandardBuffTypeId;

package/engine/standard/entries/buff-type.lua

@@ -0,0 +1,3 @@
+local ____exports = {}
+____exports.CHEMICAL_RAGE_BUFF_TYPE_ID = fourCC("BNcr")
+return ____exports

package/objutil/buff.lua

@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
 local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
 local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
 local ____unit = require("core.types.unit")
-local AttackType = ____unit.AttackType
 local DamageType = ____unit.DamageType
 local Unit = ____unit.Unit
 local ____dummy = require("core.dummy")
@@ -756,7 +755,7 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
     end)
 end
 Unit.onDamaging:addListener(function(source, target, event)
-    if event.amount == 0 and event.attackType == AttackType.SPELL and event.damageType == DamageType.NORMAL and not event.isAttack then
+    if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
         Timer:run(function()
             checkBuffs(target, true, source)
         end)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.f40f923",
+    "version": "0.0.1-dev.f4350ae",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.9a8d1de"
+        "warpack": "0.0.1-dev.fa5e065"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/arrays.d.ts

@@ -22,6 +22,7 @@ export declare const mapToLuaSet: {
     <T, R extends AnyNotNil>(array: readonly T[], transform: (value: T) => R): LuaSet<R>;
     <T, K extends KeysOfType<T, AnyNotNil>>(array: readonly T[], key: K): LuaSet<T[K] extends AnyNotNil ? T[K] : never>;
 };
+export declare const flatten: <T>(array: readonly (readonly T[])[]) => T[];
 export declare const flatMap: {
     <T, R>(array: readonly T[], transform: (value: T) => readonly R[]): R[];
     <T, K extends KeysOfType<T, readonly any[]>>(array: readonly T[], key: K): (T[K] extends readonly (infer R)[] ? R : never)[];

package/utility/arrays.lua

@@ -3,6 +3,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalArgumentException = ____exception.IllegalArgumentException
+local ____functions = require("utility.functions")
+local identity = ____functions.identity
 local mathMax = math.max
 local mathMin = math.min
 local select = _G.select
@@ -120,6 +122,7 @@ ____exports.mapToLuaSet = function(array, transform)
     end
     return result
 end
+____exports.flatten = function(array) return ____exports.flatMap(array, identity) end
 ____exports.flatMap = function(array, transform)
     local result = {}
     local k = 1

package/utility/functions.d.ts

@@ -3,3 +3,4 @@ export declare const apply: {
     <T, ConsumerParameters extends any[]>(object: T, consumer: (value: T, ...parameters: ConsumerParameters) => void, ...parameters: ConsumerParameters): T;
     <T, ConsumerParameters extends any[], K extends KeysOfType<T, (...parameters: ConsumerParameters) => void>>(object: T, key: K, ...parameters: ConsumerParameters): T;
 };
+export declare const identity: <T>(value: T) => T;

package/utility/functions.lua

@@ -87,4 +87,5 @@ ____exports.apply = function(object, transform, ...)
     end
     return object
 end
+____exports.identity = function(value) return value end
 return ____exports

package/utility/linked-set.d.ts

@@ -50,6 +50,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     protected __pairs(this: LinkedSet<T>): LuaIterator<T | undefined, IteratorState<T>>;
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
+export declare const mutableLinkedSet: <T extends AnyNotNil>() => LinkedSet<T>;
 export declare const mutableLinkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => LinkedSet<T>;
 export declare const mutableLinkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => ReadonlyLinkedSet<T>;

package/utility/linked-set.lua

@@ -177,6 +177,9 @@ local EMPTY_LINKED_SET = __TS__New(EmptyLinkedSet)
 ____exports.emptyLinkedSet = function()
     return EMPTY_LINKED_SET
 end
+____exports.mutableLinkedSet = function()
+    return __TS__New(____exports.LinkedSet)
+end
 ____exports.mutableLinkedSetOf = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do

package/utility/lua-maps.d.ts

@@ -1,5 +1,8 @@
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
+export declare const mutableLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
+export declare const mutableWeakLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
 export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40>>) => LuaMap<K, V>;
 export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: LuaMap<K, V>) => LuaMap<V, K>;
 export declare const mapValues: <K extends AnyNotNil, V1, V2>(luaMap: LuaMap<K, V1>, transform: (value: V1) => V2) => LuaMap<K, V2>;
+export declare const getOrPut: <K extends AnyNotNil, V>(luaMap: LuaMap<K, V>, key: K, defaultValue: () => V) => V;

package/utility/lua-maps.lua

@@ -1,5 +1,13 @@
 local ____exports = {}
 local select = _G.select
+local setmetatable = _G.setmetatable
+local weakKeysMetatable = {__mode = "k"}
+____exports.mutableLuaMap = function()
+    return {}
+end
+____exports.mutableWeakLuaMap = function()
+    return setmetatable({}, weakKeysMetatable)
+end
 ____exports.luaMapOf = function(...)
     local luaMap = {}
     for i = 1, select("#", ...), 2 do
@@ -22,4 +30,12 @@ ____exports.mapValues = function(luaMap, transform)
     end
     return result
 end
+____exports.getOrPut = function(luaMap, key, defaultValue)
+    local value = luaMap[key]
+    if value == nil then
+        value = defaultValue()
+        luaMap[key] = value
+    end
+    return value
+end
 return ____exports

package/utility/lua-sets.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+export declare const mutableLuaSet: <T extends AnyNotNil>() => LuaSet<T>;
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
 export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;
 export declare const luaSetIntersection: <T extends AnyNotNil>(firstLuaSet: ReadonlyLuaSet<T>, secondLuaSet: ReadonlyLuaSet<T>) => LuaSet<T>;

package/utility/lua-sets.lua

@@ -1,5 +1,8 @@
 local ____exports = {}
 local select = _G.select
+____exports.mutableLuaSet = function()
+    return {}
+end
 ____exports.luaSetOf = function(...)
     local luaSet = {}
     for i = 1, select("#", ...) do