warscript 0.0.1-dev.24ac045 → 0.0.1-dev.24da7f2

package/engine/internal/unit/order.lua

@@ -11,7 +11,7 @@ local getUnitCurrentOrder = GetUnitCurrentOrder
 local issueImmediateOrderById = IssueImmediateOrderById
 local issuePointOrderById = IssuePointOrderById
 local issueTargetOrderById = IssueTargetOrderById
-local unitLastOrderTypeAttribute = attribute()
+local unitLastOrderKindAttribute = attribute()
 local unitLastOrderIdAttribute = attribute()
 local unitLastOrderStartTimeAttribute = attribute()
 local unitLastOrderStartXAttribute = attribute()
@@ -22,7 +22,7 @@ local unitLastOrderTargetAttribute = attribute()
 Unit.onImmediateOrder:addListener(
     4,
     function(unit, orderId)
-        unit[unitLastOrderTypeAttribute] = 0
+        unit[unitLastOrderKindAttribute] = 0
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -35,7 +35,7 @@ Unit.onImmediateOrder:addListener(
 Unit.onPointOrder:addListener(
     4,
     function(unit, orderId, x, y)
-        unit[unitLastOrderTypeAttribute] = 1
+        unit[unitLastOrderKindAttribute] = 1
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -48,7 +48,7 @@ Unit.onPointOrder:addListener(
 Unit.onTargetOrder:addListener(
     4,
     function(unit, orderId, target)
-        unit[unitLastOrderTypeAttribute] = 2
+        unit[unitLastOrderKindAttribute] = 2
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -62,7 +62,7 @@ local function toUndefinedIfCurrentOrderDoesNotMatchLast(unit, value)
     local currentOrderId = getUnitCurrentOrder(unit.handle)
     local lastOrderId = unit[unitLastOrderIdAttribute]
     local ____temp_0
-    if currentOrderId == lastOrderId or currentOrderId == orderId("patrolAI") and lastOrderId == orderId("patrol") then
+    if currentOrderId == lastOrderId or currentOrderId == 851991 and lastOrderId == 851990 then
         ____temp_0 = value
     else
         ____temp_0 = nil
@@ -71,9 +71,9 @@ local function toUndefinedIfCurrentOrderDoesNotMatchLast(unit, value)
 end
 __TS__ObjectDefineProperty(
     Unit.prototype,
-    "currentOrderType",
+    "currentOrderKind",
     {get = function(self)
-        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTypeAttribute]) or 0
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderKindAttribute]) or 0
     end}
 )
 __TS__ObjectDefineProperty(
@@ -125,12 +125,12 @@ __TS__ObjectDefineProperty(
         return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTargetAttribute])
     end}
 )
-local issueOrderByType = {
+local issueOrderByKind = {
     [0] = issueImmediateOrderById,
     [1] = issuePointOrderById,
     [2] = function(unitHandle, orderId, widget) return issueTargetOrderById(unitHandle, orderId, widget.handle) end
 }
-Unit.prototype.issueOrder = function(self, orderType, orderId, xOrTarget, y)
-    return issueOrderByType[orderType](self.handle, orderId, xOrTarget, y)
+Unit.prototype.issueOrder = function(self, orderKind, orderId, xOrTarget, y)
+    return issueOrderByKind[orderKind](self.handle, orderId, xOrTarget, y)
 end
 return ____exports

package/engine/internal/unit/range-event.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+import { Event } from "../../../event";
+declare module "../unit" {
+    interface Unit {
+        readonly unitInRangeEvent: Record<number, Event<[unit: Unit, range: number, unitInRange: Unit]>>;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        readonly unitOutOfRangeEvent: Record<number, Event<[unit: Unit, range: number, unitOutOfRange: Unit]>>;
+    }
+}

package/engine/internal/unit/range-event.lua

@@ -0,0 +1,90 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____event = require("event")
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
+local TriggerEvent = ____event.TriggerEvent
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____linked_2Dmap = require("utility.linked-map")
+local mutableLinkedMap = ____linked_2Dmap.mutableLinkedMap
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
+local getTriggerUnit = GetTriggerUnit
+local triggerRegisterUnitInRange = TriggerRegisterUnitInRange
+local eventInvoke = Event.invoke
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitInRangeEvent",
+    {get = function(self)
+        local unit = self
+        local handle = self.handle
+        local unitInRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    TriggerEvent,
+                    function(trigger)
+                        triggerRegisterUnitInRange(trigger, handle, value, nil)
+                    end,
+                    function() return unit, value, Unit:of(getTriggerUnit()) end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitInRangeEvent", unitInRangeEvent)
+        return unitInRangeEvent
+    end}
+)
+local units = __TS__New(LinkedSet)
+local unitsInRangeByRangeAttribute = attribute()
+local function registerUnitOfRangeEvent(unit, range, unitInRange)
+    units:add(unit)
+    unit:getOrPut(unitsInRangeByRangeAttribute, mutableLinkedMap):getOrPut(range, mutableLinkedSet):add(unitInRange)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitOutOfRangeEvent",
+    {get = function(self)
+        local unit = self
+        local unitOutOfRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    InitializingEvent,
+                    function()
+                        unit.unitInRangeEvent[value]:addListener(999999, registerUnitOfRangeEvent)
+                    end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitOutOfRangeEvent", unitOutOfRangeEvent)
+        return unitOutOfRangeEvent
+    end}
+)
+Timer.onPeriod[1]:addListener(function()
+    for unit in pairs(units) do
+        local unitsInRangeByRange = unit[unitsInRangeByRangeAttribute]
+        if unitsInRangeByRange ~= nil then
+            for range, unitsInRange in pairs(unitsInRangeByRange) do
+                for unitInRange in pairs(unitsInRange) do
+                    if unit:getDistanceTo(unitInRange) > range then
+                        unitsInRange:remove(unitInRange)
+                        eventInvoke(unit.unitOutOfRangeEvent[range], unit, range, unitInRange)
+                    end
+                end
+            end
+        end
+    end
+end)
+return ____exports

