[lua, sql] Bastok 9-2 Behavior Adjustments

CriticalXI · CriticalXI · commit 47343903a83c · 2025-10-22T22:46:51.000-06:00
diff --git a/scripts/actions/mobskills/abyssal_strike.lua b/scripts/actions/mobskills/abyssal_strike.lua
@@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill)
     local info    = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0)
     local dmg     = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded)
 
-    xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4)
+    xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15)
     target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT)
 
     return dmg
diff --git a/scripts/actions/mobskills/shockwave.lua b/scripts/actions/mobskills/shockwave.lua
@@ -0,0 +1,27 @@
+-----------------------------------
+-- Shockwave
+-- Delivers an area of effect attack. Sleeps enemies.
+-- TODO: Verify sleep duration scaling with TP.
+-----------------------------------
+---@type TMobSkill
+local mobskillObject = {}
+
+mobskillObject.onMobSkillCheck = function(target, mob, skill)
+    return 0
+end
+
+mobskillObject.onMobWeaponSkill = function(target, mob, skill)
+    local numhits = 1
+    local accmod = 1
+    local ftp    = 2
+    local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT)
+    local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded)
+
+    target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING)
+
+    xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLEEP_I, 1, 0, 60)
+
+    return dmg
+end
+
+return mobskillObject
diff --git a/scripts/actions/mobskills/zeid_summon_shadows.lua b/scripts/actions/mobskills/zeid_summon_shadows.lua
@@ -25,8 +25,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill)
 
         shadowOne:spawn()
         shadowTwo:spawn()
-        shadowOne:setPos(xPos, yPos, zPos)
-        shadowTwo:setPos(xPos, yPos, zPos)
+        shadowOne:setPos(xPos + math.random(-2, 2), yPos, zPos + math.random(-2, 2))
+        shadowTwo:setPos(xPos + math.random(-2, 2), yPos, zPos + math.random(-2, 2))
         shadowOne:updateEnmity(target)
         shadowTwo:updateEnmity(target)
     end
diff --git a/scripts/battlefields/Throne_Room/where_two_paths_converge.lua b/scripts/battlefields/Throne_Room/where_two_paths_converge.lua
@@ -35,12 +35,19 @@ function content:onEventFinishBattlefield(player, csid, option, npc)
 
     local volkerCoords =
     {
-        [1] = { -450,      -167, -239,     125 },
-        [2] = { -769.949 , -407, -478.991, 125 },
-        [3] = { -1089.787, -647, -718.976, 125 },
+        [1] = { -451.155, -167, -240.004, 125 },
+        [2] = { -770.805, -407, -480.077, 125 },
+        [3] = { -1090.97, -647, -720.077, 125 },
     }
 
-    local zeid2 = SpawnMob(zeidId + 1)
+    -- Bail out if anyone else got here first
+    local zeid2Id = zeidId + 1
+    local zeid2Mob = GetMobByID(zeid2Id)
+    if zeid2Mob and zeid2Mob:isSpawned() then
+        return
+    end
+
+    local zeid2 = SpawnMob(zeid2Id)
 
     -- Set Phase 2 Zeid's HP to be same HPP as previous phase.
     local zeid1 = GetMobByID(zeidId)
diff --git a/scripts/enum/mob_skills.lua b/scripts/enum/mob_skills.lua
@@ -162,6 +162,10 @@ xi.mobSkill =
     TRION_FLAT_BLADE         =  969, -- Trion Flat Blade
     TRION_SAVAGE_BLADE       =  970, -- Trion Savage Blade
 
+    VOLKER_RED_LOTUS_BLADE   =  973, -- Volker Red Lotus Blade
+    VOLKER_SPIRITS_WITHIN    =  974, -- Volker Spirits Within
+    VOLKER_VORPAL_BLADE      =  975, -- Volker Vorpal Blade
+
     AJIDO_WARP_OUT           =  977, -- Windurst 9-2 Ajido teleport
     AJIDO_WARP_IN            =  978, -- Windurst 9-2 Ajido teleport
 
diff --git a/scripts/mixins/helper_npc.lua b/scripts/mixins/helper_npc.lua
@@ -115,7 +115,7 @@ g_mixins.helper_npc = function(helperMob)
         if not shouldEngage then
             for _, targetMobId in ipairs(targetMobs) do
                 local targetMob = GetMobByID(targetMobId)
