warscript 0.0.1-dev.c677d41 → 0.0.1-dev.c762beb

package/engine/object-data/entry/buff-type/applicable.lua

@@ -65,123 +65,127 @@ function ApplicableBuffType.wrap(self, other)
     return __TS__New(____exports.ApplicableBuffType, other.object)
 end
 ApplicableBuffType.BASE_ID = fourCC("BHbz")
-local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(postcompile(function()
-    local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
-        local abilityType = abilityTypeConstructor:create()
-        abilityType.isInternal = true
-        abilityType.levelCount = applicableBuffType.levelCount
-        abilityType.buttonPositionX = 0
-        abilityType.buttonPositionY = -11
-        abilityType.casterAttachmentPresets = {}
-        abilityType.targetEffectPresets = {}
-        abilityType.casterEffectSoundPresetId = nil
-        abilityType.learnLevelMinimum = 6
-        abilityType.race = "other"
-        abilityType.shouldCheckTechTreeDependencies = false
-        abilityType.techTreeDependencies = {}
-        abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
-            4,
-            2,
-            2097152,
-            8,
-            1048576,
-            16
-        )
-        abilityType.areaOfEffect = 0
-        abilityType.castRange = 999999
-        abilityType.cooldown = 0
-        abilityType.manaCost = 0
-        abilityType.buffDuration = 0
-        abilityType.heroBuffDuration = 0
-        return abilityType
-    end
-    local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
-    local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
-    for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
-        local applicatorAbilityTypeIdByApplicatorType = {}
-        if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
-                applicatorAbilityType.missProbability = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(
+    postcompile(function()
+        local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
+            local abilityType = abilityTypeConstructor:create()
+            abilityType.isInternal = true
+            abilityType.levelCount = applicableBuffType.levelCount
+            abilityType.buttonPositionX = 0
+            abilityType.buttonPositionY = -11
+            abilityType.casterAttachmentPresets = {}
+            abilityType.targetEffectPresets = {}
+            abilityType.casterEffectSoundPresetId = nil
+            abilityType.learnLevelMinimum = 6
+            abilityType.race = "other"
+            abilityType.shouldCheckTechTreeDependencies = false
+            abilityType.techTreeDependencies = {}
+            abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
+                4,
+                2,
+                2097152,
+                8,
+                1048576,
+                16
+            )
+            abilityType.areaOfEffect = 0
+            abilityType.castRange = 999999
+            abilityType.cooldown = 0
+            abilityType.manaCost = 0
+            abilityType.buffDuration = 0
+            abilityType.heroBuffDuration = 0
+            return abilityType
+        end
+        local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
+        local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
+        for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
+            local applicatorAbilityTypeIdByApplicatorType = {}
+            if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                    applicatorAbilityType.missProbability = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.scaleIncrease = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                end
             end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.scaleIncrease = 0
+            if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
+                    applicatorAbilityType.damagePerSecond = 0
+                    applicatorAbilityType.movementSpeedDecreaseFactor = 0
+                    applicatorAbilityType.attackSpeedDecreaseFactor = 0
+                    applicatorAbilityType.isDamageStacking = false
+                    applicatorAbilityType.isMovementSpeedFactorStacking = false
+                    applicatorAbilityType.isAttackSpeedFactorStacking = false
+                    applicatorAbilityType.isAbleToKill = false
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.receivedDamageIncreaseFactor = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    if applicatorAbilityType.levelCount > 1 then
+                        multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+                    end
+                    applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+                end
+            end
+            if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
+                local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
+                applicatorAbilityType.levelCount = 1
+                applicatorAbilityType.damagePerInterval = 0
+                applicatorAbilityType.castRange = 0
+                applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
             end
+            applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
         end
-        if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
-                applicatorAbilityType.damagePerSecond = 0
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.isDamageStacking = false
-                applicatorAbilityType.isMovementSpeedFactorStacking = false
-                applicatorAbilityType.isAttackSpeedFactorStacking = false
-                applicatorAbilityType.isAbleToKill = false
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
-            end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.receivedDamageIncreaseFactor = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                if applicatorAbilityType.levelCount > 1 then
-                    multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+        local applicatorUpgradeIds = {}
+        local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
+        for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
+            local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
+            local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
+            local applicatorUpgrade = BlankUpgrade:create()
+            applicatorUpgrade.isInternal = true
+            applicatorUpgrade.levelCount = maxLevelCount - 1
+            applicatorUpgrade.effects = map(
+                applicatorAbilityTypeIds,
+                function(applicatorAbilityTypeId)
+                    return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
                 end
-                applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+            )
+            applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
+            for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
+                applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
             end
         end
-        if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
-            local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
-            applicatorAbilityType.levelCount = 1
-            applicatorAbilityType.damagePerInterval = 0
-            applicatorAbilityType.castRange = 0
-            applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
-            applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-            applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
-        end
-        applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
-    end
-    local applicatorUpgradeIds = {}
-    local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
-    for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
-        local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
-        local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
-        local applicatorUpgrade = BlankUpgrade:create()
-        applicatorUpgrade.isInternal = true
-        applicatorUpgrade.levelCount = maxLevelCount - 1
-        applicatorUpgrade.effects = map(
-            applicatorAbilityTypeIds,
-            function(applicatorAbilityTypeId)
-                return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
-            end
-        )
-        applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
-        for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
-            applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
+        for ____, unitType in ipairs(UnitType:getAll()) do
+            local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
+            __TS__SparseArrayPush(
+                ____array_0,
+                table.unpack(applicatorUpgradeIds)
+            )
+            unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
         end
-    end
-    for ____, unitType in ipairs(UnitType:getAll()) do
-        local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
-        __TS__SparseArrayPush(
-            ____array_0,
-            table.unpack(applicatorUpgradeIds)
-        )
-        unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
-    end
-    return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
-end))
+        return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
+    end),
+    1,
+    2
+)
 local EVASION_ABILITY_TYPE_IDS = postcompile(function()
     return AbilityType:getAllIdsByBaseIds(map({
         "AEev",

package/engine/object-field/ability.lua

@@ -519,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else

package/engine/object-field.d.ts

@@ -88,7 +88,7 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
-    getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
+    getValue<LevelType extends [number, boolean?] | [boolean?]>(entry: ObjectDataEntryType | InstanceType, ...[level, includeModifiers]: LevelType): LevelType extends [number, boolean?] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
     updateActualValue(instance: InstanceType, level?: number): void;
     applyModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): void;

package/engine/object-field.lua

@@ -403,12 +403,12 @@ ____exports.ObjectLevelField = __TS__Class()
 local ObjectLevelField = ____exports.ObjectLevelField
 ObjectLevelField.name = "ObjectLevelField"
 __TS__ClassExtends(ObjectLevelField, ObjectFieldBase)
-function ObjectLevelField.prototype.getValue(self, entry, level)
+function ObjectLevelField.prototype.getValue(self, entry, level, includeModifiers)
     if level == nil then
         local result = {}
         local levelCount = self:getLevelCount(entry)
         for i = 0, levelCount - 1 do
-            result[i + 1] = self:getValue(entry, i)
+            result[i + 1] = self:getValue(entry, i, includeModifiers)
         end
         return result
     end
@@ -426,11 +426,13 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         end
         return self.defaultValue
     end
-    local ____opt_22 = self.originalValueByLevelByInstance
-    local ____opt_20 = ____opt_22 and ____opt_22[entry]
-    local originalValue = ____opt_20 and ____opt_20[level]
-    if originalValue ~= nil then
-        return originalValue
+    if not includeModifiers then
+        local ____opt_22 = self.originalValueByLevelByInstance
+        local ____opt_20 = ____opt_22 and ____opt_22[entry]
+        local originalValue = ____opt_20 and ____opt_20[level]
+        if originalValue ~= nil then
+            return originalValue
+        end
     end
     return self:getActualValue(entry, level)
 end

package/engine/random.d.ts

@@ -18,3 +18,4 @@ export declare const random: {
     <T>(element: T, ...elements: T[]): T;
     <T>(...elements: T[]): T | undefined;
 };
+export declare const shuffle: (array: unknown[]) => void;

package/engine/random.lua

@@ -28,4 +28,12 @@ ____exports.random = function(...)
         ...
     ))
 end
+____exports.shuffle = function(array)
+    for i = #array - 1, 1 do
+        local j = getRandomInt(0, i)
+        local value = array[i + 1]
+        array[i + 1] = array[j + 1]
+        array[j + 1] = value
+    end
+end
 return ____exports

package/engine/unit.d.ts

@@ -23,6 +23,7 @@ import "./internal/unit/attributes";
 import "./internal/unit/fly-height";
 import "./internal/unit/scale";
 import "./internal/unit/interrupts";
+import "./internal/unit/range-event";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -23,6 +23,7 @@ require("engine.internal.unit.attributes")
 require("engine.internal.unit.fly-height")
 require("engine.internal.unit.scale")
 require("engine.internal.unit.interrupts")
+require("engine.internal.unit.range-event")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/lualib_bundle.lua

@@ -653,7 +653,6 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
-        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -703,14 +702,40 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if onFinally then
-            local ____self_finallyCallbacks_2 = self.finallyCallbacks
-            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
-            if self.state ~= 0 then
-                onFinally(nil)
-            end
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
         end
-        return self
+        return self["then"](
+            self,
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
+        )
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -734,22 +759,11 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
-        local finallyCallbacks = self.finallyCallbacks
-        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            if finallyCallbacksLength == 0 then
-                return callbacks[callbacksLength](callbacks, value)
-            end
-            callbacks[callbacksLength](callbacks, value)
-        end
-        if finallyCallbacksLength ~= 0 then
-            for i = 1, finallyCallbacksLength - 1 do
-                finallyCallbacks[i](finallyCallbacks)
-            end
-            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
+            return callbacks[callbacksLength](callbacks, value)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -904,8 +918,10 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        for key in pairs(source) do
-            target[key] = source[key]
+        if type(source) == "table" then
+            for key in pairs(source) do
+                target[key] = source[key]
+            end
         end
     end
     return target
@@ -1011,6 +1027,13 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
+        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
+            local instanceMetatable = {}
+            instanceMetatable._isOwnDescriptorMetatable = true
+            setmetatable(instanceMetatable, metatable)
+            setmetatable(target, instanceMetatable)
+            metatable = instanceMetatable
+        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1383,46 +1406,70 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, items[key]}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, items[key]}}
             end
         }
     end
     function Map.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Map.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = items[key]}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = items[key]}
             end
         }
     end
@@ -1999,44 +2046,68 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, key}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, key}}
             end
         }
     end
     function Set.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Set.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
@@ -2241,7 +2312,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             end
             local result = string.gsub(
                 trace,
-                "(%S+)%.lua:(%d+)",
+                "([^%s<]+)%.lua:(%d+)",
                 function(file, line) return replacer(nil, file .. ".lua", file .. ".ts", line) end
             )
             local function stringReplacer(____, file, line)

package/objutil/object.lua

@@ -153,7 +153,7 @@ end
 function ObjectDefinition.getLevelArrayFieldValue(self, level, value, values)
     return type(values) == "function" and values(level, value) or (__TS__ArrayIsArray(values[1]) and values[1] or values)
 end
-____exports.ObjectType = ObjectType or ({})
+____exports.ObjectType = ____exports.ObjectType or ({})
 ____exports.ObjectType.ABILITY = 0
 ____exports.ObjectType[____exports.ObjectType.ABILITY] = "ABILITY"
 ____exports.ObjectType.ITEM = 1