warscript 0.0.1-dev.524fae9 → 0.0.1-dev.5354486

package/engine/object-data/entry/unit-type.d.ts

@@ -69,6 +69,16 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
     private isPortraitModelPathSet?;
+    /** Portrait fields a model setter emptied because no portrait was set yet. */
+    private autoEmptiedPortraitFields?;
+    private emptyPortraitForModel;
+    /**
+     * An explicit portrait wins over the automatic empty portraits of the model setters, so
+     * it may also be set after the models: the mode-less portrait (one portrait for every
+     * mode) returns the automatically emptied per-mode portraits to their defaults, a
+     * per-mode portrait replaces only its own mode's.
+     */
+    private setPortraitModelPathField;
     get abilityTypeIds(): AbilityTypeId[];
     set abilityTypeIds(abilityTypeIds: AbilityTypeId[]);
     get defaultActiveAbilityTypeId(): AbilityTypeId | undefined;

package/engine/object-data/entry/unit-type.lua

@@ -484,6 +484,32 @@ end
 function UnitType.getObjectData(self, map)
     return map.objects.unit
 end
+function UnitType.prototype.emptyPortraitForModel(self, portraitField)
+    if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+        self:setStringField(portraitField, "")
+        if self.autoEmptiedPortraitFields == nil then
+            self.autoEmptiedPortraitFields = {}
+        end
+        self.autoEmptiedPortraitFields[portraitField] = true
+    end
+end
+function UnitType.prototype.setPortraitModelPathField(self, portraitField, portraitModelPath)
+    local autoEmptiedPortraitFields = self.autoEmptiedPortraitFields
+    if autoEmptiedPortraitFields ~= nil then
+        if portraitField == "upor" then
+            for field in pairs(autoEmptiedPortraitFields) do
+                if field ~= portraitField then
+                    self.object:setField(field, nil)
+                end
+            end
+            self.autoEmptiedPortraitFields = nil
+        else
+            autoEmptiedPortraitFields[portraitField] = nil
+        end
+    end
+    self:setStringField(portraitField, portraitModelPath)
+    self.isPortraitModelPathSet = true
+end
 function UnitType.prototype.setDeathTypeFlag(self, flag, value)
     local deathType = self:getNumberField("udea")
     self:setNumberField("udea", value and deathType | flag or deathType & ~flag)
@@ -1076,9 +1102,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPath)
             self:setStringField("umdl", modelPath)
-            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor", "")
-            end
+            self:emptyPortraitForModel("upor")
         end
     },
     true
@@ -1092,9 +1116,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathSD)
             self:setStringField("umdl:sd", modelPathSD)
-            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:sd", "")
-            end
+            self:emptyPortraitForModel("upor:sd")
         end
     },
     true
@@ -1108,9 +1130,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathHD)
             self:setStringField("umdl:hd", modelPathHD)
-            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:hd", "")
-            end
+            self:emptyPortraitForModel("upor:hd")
         end
     },
     true
@@ -1124,9 +1144,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, modelPathDE)
             self:setStringField("umdl:de", modelPathDE)
-            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:de", "")
-            end
+            self:emptyPortraitForModel("upor:de")
         end
     },
     true
@@ -1139,8 +1157,7 @@ __TS__SetDescriptor(
             return self:getStringField("upor")
         end,
         set = function(self, portraitModelPath)
-            self:setStringField("upor", portraitModelPath)
-            self.isPortraitModelPathSet = true
+            self:setPortraitModelPathField("upor", portraitModelPath)
         end
     },
     true
@@ -1153,8 +1170,7 @@ __TS__SetDescriptor(
             return self:getStringField("upor:sd")
         end,
         set = function(self, portraitModelPathSD)
-            self:setStringField("upor:sd", portraitModelPathSD)
-            self.isPortraitModelPathSet = true
+            self:setPortraitModelPathField("upor:sd", portraitModelPathSD)
         end
     },
     true
@@ -1167,8 +1183,7 @@ __TS__SetDescriptor(
             return self:getStringField("upor:hd")
         end,
         set = function(self, portraitModelPathHD)
-            self:setStringField("upor:hd", portraitModelPathHD)
-            self.isPortraitModelPathSet = true
+            self:setPortraitModelPathField("upor:hd", portraitModelPathHD)
         end
     },
     true
