[lua, sql, cpp] Add weighted weaponskill for trusts, useWeaponSkill on entity, and Valaineral updates

scripts/actions/spells/trust/valaineral.lua

@@ -4,6 +4,191 @@
 ---@type TSpellTrust
 local spellObject = {}
 
+local urielBladeId = 238
+
+local function isMasterTopEnmityOnMob(master, mob)
+    local enmityList = mob:getEnmityList()
+    local masterId = master:getID()
+    local topEntity = nil
+    local topHate = -1
+
+    for _, enmityEntry in pairs(enmityList) do
+        if
+            enmityEntry.active and
+            enmityEntry.entity and
+            enmityEntry.entity:isAlive()
+        then
+            local totalHate = enmityEntry.ce + enmityEntry.ve
+            if totalHate > topHate then
+                topHate = totalHate
+                topEntity = enmityEntry.entity
+            end
+        end
+    end
+
+    return topEntity and topEntity:getID() == masterId
+end
+
+local function getUrielBladeForceTarget(mob)
+    local master = mob:getMaster()
+    local mastersTarget = master and master:getTarget() or nil
+    local mastersTargetId = mastersTarget and mastersTarget:getID() or 0
+    local masterId = master and master:getID() or 0
+    local threateningTarget = nil
+
+    if not master then
+        return nil
+    end
+
+    for _, entity in pairs(master:getNotorietyList()) do
+        if
+            entity and
+            entity:isMob() and
+            entity:isAlive() and
+            master:checkDistance(entity) <= 22
+        then
+            local target = entity:getTarget()
+            local isTargetingMaster = target and target:getID() == masterId
+            local masterHasTopEnmity = isMasterTopEnmityOnMob(master, entity)
+
+            if isTargetingMaster or masterHasTopEnmity then
+                if entity:getID() ~= mastersTargetId then
+                    return entity
+                end
+
+                if not threateningTarget then
+                    threateningTarget = entity
+                end
+            end
+        end
+    end
+
+    return threateningTarget
+end
+
+local function addRetailStats(mob)
+    mob:addMod(xi.mod.ENMITY, 20)
+    mob:addMod(xi.mod.CURE_POTENCY, 50)
+    mob:addMod(xi.mod.SPELLINTERRUPT, 50)
+    mob:addMod(xi.mod.REFRESH, 3)
+    mob:addMod(xi.mod.DMG, -8)
+    mob:addMod(xi.mod.HPP, 10)
+    mob:addMod(xi.mod.MPP, 20)
+end
+
+local function addSelfBuffGambits(mob)
+    mob:addGambit(ai.t.SELF,
+    {
+        { ai.c.NOT_STATUS, xi.effect.MAJESTY },
+        { ai.c.NOT_STATUS, xi.effect.PROTECT },
+    },
+    { ai.r.JA, ai.s.SPECIFIC, xi.ja.MAJESTY })
+
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_STATUS, xi.effect.PROTECT },
+        { ai.r.MA, ai.s.HIGHEST, xi.magic.spellFamily.PROTECT })
+
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_STATUS, xi.effect.REPRISAL },
+        { ai.r.MA, ai.s.SPECIFIC, xi.magic.spell.REPRISAL })
+
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_STATUS, xi.effect.ENLIGHT },
+        { ai.r.MA, ai.s.SPECIFIC, xi.magic.spell.ENLIGHT })
+
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_STATUS, xi.effect.PHALANX },
+        { ai.r.MA, ai.s.SPECIFIC, xi.magic.spell.PHALANX })
+end
+
+local function addEnmityGambits(mob)
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_HAS_TOP_ENMITY, 0 },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.PROVOKE })
+
+    mob:addGambit(ai.t.TARGET,
+        { ai.c.NOT_STATUS, xi.effect.FLASH },
+        { ai.r.MA, ai.s.SPECIFIC, xi.magic.spell.FLASH })
+end
+
+local function addDefensiveJAGambits(mob)
+    mob:addGambit(ai.t.SELF,
+        { ai.c.NOT_STATUS, xi.effect.DEFENDER },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.DEFENDER })
+
+    mob:addGambit(ai.t.SELF,
+        {
+            { ai.c.NOT_STATUS, xi.effect.SENTINEL },
+            { ai.c.NOT_STATUS, xi.effect.PALISADE },
+        },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.SENTINEL })
+
+    mob:addGambit(ai.t.SELF,
+        {
+            { ai.c.NOT_STATUS, xi.effect.PALISADE },
+            { ai.c.NOT_STATUS, xi.effect.SENTINEL },
+        },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.PALISADE })
+
+    mob:addGambit(ai.t.SELF,
+        {
+            { ai.c.MPP_LT, 50 },
+            { ai.c.TP_GTE, 1000 },
+        },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.CHIVALRY })
+
+    mob:addGambit(ai.t.TARGET,
+        { ai.c.STATUS, xi.effect.CHAINSPELL },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.RAMPART })
+
+    mob:addGambit(ai.t.TARGET,
+        { ai.c.STATUS, xi.effect.MANAFONT },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.RAMPART })
+
+    mob:addGambit(ai.t.TARGET,
+        { ai.c.STATUS, xi.effect.ASTRAL_FLOW },
+        { ai.r.JA, ai.s.SPECIFIC, xi.ja.RAMPART })
+end
+
+local function addCureGambits(mob)
+    mob:addGambit(ai.t.SELF,
+        { ai.c.HPP_LT, 75 },
+        {
+            { ai.r.JA, ai.s.SPECIFIC, xi.ja.MAJESTY },
+            { ai.r.MA, ai.s.HIGHEST, xi.magic.spellFamily.CURE },
+        })
+
+    mob:addGambit(ai.t.PARTY,
+        { ai.c.HPP_LT, 50 },
+        {
+            { ai.r.JA, ai.s.SPECIFIC, xi.ja.MAJESTY },
+            { ai.r.MA, ai.s.HIGHEST, xi.magic.spellFamily.CURE },
+        })
+end
+
+local function buildValaineralWSWeights(mob)
+    local mainSkill = mob:getSkillLevel(xi.skill.SWORD)
+    local weights = {}
+
+    if mainSkill >= 154 then
+        weights[238] = 5 -- Uriel Blade, PLD level 50
+    end
+
+    if mainSkill >= 149 then
+        weights[38] = 1 -- Circle Blade, PLD level 49
+    end
+
+    if mainSkill >= 240 then
+        weights[42] = 5 -- Savage Blade, PLD level 68
+    end
+
+    if mainSkill >= 300 then
+        weights[47] = 1 -- Sanguine Blade, PLD level 80
+    end
+
+    return weights
+end
+
 spellObject.onMagicCastingCheck = function(caster, target, spell)
     return xi.trust.canCast(caster, spell)
 end
