warscript 0.0.1-dev.724bf08 → 0.0.1-dev.72620d4

package/core/types/timer.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__Promise = ____lualib.__TS__Promise
 local ____exports = {}
@@ -9,8 +10,13 @@ local Event = ____event.Event
 local InitializingEvent = ____event.InitializingEvent
 local ____objectPool = require("util.objectPool")
 local ObjectPool = ____objectPool.ObjectPool
-local ____exception = require("exception")
-local IllegalStateException = ____exception.IllegalStateException
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____callback_2Darray = require("utility.callback-array")
+local addCallback = ____callback_2Darray.addCallback
+local callbackArray = ____callback_2Darray.callbackArray
+local consumeCallback = ____callback_2Darray.consumeCallback
+local consumeCallbacks = ____callback_2Darray.consumeCallbacks
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -23,6 +29,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -35,61 +42,76 @@ local timerByHandleId = {}
 local function timerSafeCall()
     local timer = timerByHandleId[getHandleId(getExpiredTimer())]
     if timer ~= nil then
-        if timer[2] then
+        if timer[1] then
             timer:destroy()
         end
-        local callback = timer[3]
+        local callback = timer[2]
         if callback ~= nil then
             safeCall(
                 callback,
-                ____unpack(timer, 4 + 1, 4 + (timer[4] or 0))
+                ____unpack(timer, 3 + 1, 3 + (timer[3] or 0))
             )
         end
     end
 end
+local zeroTimerScheduled = false
+local zeroTimerCallbacks = callbackArray()
+---
+-- @internal For use by internal systems only.
+____exports.consumeZeroTimerCallback = function(id)
+    consumeCallback(zeroTimerCallbacks, id)
+end
+local function invokeZeroTimerCallbacks()
+    zeroTimerScheduled = false
+    consumeCallbacks(zeroTimerCallbacks)
+end
 ____exports.Timer = __TS__Class()
 local Timer = ____exports.Timer
 Timer.name = "Timer"
+__TS__ClassExtends(Timer, AbstractDestroyable)
 function Timer.prototype.____constructor(self)
+    AbstractDestroyable.prototype.____constructor(self)
     self[0] = get()
     timerByHandleId[getHandleId(self[0])] = self
 end
 function Timer.prototype.start(self, timeout, periodic, callback, ...)
-    self[3] = callback
+    self[2] = callback
     local argsLength = select("#", ...)
-    self[4] = argsLength
+    self[3] = argsLength
     for i = 1, argsLength do
-        self[4 + i] = (select(i, ...))
+        self[3 + i] = (select(i, ...))
     end
     timerStart(self.handle, timeout, periodic, timerSafeCall)
 end
+function Timer.prototype.onDestroy(self)
+    local handle = self[0]
+    timerByHandleId[getHandleId(handle)] = nil
+    release(handle)
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
 function Timer.prototype.pause(self)
     pauseTimer(self[0])
 end
 function Timer.prototype.resume(self)
     resumeTimer(self[0])
 end
-function Timer.prototype.destroy(self)
-    if self[1] then
-        error(
-            __TS__New(IllegalStateException, "Double-destroy run for timer"),
-            0
-        )
-    end
-    local handle = self[0]
-    timerByHandleId[getHandleId(handle)] = nil
-    release(handle)
-    self[1] = true
-end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if not zeroTimerScheduled then
+        zeroTimerScheduled = true
+        ____exports.Timer:simple(0, invokeZeroTimerCallbacks)
+    end
+    if ____type(objectOrCallback) == "function" then
+        return addCallback(zeroTimerCallbacks, objectOrCallback, keyOrFirstArg, ...)
+    else
+        return addCallback(zeroTimerCallbacks, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)
-    timer[2] = true
+    timer[1] = true
     timer:start(timeout, false, callback, ...)
     return timer
 end

package/core/types/unit.d.ts

@@ -1,6 +1,11 @@
 /** @noSelfInFile */
 import "../../engine/internal/unit";
 import "../../engine/internal/unit/ability";
+import "../../engine/internal/unit/appearance";
+import "../../engine/internal/unit/extended-inventory";
+import "../../engine/internal/unit/equipment-inventory";
+import "../../engine/internal/unit/inventory";
+import "../../engine/internal/unit/item-order-events";
 import "../../engine/internal/unit+damage";
 import "../../engine/internal/unit+rally";
 import "../../engine/internal/unit+spellSteal";

package/core/types/unit.lua

@@ -1,6 +1,11 @@
 local ____exports = {}
 require("engine.internal.unit")
 require("engine.internal.unit.ability")
