Merge branch 'base' into healing_the_land_LSB

scripts/enum/item.lua

@@ -4195,6 +4195,13 @@ xi.item =
     DRACHEN_MAIL                        = 12649,
     EVOKERS_DOUBLET                     = 12650,
     MERCENARYS_GI                       = 12653,
+    CUSTOM_TUNIC                        = 12654,
+    CUSTOM_VEST                         = 12655,
+    MAGNA_JERKIN                        = 12656,
+    MAGNA_BODICE                        = 12657,
+    WONDER_KAFTAN                       = 12658,
+    SAVAGE_SEPARATES                    = 12659,
+    ELDERS_SURCOAT                      = 12660,
     GAUNTLETS                           = 12672,
     KOENIG_HANDSCHUHS                   = 12677,
     IRON_MUSKETEERS_GAUNTLETS           = 12678,
@@ -4242,6 +4249,13 @@ xi.item =
     GALKAN_BRACERS                      = 12758,
     ELVAAN_GAUNTLETS                    = 12759,
     HUME_F_GLOVES                       = 12760,
+    CUSTOM_M_GLOVES                     = 12761,
+    CUSTOM_F_GLOVES                     = 12762,
+    MAGNA_GAUNTLETS                     = 12763,
+    MAGNA_GLOVES                        = 12764,
+    WONDER_MITTS                        = 12765,
+    SAVAGE_GAUNTLETS                    = 12766,
+    ELDERS_BRACERS                      = 12767,
     CUISSES                             = 12800,
     MYTHRIL_CUISSES                     = 12801,
     KOENIG_DIECHLINGS                   = 12805,
@@ -4284,6 +4298,13 @@ xi.item =
     LINEN_SLACKS                        = 12866,
     WHITE_SLACKS                        = 12867,
     COMBAT_CASTERS_SLACKS               = 12870,
+    CUSTOM_SLACKS                       = 12871,
+    CUSTOM_PANTS                        = 12872,
+    MAGNA_M_CHAUSSES                    = 12873,
+    MAGNA_F_CHAUSSES                    = 12874,
+    WONDER_BRACCAE                      = 12875,
+    SAVAGE_LOINCLOTH                    = 12876,
+    ELDERS_BRAGUETTE                    = 12877,
     LEGIONNAIRES_SUBLIGAR               = 12881,
     ROYAL_FOOTMANS_TROUSERS             = 12882,
     HUME_SLACKS                         = 12883,
@@ -4342,6 +4363,13 @@ xi.item =
     POWER_SANDALS                       = 13012,
     STUMBLING_SANDALS                   = 13013,
     LEAPING_BOOTS                       = 13014,
+    CUSTOM_M_BOOTS                      = 13015,
+    CUSTOM_F_BOOTS                      = 13016,
+    MAGNA_M_LEDELSENS                   = 13017,
+    MAGNA_F_LEDELSENS                   = 13018,
+    WONDER_CLOMPS                       = 13019,
+    SAVAGE_GAITERS                      = 13020,
+    ELDERS_SANDALS                      = 13021,
     ROYAL_FOOTMANS_CLOGS                = 13045,
     FUMA_KYAHAN                         = 13054,
     PEACOCK_CHARM                       = 13056,

scripts/enum/magic.lua

@@ -18,7 +18,7 @@ xi.magic.spellFlag =
 -- Spell AOE IDs
 -----------------------------------
 
