warscript 0.0.1-dev.0a43a35 → 0.0.1-dev.172070c

package/core/types/frame.d.ts

@@ -25,6 +25,8 @@ export declare class Frame extends Handle<jframehandle> {
     static readonly GAME_UI: Frame;
     static readonly CONSOLE_UI: Frame;
     static readonly CONSOLE_UI_BACKDROP: Frame;
+    static readonly CONSOLE_TOP_BAR: Frame;
+    static readonly CONSOLE_BOTTOM_BAR: Frame;
     static readonly WORLD: Frame;
     static readonly CHAT: Frame;
     static readonly TIME_OF_DAY_CLOCK: Frame;

package/core/types/frame.lua

@@ -293,6 +293,8 @@ end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
 Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
+Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
+Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
 Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
 Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
 Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)

package/engine/behaviour/ability/damage.d.ts

@@ -14,12 +14,20 @@ export declare class DamageTargetAbilityBehavior extends AbilityBehavior {
     constructor(ability: Ability, damage: AbilityDependentValue<number>);
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
 }
-export declare class DamageTargetAreaAbilityBehavior extends AbilityBehavior {
+declare abstract class DamageAreaAbilityBehavior extends AbilityBehavior {
     private readonly damage;
     private readonly maximumDamage?;
-    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
+    protected constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number> | undefined);
+    protected damageArea(caster: Unit, x: number, y: number): void;
+}
+export declare class DamageSelfAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>);
+    onImpact(caster: Unit): void;
+}
+export declare class DamageTargetAreaAbilityBehavior extends DamageAreaAbilityBehavior {
+    constructor(ability: Ability, damage: AbilityDependentValue<number>, maximumDamage?: AbilityDependentValue<number>);
     onNoTargetImpact(caster: Unit): void;
     onWidgetTargetImpact(caster: Unit, target: Widget): void;
     onPointTargetImpact(caster: Unit, x: number, y: number): void;
-    private damageArea;
 }
+export {};

package/engine/behaviour/ability/damage.lua

@@ -37,25 +37,15 @@ function DamageTargetAbilityBehavior.prototype.onWidgetTargetImpact(self, caster
         self:resolveCurrentAbilityDependentValue(self.damage)
     )
 end
-____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
-local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
-DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
-__TS__ClassExtends(DamageTargetAreaAbilityBehavior, AbilityBehavior)
-function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+local DamageAreaAbilityBehavior = __TS__Class()
+DamageAreaAbilityBehavior.name = "DamageAreaAbilityBehavior"
+__TS__ClassExtends(DamageAreaAbilityBehavior, AbilityBehavior)
+function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
     AbilityBehavior.prototype.____constructor(self, ability)
     self.damage = damage
     self.maximumDamage = maximumDamage
 end