@@ -24,17 +209,150 @@ spellObject.onMobSpawn = function(mob)
     ]]
     xi.trust.message(mob, xi.trust.messageOffset.SPAWN)
 
-    mob:addGambit(ai.t.SELF, { ai.c.NOT_HAS_TOP_ENMITY, 0 }, { ai.r.JA, ai.s.SPECIFIC, xi.ja.PROVOKE })
+    -- Gambits appear to be evaluated in order. This ordering makes
+    -- enmity actions take priority over cure actions when both qualify.
+    addRetailStats(mob)
+    addEnmityGambits(mob)
+    addDefensiveJAGambits(mob)
+    addCureGambits(mob)
+    addSelfBuffGambits(mob)
+
+    -- Dynamically build a weighted weaponskill table based on current
+    -- combat skill rating eligibility.
+    mob:setTrustTPWeaponSkillWeights(buildValaineralWSWeights(mob))
+    mob:setTrustTPSkillSettings(ai.tp.CLOSER_UNTIL_TP, ai.s.WEIGHTED_WS, 2000)
+
+    mob:addListener('WEAPONSKILL_USE', 'VALAINERAL_SPECIAL_MESSAGE', function(mobArg, target, skill)
+        if skill:getID() == urielBladeId then
+            xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_1)
+        end
+
+        local pendingTpBonus = mobArg:getLocalVar('[trust]valaineral_uriel_tp_bonus')
+        if pendingTpBonus > 0 then
+            mobArg:delMod(xi.mod.TP_BONUS, pendingTpBonus)
+            mobArg:setLocalVar('[trust]valaineral_uriel_tp_bonus', 0)
+        end
+    end)
 
