warscript 0.0.1-dev.29b3feb → 0.0.1-dev.3599429

package/engine/internal/unit/ability.lua

@@ -26,11 +26,8 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +36,6 @@ local function retrieveAbility(unit, ability, abilityId)
             Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then

package/engine/internal/unit/main-selected.d.ts

@@ -1,5 +1,11 @@
 /** @noSelfInFile */
 import { Player } from "../../../core/types/player";
+import { Event } from "../../../event";
+declare module "../unit" {
+    namespace Unit {
+        const mainSelectedUnitChangeEvent: Event<[Player]>;
+    }
+}
 declare module "../unit" {
     namespace Unit {
         const getMainSelectedOf: (player: Player) => Unit | undefined;

package/engine/internal/unit/main-selected.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -8,6 +10,10 @@ local ____local_2Dclient = require("engine.local-client")
 local LocalClient = ____local_2Dclient.LocalClient
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+local ____event = require("event")
+local Event = ____event.Event
+local mainSelectedUnitChangeEvent = __TS__New(Event)
+rawset(Unit, "mainSelectedUnitChangeEvent", mainSelectedUnitChangeEvent)
 local mainSelectedUnitByPlayer = {}
 local syncSlider = BlzCreateFrameByType(
     "SLIDER",
@@ -27,7 +33,12 @@ BlzTriggerRegisterFrameEvent(trg, syncSlider, FRAMEEVENT_SLIDER_VALUE_CHANGED)
 TriggerAddAction(
     trg,
     function()
-        mainSelectedUnitByPlayer[Player:of(GetTriggerPlayer())] = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        local player = Player:of(GetTriggerPlayer())
+        local mainSelectedUnit = Unit:getBySyncId(BlzGetTriggerFrameValue())
+        if mainSelectedUnit ~= mainSelectedUnitByPlayer[player] then
+            mainSelectedUnitByPlayer[player] = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, player)
+        end
     end
 )
 rawset(

package/engine/internal/unit.lua

@@ -562,17 +562,6 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                ____exports.Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -2552,8 +2541,8 @@ __TS__ObjectDefineProperty(
     "itemMovedEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        for order = orderId("moveslot1"), orderId("moveslot5") do
-            local slotTo = order - orderId("moveslot1")
+        for order = orderId("moveslot0"), orderId("moveslot5") do
+            local slotTo = order - orderId("moveslot0")
             self.onTargetOrder[order]:addListener(function(unit, item)
                 local slotFrom = unit.items:findSlot(item)
                 if slotFrom ~= nil then

package/package.json

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