Merge pull request #6226 from jmcmorris/isnm_call_to_arms

Call to Arms ISNM
LandSandBoat · Sep 8, 2024 · 7a46bb1 · 7a46bb1
2 parents dc0e254 + 2683955
commit 7a46bb1
Show file tree

Hide file tree

Showing 12 changed files with 220 additions and 22 deletions.
diff --git a/scripts/actions/mobskills/bugle_call.lua b/scripts/actions/mobskills/bugle_call.lua
@@ -0,0 +1,50 @@
+-----------------------------------
+-- Bugle Call
+-- Description: Calls help from additional Imp Bandsman and grants TP
+-- Used only by the main Imp Bandsman in Call to Arms ISNM
+-----------------------------------
+local ID = zones[xi.zone.TALACCA_COVE]
+-----------------------------------
+---@type TMobSkill
+local mobskillObject = {}
+
+mobskillObject.onMobSkillCheck = function(target, mob, skill)
+    -- Only allow the main Imp Bandsman to use this which has the level range of 63-64
+    if mob:getMainLvl() >= 63 then
+        return 0
+    end
+
+    return 1
+end
+
+mobskillObject.onMobWeaponSkill = function(target, mob, skill)
+    local mobID = mob:getID()
+    local player = mob:getTarget()
+
+    skill:setMsg(xi.msg.basic.NONE)
+
+    mob:timer(4000, function(mobArg)
+        mobArg:addTP(1000)
+    end)
+
+    mob:timer(3000, function(mobArg)
+        for cloneID = mobID + 1, mobID + 4 do
+            local clone = GetMobByID(cloneID)
+            if clone and not clone:isSpawned() then
+                SpawnMob(cloneID)
+                if player then
+                    clone:updateEnmity(player)
+                end
+
+                mobArg:messageText(mobArg, ID.text.HELP_HAS_ARRIVED, false)
+                return
+            end
+        end
+
+        mobArg:messageText(mobArg, ID.text.NOBODY_COMES_TO_HELP, false)
+    end)
+
+    return 0
+end
+
+return mobskillObject
diff --git a/scripts/battlefields/Talacca_Cove/call_to_arms.lua b/scripts/battlefields/Talacca_Cove/call_to_arms.lua
@@ -0,0 +1,88 @@
+-----------------------------------
+-- Call to Arms
+-- Talacca Cove, Confidential Imperial Order
+-- !addkeyitem CONFIDENTIAL_IMPERIAL_ORDER
+-----------------------------------
+local ID = zones[xi.zone.TALACCA_COVE]
+-----------------------------------
+
+local content = Battlefield:new({
+    zoneId           = xi.zone.TALACCA_COVE,
+    battlefieldId    = xi.battlefield.id.CALL_TO_ARMS,
+    maxPlayers       = 6,
+    levelCap         = 60,
+    timeLimit        = utils.minutes(30),
+    index            = 0,
+    entryNpc         = '_1l0',
+    exitNpcs         = { '_1l1', '_1l2', '_1l3' },
+    requiredKeyItems = { xi.ki.CONFIDENTIAL_IMPERIAL_ORDER, message = ID.text.IMPERIAL_ORDER_BREAKS },
+})
+
+content.groups = {
+    {
+        mobs = { 'Imp_Bandsman' },
+    },
+
+    {
+        mobs     = { 'Imp_Bandsman', 'Imp_Bandsman_Add' },
+        spawned  = false,
+        allDeath = utils.bind(content.handleAllMonstersDefeated, content),
+    },
+}
+
+content.loot =
+{
+    {
+        { item = xi.item.GIL, weight = xi.loot.weight.NORMAL, amount = 8000 },
+    },
+
+    {
+        { item = xi.item.AGILITY_POTION, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.VITALITY_POTION, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.STRENGTH_POTION, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.DEXTERITY_POTION, weight = xi.loot.weight.NORMAL },
+    },
+
+    {
+        { item = xi.item.GLASS_SHEET, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.BUNDLE_OF_HOMUNCULUS_NERVES, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.SQUARE_OF_POLYFLAN, weight = xi.loot.weight.NORMAL },
+    },
+
+    {
+        { item = xi.item.SCROLL_OF_MAIDENS_VIRELAI, weight = xi.loot.weight.HIGH },
+        { item = xi.item.SCROLL_OF_CARNAGE_ELEGY, weight = xi.loot.weight.HIGH },
+        { item = xi.item.SCROLL_OF_AERO_IV, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.SCROLL_OF_FLARE, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.SCROLL_OF_FLOOD, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.SCROLL_OF_TORNADO, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.DARK_SPIRIT_PACT, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.LIGHT_SPIRIT_PACT, weight = xi.loot.weight.NORMAL },
+    },
+
+    {
+        { item = xi.item.CHOCOBO_EGG_A_LITTLE_WARM, weight = xi.loot.weight.NORMAL },
+    },
+
+    {
+        { item = xi.item.IMP_WING, weight = xi.loot.weight.NORMAL },
+    },
+
+    {
+        { item = xi.item.NONE, weight = xi.loot.weight.EXTREMELY_HIGH },
+        { item = xi.item.TEMPLAR_SABATONS, weight = xi.loot.weight.LOW },
+        { item = xi.item.BUSKERS_CAPE, weight = xi.loot.weight.LOW },
+        { item = xi.item.DOMINION_RING, weight = xi.loot.weight.LOW },
+        { item = xi.item.IMMORTALS_EARRING, weight = xi.loot.weight.LOW },
+    },
+
+    {
+        { item = xi.item.NONE, weight = xi.loot.weight.EXTREMELY_HIGH },
+        { item = xi.item.CHUNK_OF_PLATINUM_ORE, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.CHUNK_OF_DARKSTEEL_ORE, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.CHUNK_OF_ADAMAN_ORE, weight = xi.loot.weight.NORMAL },
+        { item = xi.item.CHUNK_OF_ORICHALCUM_ORE, weight = xi.loot.weight.NORMAL },
+    },
+}
+
+return content:register()
diff --git a/scripts/enum/item.lua b/scripts/enum/item.lua
@@ -5539,6 +5539,7 @@ xi.item =
     STORM_CRACKOWS                      = 15692,
     PAHLUWAN_CRACKOWS                   = 15695,
     SNEAKING_BOOTS                      = 15698,
