warscript 0.0.1-dev.5ca835c → 0.0.1-dev.5e33506

package/engine/object-field.lua

@@ -124,6 +124,7 @@ function ObjectField.prototype.setValue(self, entry, value)
         defaultValueByObjectDataEntryId[entry.id] = value
         return true
     end
+    local previousOriginalValue
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[entry]
@@ -133,11 +134,34 @@ function ObjectField.prototype.setValue(self, entry, value)
                 originalValueByInstance = mutableWeakLuaMap()
                 self.originalValueByInstance = originalValueByInstance
             end
+            previousOriginalValue = originalValueByInstance[entry]
+            if value == previousOriginalValue then
+                return true
+            end
             originalValueByInstance[entry] = value
             value = self:calculateActualValue(entry)
         end
     end
-    return self:setActualValue(entry, value)
+    local previousValue = self:setActualValue(entry, value)
+    if previousValue == nil then
+        return false
+    end
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_2 = self.invokeValueChangeEvent
+        local ____entry_1 = entry
+        local ____previousOriginalValue_0 = previousOriginalValue
+        if ____previousOriginalValue_0 == nil then
+            ____previousOriginalValue_0 = previousValue
+        end
+        ____self_invokeValueChangeEvent_2(
+            self,
+            ____entry_1,
+            self,
+            ____previousOriginalValue_0,
+            value
+        )
+    end
+    return true
 end
 function ObjectField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
@@ -151,13 +175,13 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             originalValueByInstance = mutableWeakLuaMap()
             self.originalValueByInstance = originalValueByInstance
         end
-        local ____originalValueByInstance_1 = originalValueByInstance
-        local ____instance_2 = instance
-        local ____originalValueByInstance_instance_0 = originalValueByInstance[instance]
-        if ____originalValueByInstance_instance_0 == nil then
-            ____originalValueByInstance_instance_0 = self:getActualValue(instance)
+        local ____originalValueByInstance_4 = originalValueByInstance
+        local ____instance_5 = instance
+        local ____originalValueByInstance_instance_3 = originalValueByInstance[instance]
+        if ____originalValueByInstance_instance_3 == nil then
+            ____originalValueByInstance_instance_3 = self:getActualValue(instance)
         end
