warscript 0.0.1-dev.524f1b8 → 0.0.1-dev.539675b

package/attributes.d.ts

@@ -1,8 +1,12 @@
 /** @noSelfInFile */
+declare const marker: {};
 export type Attribute<T> = {
     readonly __attribute: unique symbol;
     readonly __type: T;
+    readonly __marker: typeof marker;
 } & symbol;
+export declare const attribute: <T>() => Attribute<T>;
+export declare const isAttribute: (value: unknown) => value is Attribute<unknown>;
 export declare namespace Attribute {
     const create: <T>() => Attribute<T>;
 }
@@ -10,3 +14,4 @@ export declare class AttributesHolder {
     readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
     readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
 }
+export {};

package/attributes.lua

@@ -1,11 +1,18 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local ____exports = {}
+local marker = {}
+____exports.attribute = function()
+    return {__marker = marker}
+end
+____exports.isAttribute = function(value)
+    return type(value) == "table" and rawget(value, "__marker") == marker
+end
 ____exports.Attribute = {}
 local Attribute = ____exports.Attribute
 do
     Attribute.create = function()
-        return {}
+        return {__marker = marker}
     end
 end
 ____exports.AttributesHolder = __TS__Class()

package/core/types/order.d.ts

@@ -6,6 +6,7 @@ export type Order = {
     id: number;
     startX: number;
     startY: number;
+    issueTime: number;
 } & ({
     type: "immediate";
 } | {

package/core/types/order.lua

@@ -3,16 +3,25 @@ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
+local ____game = require("core.game")
+local elapsedTime = ____game.elapsedTime
 local getUnitCurrentOrder = GetUnitCurrentOrder
 local orders = setmetatable({}, {__mode = "k"})
 Unit.onImmediateOrder:addListener(function(unit, orderId)
-    orders[unit] = {id = orderId, startX = unit.x, startY = unit.y, type = "immediate"}
+    orders[unit] = {
+        id = orderId,
+        startX = unit.x,
+        startY = unit.y,
+        issueTime = elapsedTime(),
+        type = "immediate"
+    }
 end)
 Unit.onPointOrder:addListener(function(unit, orderId, x, y)
     orders[unit] = {
         id = orderId,
         startX = unit.x,
         startY = unit.y,
+        issueTime = elapsedTime(),
         type = "point",
         targetX = x,
         targetY = y
@@ -23,6 +32,7 @@ Unit.onTargetOrder:addListener(function(unit, orderId, target)
         id = orderId,
         startX = unit.x,
         startY = unit.y,
+        issueTime = elapsedTime(),
         type = "target",
         target = target
     }