package/engine/internal/unit/scale.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        scale: number;
+    }
+}
+export {};

package/engine/internal/unit/scale.lua

@@ -0,0 +1,20 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit = require("engine.standard.fields.unit")
+local SCALING_VALUE_UNIT_FIELD = ____unit.SCALING_VALUE_UNIT_FIELD
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "scale",
+    {
+        get = function(self)
+            return SCALING_VALUE_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            SCALING_VALUE_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/unit/shared-vision-counter.d.ts

@@ -0,0 +1,18 @@
+/** @noSelfInFile */
+import { Player } from "../../../core/types/player";
+declare module "../unit" {
+    interface Unit {
+        /**
+         * Shares this unit with the player (`UnitShareVision`) until the matching
+         * `decrementSharedVisionCounter`. Verified in game with an enemy unit: the player, and
+         * the players the player shares vision with (one step, like alliance vision), see the
+         * unit itself but not the area it sees.
+         */
+        incrementSharedVisionCounter(player: Player): void;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        decrementSharedVisionCounter(player: Player): void;
+    }
+}

package/engine/internal/unit/shared-vision-counter.lua

@@ -0,0 +1,31 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local unitShareVision = UnitShareVision
+local sharedVisionCounterByPlayerByUnit = setmetatable({}, {__mode = "k"})
+Unit.prototype.incrementSharedVisionCounter = function(self, player)
+    local sharedVisionCounterByPlayer = sharedVisionCounterByPlayerByUnit[self]
+    if sharedVisionCounterByPlayer == nil then
+        sharedVisionCounterByPlayer = {}
+        sharedVisionCounterByPlayerByUnit[self] = sharedVisionCounterByPlayer
+    end
+    local sharedVisionCounter = sharedVisionCounterByPlayer[player] or 0
+    if sharedVisionCounter == 0 then
+        unitShareVision(self.handle, player.handle, true)
+    end
+    sharedVisionCounterByPlayer[player] = sharedVisionCounter + 1
+end
+Unit.prototype.decrementSharedVisionCounter = function(self, player)
+    local sharedVisionCounterByPlayer = sharedVisionCounterByPlayerByUnit[self]
+    local sharedVisionCounter = sharedVisionCounterByPlayer and sharedVisionCounterByPlayer[player] or 0
+    if sharedVisionCounterByPlayer == nil or sharedVisionCounter == 0 then
+        return
+    end
+    if sharedVisionCounter == 1 then
+        unitShareVision(self.handle, player.handle, false)
+        sharedVisionCounterByPlayer[player] = nil
+    else
+        sharedVisionCounterByPlayer[player] = sharedVisionCounter - 1
+    end
+end
+return ____exports

package/engine/internal/unit+ability.d.ts

@@ -1,9 +1,10 @@
 /** @noSelfInFile */
-import { Ability } from "./ability";
+import { Ability, UnitAbility } from "./ability";
 import { DispatchingEvent } from "../../event";
 declare module "./unit" {
     namespace Unit {
         const abilityGainedEvent: DispatchingEvent<[Unit, Ability]>;
         const abilityLostEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityLevelChangedEvent: DispatchingEvent<[Unit, UnitAbility]>;
     }
 }

package/engine/internal/unit+ability.lua

@@ -7,8 +7,12 @@ local UnitAbility = ____ability.UnitAbility
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
-local Event = ____event.Event
 local createDispatchingEvent = ____event.createDispatchingEvent
+local Event = ____event.Event
+local ____unit_2Dability_2Dlevel_2Dnatives = require("engine.internal.misc.unit-ability-level-natives")
+local rawDecUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawDecUnitAbilityLevel
+local rawIncUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawIncUnitAbilityLevel
+local rawSetUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawSetUnitAbilityLevel
 local abilityGainedEvent = createDispatchingEvent(
     __TS__New(Event),
     function(unit, ability) return ability.typeId end
@@ -19,12 +23,79 @@ local abilityLostEvent = createDispatchingEvent(
     function(unit, ability) return ability.typeId end
 )
 rawset(Unit, "abilityLostEvent", abilityLostEvent)
+local abilityLevelChangedEvent = createDispatchingEvent(
+    __TS__New(Event),
+    function(unit, ability) return ability.typeId end
+)
+rawset(Unit, "abilityLevelChangedEvent", abilityLevelChangedEvent)
+local getUnitAbilityLevel = GetUnitAbilityLevel
+local unitDisableAbility = BlzUnitDisableAbility
+local function invokeAbilityLevelChangedEvent(unitHandle, abilityTypeId)
+    local unit = Unit:of(unitHandle)
+    if unit ~= nil then
+        local ability = unit:getAbility(abilityTypeId)
+        if ability ~= nil then
+            Event.invoke(abilityLevelChangedEvent, unit, ability)
+        end
+    end
+end
+local function invokeAbilityLevelChangedEventIfChanged(unitHandle, abilityTypeId, previousLevel)
+    if previousLevel ~= 0 then
+        local level = getUnitAbilityLevel(unitHandle, abilityTypeId)
+        if level ~= 0 and level ~= previousLevel then
+            invokeAbilityLevelChangedEvent(unitHandle, abilityTypeId)
+        end
+    end
+end
+_G.SetUnitAbilityLevel = function(whichUnit, abilcode, level)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawSetUnitAbilityLevel(whichUnit, abilcode, level)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+_G.IncUnitAbilityLevel = function(whichUnit, abilcode)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawIncUnitAbilityLevel(whichUnit, abilcode)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+_G.DecUnitAbilityLevel = function(whichUnit, abilcode)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawDecUnitAbilityLevel(whichUnit, abilcode)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+local heroSkillTrigger = CreateTrigger()
+TriggerRegisterAnyUnitEventBJ(heroSkillTrigger, EVENT_PLAYER_HERO_SKILL)
+TriggerAddCondition(
+    heroSkillTrigger,
+    Condition(function()
+        if GetLearnedSkillLevel() > 1 then
+            local unitHandle = GetTriggerUnit()
+            if unitHandle ~= nil then
+                invokeAbilityLevelChangedEvent(
+                    unitHandle,
+                    GetLearnedSkill()
+                )
+            end
+        end
+    end)
+)
 UnitAbility.onCreate:addListener(
     0,
     function(ability)
         Event.invoke(abilityGainedEvent, ability.owner, ability)
     end
 )
+UnitAbility.onDestroy:addListener(
+    999999,
+    function(ability)
+        local owner = ability.owner
+        if owner.state ~= 2 then
+            unitDisableAbility(owner.handle, ability.typeId, true, false)
+        end
+    end
+)
 UnitAbility.destroyEvent:addListener(
     4,
     function(ability)
@@ -40,8 +111,17 @@ ItemAbility.onCreate:addListener(
         end
     end
 )
+ItemAbility.destroyEvent:addListener(
+    4,
+    function(ability)
+        local unit = ability.owner.owner
+        if unit ~= nil then
+            Event.invoke(abilityLostEvent, unit, ability)
+        end
+    end
+)
 Unit.itemPickedUpEvent:addListener(
-    0,
+    -999999,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
             Event.invoke(abilityGainedEvent, unit, ability)
@@ -49,7 +129,7 @@ Unit.itemPickedUpEvent:addListener(
     end
 )
 Unit.itemDroppedEvent:addListener(
-    4,
+    999999,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
             Event.invoke(abilityLostEvent, unit, ability)

package/engine/internal/unit+bonus.lua

@@ -3,9 +3,9 @@ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ____armor_2Dincrease = require("engine.internal.object-data.armor-increase")
-local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_FIELD
-local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____armor_2Dbonus = require("engine.internal.object-data.armor-bonus")
+local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_FIELD
+local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
 local getUnitAbility = BlzGetUnitAbility
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
 local unitAddAbility = UnitAddAbility

package/engine/internal/unit+damage.d.ts

@@ -1,6 +1,8 @@
 /** @noSelfInFile */
+import "./unit/allowed-targets";
 import { Widget } from "../../core/types/widget";
 import { AttackType } from "../object-data/auxiliary/attack-type";
+import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
 export type DamageType = jdamagetype;
 export declare namespace DamageType {
     const UNKNOWN: jdamagetype;
@@ -56,5 +58,12 @@ export declare namespace WeaponType {
 declare module "./unit" {
     interface Unit {
         damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): boolean;
+        /**
+         * Deals amount to each allowed unit in collision range of (x, y).
+         * A positive maximumDamage caps the total requested damage, shared equally
+         * between the targets. Zero or omitted means unlimited; damage mitigation
+         * and damage-event modifiers are applied afterward by damageTarget.
+         */
+        damageArea(x: number, y: number, range: number, allowedTargetCombatClassifications: CombatClassifications, amount: number, maximumDamage?: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): void;
     }
 }

package/engine/internal/unit+damage.lua

@@ -3,6 +3,7 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.allowed-targets")
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
@@ -11,6 +12,8 @@ local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
 local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
 local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
 local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
+local ____math = require("math")
+local min = ____math.min
 local createUnit = CreateUnit
 local getOwningPlayer = GetOwningPlayer
 local showUnit = ShowUnit
@@ -116,4 +119,34 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
         weaponType
     )
 end
+Unit.prototype.damageArea = function(self, x, y, range, allowedTargetCombatClassifications, amount, maximumDamage, attack, ranged, attackType, damageType, weaponType, metadata)
+    if maximumDamage == nil then
+        maximumDamage = 0
+    end
+    local targets = Unit.getAllowedTargetsInCollisionRange(
+        self,
+        allowedTargetCombatClassifications,
+        x,
+        y,
+        range
+    )
+    if #targets == 0 then
+        return
+    end
+    if maximumDamage > 0 then
+        amount = min(amount, maximumDamage / #targets)
+    end
+    for ____, target in ipairs(targets) do
+        self:damageTarget(
+            target,
+            amount,
+            attack,
+            ranged,
+            attackType,
+            damageType,
+            weaponType,
+            metadata
+        )
+    end
+end
 return ____exports

package/engine/internal/unit+rally.lua

@@ -23,22 +23,22 @@ local issueTargetOrderById = IssueTargetOrderById
 local queuePointOrderById = BlzQueuePointOrderById
 local queueTargetOrderById = BlzQueueTargetOrderById
 local rallyRouteByUnit = setmetatable({}, {__mode = "k"})
-Unit.onPointOrder[orderId("setrally")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851980]:addListener(function(unit, x, y)
     processPoint(unit, x, y)
 end)
-Unit.onPointOrder[orderId("smart")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851971]:addListener(function(unit, x, y)
     if unit:hasAbility(fourCC("ARal")) then
         processPoint(unit, x, y)
     end
 end)
-Unit.onTargetOrder[orderId("setrally")]:addListener(function(unit, target)
+Unit.onTargetOrder[851980]:addListener(function(unit, target)
     if __TS__InstanceOf(target, Unit) then
         processUnit(unit, target)
     elseif __TS__InstanceOf(target, Destructable) then
         processDestructible(unit, target)
     end
 end)
-Unit.onTargetOrder[orderId("smart")]:addListener(function(unit, target)
+Unit.onTargetOrder[851971]:addListener(function(unit, target)
     if unit:hasAbility(fourCC("ARal")) then
         if __TS__InstanceOf(target, Unit) then
             processUnit(unit, target)
@@ -116,41 +116,19 @@ __TS__ObjectDefineProperty(
             do
                 local rallyPoint = rallyRoute[1]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    issueTargetOrderById(handle, 851980, rallyPoint.handle)
                 elseif rallyPoint ~= nil then
-                    issuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    issuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 else
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        handle
-                    )
+                    issueTargetOrderById(handle, 851980, handle)
                 end
             end
             for i = 2, #rallyRoute do
                 local rallyPoint = rallyRoute[i]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    queueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    queueTargetOrderById(handle, 851980, rallyPoint.handle)
                 else
-                    queuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    queuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 end
             end
         end