-                if targetMob and targetMob:isEngaged() then
+                if targetMob and targetMob:isSpawned() and targetMob:isEngaged() then
                     shouldEngage = true
                     break
                 end
diff --git a/scripts/zones/Throne_Room/IDs.lua b/scripts/zones/Throne_Room/IDs.lua
@@ -19,6 +19,7 @@ zones[xi.zone.THRONE_ROOM] =
         TIME_IN_THE_BATTLEFIELD_IS_UP = 7232, -- Your time in the battlefield is up! Now exiting...
         PARTY_MEMBERS_ARE_ENGAGED     = 7247, -- The battlefield where your party members are engaged in combat is locked. Access is denied.
         NO_BATTLEFIELD_ENTRY          = 7249, -- The door is sealed shut with an evil curse.
+        UNABLE_TO_PROTECT             = 7288, -- You were unable to protect Captain Volker. Now leaving the battlefield.
         TESTIMONY_IS_TORN             = 7290, -- Your <item> is torn...
         TESTIMONY_WEARS               = 7291, -- Your <item> [/rips into shreds!/is on the verge of tearing apart.../is showing signs of wear...] (# [use remains/uses remain].)
         MEMBERS_OF_YOUR_PARTY         = 7538, -- Currently, <number> members of your party (including yourself) have clearance to enter the battlefield.
diff --git a/scripts/zones/Throne_Room/mobs/Shadow_of_Rage.lua b/scripts/zones/Throne_Room/mobs/Shadow_of_Rage.lua
@@ -3,13 +3,48 @@
 --  Mob: Shadow of Rage
 -- Bastok mission 9-2 BCNM Fight (Phase 2)
 -----------------------------------
+local ID = zones[xi.zone.THRONE_ROOM]
+-----------------------------------
 ---@type TMobEntity
 local entity = {}
 
 entity.onMobInitialize = function(mob)
     mob:addImmunity(xi.immunity.PETRIFY)
     mob:addImmunity(xi.immunity.LIGHT_SLEEP)
     mob:addImmunity(xi.immunity.DARK_SLEEP)
+
+    -- 50% chance to immediately TP move again (but only once per chain)
+    mob:addListener('WEAPONSKILL_STATE_EXIT', 'SHADOW_TP_CHAIN', function(mobEntity, skillID)
+        local justChained = mobEntity:getLocalVar('justChained')
+
+        -- Only allow chaining if this wasn't already a chained TP move
+        if justChained == 0 and math.random(1, 100) <= 50 then
+            mobEntity:setTP(3000)
+            mobEntity:setLocalVar('justChained', 1) -- Mark this as a chained TP
+        else
+            -- Reset the chained flag for next potential chain
+            mobEntity:setLocalVar('justChained', 0)
+        end
+    end)
+end
+
+entity.onMobDeath = function(mob, player, optParams)
+    if optParams.isKiller or optParams.noKiller then
+        local battlefieldArea = mob:getBattlefield():getArea()
+        local areaOffset = (battlefieldArea - 1) * 4
+        local zeid2Id = ID.mob.ZEID_BCNM_OFFSET + areaOffset + 1
+        local zeid2 = GetMobByID(zeid2Id)
+
+        -- Set clone respawn if it's not already set
+        if zeid2 and zeid2:isAlive() then
+            local currentRespawnTime = zeid2:getLocalVar('petRespawnTime')
+            local currentTime = GetSystemTime()
+
+            if currentRespawnTime == 0 or currentTime >= currentRespawnTime then
+                zeid2:setLocalVar('petRespawnTime', currentTime + 60)
+            end
+        end
+    end
 end
 
 return entity
diff --git a/scripts/zones/Throne_Room/mobs/Volker.lua b/scripts/zones/Throne_Room/mobs/Volker.lua
@@ -4,44 +4,53 @@
 -- Ally during Bastok Mission 9-2
 -----------------------------------
 local ID = zones[xi.zone.THRONE_ROOM]
+mixins = { require('scripts/mixins/helper_npc') }
 -----------------------------------
 ---@type TMobEntity
 local entity = {}
 
+-- Helper NPC configuration
+local helperConfig =
+{
+    engageWaitTime = 90, -- 1.5 minutes
+    isAggroable = false,
+    targetMobs = function(mob)
+        local battlefieldArea = mob:getBattlefield():getArea()
+        local areaOffset = (battlefieldArea - 1) * 4
+        return
+        {
+            ID.mob.ZEID_BCNM_OFFSET + areaOffset + 1, -- Zeid
+            ID.mob.ZEID_BCNM_OFFSET + areaOffset + 2, -- Shadow_of_Rage
+            ID.mob.ZEID_BCNM_OFFSET + areaOffset + 3, -- Shadow_of_Rage
+        }
+    end,
+}
+
 entity.onMobSpawn = function(volker)
+    xi.mix.helperNpc.config(volker, helperConfig)
+
     volker:addListener('WEAPONSKILL_STATE_ENTER', 'WS_START_MSG', function(mob, skillID)
         -- Red Lotus Blade
-        if skillID == 973 then
+        if skillID == xi.mobSkill.VOLKER_RED_LOTUS_BLADE then
             mob:showText(mob, ID.text.NO_HIDE_AWAY)
-        -- Spirits Within
-        elseif skillID == 974 then
+            -- Spirits Within
+        elseif skillID == xi.mobSkill.VOLKER_SPIRITS_WITHIN then
             mob:showText(mob, ID.text.YOUR_ANSWER)
-        -- Vorpal Blade
-        elseif skillID == 975 then
+            -- Vorpal Blade
+        elseif skillID == xi.mobSkill.VOLKER_VORPAL_BLADE then
             mob:showText(mob, ID.text.CANT_UNDERSTAND)
         end
     end)
 end
 
-entity.onMobRoam = function(mob)
-    local wait = mob:getLocalVar('wait')
-    local ready = mob:getLocalVar('ready')
-    if ready == 0 and wait > 40 then
-        local baseID = ID.mob.ZEID_BCNM_OFFSET + (mob:getBattlefield():getArea() - 1) * 4
-        mob:setLocalVar('ready', bit.band(baseID, 0xFFF))
-        mob:setLocalVar('wait', 0)
-    elseif ready > 0 then
-        local mobObj = GetMobByID(ready + bit.lshift(mob:getZoneID(), 12) + 0x1000000)
-        if mobObj then
-            mob:addEnmity(mobObj, 0, 1)
+entity.onMobDeath = function(mob, player, optParams)
+    if optParams.isKiller or optParams.noKiller then
+        mob:getBattlefield():lose()
+        local players = mob:getBattlefield():getPlayers()
+        for _, playerObj in pairs(players) do
+            playerObj:messageSpecial(ID.text.UNABLE_TO_PROTECT)
         end
-    else
-        mob:setLocalVar('wait', wait + 3)
     end
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-    mob:getBattlefield():lose()
-end
-
 return entity
diff --git a/scripts/zones/Throne_Room/mobs/Zeid.lua b/scripts/zones/Throne_Room/mobs/Zeid.lua
@@ -10,6 +10,7 @@ entity.onMobInitialize = function(mob)
     mob:addImmunity(xi.immunity.PETRIFY)
     mob:addImmunity(xi.immunity.LIGHT_SLEEP)
     mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addMod(xi.mod.REGAIN, 200)
 end
 
 return entity
diff --git a/scripts/zones/Throne_Room/mobs/Zeid_2.lua b/scripts/zones/Throne_Room/mobs/Zeid_2.lua
@@ -12,28 +12,54 @@ entity.onMobInitialize = function(mob)
     mob:addImmunity(xi.immunity.PETRIFY)
     mob:addImmunity(xi.immunity.LIGHT_SLEEP)
     mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addMod(xi.mod.REGAIN, 300)
+    mob:setMobMod(xi.mobMod.NO_REST, 1)
+
+    -- 50% chance to immediately TP move again (but only once per chain)
+    mob:addListener('WEAPONSKILL_STATE_EXIT', 'ZEID_TP_CHAIN', function(mobEntity, skillID)
+        local justChained = mobEntity:getLocalVar('justChained')
+
+        -- Only allow chaining if this wasn't already a chained TP move
+        if justChained == 0 and math.random(1, 100) <= 50 then
+            mobEntity:setTP(3000)
+            mobEntity:setLocalVar('justChained', 1) -- Mark this as a chained TP
+        else
+            -- Reset the chained flag for next potential chain
+            mobEntity:setLocalVar('justChained', 0)
+        end
+    end)
 end
 
 entity.onMobSpawn = function(mob)
-    xi.mix.jobSpecial.config(mob, {
-        specials =
+    mob:setLocalVar('petSpawnPercent', math.random(50, 90))
+    xi.mix.jobSpecial.config(mob,
         {
-            { id = xi.jsa.BLOOD_WEAPON, hpp = math.random(20, 50) },
-        },
-    })
+            specials =
+            {
+                { id = xi.jsa.BLOOD_WEAPON, hpp = math.random(20, 50) },
+            },
+        })
 end
 
 entity.onMobFight = function(mob, target)