-        ____originalValueByInstance_1[____instance_2] = ____originalValueByInstance_instance_0
+        ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
         self:setActualValue(
             instance,
             self:calculateActualValue(instance)
@@ -203,22 +227,22 @@ function ObjectField.prototype.getActualValue(self, instance)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
         if defaultValue ~= nil or self.isGlobal then
-            local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_3 == nil then
-                ____self_valueByInstance_instance_3 = defaultValue
+            local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_6 == nil then
+                ____self_valueByInstance_instance_6 = defaultValue
             end
-            local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
-            if ____self_valueByInstance_instance_3_4 == nil then
-                ____self_valueByInstance_instance_3_4 = self.defaultValue
+            local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
+            if ____self_valueByInstance_instance_6_7 == nil then
+                ____self_valueByInstance_instance_6_7 = self.defaultValue
             end
-            return ____self_valueByInstance_instance_3_4
+            return ____self_valueByInstance_instance_6_7
         end
     end
-    local ____temp_5 = self:getNativeFieldValue(instance)
-    if ____temp_5 == nil then
-        ____temp_5 = self.defaultValue
+    local ____temp_8 = self:getNativeFieldValue(instance)
+    if ____temp_8 == nil then
+        ____temp_8 = self.defaultValue
     end
-    return ____temp_5
+    return ____temp_8
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -226,35 +250,33 @@ function ObjectField.prototype.setActualValue(self, instance, value)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
         if defaultValue ~= nil or self.isGlobal then
-            local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_6 == nil then
-                ____self_valueByInstance_instance_6 = defaultValue
+            local ____self_valueByInstance_instance_9 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_9 == nil then
+                ____self_valueByInstance_instance_9 = defaultValue
             end
-            local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
-            if ____self_valueByInstance_instance_6_7 == nil then
-                ____self_valueByInstance_instance_6_7 = self.defaultValue
+            local ____self_valueByInstance_instance_9_10 = ____self_valueByInstance_instance_9
+            if ____self_valueByInstance_instance_9_10 == nil then
+                ____self_valueByInstance_instance_9_10 = self.defaultValue
             end
-            local previousValue = ____self_valueByInstance_instance_6_7
+            local previousValue = ____self_valueByInstance_instance_9_10
             self.valueByInstance[instance] = value
-            self:invokeValueChangeEvent(instance, self, previousValue, value)
-            return true
+            return previousValue
         end
     end
     if not self:hasNativeFieldValue(objectDataEntryId) then
-        return false
+        return nil
     end
     local previousValue = self:getNativeFieldValue(instance)
     if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
-        return false
+        return nil
     end
-    self:invokeValueChangeEvent(instance, self, previousValue, value)
-    return true
+    return previousValue
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
-    local ____opt_8 = self.originalValueByInstance
-    local originalValue = ____opt_8 and ____opt_8[instance]
-    local ____opt_10 = self.modifiersByInstance
-    local modifiers = ____opt_10 and ____opt_10[instance]
+    local ____opt_11 = self.originalValueByInstance
+    local originalValue = ____opt_11 and ____opt_11[instance]
+    local ____opt_13 = self.modifiersByInstance
+    local modifiers = ____opt_13 and ____opt_13[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then
@@ -319,17 +341,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_13
+                local ____temp_16
                 if index == nil then
-                    ____temp_13 = value
+                    ____temp_16 = value
                 else
-                    local ____value_index_12 = value[index + 1]
-                    if ____value_index_12 == nil then
-                        ____value_index_12 = self.defaultValue
+                    local ____value_index_15 = value[index + 1]
+                    if ____value_index_15 == nil then
+                        ____value_index_15 = self.defaultValue
                     end
-                    ____temp_13 = ____value_index_12
+                    ____temp_16 = ____value_index_15
                 end
-                return ____temp_13
+                return ____temp_16
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -339,17 +361,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
         if defaultValue ~= nil or self.isGlobal then
             local value = self.valueByInstance[entry] or defaultValue or emptyArray()
-            local ____temp_15
+            local ____temp_18
             if index == nil then
-                ____temp_15 = value
+                ____temp_18 = value
             else
-                local ____value_index_14 = value[index + 1]
-                if ____value_index_14 == nil then
-                    ____value_index_14 = self.defaultValue
+                local ____value_index_17 = value[index + 1]
+                if ____value_index_17 == nil then
+                    ____value_index_17 = self.defaultValue
                 end
-                ____temp_15 = ____value_index_14
+                ____temp_18 = ____value_index_17
             end
-            return ____temp_15
+            return ____temp_18
         end
     end
     if index ~= nil then
@@ -394,18 +416,18 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_16 = valueByLevel[level + 1]
-                if ____valueByLevel_index_16 == nil then
-                    ____valueByLevel_index_16 = self.defaultValue
+                local ____valueByLevel_index_19 = valueByLevel[level + 1]
+                if ____valueByLevel_index_19 == nil then
+                    ____valueByLevel_index_19 = self.defaultValue
                 end
-                return ____valueByLevel_index_16
+                return ____valueByLevel_index_19
             end
         end
         return self.defaultValue
     end
-    local ____opt_19 = self.originalValueByLevelByInstance
-    local ____opt_17 = ____opt_19 and ____opt_19[entry]
-    local originalValue = ____opt_17 and ____opt_17[level]
+    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
@@ -449,6 +471,7 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         valueByLevel[level + 1] = value
         return true
     end
+    local previousOriginalValue
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[entry]
@@ -458,11 +481,36 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
                 originalValueByLevelByInstance = mutableWeakLuaMap()
                 self.originalValueByLevelByInstance = originalValueByLevelByInstance
             end
-            getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)[level] = value
+            local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
+            previousOriginalValue = originalValueByLevel[level]
+            if value == previousOriginalValue then
+                return true
+            end
+            originalValueByLevel[level] = value
             value = self:calculateActualValue(entry, level)
         end
     end
-    return self:setActualValue(entry, level, value)
+    local previousValue = self:setActualValue(entry, level, value)
+    if previousValue == nil then
+        return false
+    end
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_26 = self.invokeValueChangeEvent
+        local ____entry_25 = entry
+        local ____previousOriginalValue_24 = previousOriginalValue
+        if ____previousOriginalValue_24 == nil then
+            ____previousOriginalValue_24 = previousValue
+        end
+        ____self_invokeValueChangeEvent_26(
+            self,
+            ____entry_25,
+            self,
+            level,
+            ____previousOriginalValue_24,
+            value
+        )
+    end
+    return true
 end
 function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
@@ -479,11 +527,11 @@ function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
         local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
         local levelCount = self:getLevelCount(instance)
         for level = 0, levelCount - 1 do
-            local ____originalValueByLevel_level_21 = originalValueByLevel[level]
-            if ____originalValueByLevel_level_21 == nil then
-                ____originalValueByLevel_level_21 = self:getActualValue(instance, level)
+            local ____originalValueByLevel_level_27 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_27 == nil then
+                ____originalValueByLevel_level_27 = self:getActualValue(instance, level)
             end
-            originalValueByLevel[level] = ____originalValueByLevel_level_21
+            originalValueByLevel[level] = ____originalValueByLevel_level_27
             self:setActualValue(
                 instance,
                 level,
@@ -530,23 +578,23 @@ function ObjectLevelField.prototype.getActualValue(self, instance, level)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
         if defaultValueByLevel ~= nil or self.isGlobal then
-            local ____opt_22 = self.valueByInstance[instance]
-            local ____temp_24 = ____opt_22 and ____opt_22[level + 1]
-            if ____temp_24 == nil then
-                ____temp_24 = (defaultValueByLevel or emptyArray())[level + 1]
+            local ____opt_28 = self.valueByInstance[instance]
+            local ____temp_30 = ____opt_28 and ____opt_28[level + 1]
+            if ____temp_30 == nil then
+                ____temp_30 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____temp_24_25 = ____temp_24
-            if ____temp_24_25 == nil then
-                ____temp_24_25 = self.defaultValue
+            local ____temp_30_31 = ____temp_30
+            if ____temp_30_31 == nil then
+                ____temp_30_31 = self.defaultValue
             end
-            return ____temp_24_25
+            return ____temp_30_31
         end
     end
-    local ____temp_26 = self:getNativeFieldValue(instance, level)
-    if ____temp_26 == nil then
-        ____temp_26 = self.defaultValue
+    local ____temp_32 = self:getNativeFieldValue(instance, level)
+    if ____temp_32 == nil then
+        ____temp_32 = self.defaultValue
     end
-    return ____temp_26
+    return ____temp_32
 end
 function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -559,48 +607,34 @@ function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
                 valueByLevel = {}
                 self.valueByInstance[instance] = valueByLevel
             end
-            local ____valueByLevel_index_27 = valueByLevel[level + 1]
-            if ____valueByLevel_index_27 == nil then
-                ____valueByLevel_index_27 = (defaultValueByLevel or emptyArray())[level + 1]
+            local ____valueByLevel_index_33 = valueByLevel[level + 1]
+            if ____valueByLevel_index_33 == nil then
+                ____valueByLevel_index_33 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____valueByLevel_index_27_28 = ____valueByLevel_index_27
-            if ____valueByLevel_index_27_28 == nil then
-                ____valueByLevel_index_27_28 = self.defaultValue
+            local ____valueByLevel_index_33_34 = ____valueByLevel_index_33
+            if ____valueByLevel_index_33_34 == nil then
+                ____valueByLevel_index_33_34 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_27_28
+            local previousValue = ____valueByLevel_index_33_34
             valueByLevel[level + 1] = value
-            self:invokeValueChangeEvent(
-                instance,
-                self,
-                level,
-                previousValue,
-                value
-            )
-            return true
+            return previousValue
         end
     end
     if not self:hasNativeFieldValue(objectDataEntryId) then
-        return false
+        return nil
     end
     local previousValue = self:getNativeFieldValue(instance, level)
     if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
-        return false
+        return nil
     end
-    self:invokeValueChangeEvent(
-        instance,
-        self,
-        level,
-        previousValue,
-        value
-    )
-    return true
+    return previousValue
 end
 function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
-    local ____opt_31 = self.originalValueByLevelByInstance
-    local ____opt_29 = ____opt_31 and ____opt_31[instance]
-    local originalValue = ____opt_29 and ____opt_29[level]
-    local ____opt_33 = self.modifiersByInstance
-    local modifiers = ____opt_33 and ____opt_33[instance]
+    local ____opt_37 = self.originalValueByLevelByInstance
+    local ____opt_35 = ____opt_37 and ____opt_37[instance]
+    local originalValue = ____opt_35 and ____opt_35[level]
+    local ____opt_39 = self.modifiersByInstance
+    local modifiers = ____opt_39 and ____opt_39[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then

package/engine/standard/fields/ability.d.ts

@@ -376,8 +376,8 @@ export declare const INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD: Abi
 export declare const ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;

package/engine/standard/fields/ability.lua

@@ -387,8 +387,8 @@ ____exports.INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloa
 ____exports.ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Neu1"))
 ____exports.AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Arm1"))
 ____exports.DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi1"))
-____exports.ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
-____exports.MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
+____exports.MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
+____exports.ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
 ____exports.EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa1"))
 ____exports.DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa2"))
 ____exports.ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa3"))

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.5ca835c",
+    "version": "0.0.1-dev.5e33506",
     "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.251db08"
+        "warpack": "0.0.1-dev.efd0770"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",