+require("engine.internal.unit.appearance")
+require("engine.internal.unit.extended-inventory")
+require("engine.internal.unit.equipment-inventory")
+require("engine.internal.unit.inventory")
+require("engine.internal.unit.item-order-events")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")
 require("engine.internal.unit+spellSteal")

package/core/util.d.ts

@@ -54,9 +54,11 @@ declare global {
     function fourCC(id: string): number;
 }
 declare namespace inner {
-    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "moveslot0" | "moveslot1" | "moveslot2" | "moveslot3" | "moveslot4" | "moveslot5" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
+    /** @deprecated Use the {@link OrderType} const enum from `warscript/engine/object-data/auxiliary/order-type` instead. */
+    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "AImove" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auracalltoarms" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "batteringram" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "bladedance" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "challengingcall" | "channel" | "charm" | "chemicalrage" | "cleansingfire" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "consecration" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "deathseekerbow" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "moveslot0" | "moveslot1" | "moveslot2" | "moveslot3" | "moveslot4" | "moveslot5" | "useslot0" | "useslot1" | "useslot2" | "useslot3" | "useslot4" | "useslot5" | "moveslotext0" | "moveslotext1" | "moveslotext2" | "moveslotext3" | "moveslotext4" | "moveslotext5" | "moveslotext6" | "moveslotext7" | "moveslotext8" | "moveslotext9" | "moveslotext10" | "moveslotext11" | "moveslotext12" | "moveslotext13" | "moveslotext14" | "moveslotext15" | "moveslotext16" | "moveslotext17" | "moveslotext18" | "moveslotext19" | "moveslotext20" | "moveslotext21" | "moveslotext22" | "moveslotext23" | "moveslotext24" | "moveslotext25" | "moveslotext26" | "moveslotext27" | "moveslotext28" | "moveslotext29" | "moveslotequip0" | "moveslotequip1" | "moveslotequip2" | "moveslotequip3" | "moveslotequip4" | "moveslotequip5" | "moveslotequip6" | "moveslotequip7" | "moveslotequip8" | "useslotext0" | "useslotext1" | "useslotext2" | "useslotext3" | "useslotext4" | "useslotext5" | "useslotext6" | "useslotext7" | "useslotext8" | "useslotext9" | "useslotext10" | "useslotext11" | "useslotext12" | "useslotext13" | "useslotext14" | "useslotext15" | "useslotext16" | "useslotext17" | "useslotext18" | "useslotext19" | "useslotext20" | "useslotext21" | "useslotext22" | "useslotext23" | "useslotext24" | "useslotext25" | "useslotext26" | "useslotext27" | "useslotext28" | "useslotext29" | "useslotequip0" | "useslotequip1" | "useslotequip2" | "useslotequip3" | "useslotequip4" | "useslotequip5" | "useslotequip6" | "useslotequip7" | "useslotequip8" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareaoe" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "grit" | "guidinghand" | "harvest" | "headsplitter" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "heroicchallenge" | "heroicslash" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "inspirecourage" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "AIpatrol" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "purifierblade" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "righteousfury" | "ritualdagger" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soullantern" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "sweepingstrike" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undeadvengeance" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unguidinghand" | "unholyfrenzy" | "unholyfrenzyaoe" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unsoullantern" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "valiantcharge" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "warcry" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest" | "witheringfire") => number;
 }
 declare global {
+    /** @deprecated Use the {@link OrderType} const enum from `warscript/engine/object-data/auxiliary/order-type` instead. */
     function orderId(...args: Parameters<typeof inner.orderId>): ReturnType<typeof inner.orderId>;
 }
 export {};

package/core/util.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__StringPadEnd = ____lualib.__TS__StringPadEnd
 local ____exports = {}
 local ns = {}
 do
@@ -14,7 +16,10 @@ do
         if type(id) == "number" then
             return id
         else
-            local numid = string.unpack(">I4", id)
+            local numid = string.unpack(
+                ">I4",
+                __TS__StringPadEnd(id, 4, "\0")
+            )
             return numid
         end
     end