-function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
-    self:damageArea(caster, caster.x, caster.y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
-    self:damageArea(caster, target.x, target.y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
-    self:damageArea(caster, x, y)
-end
-function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
+function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
     local targets = Unit.getAllowedTargetsInCollisionRange(
         caster,
         self:resolveCurrentAbilityDependentValue(ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
@@ -72,4 +62,30 @@ function DamageTargetAreaAbilityBehavior.prototype.damageArea(self, caster, x, y
         caster:damageTarget(target, damage)
     end
 end
+____exports.DamageSelfAreaAbilityBehavior = __TS__Class()
+local DamageSelfAreaAbilityBehavior = ____exports.DamageSelfAreaAbilityBehavior
+DamageSelfAreaAbilityBehavior.name = "DamageSelfAreaAbilityBehavior"
+__TS__ClassExtends(DamageSelfAreaAbilityBehavior, DamageAreaAbilityBehavior)
+function DamageSelfAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+end
+function DamageSelfAreaAbilityBehavior.prototype.onImpact(self, caster)
+    self:damageArea(caster, caster.x, caster.y)
+end
+____exports.DamageTargetAreaAbilityBehavior = __TS__Class()
+local DamageTargetAreaAbilityBehavior = ____exports.DamageTargetAreaAbilityBehavior
+DamageTargetAreaAbilityBehavior.name = "DamageTargetAreaAbilityBehavior"
+__TS__ClassExtends(DamageTargetAreaAbilityBehavior, DamageAreaAbilityBehavior)
+function DamageTargetAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+    DamageAreaAbilityBehavior.prototype.____constructor(self, ability, damage, maximumDamage)
+end
+function DamageTargetAreaAbilityBehavior.prototype.onNoTargetImpact(self, caster)
+    self:damageArea(caster, caster.x, caster.y)
+end
+function DamageTargetAreaAbilityBehavior.prototype.onWidgetTargetImpact(self, caster, target)
+    self:damageArea(caster, target.x, target.y)
+end
+function DamageTargetAreaAbilityBehavior.prototype.onPointTargetImpact(self, caster, x, y)
+    self:damageArea(caster, x, y)
+end
 return ____exports

package/engine/behaviour/ability/restore-mana.d.ts

@@ -0,0 +1,15 @@
+/** @noSelfInFile */
+import { Ability } from "../../internal/ability";
+import { Unit } from "../../internal/unit";
+import { AbilityDependentValue } from "../../object-field/ability";
+import { AbilityBehavior } from "../ability";
+export declare class RestoreManaSelfAbilityBehavior extends AbilityBehavior {
+    private readonly mana;
+    constructor(ability: Ability, mana: AbilityDependentValue<number>);
+    onImpact(caster: Unit): void;
+}
+export declare class RestoreManaAbilityBehavior extends AbilityBehavior {
+    private readonly mana;
+    constructor(ability: Ability, mana: AbilityDependentValue<number>);
+    onUnitTargetImpact(caster: Unit, target: Unit): void;
+}

package/engine/behaviour/ability/restore-mana.lua

@@ -0,0 +1,29 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ability = require("engine.behaviour.ability")
+local AbilityBehavior = ____ability.AbilityBehavior
+____exports.RestoreManaSelfAbilityBehavior = __TS__Class()
+local RestoreManaSelfAbilityBehavior = ____exports.RestoreManaSelfAbilityBehavior
+RestoreManaSelfAbilityBehavior.name = "RestoreManaSelfAbilityBehavior"
+__TS__ClassExtends(RestoreManaSelfAbilityBehavior, AbilityBehavior)
+function RestoreManaSelfAbilityBehavior.prototype.____constructor(self, ability, mana)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.mana = mana
+end
+function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
+    caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
+end
+____exports.RestoreManaAbilityBehavior = __TS__Class()
+local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
+RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
+__TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
+function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
+    AbilityBehavior.prototype.____constructor(self, ability)
+    self.mana = mana
+end
+function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
+    target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
+end
+return ____exports

package/engine/game-map.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { Rect } from "../core/types/rect";
+import { Region } from "../core/types/region";
+export declare class GameMap {
+    static get worldBoundsRect(): Rect;
+    static get worldBoundsRegion(): Region;
+}

package/engine/game-map.lua

@@ -0,0 +1,32 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____rect = require("core.types.rect")
+local Rect = ____rect.Rect
+local ____region = require("core.types.region")
+local Region = ____region.Region
+____exports.GameMap = __TS__Class()
+local GameMap = ____exports.GameMap
+GameMap.name = "GameMap"
+function GameMap.prototype.____constructor(self)
+end
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRect",
+    {get = function(self)
+        local rect = Rect:of(GetWorldBounds())
+        rawset(self, "worldBoundsRect", rect)
+        return rect
+    end}
+)
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRegion",
+    {get = function(self)
+        local region = Region:create(self.worldBoundsRect)
+        rawset(self, "worldBoundsRegion", region)
+        return region
+    end}
+)
+return ____exports

package/engine/internal/unit+transport.lua

@@ -6,9 +6,8 @@ local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
 local Event = ____event.Event
-local ____mapbounds = require("core.mapbounds")
-local boundMax = ____mapbounds.boundMax
-local boundRegion = ____mapbounds.boundRegion
+local ____game_2Dmap = require("engine.game-map")
+local GameMap = ____game_2Dmap.GameMap
 local eventInvoke = Event.invoke
 local tableRemove = table.remove
 local ____assert = _G.assert
@@ -58,8 +57,8 @@ triggerAddCondition(
             deboard(unit)
         end
         if not unitAlive(handle) then
-            unit.x = boundMax.x
-            unit.y = boundMax.y
+            unit.x = GameMap.worldBoundsRect.maxX
+            unit.y = GameMap.worldBoundsRect.maxY
         end
         local transport = Unit:of(getTransportUnit())
         transportByUnit[unit] = transport
@@ -68,11 +67,6 @@ triggerAddCondition(
         eventInvoke(onBoardEvent, unit, transport)
     end)
 )
-boundRegion.onUnitEnter:addListener(function(unit)
-    if transportByUnit[unit] ~= nil and not isUnitLoaded(unit.handle) then
-        deboard(unit)
-    end
-end)
 Unit.deathEvent:addListener(function(unit)
     if transportByUnit[unit] ~= nil then
         deboard(unit)

package/engine/internal/unit.lua

@@ -290,7 +290,6 @@ local function dispatch(event, idGetter, argsGetter)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(...)
                         local id = idGetter(...)
                         local dispatched = rawget(self, id)
@@ -328,7 +327,6 @@ local function dispatchAbility(event)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(unit, ability, ...)
                         local dispatched = rawget(self, ability.typeId)
                         if dispatched ~= nil then
@@ -706,6 +704,10 @@ function Unit.prototype.onDestroy(self)
     if eventsToDestroy ~= nil then
         forEach(eventsToDestroy, "destroy")
     end
+    if getUnitAbilityLevel(handle, leaveDetectAbilityId) > 0 then
+        unitRemoveAbility(handle, leaveDetectAbilityId)
+        removeUnit(handle)
+    end
     return Handle.prototype.onDestroy(self)
 end
 function Unit.prototype.addAttackHandler(self, condition, action)
@@ -2060,7 +2062,6 @@ Unit.onDecay = __TS__New(
 Unit.onResurrect = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local dead = setmetatable({}, {__mode = "k"})
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
@@ -2076,10 +2077,15 @@ Unit.onResurrect = __TS__New(
 Unit.morphEvent = __TS__New(
     InitializingEvent,
     function(event)
+        local function ifNotLeft(unit)
+            local handle = unit.handle
+            if getUnitAbilityLevel(handle, leaveDetectAbilityId) ~= 0 and unitAddAbility(handle, morphDetectAbilityId) then
+                invoke(event, unit)
+            end
+        end
         ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
-                assert(unitAddAbility(unit.handle, morphDetectAbilityId))
-                Timer:run(Event.invoke, event, unit)
+                Timer:run(ifNotLeft, unit)
             end
         end)
     end
@@ -2117,7 +2123,6 @@ Unit.onSpellEffect = dispatchId(__TS__New(
 Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local function listener(unit, id)
             local ____GetSpellTargetUnit_result_8
             if GetSpellTargetUnit() then
@@ -2334,7 +2339,6 @@ Unit.autoAttackStartEvent = __TS__New(
 )
 Unit.onDamaging = (function()
     local event = __TS__New(Event)
-    local invoke = Event.invoke
     local trigger = CreateTrigger()
     TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGING)
     TriggerAddCondition(
@@ -2433,7 +2437,6 @@ end)()
 Unit.onDamage = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local trigger = CreateTrigger()
         TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
         TriggerAddCondition(

package/lualib_bundle.lua

@@ -1094,6 +1094,11 @@ do
         end
         if __TS__StringIncludes(_VERSION, "Lua 5.0") then
             return debug.traceback(("[Level " .. tostring(level)) .. "]")
+        elseif _VERSION == "Lua 5.1" then
+            return string.sub(
+                debug.traceback("", level),
+                2
+            )
         else
             return debug.traceback(nil, level)
         end
@@ -1102,7 +1107,7 @@ do
         return function(self)
             local description = getDescription(self)
             local caller = debug.getinfo(3, "f")
-            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0") or _VERSION == "Lua 5.1"
+            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0")
             if isClassicLua or caller and caller.func ~= error then
                 return description
             else
@@ -1126,7 +1131,7 @@ do
         end
         self.message = message
         self.name = "Error"
-        self.stack = getErrorStack(nil, self.constructor.new)
+        self.stack = getErrorStack(nil, __TS__New)
         local metatable = getmetatable(self)
         if metatable and not metatable.__errorToStringPatched then
             metatable.__errorToStringPatched = true

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.0a43a35",
+    "version": "0.0.1-dev.172070c",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.07dd222"
+        "warpack": "0.0.1-dev.2c4e71e"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/core/mapbounds.d.ts

@@ -1,8 +0,0 @@
-/** @noSelfInFile */
-import { Rect } from "./types/rect";
-import { Region } from "./types/region";
-export declare const boundRect: Rect;
-export declare const boundRegion: Region;
-export declare const boundMin: Readonly<Vec2>;
-export declare const boundMax: Readonly<Vec2>;
-export declare const boundCenter: Readonly<Vec2>;

package/core/mapbounds.lua

@@ -1,12 +0,0 @@
-local ____exports = {}
-local ____rect = require("core.types.rect")
-local Rect = ____rect.Rect
-local ____region = require("core.types.region")
-local Region = ____region.Region
-____exports.boundRect = Rect:of(GetWorldBounds())
-____exports.boundRegion = Region:create()
-____exports.boundRegion:addRect(____exports.boundRect)
-____exports.boundMin = vec2(____exports.boundRect.minX, ____exports.boundRect.minY)
-____exports.boundMax = vec2(____exports.boundRect.maxX, ____exports.boundRect.maxY)
-____exports.boundCenter = (____exports.boundMin + ____exports.boundMax) * 0.5
-return ____exports