----@enum xi.aoe
+---@enum xi.magic.aoe
 xi.magic.aoe =
 {
     NONE        = 0,
@@ -34,7 +34,7 @@ xi.magic.aoe =
 -- Spell Groups
 -----------------------------------
 
----@enum xi.spellGroup
+---@enum xi.magic.spellGroup
 xi.magic.spellGroup =
 {
     NONE      = 0,
@@ -52,7 +52,7 @@ xi.magic.spellGroup =
 -- Spell Families
 -----------------------------------
 
----@enum xi.spellFamily
+---@enum xi.magic.spellFamily
 xi.magic.spellFamily =
 {
     NONE               = 0,
@@ -218,7 +218,7 @@ xi.magic.spellFamily =
 -- Spell IDs
 -----------------------------------
 
----@enum xi.spell
+---@enum xi.magic.spell
 xi.magic.spell =
 {
     CURE                  =    1,

scripts/specs/core/CBaseEntity.lua

@@ -2687,11 +2687,31 @@ end
 ---@param effectFlag integer?
 ---@param silent boolean?
 ---@return boolean
----@overload fun(effectID: integer, effectIcon: integer, power: number, tick: number, duration: number, silent: boolean): boolean
----@overload fun(effectID: integer, effectIcon: integer, power: number, tick: number, duration: number, subType: integer, subPower: integer, silent: boolean): boolean
 function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, subType, subPower, tier, effectFlag, silent)
 end
 
+---@param effectID integer
+---@param effectIcon integer
+---@param power number
+---@param tick number
+---@param duration number
+---@param silent boolean?
+---@return boolean
+function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, silent)
+end
+
+---@param effectID integer
+---@param effectIcon integer
+---@param power number
+---@param tick number
+---@param duration number
+---@param subType integer
+---@param subPower integer
+---@param silent boolean?
+---@return boolean
+function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, subType, subPower, silent)
+end
+
 ---@nodiscard
 ---@param StatusID integer
 ---@param SubType integer?

scripts/specs/core/CTradeContainer.lua

@@ -63,7 +63,7 @@ function CTradeContainer:confirmItem(itemID, amountObj)
 end
 
 ---@param slotID integer
----@param amountObj integer
+---@param amountObj integer?
 ---@return boolean
 function CTradeContainer:confirmSlot(slotID, amountObj)
 end

scripts/specs/types/MobEntity.lua

@@ -0,0 +1,30 @@
+---@meta
+
+---@class TMobEntity
+---@field onMobInitialize? fun(mob: CBaseEntity)
+---@field onPath? fun(mob: CBaseEntity)
+---@field onPathPoint? fun(mob: CBaseEntity)
+---@field onPathComplete? fun(mob: CBaseEntity)
+---@field onMobEngage? fun(mob: CBaseEntity, target: CBaseEntity)
+---@field onMobDisengage? fun(mob: CBaseEntity)
+---@field onMobFollow? fun(mob: CBaseEntity, target: CBaseEntity)
+---@field onMobUnfollow? fun(mob: CBaseEntity, target: CBaseEntity)
+---@field onMobDrawIn? fun(mob: CBaseEntity, target: CBaseEntity)
+---@field onMobFight? fun(mob: CBaseEntity, target: CBaseEntity)
+---@field onCriticalHit? fun(mob: CBaseEntity, attacker: CBaseEntity?)
+---@field onMobDeath? fun(mob: CBaseEntity, killer: CBaseEntity?, optParams: { isKiller: boolean, noKiller: boolean, isWeaponSkillKill: boolean, weaponskillUsed: xi.weaponskill, weaponskillDamage: integer })
+---@field onMobSpawn? fun(mob: CBaseEntity)
+---@field onMobRoamAction? fun(mob: CBaseEntity)
+---@field onMobRoam? fun(mob: CBaseEntity)
+---@field onMobDespawn? fun(mob: CBaseEntity)
+---@field onMobWeaponSkillPrepare? fun(mob: CBaseEntity, target: CBaseEntity): integer?
+---@field onMobWeaponSkill? fun(target: CBaseEntity, mob: CBaseEntity, mobSkill: CMobSkill, action: CAction): integer?
+---@field onMobSkillTarget? fun(target: CBaseEntity, mob: CBaseEntity, mobSkill: CMobSkill): CBaseEntity?
+---@field onAdditionalEffect? fun(mob: CBaseEntity, target: CBaseEntity, damage: integer): (integer?, integer?, integer?)
+---@field onMobMagicPrepare? fun(mob: CBaseEntity, target: CBaseEntity, spell: CSpell?): xi.magic.spell|0?
+---@field onWeaponskillHit? fun(mob: CBaseEntity, attacker: CBaseEntity, weaponskillId: xi.weaponskill)
+---@field onSpikesDamage? fun(mob: CBaseEntity, target: CBaseEntity, damage: integer): (integer?, integer?, integer?)
+---@field onMagicHit? fun(caster: CBaseEntity, target: CBaseEntity, spell: CSpell)
+---@field onSpellPrecast? fun(mob: CBaseEntity, spell: CSpell)
+---@field onSteal? fun(player: CBaseEntity, target: CBaseEntity, ability: CAbility, action: CAction): integer?
+---@field onMagicCastingCheck? fun(mob: CBaseEntity, target: CBaseEntity, spell: CSpell): integer?

scripts/specs/types/NpcEntity.lua

@@ -0,0 +1,12 @@
+---@meta
+
+---@class TNpcEntity
+---@field onEventUpdate? fun(player: CBaseEntity, csid: integer, option: integer, npc: CBaseEntity)
+---@field onEventFinish? fun(player: CBaseEntity, csid: integer, option: integer, npc: CBaseEntity)
+---@field onPath? fun(npc: CBaseEntity)
+---@field onPathComplete? fun(npc: CBaseEntity)
+---@field onPathPoint? fun(npc: CBaseEntity)
+---@field onSpawn? fun(npc: CBaseEntity)
+---@field onTimeTrigger? fun(npc: CBaseEntity, triggerId: integer)
+---@field onTrade? fun(player: CBaseEntity, npc: CBaseEntity, trade: CTradeContainer)
+---@field onTrigger? fun(player: CBaseEntity, npc: CBaseEntity): -1|nil

scripts/zones/Abdhaljs_Isle-Purgonorgo/npcs/Pursuivant.lua

@@ -4,6 +4,7 @@
 -- Type: Warp
 -- !pos 516.223 -3.038 545.258 44
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/mobs/Desert_Puk.lua

@@ -4,6 +4,7 @@
 -----------------------------------
 mixins = { require('scripts/mixins/families/puk') }
 -----------------------------------
+---@type TMobEntity
 local entity = {}
 
 entity.onMobInitialize = function(mob)

scripts/zones/Abyssea-Altepa/mobs/Rani.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea - Altepa
 --   NM: Rani
 -----------------------------------
+---@type TMobEntity
 local entity = {}
 
 entity.onMobFight = function(mob, target)

scripts/zones/Abyssea-Altepa/npcs/Atma_Fabricant.lua

@@ -2,6 +2,7 @@
 -- Zone: Abyssea - Altepa
 --  NPC: Atma Fabricant
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Atma_Infusionist.lua

@@ -2,6 +2,7 @@
 -- Zone: Abyssea - La-Theine
 --  NPC: Atma Infusionist
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Bonarpant.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Bonarpant
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Cavernous_Maw.lua

@@ -4,6 +4,7 @@
 -- !pos 444.000 -0.500 320.000 218
 -- Notes Teleports Players to South Gustaberg
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Conflux_Surveyor.lua

@@ -2,6 +2,7 @@
 -- Zone: Abyssea - Altepa
 --  NPC: Conflux Surveyor
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua

@@ -3,6 +3,7 @@
 --  NPC: Cruor Prospector
 -- Type: Cruor NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 ---@type TProspectorItems
@@ -180,7 +181,7 @@ entity.onEventFinish = function(player, csid, option, npc)
 
         if enhanceData[2] <= cruorTotal then
             for _, v in ipairs(enhanceData[1]) do
-                player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5])
+                player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0)
 
                 if v[1] == xi.effect.ABYSSEA_HP then
                     player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5])