-    mob:addGambit(ai.t.TARGET, { ai.c.NOT_STATUS, xi.effect.FLASH }, { ai.r.MA, ai.s.SPECIFIC, xi.magic.spell.FLASH })
+    mob:addListener('COMBAT_TICK', 'VALAINERAL_SPECIAL', function(mobArg, target, wsid, tp, action)
+        if
+            not mobArg:canUseAbilities() or
+            mobArg:getCurrentAction() ~= xi.action.category.BASIC_ATTACK
+        then
+            return
+        end
 
-    mob:addGambit(ai.t.SELF, { ai.c.NOT_STATUS, xi.effect.SENTINEL }, { ai.r.JA, ai.s.SPECIFIC, xi.ja.SENTINEL })
+        local now = GetSystemTime()
+        local nextUrielAttempt = mobArg:getLocalVar('[trust]valaineral_uriel_next')
+        if now < nextUrielAttempt then
+            return
+        end
 
-    mob:addGambit(ai.t.PARTY, { ai.c.HPP_LT, 50 }, { ai.r.MA, ai.s.HIGHEST, xi.magic.spellFamily.CURE })
+        -- Force Uriel Blade only against the mob that is threatening the
+        -- master, and only when that mob is in melee range.
+        local forceTarget = getUrielBladeForceTarget(mobArg)
+        if forceTarget and forceTarget:isMob() and forceTarget:isAlive() then
+            local distanceToForceTarget = mobArg:checkDistance(forceTarget)
+            local meleeRangeToForceTarget = mobArg:getMeleeRange(forceTarget)
+
+            -- Do not fall back to the current target. If the qualifying mob
+            -- is not in range yet, wait for a later tick.
+            if distanceToForceTarget <= (meleeRangeToForceTarget + 0.5) then
+                local currentTP = mobArg:getTP()
+                local neededBonus = 0
+
+                -- Retail damage observations suggest that when Valaineral
+                -- uses Uriel Blade below 1000 TP, TP is normalized to 1000
+                -- for fTP calculation.
+                local pendingTpBonus = mobArg:getLocalVar('[trust]valaineral_uriel_tp_bonus')
+                if pendingTpBonus > 0 then
+                    mobArg:delMod(xi.mod.TP_BONUS, pendingTpBonus)
+                    mobArg:setLocalVar('[trust]valaineral_uriel_tp_bonus', 0)
+                end
+
+                if currentTP < 1000 then
+                    neededBonus = 1000 - currentTP
+                    mobArg:addMod(xi.mod.TP_BONUS, neededBonus)
+                    mobArg:setLocalVar('[trust]valaineral_uriel_tp_bonus', neededBonus)
+                end
+
+                mobArg:setLocalVar('[trust]valaineral_uriel_next', now + 8)
+                mobArg:useWeaponSkill(urielBladeId, forceTarget)
+                return
+            end
+
+            return
+        end
+
+        -- Use Divine Emblem before casting Flash if Flash is available,
+        -- Divine Emblem is available, and the target does not already
+        -- have Flash.
+        local currentTarget = mobArg:getTarget()
+        if
+            currentTarget and
+            not currentTarget:hasStatusEffect(xi.effect.FLASH) and
+            not mobArg:hasRecast(xi.recast.MAGIC, xi.magic.spell.FLASH) and
+            not mobArg:hasRecast(xi.recast.ABILITY, xi.ja.DIVINE_EMBLEM) and
+            not mobArg:hasStatusEffect(xi.effect.DIVINE_EMBLEM)
+        then
+            mobArg:useJobAbility(xi.ja.DIVINE_EMBLEM, mobArg)
+        end
+    end)
+
+    --[[ Remove the comment block to enable
+    This listener adds the additional light damage
+    effect to Valaineral's Hauteclaire. It is a flavor mod
+    and only matches his WotG battlefield behavior.
+    mob:addListener('ATTACK', 'VALAINERAL_ATTACKS', function(mobArg, target, action)
+        if not target or not action then
+            return
+        end
+
+        local targetID = target:getID()
+        local actionMsg = action:getMsg(targetID)
+
+        if actionMsg ~= xi.msg.basic.HIT_DMG and actionMsg ~= xi.msg.basic.HIT_CRIT then
+            return
+        end
+
+        local divineSkill = mobArg:getSkillLevel(xi.skill.DIVINE_MAGIC)
+
+        -- Enlight-style formula to determine maximum potency.
+        local maxPower = math.floor((((divineSkill / 20) * 3) + 12) - (divineSkill / 40))
+
+        -- Roll 85% to 100% of max for damage variation.
+        local minPower = math.floor(maxPower * 0.85)
+        local rolledPower = math.random(minPower, maxPower)
+
+        local addEffect, message, damage = xi.combat.action.executeAddEffectDamage(mobArg, target, {
+            chance         = 95,
+            attackType     = xi.attackType.MAGICAL,
+            magicalElement = xi.element.LIGHT,
+            basePower      = rolledPower,
+            canMAB         = false,
+            canResist      = false,
+        })
+
+        if addEffect > 0 and damage > 0 then
+            action:additionalEffect(targetID, addEffect)
+            action:addEffectMessage(targetID, message)
+            action:addEffectParam(targetID, damage)
+        end
+    end)
+    ]]
 end
 
 spellObject.onMobDespawn = function(mob)
     xi.trust.message(mob, xi.trust.messageOffset.DESPAWN)
