[BCNM] Implement BCNM20 Shooting Fish

Co-Authored-By: dallano <[email protected]>
LandSandBoat · Sep 7, 2024 · 085858e · 085858e
1 parent d79a273
commit 085858e
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 4 deletions.
diff --git a/scripts/actions/mobskills/aqua_ball_knockback.lua b/scripts/actions/mobskills/aqua_ball_knockback.lua
@@ -0,0 +1,31 @@
+-----------------------------------
+-- Aqua Ball
+-- Deals ranged water damage that causes knockback.
+-- Used by pugils in BCNM: Shooting Fish
+-----------------------------------
+require('scripts/globals/mobskills')
+-----------------------------------
+---@type TMobSkill
+local mobskillObject = {}
+
+mobskillObject.onMobSkillCheck = function(target, mob, skill)
+    return 0
+end
+
+mobskillObject.onMobWeaponSkill = function(target, mob, skill)
+    local damage   = mob:getWeaponDmg() * 3
+    local power    = 20
+    local tick     = 3
+    local duration = power * tick
+
+    damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1.5)
+    damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS)
+
+    target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER)
+    xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STR_DOWN, power, tick, duration)
+    skill:setMsg(xi.msg.basic.HIT_DMG)
+
+    return damage
+end
+
+return mobskillObject
diff --git a/scripts/battlefields/Horlais_Peak/shooting_fish.lua b/scripts/battlefields/Horlais_Peak/shooting_fish.lua
@@ -16,8 +16,6 @@ local content = Battlefield:new({
     entryNpc         = 'BC_Entrance',
     exitNpc          = 'Burning_Circle',
     requiredItems    = { xi.item.CLOUDY_ORB, wearMessage = horlaisID.text.A_CRACK_HAS_FORMED, wornMessage = horlaisID.text.ORB_IS_CRACKED },
-
-    experimental = true,
 })
 
 content:addEssentialMobs({ 'Sniper_Pugil', 'Archer_Pugil' })

diff --git a/scripts/zones/Horlais_Peak/mobs/Archer_Pugil.lua b/scripts/zones/Horlais_Peak/mobs/Archer_Pugil.lua
@@ -0,0 +1,16 @@
+-----------------------------------
+-- Area: Horlais Peak
+--  Mob: Archer Pugil
+-- BCNM: Shooting Fish
+-----------------------------------
+---@type TMobEntity
+local entity = {}
+
+entity.onMobSpawn = function(mob)
+    mob:setMobSkillAttack(2014) -- Aquaball Knockback AA Skill
+end
+
+entity.onMobDeath = function(mob, player, optParams)
+end
+
+return entity
diff --git a/scripts/zones/Horlais_Peak/mobs/Sniper_Pugil.lua b/scripts/zones/Horlais_Peak/mobs/Sniper_Pugil.lua
@@ -0,0 +1,16 @@
+-----------------------------------
+-- Area: Horlais Peak
+--  Mob: Sniper Pugil
+-- BCNM: Shooting Fish
+-----------------------------------
+---@type TMobEntity
+local entity = {}
+
+entity.onMobSpawn = function(mob)
+    mob:setMobSkillAttack(2014) -- Aquaball Knockback AA Skill
+end
+
+entity.onMobDeath = function(mob, player, optParams)
+end
+
+return entity
diff --git a/sql/mob_skill_lists.sql b/sql/mob_skill_lists.sql
@@ -3911,7 +3911,9 @@ INSERT INTO `mob_skill_lists` VALUES ('Avatar_Ifrit_WTB',2013,844); -- Waking th
 INSERT INTO `mob_skill_lists` VALUES ('Avatar_Ifrit_WTB',2013,845); -- Waking the Beast, fire iv
 INSERT INTO `mob_skill_lists` VALUES ('Avatar_Ifrit_WTB',2013,847); -- Waking the Beast, meteor_strike
 
--- Next available ID: 2014
+INSERT INTO `mob_skill_lists` VALUES ('Shooting_Fish',2014,313); -- knockback aquaball - BCNM20 Shooting Fish
+
+-- Next available ID: 2015
 
 -- ------------------------------------------------------------
 -- Start of Ambuscade section

diff --git a/sql/mob_skills.sql b/sql/mob_skills.sql
@@ -326,7 +326,7 @@ INSERT INTO `mob_skills` VALUES (309,53,'spore',0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (310,54,'queasyshroom',0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (311,55,'numbshroom',0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (312,56,'shakeshroom',0,7.0,2000,1500,4,0,0,0,0,0,0);
--- INSERT INTO `mob_skills` VALUES (313,57,'counterspore',0,7.0,2000,1500,4,0,0,0,0,0,0);
+INSERT INTO `mob_skills` VALUES (313,201,'aqua_ball_knockback',0,14.0,2000,0,4,0,0,7,0,0,0);
 INSERT INTO `mob_skills` VALUES (314,58,'silence_gas',4,13.5,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (315,59,'dark_spore',4,13.5,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (316,60,'impale',0,7.0,2000,1500,4,0,0,0,0,0,0);