-    local zeid    = mob:getID()
-    local shadow1 = GetMobByID(zeid + 1)
-    local shadow2 = GetMobByID(zeid + 2)
-
-    if
-        mob:getHPP() <= 77 and
-        shadow1 and shadow1:isDead() and
-        shadow2 and shadow2:isDead()
+    local zeid             = mob:getID()
+    local shadow1          = GetMobByID(zeid + 1)
+    local shadow2          = GetMobByID(zeid + 2)
+    local initialSpawnDone = mob:getLocalVar('initialSpawnDone')
+
+    -- Initial check for HPP based spawn, then respawn based on timer if a shadow dies
+    if initialSpawnDone == 0 and mob:getHPP() <= mob:getLocalVar('petSpawnPercent') then
+        mob:useMobAbility(xi.mobSkill.ZEID_SUMMON_SHADOWS_2, nil, 0)
+        mob:setLocalVar('initialSpawnDone', 1)
+    elseif
+        initialSpawnDone == 1 and
+        mob:getLocalVar('petRespawnTime') ~= 0 and
+        GetSystemTime() >= mob:getLocalVar('petRespawnTime') and
+        (shadow1 and shadow1:isDead() or shadow2 and shadow2:isDead())
     then
-        mob:useMobAbility(xi.mobSkill.ZEID_SUMMON_SHADOWS_2)
+        mob:useMobAbility(xi.mobSkill.ZEID_SUMMON_SHADOWS_2, nil, 0)
+        -- Clear the timer to prevent re-summoning until a shadow dies again
+        mob:setLocalVar('petRespawnTime', 0)
     end
 end
 
