warscript 0.0.1-dev.e5e97e8 → 0.0.1-dev.e698bed

package/engine/object-field.lua

@@ -100,7 +100,7 @@ function ObjectField.prototype.getValue(self, entry, includeModifiers)
         end
         return self.defaultValue
     end
-    if includeModifiers == false then
+    if not includeModifiers then
         local originalValueByInstance = self.originalValueByInstance
         if originalValueByInstance ~= nil then
             local originalValue = originalValueByInstance[entry]
@@ -235,10 +235,8 @@ function ObjectField.prototype.setActualValue(self, instance, value)
                 ____self_valueByInstance_instance_6_7 = self.defaultValue
             end
             local previousValue = ____self_valueByInstance_instance_6_7
-            if value ~= previousValue then
-                self.valueByInstance[instance] = value
-                self:invokeValueChangeEvent(instance, self, previousValue, value)
-            end
+            self.valueByInstance[instance] = value
+            self:invokeValueChangeEvent(instance, self, previousValue, value)
             return true
         end
     end
@@ -246,12 +244,10 @@ function ObjectField.prototype.setActualValue(self, instance, value)
         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)
+    if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
+        return false
     end
+    self:invokeValueChangeEvent(instance, self, previousValue, value)
     return true
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
@@ -407,6 +403,12 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         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]
+    if originalValue ~= nil then
+        return originalValue
+    end
     return self:getActualValue(entry, level)
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
@@ -477,11 +479,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_17 = originalValueByLevel[level]
-            if ____originalValueByLevel_level_17 == nil then
-                ____originalValueByLevel_level_17 = self:getActualValue(instance, level)
+            local ____originalValueByLevel_level_21 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_21 == nil then
+                ____originalValueByLevel_level_21 = self:getActualValue(instance, level)
             end
-            originalValueByLevel[level] = ____originalValueByLevel_level_17
+            originalValueByLevel[level] = ____originalValueByLevel_level_21
             self:setActualValue(
                 instance,
                 level,
@@ -528,23 +530,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_18 = self.valueByInstance[instance]
-            local ____temp_20 = ____opt_18 and ____opt_18[level + 1]
-            if ____temp_20 == nil then
-                ____temp_20 = (defaultValueByLevel or emptyArray())[level + 1]
+            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]
             end
-            local ____temp_20_21 = ____temp_20
-            if ____temp_20_21 == nil then
-                ____temp_20_21 = self.defaultValue
+            local ____temp_24_25 = ____temp_24
+            if ____temp_24_25 == nil then
+                ____temp_24_25 = self.defaultValue
             end
-            return ____temp_20_21
+            return ____temp_24_25
         end
     end
-    local ____temp_22 = self:getNativeFieldValue(instance, level)
-    if ____temp_22 == nil then
-        ____temp_22 = self.defaultValue
+    local ____temp_26 = self:getNativeFieldValue(instance, level)
+    if ____temp_26 == nil then
+        ____temp_26 = self.defaultValue
     end
-    return ____temp_22
+    return ____temp_26
 end
 function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -557,25 +559,23 @@ function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
                 valueByLevel = {}
                 self.valueByInstance[instance] = valueByLevel
             end
-            local ____valueByLevel_index_23 = valueByLevel[level + 1]
-            if ____valueByLevel_index_23 == nil then
-                ____valueByLevel_index_23 = (defaultValueByLevel or emptyArray())[level + 1]
-            end
-            local ____valueByLevel_index_23_24 = ____valueByLevel_index_23
-            if ____valueByLevel_index_23_24 == nil then
-                ____valueByLevel_index_23_24 = self.defaultValue
+            local ____valueByLevel_index_27 = valueByLevel[level + 1]
+            if ____valueByLevel_index_27 == nil then
+                ____valueByLevel_index_27 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local previousValue = ____valueByLevel_index_23_24
-            if value ~= previousValue then
-                valueByLevel[level + 1] = value
-                self:invokeValueChangeEvent(
-                    instance,
-                    self,
-                    level,
-                    previousValue,
-                    value
-                )
+            local ____valueByLevel_index_27_28 = ____valueByLevel_index_27
+            if ____valueByLevel_index_27_28 == nil then
+                ____valueByLevel_index_27_28 = self.defaultValue
             end
+            local previousValue = ____valueByLevel_index_27_28
+            valueByLevel[level + 1] = value
+            self:invokeValueChangeEvent(
+                instance,
+                self,
+                level,
+                previousValue,
+                value
+            )
             return true
         end
     end
@@ -583,26 +583,24 @@ function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
         return false
     end
     local previousValue = self:getNativeFieldValue(instance, level)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(instance, level, value) then
-            return false
-        end
-        self:invokeValueChangeEvent(
-            instance,
-            self,
-            level,
-            previousValue,
-            value
-        )
+    if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
+        return false
     end
+    self:invokeValueChangeEvent(
+        instance,
+        self,
+        level,
+        previousValue,
+        value
+    )
     return true
 end
 function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
-    local ____opt_27 = self.originalValueByLevelByInstance
-    local ____opt_25 = ____opt_27 and ____opt_27[instance]
-    local originalValue = ____opt_25 and ____opt_25[level]
-    local ____opt_29 = self.modifiersByInstance
-    local modifiers = ____opt_29 and ____opt_29[instance]
+    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]
     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/engine/standard/fields/unit.d.ts

@@ -1,4 +1,6 @@
 /** @noSelfInFile */
-import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
+import { UnitClassificationsField, UnitFlyHeightField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
 export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
 export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
+export declare const FLY_HEIGHT_UNIT_FLOAT_FIELD: UnitFlyHeightField & symbol;
+export declare const SCALING_VALUE_UNIT_FLOAT_FIELD: UnitScalingValueField & symbol;

package/engine/standard/fields/unit.lua

@@ -1,7 +1,11 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
 local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitFlyHeightField = ____unit.UnitFlyHeightField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
+local UnitScalingValueField = ____unit.UnitScalingValueField
 ____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
 ____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+____exports.FLY_HEIGHT_UNIT_FLOAT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
+____exports.SCALING_VALUE_UNIT_FLOAT_FIELD = UnitScalingValueField:create(fourCC("usca"))
 return ____exports

package/engine/unit.d.ts

@@ -19,6 +19,8 @@ import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
 import "./internal/unit/main-selected";
 import "./internal/unit/add-item-to-slot-init";
+import "./internal/unit/fly-height";
+import "./internal/unit/scale";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -19,6 +19,8 @@ require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
 require("engine.internal.unit.main-selected")
 require("engine.internal.unit.add-item-to-slot-init")
+require("engine.internal.unit.fly-height")
+require("engine.internal.unit.scale")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/package.json

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