Index: scripts/globals/bcnm.lua =================================================================== --- scripts/globals/bcnm.lua (revision 1847) +++ scripts/globals/bcnm.lua (working copy) @@ -8,6 +8,7 @@ -- e.g. zone,{itemid,bcnmid,itemid,bcnmid,itemid,bcnmid} -- DO NOT INCLUDE MAAT FIGHTS itemid_bcnmid_map = {139,{1553,11}, -- Horlais Peak + 140,{1551,34}, -- Ghelsba Outpost 144,{1166,68,1178,81,1553,76}, -- Waughroon Shrine 146,{1553,107,1551,105}, -- Balgas Dias 168,{0,0}, -- Chamber of Oracles @@ -27,7 +28,7 @@ -- The paramid is a bitmask which you need to find out. Being a bitmask, it will be one of: -- 0,1,2,3,4,5,... bcnmid_param_map = {139,{0,0,5,5,6,6,7,7,11,11}, - 140,{32,0,33,1}, + 140,{32,0,33,1,34,2}, 144,{64,0,68,4,70,6,71,7,72,8,81,17,76,12}, 146,{96,0,101,5,102,6,103,7,107,11,105,9}, 163,{128,0}, @@ -180,7 +181,7 @@ return false; else id = player:getVar("trade_bcnmid"); - if(id == 68 or id == 418 or id == 450 or id == 482 or id == 545 or id == 578 or id == 609 or id == 81 or id == 76 or id == 107 or id == 11 or id == 105) then + if(id == 68 or id == 418 or id == 450 or id == 482 or id == 545 or id == 578 or id == 609 or id == 81 or id == 76 or id == 107 or id == 11 or id == 105 or id == 34) then player:tradeComplete(); -- Removes the item, eventually need to remove orbs from this list and set bitmask on vraible to cracked instead of removing orb!!! end return true; Index: scripts/zones/Ghelsba_Outpost/mobs/Colo-Colo.lua =================================================================== --- scripts/zones/Ghelsba_Outpost/mobs/Colo-Colo.lua (revision 0) +++ scripts/zones/Ghelsba_Outpost/mobs/Colo-Colo.lua (working copy) @@ -0,0 +1,27 @@ +----------------------------------- +-- Mob: Colo-colo +-- +-- +----------------------------------- +-- onMobSpawn Action +----------------------------------- + +function OnMobSpawn(mob) +end; + +----------------------------------- +-- onMobEngaged +----------------------------------- + +function onMobEngaged(mob,target) + + GetMobByID(17350930):updateEnmity(target); + GetMobByID(17350931):updateEnmity(target); +end; + +----------------------------------- +-- onMobDeath +----------------------------------- + +function onMobDeath(mob, killer) +end; \ No newline at end of file Index: scripts/zones/Ghelsba_Outpost/mobs/Furies.lua =================================================================== --- scripts/zones/Ghelsba_Outpost/mobs/Furies.lua (revision 0) +++ scripts/zones/Ghelsba_Outpost/mobs/Furies.lua (working copy) @@ -0,0 +1,28 @@ +----------------------------------- +-- Mob: Furies +-- +----------------------------------- +-- onMobSpawn Action +----------------------------------- + +function OnMobSpawn(mob) +end; + +----------------------------------- +-- onMobEngaged +----------------------------------- + +function onMobEngaged(mob,target) + GetMobByID(17350929):updateEnmity(target); + GetMobByID(17350930):updateEnmity(target); + GetMobByID(17350931):updateEnmity(target); + +end; + +----------------------------------- +-- onMobDeath +----------------------------------- + +function onMobDeath(mob,killer) + +end; \ No newline at end of file Index: scripts/zones/Ghelsba_Outpost/npcs/Armoury_Crate.lua =================================================================== --- scripts/zones/Ghelsba_Outpost/npcs/Armoury_Crate.lua (revision 0) +++ scripts/zones/Ghelsba_Outpost/npcs/Armoury_Crate.lua (working copy) @@ -0,0 +1,41 @@ +----------------------------------- +-- Area: Ghelsba Outpost +-- NPC: Armoury Crate +-- Ghelsba Outpost Burning Cicrcle Armoury Crate +----------------------------------- +package.loaded["scripts/zones/Ghelsba_Outpost/TextIDs"] = nil; +package.loaded["scripts/globals/bcnm"] = nil; +------------------------------------- + +require("scripts/zones/Ghelsba_Outpost/TextIDs"); + +----------------------------------- + +----------------------------------- +-- onTrade Action +----------------------------------- + +function onTrade(player,npc,trade) +end; + +----------------------------------- +-- onTrigger Action +----------------------------------- + +function onTrigger(player,npc) + player:getBCNMloot(); +end; + +----------------------------------- +-- onEventUpdate +----------------------------------- + +function onEventUpdate(player,csid,option) +end; + +----------------------------------- +-- onEventFinish Action +----------------------------------- + +function onEventFinish(player,csid,option) +end; Index: scripts/zones/Ghelsba_Outpost/npcs/Hut_Door.lua =================================================================== --- scripts/zones/Ghelsba_Outpost/npcs/Hut_Door.lua (revision 1847) +++ scripts/zones/Ghelsba_Outpost/npcs/Hut_Door.lua (working copy) @@ -3,6 +3,7 @@ -- NPC: Hut Door -- Involved in Quest: The Holy Crest -- Involved in Mission: Save the children +-- -- @pos -162 -11 78 140 ----------------------------------- package.loaded["scripts/zones/Ghelsba_Outpost/TextIDs"] = nil; @@ -20,6 +21,11 @@ ----------------------------------- function onTrade(player,npc,trade) + + if(TradeBCNM(player,player:getZone(),trade,npc))then + return; + end + end; ----------------------------------- @@ -28,17 +34,17 @@ function onTrigger(player,npc) - if(player:hasKeyItem(ORCISH_HUT_KEY)) then - if(player:hasCompletedMission(SANDORIA,SAVE_THE_CHILDREN)) then +-- if(player:hasKeyItem(ORCISH_HUT_KEY)) then +-- if(player:hasCompletedMission(SANDORIA,SAVE_THE_CHILDREN)) then player:startEvent(0x0003); - else - player:startEvent(0x0037); - end - else +-- else +-- player:startEvent(0x0037); +-- end +-- else if(EventTriggerBCNM(player,npc))then return; end - end +-- end end; Index: sql/bcnm_info.sql =================================================================== --- sql/bcnm_info.sql (revision 1847) +++ sql/bcnm_info.sql (working copy) @@ -70,7 +70,7 @@ -- Ghelsba Outpost INSERT INTO `bcnm_info` VALUES ('32', '140', 'save_the_children', NULL, NULL, '600', '0', '6', '0', '5'); INSERT INTO `bcnm_info` VALUES ('33', '140', 'holy_crest', NULL, NULL, '600', '75', '6', '0', '7'); -INSERT INTO `bcnm_info` VALUES ('34', '140', 'wings_of_fury', NULL, NULL, '900', '20', '3', '0', '15'); +INSERT INTO `bcnm_info` VALUES ('34', '140', 'wings_of_fury', NULL, NULL, '900', '20', '3', '2', '15'); INSERT INTO `bcnm_info` VALUES ('35', '140', 'petrifying_pair', NULL, NULL, '900', '30', '3', '0', '15'); INSERT INTO `bcnm_info` VALUES ('36', '140', 'toadal_recall', NULL, NULL, '1800', '30', '6', '0', '15'); INSERT INTO `bcnm_info` VALUES ('37', '140', 'mirror_mirror', NULL, NULL, '900', '40', '3', '0', '7'); Index: sql/bcnm_instance.sql =================================================================== --- sql/bcnm_instance.sql (revision 1847) +++ sql/bcnm_instance.sql (working copy) @@ -53,6 +53,9 @@ INSERT INTO `bcnm_instance` VALUES ('32', '1', '17350663'); INSERT INTO `bcnm_instance` VALUES ('32', '1', '17350664'); INSERT INTO `bcnm_instance` VALUES ('33', '1', '17350928'); +INSERT INTO `bcnm_instance` VALUES ('34', '1', '17350929'); +INSERT INTO `bcnm_instance` VALUES ('34', '1', '17350930'); +INSERT INTO `bcnm_instance` VALUES ('34', '1', '17350931'); -- Waughroon Shrine INSERT INTO `bcnm_instance` VALUES ('64', '1', '17367041'); Index: sql/bcnm_loot.sql =================================================================== --- sql/bcnm_loot.sql (revision 1847) +++ sql/bcnm_loot.sql (working copy) @@ -130,3 +130,30 @@ INSERT INTO `bcnm_loot` VALUES ('1', '1601', '260', '6'); INSERT INTO `bcnm_loot` VALUES ('1', '4853', '250', '6'); INSERT INTO `bcnm_loot` VALUES ('1', '930', '190', '6'); +INSERT INTO `bcnm_loot` VALUES ('2', '891', '1000', '0'); +INSERT INTO `bcnm_loot` VALUES ('2', '4900', '306', '1'); +INSERT INTO `bcnm_loot` VALUES ('2', '4744', '319', '1'); +INSERT INTO `bcnm_loot` VALUES ('2', '4745', '125', '1'); +INSERT INTO `bcnm_loot` VALUES ('2', '4746', '222', '1'); +INSERT INTO `bcnm_loot` VALUES ('2', '17786', '153', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '18170', '139', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '16687', '83', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '17571', '97', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '17993', '125', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '749', '444', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '773', '56', '2'); +INSERT INTO `bcnm_loot` VALUES ('2', '17820', '111', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '17993', '139', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '18170', '139', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '18085', '42', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '16959', '181', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '774', '97', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '769', '69', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '776', '14', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '775', '28', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '772', '28', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '771', '14', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '770', '69', '3'); +INSERT INTO `bcnm_loot` VALUES ('2', '13548', '167', '4'); +INSERT INTO `bcnm_loot` VALUES ('2', '922', '444', '4'); +INSERT INTO `bcnm_loot` VALUES ('2', '0', '600', '4'); Index: sql/bcnm_treasure_chests.sql =================================================================== --- sql/bcnm_treasure_chests.sql (revision 1847) +++ sql/bcnm_treasure_chests.sql (working copy) @@ -35,6 +35,7 @@ -- INSERT INTO `bcnm_treasure_chests` VALUES ('11', '3', '17346721'); -- Ghelsba Outpost +INSERT INTO `bcnm_treasure_chests` VALUES ('34', '1', '17350932'); -- Waughroon Shrine INSERT INTO `bcnm_treasure_chests` VALUES ('81', '1', '17367089'); Index: sql/mob_spawn_points.sql =================================================================== --- sql/mob_spawn_points.sql (revision 1847) +++ sql/mob_spawn_points.sql (working copy) @@ -24667,10 +24667,9 @@ INSERT INTO `mob_spawn_points` VALUES ('17350926', 'Cheiroptera', '7732', '-14.000', '-31.000', '183.000', '127'); INSERT INTO `mob_spawn_points` VALUES ('17350927', 'Cheiroptera', '7732', '13.556', '-27.894', '178.308', '126'); INSERT INTO `mob_spawn_points` VALUES ('17350928', 'Cyranuce_M_Cutauleon', '7734', '-189.000', '-10.000', '45.000', '95'); -INSERT INTO `mob_spawn_points` VALUES ('17350929', 'Colo-colo', '7733', '0.000', '0.000', '0.000', '0'); -INSERT INTO `mob_spawn_points` VALUES ('17350930', 'Furies', '7737', '0.000', '0.000', '0.000', '0'); -INSERT INTO `mob_spawn_points` VALUES ('17350931', 'Furies', '7737', '0.000', '0.000', '0.000', '0'); -INSERT INTO `mob_spawn_points` VALUES ('17350932', 'Armoury_Crate', '7729', '0.000', '0.000', '0.000', '0'); +INSERT INTO `mob_spawn_points` VALUES ('17350929', 'Colo-colo', '7733', '-188.000', '-10.000', '45.000', '127'); +INSERT INTO `mob_spawn_points` VALUES ('17350930', 'Furies', '7737', '-185.000', '-10.000', '48.000', '127'); +INSERT INTO `mob_spawn_points` VALUES ('17350931', 'Furies', '7737', '-191.000', '-10.000', '51.000', '127'); INSERT INTO `mob_spawn_points` VALUES ('17350933', 'Kalamainu', '7740', '0.000', '0.000', '0.000', '0'); INSERT INTO `mob_spawn_points` VALUES ('17350934', 'Kilioa', '7741', '0.000', '0.000', '0.000', '0'); INSERT INTO `mob_spawn_points` VALUES ('17350935', 'Armoury_Crate', '7729', '0.000', '0.000', '0.000', '0'); Index: sql/npc_list.sql =================================================================== --- sql/npc_list.sql (revision 1847) +++ sql/npc_list.sql (working copy) @@ -8407,7 +8407,7 @@ INSERT INTO `npc_list` VALUES ('17346840', 'Elrica', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '2075', 0x0100040255105520553055405550006000700000, '32', '139'); INSERT INTO `npc_list` VALUES ('17346841', 'Terounalivet', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '2075', 0x0100060353105320533053405350006000700000, '32', '139'); INSERT INTO `npc_list` VALUES ('17346842', 'qm1', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '2', '2051', 0x0000320000000000000000000000000000000000, '0', '139'); -INSERT INTO `npc_list` VALUES ('17350932', 'Armoury_Crate', '112', '-188.704', '-10.547', '45.326', '7', '40', '40', '0', '8', '0', '6', '1155', 0x0000C00300000000000000000000000000000000, '0', '140'); +INSERT INTO `npc_list` VALUES ('17350932', 'Armoury_Crate', '192', '-188.704', '-10.547', '45.326', '7', '40', '40', '0', '8', '0', '6', '1155', 0x0000C00300000000000000000000000000000000, '0', '140'); INSERT INTO `npc_list` VALUES ('17350935', 'Armoury_Crate', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '3', 0x0000320000000000000000000000000000000000, '0', '140'); INSERT INTO `npc_list` VALUES ('17350940', 'Armoury_Crate', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '6', '3', 0x0000320000000000000000000000000000000000, '0', '140'); INSERT INTO `npc_list` VALUES ('17350947', 'Hut_Door', '124', '-165.357', '-11.672', '77.771', '1', '40', '40', '0', '0', '0', '0', '3', 0x0000320000000000000000000000000000000000, '0', '140'); @@ -8836,7 +8836,7 @@ INSERT INTO `npc_list` VALUES ('17391849', 'Overlord_Bakgodek', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '2', '29', 0x0000F30300000000000000000000000000000000, '0', '150'); INSERT INTO `npc_list` VALUES ('17391850', 'Ironhand_Gadzradd', '0', '0.000', '0.000', '0.000', '0', '40', '40', '0', '0', '0', '2', '27', 0x0000160400000000000000000000000000000000, '0', '150'); INSERT INTO `npc_list` VALUES ('17391851', 'Cryptexphere', '246', '-147.493', '-8.268', '-26.562', '1', '40', '40', '0', '0', '0', '0', '3', 0x0000340000000000000000000000000000000000, '0', '150'); -INSERT INTO `npc_list` VALUES ('17396142', 'Tebhi', '215', '-136.000', '24.000', '-21.000', '0', '40', '40', '0', '0', '0', '6', '3', 0x0000320000000000000000000000000000000000, '0', '151'); +INSERT INTO `npc_list` VALUES ('17396142', 'Tebhi', '151', '-136.000', '24.000', '-21.000', '0', '40', '40', '0', '2', '0', '6', '27', 0x0001A00000000000000000000000000000000000, '0', '151'); INSERT INTO `npc_list` VALUES ('17396149', 'DIRECTOR', '242', '13.986', '0.249', '-22.952', '0', '40', '40', '0', '0', '0', '6', '27', 0x00004A0000000000000000000000000000000000, '0', '151'); INSERT INTO `npc_list` VALUES ('17396150', 'Ajido-Marujido', '151', '26.320', '23.964', '-22.498', '0', '40', '40', '0', '2', '0', '6', '27', 0x0000950000000000000000000000000000000000, '0', '151'); INSERT INTO `npc_list` VALUES ('17396151', '_470', '0', '20.000', '-2.599', '-11.291', '32769', '40', '40', '9', '0', '0', '0', '4099', 0x0200000000000000000000000000000000000000, '0', '151');