+    TEMPLAR_SABATONS                    = 15699,
     ARES_SOLLERETS                      = 15711,
     ENYOS_LEGGINGS                      = 15712,
     PHOBOSS_SABATONS                    = 15713,
@@ -5595,6 +5596,7 @@ xi.item =
     GARRULOUS_RING                      = 15779,
     CERBERUS_RING                       = 15780,
     MULTIPLE_RING                       = 15790,
+    DOMINION_RING                       = 15784,
     IOTA_RING                           = 15799,
     OMEGA_RING                          = 15800,
     FERAL_RING                          = 15802,
@@ -5674,6 +5676,7 @@ xi.item =
     INSOMNIA_EARRING                    = 15972,
     VISION_EARRING                      = 15973,
     VELOCITY_EARRING                    = 15974,
+    IMMORTALS_EARRING                   = 15975,
     PIRATES_EARRING                     = 15976,
     HATEN_EARRING                       = 15981,
     PRIESTS_EARRING                     = 15982,
@@ -5768,6 +5771,7 @@ xi.item =
     LANCERS_PELERINE                    = 16208,
     NAVARCHS_MANTLE                     = 16209,
     IMMORTALS_CAPE                      = 16217,
+    BUSKERS_CAPE                        = 16219,
     ASLAN_CAPE                          = 16228,
     GLEEMANS_CAPE                       = 16229,
     LIEUTENANTS_CAPE                    = 16230,

diff --git a/scripts/zones/Talacca_Cove/IDs.lua b/scripts/zones/Talacca_Cove/IDs.lua
@@ -28,8 +28,11 @@ zones[xi.zone.TALACCA_COVE] =
         A_CRACK_HAS_FORMED            = 7639, -- A crack has formed on the <item>, and the beast inside has been unleashed!
         PARTY_MEMBERS_HAVE_FALLEN     = 7673, -- All party members have fallen in battle. Now leaving the battlefield.
         THE_PARTY_WILL_BE_REMOVED     = 7680, -- If all party members' HP are still zero after # minute[/s], the party will be removed from the battlefield.
