warscript 0.0.1-dev.2af030d → 0.0.1-dev.35997e2

package/engine/behaviour/ability/instant-impact.lua

@@ -12,8 +12,12 @@ local InstantImpactAbilityBehavior = ____exports.InstantImpactAbilityBehavior
 InstantImpactAbilityBehavior.name = "InstantImpactAbilityBehavior"
 __TS__ClassExtends(InstantImpactAbilityBehavior, AbilityBehavior)
 function InstantImpactAbilityBehavior.prototype.onCastingStart(self, caster)
+    local abilityTypeId = self.ability.typeId
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
+    if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
+        return
+    end
     caster.mana = caster.mana - manaCost
     if cooldown == 0 then
         caster:interruptCast(self.ability.typeId)

package/engine/internal/unit.d.ts

@@ -249,6 +249,7 @@ export declare class Unit extends Handle<junit> {
     getAbilityById(abilityId: number): UnitAbility | undefined;
     removeAbility(abilityId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
+    getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;
     endAbilityCooldown(abilityId: number): void;
     interruptAttack(): void;

package/engine/internal/unit.lua

@@ -914,6 +914,9 @@ end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
 end
+function Unit.prototype.getAbilityRemainingCooldown(self, abilityId)
+    return BlzGetUnitAbilityCooldownRemaining(self.handle, abilityId)
+end
 function Unit.prototype.startAbilityCooldown(self, abilityId, cooldown)
     BlzStartUnitAbilityCooldown(self.handle, abilityId, cooldown)
 end

package/engine/object-data/entry/ability-type/spirit-touch.d.ts

@@ -7,8 +7,8 @@ export declare class SpiritTouchAbilityType extends AbilityType {
     set manaGain(manaGain: ObjectDataEntryLevelFieldValueSupplier<number>);
     get manaRequirement(): number[];
     set manaRequirement(manaRequirement: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get maximumTargetCount(): number[];
-    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
     get maximumManaCostFactor(): number[];
     set maximumManaCostFactor(maximumManaCostFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get maximumTargetCount(): number[];
+    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

package/engine/object-data/entry/ability-type/spirit-touch.lua

@@ -38,26 +38,26 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumTargetCount",
+    "maximumManaCostFactor",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb5")
         end,
-        set = function(self, maximumTargetCount)
-            self:setNumberLevelField("Rpb5", maximumTargetCount)
+        set = function(self, maximumManaCostFactor)
+            self:setNumberLevelField("Rpb5", maximumManaCostFactor)
         end
     },
     true
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumManaCostFactor",
+    "maximumTargetCount",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb6")
         end,
-        set = function(self, maximumManaCostFactor)
-            self:setNumberLevelField("Rpb6", maximumManaCostFactor)
+        set = function(self, maximumTargetCount)
+            self:setNumberLevelField("Rpb6", maximumTargetCount)
         end
     },
     true

package/engine/standard/entries/unit-type.d.ts

@@ -13,7 +13,9 @@ export declare const ARCHMAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const BLOOD_MAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const MOUNTAIN_KING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ARCHER_HIGH_ELF_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CAPTAIN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const SWORDSMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ANTONIDAS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
@@ -45,7 +47,22 @@ export declare const SPIRIT_WALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const TAUREN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WIND_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WITCH_DOCTOR_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_TALON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRYAD_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const FAERIE_DRAGON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const GLAIVE_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HUNTRESS_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const WISP_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEMON_HUNTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MOON_PRIESTESS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const WARDEN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;

package/engine/standard/entries/unit-type.lua

@@ -12,7 +12,9 @@ ____exports.ARCHMAGE_HERO_UNIT_TYPE_ID = fourCC("Hamg")
 ____exports.BLOOD_MAGE_HERO_UNIT_TYPE_ID = fourCC("Hblm")
 ____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
 ____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
+____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
 ____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
 ____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
 ____exports.ANTONIDAS_HERO_UNIT_TYPE_ID = fourCC("Hant")
@@ -44,7 +46,22 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
+____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
+____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
+____exports.DRUID_OF_THE_TALON_UNIT_TYPE_ID = fourCC("edot")
+____exports.DRYAD_UNIT_TYPE_ID = fourCC("edry")
+____exports.FAERIE_DRAGON_UNIT_TYPE_ID = fourCC("efdr")
+____exports.GLAIVE_THROWER_UNIT_TYPE_ID = fourCC("ebal")
+____exports.HIPPOGRYPH_UNIT_TYPE_ID = fourCC("ehip")
+____exports.HIPPOGRYPH_RIDER_UNIT_TYPE_ID = fourCC("ehpr")
+____exports.HUNTRESS_UNIT_TYPE_ID = fourCC("esen")
+____exports.MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID = fourCC("emtg")
+____exports.WISP_UNIT_TYPE_ID = fourCC("ewsp")
 ____exports.DEMON_HUNTER_HERO_UNIT_TYPE_ID = fourCC("Edem")
+____exports.KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID = fourCC("Ekee")
+____exports.MOON_PRIESTESS_HERO_UNIT_TYPE_ID = fourCC("Emoo")
+____exports.WARDEN_HERO_UNIT_TYPE_ID = fourCC("Ewar")
 ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.2af030d",
+    "version": "0.0.1-dev.35997e2",
     "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.3",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.ec41c86"
+        "warpack": "0.0.1-dev.1976a88"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^5.59.11",