scripts/zones/Abyssea-Altepa/npcs/DSgt_Excenmille.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea - Altepa
 --  NPC: Dominion Sergeant
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea - Altepa
 --  NPC: Dominion Sergeant
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/DSgt_Volker.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea - Altepa
 --  NPC: Dominion Sergeant
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Hildith.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Hildith
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Honoi-Gomoi.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Honoi-Gomoi
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Justinius.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Justinius
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Mheca_Khetashipah.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Mheca Khetashipah
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Rielle.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Rielle
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Ronta-Onta.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Ronta-Onta
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Sola_Jaab.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Sola Jaab
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Sturdy_Pyxis.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea
 -- NPC: Sturdy Pyxis
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Taraihi-Perunhi.lua

@@ -2,6 +2,7 @@
 -- Area: Abyssea_Altepa
 --  NPC: Taraihi-Perunhi
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#01.lua

@@ -3,6 +3,7 @@
 --  NPC: Veridical Conflux #01
 -- Aybssea Teleport NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#02.lua

@@ -3,6 +3,7 @@
 --  NPC: Veridical Conflux #02
 -- Aybssea Teleport NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#03.lua

@@ -3,6 +3,7 @@
 --  NPC: Veridical Conflux #03
 -- Aybssea Teleport NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#04.lua

@@ -3,6 +3,7 @@
 --  NPC: Veridical Conflux #04
 -- Aybssea Teleport NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)

scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#05.lua

@@ -3,6 +3,7 @@
 --  NPC: Veridical Conflux #05
 -- Aybssea Teleport NPC
 -----------------------------------
+---@type TNpcEntity
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)