+        IMPERIAL_ORDER_BREAKS         = 7688, -- The <item> breaks!
         ENTERING_THE_BATTLEFIELD_FOR  = 7701, -- Entering the battlefield for [Call to Arms/Compliments to the Chef/Puppetmaster Blues/Breaking the Bonds of Fate/Legacy of the Lost/Legacy of the Lost]!
         YOU_CAN_NOW_BECOME_A_CORSAIR  = 7799, -- You can now become a corsair!
+        NOBODY_COMES_TO_HELP          = 7850, -- Nobody comes to help.
+        HELP_HAS_ARRIVED              = 7851, -- Help has arrived!
     },
     mob =
     {

diff --git a/scripts/zones/Talacca_Cove/mobs/Imp_Bandsman.lua b/scripts/zones/Talacca_Cove/mobs/Imp_Bandsman.lua
@@ -0,0 +1,22 @@
+-----------------------------------
+-- Area: Talacca Cove
+--   NM: Imp Bandsman
+-----------------------------------
+---@type TMobEntity
+local entity = {}
+
+entity.onMobInitialize = function(mob)
+    mob:addImmunity(xi.immunity.POISON)
+    mob:addImmunity(xi.immunity.SILENCE)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.GRAVITY)
+    mob:addImmunity(xi.immunity.SLOW)
+    mob:addImmunity(xi.immunity.PARALYZE)
+    mob:setMobMod(xi.mobMod.SIGHT_RANGE, 25)
+end
+
+entity.onMobDeath = function(mob, player, optParams)
+end
+
+return entity
diff --git a/scripts/zones/Talacca_Cove/mobs/Imp_Bandsman_Add.lua b/scripts/zones/Talacca_Cove/mobs/Imp_Bandsman_Add.lua
@@ -0,0 +1,26 @@
+-----------------------------------
+-- Area: Talacca Cove
+--   NM: Imp Bandsman Add
+-----------------------------------
+mixins = { require('scripts/mixins/families/imp') }
+-----------------------------------
+---@type TMobEntity
+local entity = {}
+
+entity.onMobInitialize = function(mob)
+end
+
+entity.onMobSpawn = function(mob)
+    -- One imp is always slightly bigger and another is always slightly smaller
+    local mobIDModulized = mob:getID() % 4
+    if mobIDModulized == 0 then
+        mob:setMobFlags(1159)
+    elseif mobIDModulized == 1 then
+        mob:setMobFlags(1155)
+    end
+end
+
+entity.onMobDeath = function(mob, player, optParams)
+end
+
+return entity
diff --git a/sql/mob_groups.sql b/sql/mob_groups.sql
@@ -2884,14 +2884,15 @@ INSERT INTO `mob_groups` VALUES (4,4813,57,'Lahama_fished',0,128,0,0,0,77,78,0);
 INSERT INTO `mob_groups` VALUES (5,2426,57,'Llamhigyn_Y_Dwr',0,128,1528,0,0,77,79,0);
 INSERT INTO `mob_groups` VALUES (6,1534,57,'Giant_Orobon',0,128,969,0,0,78,83,0);
 
-INSERT INTO `mob_groups` VALUES (7,2071,57,'Imp_Bandsman',0,128,0,0,0,60,60,0);
+INSERT INTO `mob_groups` VALUES (7,2071,57,'Imp_Bandsman',0,128,0,8000,0,63,64,0);
 INSERT INTO `mob_groups` VALUES (8,139,57,'Angler_Orobon',0,128,0,0,0,75,75,0);
 INSERT INTO `mob_groups` VALUES (9,4123,57,'Valkeng',0,128,0,0,0,60,60,0);
 INSERT INTO `mob_groups` VALUES (10,3292,57,'Qultada',0,128,0,0,0,70,70,0);
 INSERT INTO `mob_groups` VALUES (11,1506,57,'Gessho',0,128,0,0,0,80,80,0);
 INSERT INTO `mob_groups` VALUES (12,1506,57,'Gessho',0,128,0,2000,0,70,70,0);
 INSERT INTO `mob_groups` VALUES (13,1506,57,'Gessho',0,128,0,0,0,0,0,0);
 INSERT INTO `mob_groups` VALUES (14,1506,57,'Gessho',0,128,0,0,0,0,0,0);
+INSERT INTO `mob_groups` VALUES (15,2071,57,'Imp_Bandsman_Add',0,128,0,1400,0,60,61,0);
 
 -- ------------------------------------------------------------
 -- Silver_Sea_route_to_Nashmau (Zone 58)