+    mob:removeListener('VALAINERAL_ATTACKS')
+    mob:removeListener('VALAINERAL_SPECIAL')
+    mob:removeListener('VALAINERAL_SPECIAL_MESSAGE')
+
+    local pendingTpBonus = mob:getLocalVar('[trust]valaineral_uriel_tp_bonus')
+    if pendingTpBonus > 0 then
+        mob:delMod(xi.mod.TP_BONUS, pendingTpBonus)
+        mob:setLocalVar('[trust]valaineral_uriel_tp_bonus', 0)
+    end
 end
 
 spellObject.onMobDeath = function(mob)

scripts/globals/gambits.lua

@@ -124,6 +124,7 @@ ai.select =
     HELIX_MOB_WEAKNESS  = 15,
     DEF_BAR_ELEMENT     = 16,
     RUNE_DAY            = 17,
+    WEIGHTED_WS         = 18,
 }
 ai.s = ai.select
 

scripts/specs/core/CBaseEntity.lua

@@ -3394,6 +3394,11 @@ end
 function CBaseEntity:setTrustTPSkillSettings(trigger, select, value)
 end
 
+---@param weights table<integer, integer>
+---@return nil
+function CBaseEntity:setTrustTPWeaponSkillWeights(weights)
+end
+
 ---@nodiscard
 ---@return boolean
 function CBaseEntity:hasPet()
@@ -3944,6 +3949,13 @@ end
 function CBaseEntity:useJobAbility(skillID, pet)
 end
 
+---@param skillID integer
+---@param target CBaseEntity?
+---@param syncBattleId boolean?
+---@return nil
+function CBaseEntity:useWeaponSkill(skillID, target, syncBattleId)
+end
+
 ---@param skillID integer
 ---@param PLuaBaseEntity CBaseEntity?
 ---@param castTimeOverride number?

sql/mob_skill_lists.sql

@@ -3442,9 +3442,9 @@ INSERT INTO `mob_skill_lists` VALUES ('TRUST_Mihli_Aliapoh',1024,162);  -- Brain
 INSERT INTO `mob_skill_lists` VALUES ('TRUST_Mihli_Aliapoh',1024,166);  -- True Strike
 INSERT INTO `mob_skill_lists` VALUES ('TRUST_Mihli_Aliapoh',1024,168);  -- Hexastrike
 INSERT INTO `mob_skill_lists` VALUES ('TRUST_Mihli_Aliapoh',1024,3203); -- Scouring Bubbles
-INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,34);  -- Red Lotus Blade
-INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,41);  -- Swift Blade
-INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,42);  -- Savage Blade
+INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,38);  -- Circle Blade (2021 Update)
+INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,42);  -- Savage Blade (2021 Update)
+INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,47);  -- Sanguine Blade (2021 Update)
 INSERT INTO `mob_skill_lists` VALUES ('TRUST_Valaineral',1025,238); -- Uriel Blade
 -- INSERT INTO `mob_skill_lists` VALUES ('TRUST_Joachim',1026,0);
 INSERT INTO `mob_skill_lists` VALUES ('TRUST_Naja_Salaheem',1027,166); -- True Strike