@@ -1181,8 +1196,7 @@ __TS__SetDescriptor(
             return self:getStringField("upor:de")
         end,
         set = function(self, portraitModelPathDE)
-            self:setStringField("upor:de", portraitModelPathDE)
-            self.isPortraitModelPathSet = true
+            self:setPortraitModelPathField("upor:de", portraitModelPathDE)
         end
     },
     true

package/engine/random.lua

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

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

@@ -7,8 +7,8 @@ export declare const BUTTON_POSITION_ACTIVATED_Y_ABILITY_INTEGER_FIELD: AbilityI
 export declare const BUTTON_POSITION_RESEARCH_X_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const BUTTON_POSITION_RESEARCH_Y_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const MISSILE_SPEED_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
-export declare const TARGET_ATTACHMENTS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
-export declare const CASTER_ATTACHMENTS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
+export declare const TARGET_EFFECT_COUNT_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
+export declare const CASTER_EFFECT_COUNT_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const PRIORITY_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const LEVELS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const REQUIRED_LEVEL_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;

package/engine/standard/fields/ability.lua

@@ -18,8 +18,8 @@ ____exports.BUTTON_POSITION_ACTIVATED_Y_ABILITY_INTEGER_FIELD = AbilityIntegerFi
 ____exports.BUTTON_POSITION_RESEARCH_X_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arpx"))
 ____exports.BUTTON_POSITION_RESEARCH_Y_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arpy"))
 ____exports.MISSILE_SPEED_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("amsp"))
-____exports.TARGET_ATTACHMENTS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("atac"))
-____exports.CASTER_ATTACHMENTS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("acac"))
+____exports.TARGET_EFFECT_COUNT_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("atac"))
+____exports.CASTER_EFFECT_COUNT_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("acac"))
 ____exports.PRIORITY_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("apri"))
 ____exports.LEVELS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("alev"))
 ____exports.REQUIRED_LEVEL_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arlv"))

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.524fae9",
+    "version": "0.0.1-dev.5354486",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -17,7 +17,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.2e316da"
+        "warpack": "0.0.1-dev.eb3e92a"
     },
     "publishConfig": {
         "access": "public",

package/utility/arrays.d.ts

@@ -1,6 +1,11 @@
 /** @noSelfInFile */
-import { TupleOf } from "./types";
+import { NonEmptyArray, ReadonlyNonEmptyArray, TupleOf } from "./types";
 export declare const emptyArray: <T>() => readonly T[];
+/** Checks for any element with `next` instead of computing the length. */
+export declare const isNonEmptyArray: {
+    <T>(array: T[]): array is NonEmptyArray<T>;
+    <T>(array: readonly T[]): array is ReadonlyNonEmptyArray<T>;
+};
 export declare const joinToString: <T>(array: readonly T[], separator: string, transform?: (element: T) => string) => string;
 export declare const arrayOfNotNull: <T>(...elements: readonly (T | undefined | null)[]) => T[];
 export declare const array: <T, N extends number>(length: N, initialize: (index: number) => T) => TupleOf<T, N>;

package/utility/arrays.lua

@@ -7,6 +7,7 @@ local ____functions = require("utility.functions")
 local identity = ____functions.identity
 local mathMax = math.max
 local mathMin = math.min
+local next = _G.next
 local select = _G.select
 local tableConcat = table.concat
 local tableSort = table.sort
@@ -14,6 +15,10 @@ local EMPTY_ARRAY = {}
 ____exports.emptyArray = function()
     return EMPTY_ARRAY
 end
+--- Checks for any element with `next` instead of computing the length.
+____exports.isNonEmptyArray = function(array)
+    return (next(array)) ~= nil
+end
 ____exports.joinToString = function(array, separator, transform)
     if transform == nil then
         transform = tostring

package/engine/internal/unit/pseudo-passive-abilities.lua

@@ -1,11 +0,0 @@
-local ____exports = {}
----
--- @internal For use by internal systems only.
-____exports.compiletimePseudoPassiveAbilityTypeIds = {}
----
--- @internal For use by internal systems only.
-____exports.pseudoPassiveAbilityTypeIds = postcompile(function() return ____exports.compiletimePseudoPassiveAbilityTypeIds end)
----
--- @internal For use by internal systems only.
-____exports.pseudoPassiveAbilityOrderTypeStringId = "channel"
-return ____exports