diff --git a/sql/mob_pools.sql b/sql/mob_pools.sql
@@ -2124,7 +2124,7 @@ INSERT INTO `mob_pools` VALUES (2067,'Imperial_Gears','Imperial_Gears',120,0x000
 INSERT INTO `mob_pools` VALUES (2068,'Imperial_Trooper','Imperial_Trooper',149,0x0500A70700000000000000000000000000000000,7,7,3,240,100,0,0,0,0,0,0,0,7,1155,0,0,4,64,0,149,149);
 INSERT INTO `mob_pools` VALUES (2069,'Impervious_Chariot','Impervious_Chariot',63,0x00001E0700000000000000000000000000000000,12,12,10,240,100,0,1,1,1,2,0,0,0,1157,0,0,0,0,0,963,63);
 INSERT INTO `mob_pools` VALUES (2070,'Impish_Bats','Impish_Bats',47,0x0000040100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,0,0,64,179,1669,8,0,0,0,0,47,47);
-INSERT INTO `mob_pools` VALUES (2071,'Imp_Bandsman','Imp_Bandsman',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,3,0,0,2,0,0,165,165);
+INSERT INTO `mob_pools` VALUES (2071,'Imp_Bandsman','Imp_Bandsman',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,1157,0,0,2,0,0,414,165);
 INSERT INTO `mob_pools` VALUES (2072,'Incendiary_Bombs','Incendiary_Bombs',68,0x0000230100000000000000000000000000000000,1,1,5,240,100,0,1,1,0,0,0,64,9,1665,12,0,0,0,0,68,68);
 INSERT INTO `mob_pools` VALUES (2073,'Incubus_Bats_BT','Incubus_Bats_BT',47,0x0000040100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,0,0,64,504,1667,8,0,0,0,0,47,47);
 INSERT INTO `mob_pools` VALUES (2074,'Indich','Indich',115,0x05000F0400000000000000000000000000000000,10,7,3,240,100,0,1,0,0,2,0,32,390,1181,0,0,6,0,0,115,115);

diff --git a/sql/mob_skill_lists.sql b/sql/mob_skill_lists.sql
@@ -1928,7 +1928,11 @@ INSERT INTO `mob_skill_lists` VALUES ('Phantom_Puk',413,1720);
 INSERT INTO `mob_skill_lists` VALUES ('Phantom_Puk',413,1721);
 INSERT INTO `mob_skill_lists` VALUES ('Phantom_Puk',413,1723);
 INSERT INTO `mob_skill_lists` VALUES ('Phantom_Puk',413,1724);
--- 414 to 435: free
+INSERT INTO `mob_skill_lists` VALUES ('Imp_Bandsman',414,1709);
+INSERT INTO `mob_skill_lists` VALUES ('Imp_Bandsman',414,1710);
+INSERT INTO `mob_skill_lists` VALUES ('Imp_Bandsman',414,1711);
+INSERT INTO `mob_skill_lists` VALUES ('Imp_Bandsman',414,1712);
+-- 415 to 435: free
 INSERT INTO `mob_skill_lists` VALUES ('Bloodlapper',436,2162);
 INSERT INTO `mob_skill_lists` VALUES ('Ghillie_Dhu',437,685);
 INSERT INTO `mob_skill_lists` VALUES ('Highlander_Lizard',438,371);

diff --git a/sql/mob_skills.sql b/sql/mob_skills.sql
@@ -1725,7 +1725,7 @@ INSERT INTO `mob_skills` VALUES (1708,1175,'proboscis_shower',0,7.0,2000,1500,1,
 INSERT INTO `mob_skills` VALUES (1709,1181,'abrasive_tantara',1,10.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (1710,1182,'deafening_tantara',1,10.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (1711,1180,'frenetic_rip',0,7.0,2000,1500,4,0,0,0,0,0,0);
--- INSERT INTO `mob_skills` VALUES (1712,1456,'bugle_call',0,7.0,2000,1500,4,0,0,0,0,0,0);
+INSERT INTO `mob_skills` VALUES (1712,1183,'bugle_call',0,7.0,2000,3000,1,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (1713,1159,'yawn',1,18.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (1714,1160,'wing_slap',0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (1715,1161,'beak_lunge',0,7.0,2000,1500,4,0,0,5,0,0,0);

diff --git a/sql/mob_spawn_points.sql b/sql/mob_spawn_points.sql
@@ -12983,21 +12983,21 @@ INSERT INTO `mob_spawn_points` VALUES (17010693,'Llamhigyn_Y_Dwr','Llamhigyn Y D
 INSERT INTO `mob_spawn_points` VALUES (17010694,'Giant_Orobon','Giant Orobon',6,1.000,1.000,1.000,0);
 
 -- ISMN: Call to Arms
-INSERT INTO `mob_spawn_points` VALUES (17010695,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010696,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010697,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010698,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010699,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010701,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010702,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010703,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010704,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010705,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010707,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010708,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010709,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010710,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
-INSERT INTO `mob_spawn_points` VALUES (17010711,'Imp_Bandsman','Imp Bandsman',7,0.000,0.000,0.000,0);
+INSERT INTO `mob_spawn_points` VALUES (17010695,'Imp_Bandsman','Imp Bandsman',7,0.-180,39.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010696,'Imp_Bandsman_Add','Imp Bandsman',15,-180,39.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010697,'Imp_Bandsman_Add','Imp Bandsman',15,-180,39.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010698,'Imp_Bandsman_Add','Imp Bandsman',15,-180,39.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010699,'Imp_Bandsman_Add','Imp Bandsman',15,-180,39.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010701,'Imp_Bandsman','Imp Bandsman',7,20,-0.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010702,'Imp_Bandsman_Add','Imp Bandsman',15,20,-0.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010703,'Imp_Bandsman_Add','Imp Bandsman',15,20,-0.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010704,'Imp_Bandsman_Add','Imp Bandsman',15,20,-0.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010705,'Imp_Bandsman_Add','Imp Bandsman',15,20,-0.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010707,'Imp_Bandsman','Imp Bandsman',7,220,-40.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010708,'Imp_Bandsman_Add','Imp Bandsman',15,220,-40.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010709,'Imp_Bandsman_Add','Imp Bandsman',15,220,-40.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010710,'Imp_Bandsman_Add','Imp Bandsman',15,220,-40.5,185,65);
+INSERT INTO `mob_spawn_points` VALUES (17010711,'Imp_Bandsman_Add','Imp Bandsman',15,220,-40.5,185,65);
 
 -- ISNM: Compliments to the Chef
 INSERT INTO `mob_spawn_points` VALUES (17010713,'Angler_Orobon','Angler Orobon',8,0.000,0.000,0.000,0);

diff --git a/sql/npc_list.sql b/sql/npc_list.sql
@@ -5507,9 +5507,9 @@ INSERT INTO `npc_list` VALUES (17006901,'2','',0,0.000,0.000,0.000,0,40,40,0,0,0
 -- Talacca Cove (Zone 57)
 -- ------------------------------------------------------------
 
-INSERT INTO `npc_list` VALUES (17010700,'Armoury_Crate','Armoury Crate',64,-180.000,39.080,180.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1); -- call_to_arms
-INSERT INTO `npc_list` VALUES (17010706,'Armoury_Crate','Armoury Crate',64,0.000,0.000,0.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);
-INSERT INTO `npc_list` VALUES (17010712,'Armoury_Crate','Armoury Crate',64,0.000,0.000,0.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);
+INSERT INTO `npc_list` VALUES (17010700,'Armoury_Crate','Armoury Crate',65,-180,39.5,185,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1); -- call_to_arms
+INSERT INTO `npc_list` VALUES (17010706,'Armoury_Crate','Armoury Crate',65,20,-0.5,185,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);
+INSERT INTO `npc_list` VALUES (17010712,'Armoury_Crate','Armoury Crate',65,220,-40.5,185,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);
 INSERT INTO `npc_list` VALUES (17010714,'Armoury_Crate','Armoury Crate',64,-180.000,39.080,180.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1); -- compliments_to_the_chef
 INSERT INTO `npc_list` VALUES (17010716,'Armoury_Crate','Armoury Crate',64,0.000,0.000,0.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);
 INSERT INTO `npc_list` VALUES (17010718,'Armoury_Crate','Armoury Crate',64,0.000,0.000,0.000,7,40,40,0,8,0,6,1155,0x0000C10300000000000000000000000000000000,0,'TOAU',1);