@@ -95,11 +100,14 @@ macro_define(
 _G.fourCC = util.s2id
 local inner = {}
 do
+    ---
+    -- @deprecated Use the {@link OrderType } const enum from `warscript/engine/object-data/auxiliary/order-type` instead.
     inner.orderId = (function()
         local orders = {
             absorb = 852529,
             acidbomb = 852662,
             acolyteharvest = 852185,
+            AImove = 851988,
             ambush = 852131,
             ancestralspirit = 852490,
             ancestralspirittarget = 852491,
@@ -109,6 +117,7 @@ do
             attackground = 851984,
             attackonce = 851985,
             attributemodskill = 852576,
+            auracalltoarms = 852688,
             auraunholy = 852215,
             auravampiric = 852216,
             autodispel = 852132,
@@ -125,6 +134,7 @@ do
             barkskin = 852135,
             barkskinoff = 852137,
             barkskinon = 852136,
+            batteringram = 852705,
             battleroar = 852599,
             battlestations = 852099,
             bearform = 852138,
@@ -132,6 +142,7 @@ do
             blackarrow = 852577,
             blackarrowoff = 852579,
             blackarrowon = 852578,
+            bladedance = 852698,
             blight = 852187,
             blink = 852525,
             blizzard = 852089,
@@ -150,13 +161,16 @@ do
             carrionscarabson = 852552,
             carrionswarm = 852218,
             chainlightning = 852119,
+            challengingcall = 852520,
             channel = 852600,
             charm = 852581,
             chemicalrage = 852663,
+            cleansingfire = 852704,
             cloudoffog = 852473,
             clusterrockets = 852652,
             coldarrows = 852244,
             coldarrowstarg = 852243,
+            consecration = 852702,
             controlmagic = 852474,
             corporealform = 852493,
             corrosivebreath = 852140,
@@ -181,6 +195,7 @@ do
             deathanddecay = 852221,
             deathcoil = 852222,
             deathpact = 852223,
+            deathseekerbow = 852710,
             decouple = 852509,
             defend = 852055,
             detectaoe = 852015,
@@ -202,11 +217,96 @@ do
             moveslot3 = 852005,
             moveslot4 = 852006,
             moveslot5 = 852007,
+            useslot0 = 852008,
+            useslot1 = 852009,
+            useslot2 = 852010,
+            useslot3 = 852011,
+            useslot4 = 852012,
+            useslot5 = 852013,
+            moveslotext0 = 852714,
+            moveslotext1 = 852715,
+            moveslotext2 = 852716,
+            moveslotext3 = 852717,
+            moveslotext4 = 852718,
+            moveslotext5 = 852719,
+            moveslotext6 = 852720,
+            moveslotext7 = 852721,
+            moveslotext8 = 852722,
+            moveslotext9 = 852723,
+            moveslotext10 = 852724,
+            moveslotext11 = 852725,
+            moveslotext12 = 852726,
+            moveslotext13 = 852727,
+            moveslotext14 = 852728,
+            moveslotext15 = 852729,
+            moveslotext16 = 852730,
+            moveslotext17 = 852731,
+            moveslotext18 = 852732,
+            moveslotext19 = 852733,
+            moveslotext20 = 852734,
+            moveslotext21 = 852735,
+            moveslotext22 = 852736,
+            moveslotext23 = 852737,
+            moveslotext24 = 852738,
+            moveslotext25 = 852739,
+            moveslotext26 = 852740,
+            moveslotext27 = 852741,
+            moveslotext28 = 852742,
+            moveslotext29 = 852743,
+            moveslotequip0 = 852744,
+            moveslotequip1 = 852745,
+            moveslotequip2 = 852746,
+            moveslotequip3 = 852747,
+            moveslotequip4 = 852748,
+            moveslotequip5 = 852749,
+            moveslotequip6 = 852750,
+            moveslotequip7 = 852751,
+            moveslotequip8 = 852752,
+            useslotext0 = 852771,
+            useslotext1 = 852772,
+            useslotext2 = 852773,
+            useslotext3 = 852774,
+            useslotext4 = 852775,
+            useslotext5 = 852776,
+            useslotext6 = 852777,
+            useslotext7 = 852778,
+            useslotext8 = 852779,
+            useslotext9 = 852780,
+            useslotext10 = 852781,
+            useslotext11 = 852782,
+            useslotext12 = 852783,
+            useslotext13 = 852784,
+            useslotext14 = 852785,
+            useslotext15 = 852786,
+            useslotext16 = 852787,
+            useslotext17 = 852788,
+            useslotext18 = 852789,
+            useslotext19 = 852790,
+            useslotext20 = 852791,
+            useslotext21 = 852792,
+            useslotext22 = 852793,
+            useslotext23 = 852794,
+            useslotext24 = 852795,
+            useslotext25 = 852796,
+            useslotext26 = 852797,
+            useslotext27 = 852798,
+            useslotext28 = 852799,
+            useslotext29 = 852800,
+            useslotequip0 = 852801,
+            useslotequip1 = 852802,
+            useslotequip2 = 852803,
+            useslotequip3 = 852804,
+            useslotequip4 = 852805,
+            useslotequip5 = 852806,
+            useslotequip6 = 852807,
+            useslotequip7 = 852808,
+            useslotequip8 = 852809,
             drunkenhaze = 852585,
             earthquake = 852121,
             eattree = 852146,
             elementalfury = 852586,
             ensnare = 852106,
+            ensnareaoe = 852687,
             ensnareoff = 852108,
             ensnareon = 852107,
             entangle = 852147,
@@ -241,13 +341,18 @@ do
             getitem = 851981,
             gold2lumber = 852233,
             grabtree = 852511,
+            grit = 852693,
+            guidinghand = 852695,
             harvest = 852018,
+            headsplitter = 852691,
             heal = 852063,
             healingspray = 852664,
             healingward = 852109,
             healingwave = 852501,
             healoff = 852065,
             healon = 852064,
+            heroicchallenge = 852694,
+            heroicslash = 852684,
             hex = 852502,
             holdposition = 851993,
             holybolt = 852092,
@@ -262,6 +367,7 @@ do
             innerfire = 852066,
             innerfireoff = 852068,
             innerfireon = 852067,
+            inspirecourage = 852689,
             instant = 852200,
             invisibility = 852069,
             lavamonster = 852667,
@@ -293,7 +399,6 @@ do
             mount = 852469,
             mounthippogryph = 852143,
             move = 851986,
-            moveAI = 851988,
             nagabuild = 852467,
             neutraldetectaoe = 852023,
             neutralinteract = 852566,
@@ -304,7 +409,7 @@ do
             parasiteoff = 852603,
             parasiteon = 852602,
             patrol = 851990,
-            patrolAI = 851991,
+            AIpatrol = 851991,
             phaseshift = 852514,
             phaseshiftinstant = 852517,
             phaseshiftoff = 852516,
@@ -317,6 +422,7 @@ do
             possession = 852196,
             preservation = 852568,
             purge = 852111,
+            purifierblade = 852707,
             rainofchaos = 852237,
             rainoffire = 852238,
             raisedead = 852197,
@@ -353,6 +459,8 @@ do
             returnresources = 852020,
             revenge = 852241,
             revive = 852039,
+            righteousfury = 852706,
+            ritualdagger = 852674,
             roar = 852164,
             robogoblin = 852656,
             root = 852165,
@@ -375,6 +483,7 @@ do
             slowoff = 852077,
             slowon = 852076,
             soulburn = 852668,
+            soullantern = 852708,
             soulpreservation = 852242,
             spellshield = 852571,
             spellshieldaoe = 852572,
@@ -401,6 +510,7 @@ do
             summonphoenix = 852489,
             summonquillbeast = 852595,
             summonwareagle = 852596,
+            sweepingstrike = 852680,
             tankdroppilot = 852079,
             tankloadpilot = 852080,
             tankpilot = 852081,
@@ -419,12 +529,15 @@ do
             uncoldarrows = 852245,
             uncorporealform = 852494,
             undeadbuild = 851998,
+            undeadvengeance = 852703,
             undefend = 852056,
             undivineshield = 852091,
             unetherealform = 852497,
             unflamingarrows = 852175,
             unflamingattack = 852541,
+            unguidinghand = 852696,
             unholyfrenzy = 852209,
+            unholyfrenzyaoe = 852675,
             unimmolation = 852178,
             unload = 852047,
             unloadall = 852048,
@@ -434,17 +547,20 @@ do
             unravenform = 852156,
             unrobogoblin = 852657,
             unroot = 852166,
+            unsoullantern = 852709,
             unstableconcoction = 852500,
             unstoneform = 852207,
             unsubmerge = 852605,
             unsummon = 852210,
             unwindwalk = 852130,
+            valiantcharge = 852685,
             vengeance = 852521,
             vengeanceinstant = 852524,
             vengeanceoff = 852523,
             vengeanceon = 852522,
             volcano = 852669,
             voodoo = 852503,
+            warcry = 852701,
             ward = 852504,
             waterelemental = 852097,
             wateryminion = 852598,
@@ -453,7 +569,8 @@ do
             webon = 852212,
             whirlwind = 852128,
             windwalk = 852129,
-            wispharvest = 852214
+            wispharvest = 852214,
+            witheringfire = 852711
         }
         return function(id)
             return orders[id] or 0