diff --git a/sql/mob_groups.sql b/sql/mob_groups.sql
@@ -11395,9 +11395,9 @@ INSERT INTO `mob_groups` VALUES (127,5146,164,'Laidly_Laurence',0,128,0,0,9999,9
 
 INSERT INTO `mob_groups` VALUES (1,3579,165,'Shadow_Lord_1',0,128,0,10000,0,60,60,0);
 INSERT INTO `mob_groups` VALUES (2,4593,165,'Shadow_Lord_2',0,128,0,4000,0,60,60,0);
-INSERT INTO `mob_groups` VALUES (3,4498,165,'Zeid',0,128,0,0,0,75,76,0);
-INSERT INTO `mob_groups` VALUES (4,4498,165,'Zeid',0,128,0,0,0,75,78,0);
-INSERT INTO `mob_groups` VALUES (5,3580,165,'Shadow_of_Rage',0,128,0,0,0,75,75,0);
+INSERT INTO `mob_groups` VALUES (3,4498,165,'Zeid',0,128,0,8500,8500,75,76,0);
+INSERT INTO `mob_groups` VALUES (4,4498,165,'Zeid',0,128,0,8500,8500,75,78,0);
+INSERT INTO `mob_groups` VALUES (5,3580,165,'Shadow_of_Rage',0,128,0,500,0,75,75,0);
 INSERT INTO `mob_groups` VALUES (6,1788,165,'Grand_Marquis_Chomiel',0,128,0,0,0,60,60,0);
 INSERT INTO `mob_groups` VALUES (7,1130,165,'Duke_Amduscias',0,128,0,0,0,60,60,0);
 INSERT INTO `mob_groups` VALUES (8,811,165,'Count_Andromalius',0,128,0,0,0,60,60,0);
@@ -11420,7 +11420,7 @@ INSERT INTO `mob_groups` VALUES (24,0,165,'Lion',0,128,0,0,0,0,0,0);
 INSERT INTO `mob_groups` VALUES (25,0,165,'Lion',0,128,0,0,0,0,0,0);
 INSERT INTO `mob_groups` VALUES (26,0,165,'Zeid',0,128,0,0,0,0,0,0);
 INSERT INTO `mob_groups` VALUES (27,0,165,'Aldo',0,128,0,0,0,0,0,0);
-INSERT INTO `mob_groups` VALUES (28,4249,165,'Volker',0,128,0,0,0,75,75,1); -- ally
+INSERT INTO `mob_groups` VALUES (28,4249,165,'Volker',0,128,0,1300,0,75,75,1); -- ally
 
 -- ------------------------------------------------------------
 -- Ranguemont_Pass (Zone 166)
diff --git a/sql/mob_pools.sql b/sql/mob_pools.sql
@@ -3634,7 +3634,7 @@ INSERT INTO `mob_pools` VALUES (3576,'Shadow_Eye','Shadow_Eye',4,0x0000080100000
 INSERT INTO `mob_pools` VALUES (3577,'Shadow_Funguar','Shadow_Funguar',116,0x0000780100000000000000000000000000000000,1,1,11,240,100,0,0,0,1,0,0,0,1,135,0,0,0,0,0,116,116);
 INSERT INTO `mob_pools` VALUES (3578,'Shadow_Lizard','Shadow_Lizard',174,0x0000490100000000000000000000000000000000,1,1,11,240,100,0,0,0,1,0,0,0,1,135,0,0,0,0,0,174,174);
 INSERT INTO `mob_pools` VALUES (3579,'Shadow_Lord_1','Shadow_Lord',224,0x0000150300000000000000000000000000000000,8,4,4,240,100,0,1,0,0,18,0,0,1516,131,0,0,20,0,0,224,224);
-INSERT INTO `mob_pools` VALUES (3580,'Shadow_of_Rage','Shadow_of_Rage',480,0x0000040300000000000000000000000000000000,8,8,4,240,100,0,1,1,1,18,0,0,2221,135,0,0,5,0,0,480,480);
+INSERT INTO `mob_pools` VALUES (3580,'Shadow_of_Rage','Shadow_of_Rage',480,0x0000040300000000000000000000000000000000,8,8,4,240,100,0,1,1,1,18,0,0,2221,135,0,0,0,0,0,480,480);
 INSERT INTO `mob_pools` VALUES (3581,'Shailham','Shailham',149,0x05006207536861696C68616D0100000000000000,1,1,0,0,100,0,0,0,0,0,0,0,1,155,0,0,0,0,0,149,149);
 INSERT INTO `mob_pools` VALUES (3582,'Shamarhaan','Shamarhaan',145,0x0500730500000000000000000000000000000000,18,18,1,240,100,0,0,0,0,16,0,0,1,155,0,0,0,0,0,145,145);
 INSERT INTO `mob_pools` VALUES (3583,'Shamblix_Rottenheart','Shamblix_Rottenheart',373,0x00003F0400000000000000000000000000000000,8,8,3,240,100,0,1,0,1,2,0,32,0,159,0,0,5,0,0,373,373);
@@ -4552,7 +4552,7 @@ INSERT INTO `mob_pools` VALUES (4494,'ZaDha_Adamantking_BS','ZaDha_Adamantking',
 INSERT INTO `mob_pools` VALUES (4495,'ZaDhas_Biographer','ZaDhas_Biographer',202,0x00001E0400000000000000000000000000000000,4,4,6,265,100,0,1,0,1,0,0,0,0,0,0,0,2,0,0,202,202);
 INSERT INTO `mob_pools` VALUES (4496,'ZaDhas_Minister','ZaDhas_Minister',202,0x00001F0400000000000000000000000000000000,3,3,3,265,100,0,1,0,1,0,0,0,0,0,0,0,1,0,0,202,202);
 INSERT INTO `mob_pools` VALUES (4497,'Zebra_Zachary','Zebra_Zachary',70,0x0000210100000000000000000000000000000000,1,1,11,240,100,0,1,0,0,2,0,0,0,0,0,0,0,0,0,70,70);
-INSERT INTO `mob_pools` VALUES (4498,'Zeid','Zeid',480,0x0000030300000000000000000000000000000000,8,8,4,240,100,0,1,1,0,18,0,32,1,159,0,0,5,0,0,480,480);
+INSERT INTO `mob_pools` VALUES (4498,'Zeid','Zeid',480,0x0000030300000000000000000000000000000000,8,8,4,240,100,0,1,1,0,18,0,32,1,159,0,0,396,0,0,480,480);
 INSERT INTO `mob_pools` VALUES (4499,'ZeVho_Fallsplitter','ZeVho_Fallsplitter',202,0x00001D0400000000000000000000000000000000,8,8,4,265,100,0,1,0,1,2,0,32,661,159,0,0,5,0,0,705,337);
 INSERT INTO `mob_pools` VALUES (4500,'Zhadjaraf','Zhadjaraf',145,0x0500610700000000000000000000000000000000,1,1,8,240,100,0,0,0,0,0,0,0,1,155,0,0,0,0,0,145,145);
 INSERT INTO `mob_pools` VALUES (4501,'Zhayolm_Apkallu','Zhayolm_Apkallu',27,0x0000BB0600000000000000000000000000000000,2,2,1,480,100,0,0,0,1,0,0,0,298,131,5,0,0,0,0,27,27);
diff --git a/sql/mob_skill_lists.sql b/sql/mob_skill_lists.sql
@@ -2207,6 +2207,7 @@ INSERT INTO `mob_skill_lists` VALUES ('Zeid',480,980); -- Freeze Bite
 INSERT INTO `mob_skill_lists` VALUES ('Zeid',480,981); -- GroundStrike
 INSERT INTO `mob_skill_lists` VALUES ('Zeid',480,982); -- Abyssal Drain
 INSERT INTO `mob_skill_lists` VALUES ('Zeid',480,983); -- Abyssal strike
+INSERT INTO `mob_skill_lists` VALUES ('Zeid',480,987); -- Shockwave
 INSERT INTO `mob_skill_lists` VALUES ('Ajido-Marujido',481,988); -- Warp In (Works the same as Ealdnarche's)
 INSERT INTO `mob_skill_lists` VALUES ('Ajido-Marujido',481,989); -- Warp Out (Works the same as Ealdnarche's)
 INSERT INTO `mob_skill_lists` VALUES ('Volker',482,973); -- Red Lotus Blade
diff --git a/sql/mob_skills.sql b/sql/mob_skills.sql
@@ -993,15 +993,15 @@ INSERT INTO `mob_skills` VALUES (975,681,'vorpal_blade',0,0.0,7.0,2500,1500,4,0,
 INSERT INTO `mob_skills` VALUES (976,673,'berserk_volker',1,0.0,15.0,2000,200,1,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (977,674,'adjido_warp_out',0,0.0,7.0,2000,1500,1,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (978,675,'adjido_warp_in',0,0.0,7.0,2000,1500,1,0,0,0,0,0,0);
-INSERT INTO `mob_skills` VALUES (979,682,'power_slash',0,0.0,10.0,2000,500,4,0,0,0,0,0,0);
-INSERT INTO `mob_skills` VALUES (980,683,'freeze_bite',0,0.0,10.0,2000,500,4,0,0,0,0,0,0);
-INSERT INTO `mob_skills` VALUES (981,684,'ground_strike',0,0.0,10.0,2000,500,4,0,0,0,0,0,0);
+INSERT INTO `mob_skills` VALUES (979,682,'power_slash',0,0.0,10.0,2000,500,4,0,0,0,1,0,0);
+INSERT INTO `mob_skills` VALUES (980,683,'freeze_bite',0,0.0,10.0,2000,500,4,0,0,0,7,6,0);
+INSERT INTO `mob_skills` VALUES (981,684,'ground_strike',0,0.0,10.0,2000,500,4,0,0,0,12,10,0);
 INSERT INTO `mob_skills` VALUES (982,671,'abyssal_drain',0,0.0,10.0,2000,500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (983,672,'abyssal_strike',0,0.0,10.0,2000,500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (984,685,'electrocharge',0,0.0,15.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (985,686,'stellar_burst',2,0.0,7.0,5000,1000,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (986,687,'vortex',2,0.0,20.0,5000,1000,4,0,0,0,0,0,0);
--- INSERT INTO `mob_skills` VALUES (987,731,'shockwave',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
+INSERT INTO `mob_skills` VALUES (987,688,'shockwave',1,0.0,7.0,2000,1500,4,0,0,0,7,6,0);
 INSERT INTO `mob_skills` VALUES (988,689,'eald2_warp_in',0,0.0,22.0,500,0,1,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (989,690,'eald2_warp_out',0,0.0,22.0,500,0,1,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (990,691,'gaea_stream_eta',0,0.0,15.0,4000,1500,4,0,0,0,0,0,0);
