[manual]Делаем осадные КХ , обычными КХ.

-- Убираем мобов у Fortress of Resistance.
DELETE FROM `spawnlist` WHERE `npc_templateid` IN ('35368', '35369', '35370', '35371', '35372', '35373', '35374');

-- Убираем мобов у Devastated Castle.
DELETE FROM `spawnlist` WHERE `npc_templateid` IN ('35410', '35411', '35412', '35413', '35414', '35415', '35416', '35417', '35418');

-- Убираем мобов у Bandit Stronghold.
DELETE FROM `spawnlist` WHERE `npc_templateid` IN ('35428', '35429', '35430', '35431', '35432');

--
-- Fortress of Resistance
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11100';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11100, 0, 43648, 109416),
(11100, 1, 43081, 108840),
(11100, 2, 43658, 108274),
(11100, 3, 43887, 108507),
(11100, 4, 43642, 108749),
(11100, 5, 43640, 108940),
(11100, 6, 43882, 109186);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'Partisan' WHERE `id` = '21';

-- Замена НПС в Клан Холле, чтоб подключить им функции
UPDATE `npc` SET `type` = 'L2ClanHallManager' WHERE `id` = '35383';
UPDATE `npc` SET `type` = 'L2Doormen' WHERE `id` = '30596';

-- Магазинчик в Клан Холле
DELETE FROM `merchant_buylists` WHERE `shop_id` like '%35383';
INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,time) VALUES
(6902,12900,135383,1,-1,0),
(1829,500,135383,2,5,1),
(5169,300,135383,3,5,1),
(6902,12900,235383,1,-1,0),
(1829,500,235383,2,5,1),
(5858,100000,235383,3,1,1),
(5169,300,235383,4,10,1),
(7124,35000,235383,5,1,1),
(7126,35000,235383,6,1,1),
(6902,12900,335383,1,-1,0),
(1829,500,335383,2,5,1),
(5858,100000,335383,3,1,1),
(5169,300,335383,4,10,1),
(7124,35000,335383,5,1,1),
(7126,35000,335383,6,1,1),
(7585,500000,335383,7,1,2),
(6926,18,335383,8,1,1),
(6929,15,335383,9,1,1),
(6931,15,335383,10,1,1),
(6920,50,335383,11,1,1),
(6922,100000,335383,12,1,1),
(7700,100000,335383,13,1,1),
(6940,4000,335383,14,1,1),
(6941,4000,335383,15,1,1),
(6942,4000,335383,16,1,1),
(6978,12000,335383,17,1,1),
(6979,12000,335383,18,1,1),
(6980,12000,335383,19,1,1),
(6981,12000,335383,20,1,1),
(6982,12000,335383,21,1,1),
(6983,12000,335383,22,1,1),
(6984,12000,335383,23,1,1),
(6985,12000,335383,24,1,1),
(6986,12000,335383,25,1,1),
(6987,12000,335383,26,1,1),
(6988,12000,335383,27,1,1),
(6989,12000,335383,28,1,1);

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Dion Castle Town',75003,19025,145245,-3107,500,0);

--
-- Devastated Castle
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11113';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11113, 0, 177212, -16508),
(11113, 1, 177128, -16712),
(11113, 2, 177127, -17867),
(11113, 3, 177502, -18854),
(11113, 4, 178338, -18921),
(11113, 5, 178560, -19061),
(11113, 6, 179642, -19063),
(11113, 7, 179778, -18766),
(11113, 8, 179780, -15346),
(11113, 9, 179698, -15177),
(11113, 10, 179355, -14604),
(11113, 11, 179027, -14623),
(11113, 12, 178949, -14665),
(11113, 13, 178763, -14995),
(11113, 14, 178465, -15039),
(11113, 15, 178213, -15040),
(11113, 16, 177875, -15015),
(11113, 17, 177625, -14601),
(11113, 18, 177322, -14601),
(11113, 19, 176888, -15331),
(11113, 20, 176888, -16422);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'Devastated' WHERE `id` = '34';

-- Замена НПС в Клан Холле, чтоб подключить им функции
UPDATE `npc` SET `type` = 'L2ClanHallManager' WHERE `id` = '35421';

-- Добавляем новых НПС
INSERT IGNORE INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideTitle`,`class`,`collision_radius`,`collision_height`,`level`,`sex`,`type`,`attackrange`,`hp`,`mp`,`hpreg`,`mpreg`,`str`,`con`,`dex`,`int`,`wit`,`men`,`exp`,`sp`,`patk`,`pdef`,`matk`,`mdef`,`atkspd`,`aggro`,`matkspd`,`rhand`,`lhand`,`armor`,`walkspd`,`runspd`,`faction_id`,`faction_range`,`isUndead`,`absorb_level`,`absorb_type`) VALUES
(75014,35419,'Hell''s Doorman',1,'',1,'Monster.human_ghost',10.00,20.00,70,'male','L2Doormen',40,11586,1319,13.43,3.09,40,43,30,21,20,10,490,0,2297,469,779,381,278,0,333
,0,0,0,88,132,'gustav_clan',1000,1,0,'LAST_HIT');

-- Спавн
INSERT IGNORE INTO `spawnlist` VALUES
(NULL,'Devastated Castle - Clan Hall NPC',1,75014,178388,-18544,-2262,0,0,65268,60,0,'0'),
(NULL,'Devastated Castle - Clan Hall NPC',1,75014,178076,-18144,-2230,0,0,17352,60,0,'0'),
(NULL,'Devastated Castle - Clan Hall NPC',1,75014,178147,-15208,-2262,0,0,50449,60,0,'0'),
(NULL,'Devastated Castle - Clan Hall NPC',1,75014,178221,-14963,-2261,0,0,15911,60,0,'0');

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Town of Aden',75015,147450,28081,-2294,500,0),
('Clan Hall -> Fields of Massacre',75016,179718,-7843,-3517,0,0);

--
-- Bandit Stronghold
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11114';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11114, 0, 79854, -16869),
(11114, 1, 80531, -17189),
(11114, 2, 81166, -17194),
(11114, 3, 81458, -17324),
(11114, 4, 81834, -17750),
(11114, 5, 83222, -18068),
(11114, 6, 83518, -18117),
(11114, 7, 84091, -18243),
(11114, 8, 84795, -18174),
(11114, 9, 84940, -18365),
(11114, 10, 85134, -18437),
(11114, 11, 85214, -18436),
(11114, 12, 85601, -18122),
(11114, 13, 85648, -18080),
(11114, 14, 85571, -17871),
(11114, 15, 85433, -17683),
(11114, 16, 85686, -17177),
(11114, 17, 85627, -16086),
(11114, 18, 85285, -15722),
(11114, 19, 85053, -15521),
(11114, 20, 83779, -14815),
(11114, 21, 83487, -14661),
(11114, 22, 81961, -14463),
(11114, 23, 81646, -14411),
(11114, 24, 80781, -14395),
(11114, 25, 79911, -14638),
(11114, 26, 79463, -14995),
(11114, 27, 79442, -15877),
(11114, 28, 79799, -16195);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'Bandit' WHERE `id` = '35';

-- Замена НПС в Клан Холле, чтоб подключить им функции
UPDATE `npc` SET `type` = 'L2Doormen' WHERE `id` = '35433';
UPDATE `npc` SET `type` = 'L2Doormen' WHERE `id` = '35434';
UPDATE `npc` SET `type` = 'L2Doormen' WHERE `id` = '35435';
UPDATE `npc` SET `type` = 'L2Doormen' WHERE `id` = '35436';

-- Spawn Changes
UPDATE `spawnlist` SET `locx` = '85584', `locy` = '-18224', `locz` = '-1819' WHERE `id` = '58435';

-- Новые магазины
INSERT IGNORE INTO merchant_shopids VALUES (135438,'35438');
INSERT IGNORE INTO merchant_shopids VALUES (235438,'35438');
INSERT IGNORE INTO merchant_shopids VALUES (335438,'35438');

-- Insert new Buylists
DELETE FROM `merchant_buylists` WHERE `shop_id` like '%35438';
INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,time) VALUES
(6902,12900,135438,1,-1,0),
(1829,500,135438,2,5,1),
(5169,300,135438,3,5,1),
(6902,12900,235438,1,-1,0),
(1829,500,235438,2,5,1),
(5858,100000,235438,3,1,2),
(5169,300,235438,4,10,1),
(7129,35000,235438,5,1,1),
(7130,35000,235438,6,1,1),
(6902,12900,335438,1,-1,0),
(1829,500,335438,2,5,1),
(5858,100000,335438,3,3,1),
(5169,300,335438,4,10,1),
(7129,35000,335438,5,1,1),
(7130,35000,335438,6,1,1),
(7583,500000,335438,7,1,2),
(7584,500000,335438,8,1,2),
(7585,500000,335438,9,1,2),
(6928,180,335438,10,1,1),
(6935,600,335438,11,1,1),
(6936,1200,335438,12,1,1),
(6938,1200,335438,13,1,1),
(6921,250,335438,14,1,1),
(6923,100000,335438,15,1,1),
(7691,100000,335438,16,1,1),
(6940,4000,335438,17,1,1),
(6941,4000,335438,18,1,1),
(6942,4000,335438,19,1,1),
(6943,4000,335438,20,1,1),
(6944,4000,335438,21,1,1),
(6945,4000,335438,22,1,1),
(6946,4000,335438,23,1,1),
(6947,4000,335438,24,1,1),
(6948,4000,335438,25,1,1),
(6949,4000,335438,26,1,1),
(6950,4000,335438,27,1,1),
(6951,4000,335438,28,1,1),
(6952,4000,335438,29,1,1),
(6953,4000,335438,30,1,1),
(7002,29000,335438,31,1,1),
(7003,29000,335438,32,1,1),
(7004,29000,335438,33,1,1),
(7005,29000,335438,34,1,1),
(7006,29000,335438,35,1,1),
(7007,29000,335438,36,1,1),
(7008,29000,335438,37,1,1),
(7009,29000,335438,38,1,1),
(7010,29000,335438,39,1,1),
(7011,29000,335438,40,1,1),
(7012,29000,335438,41,1,1),
(7013,29000,335438,42,1,1);

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Town of Oren',75008,80847,54661,-1519,500,0),
('Clan Hall -> Ivory Tower',75009,85341,16151,-3673,500,0),
('Clan Hall -> Sea of Spores',75010,65085,22925,-3761,500,0),
('Clan Hall -> Forest of Evil',75011,104404,-151,-3421,500,0),
('Clan Hall -> Outlaw Forest',75012,86034,-2434,-3529,500,0),
('Clan Hall -> Border Outpost',75013,110647,-10087,-2017,500,0),
('Clan Hall -> Bandit Stronghold',75014,86825,-20028,-2009,0,0);

--
-- Rainbow Springs Chateau
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11141';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11141, 0, 141418, -124505),
(11141, 1, 140939, -124184),
(11141, 2, 140730, -124031),
(11141, 3, 140683, -123780),
(11141, 4, 140608, -123774),
(11141, 5, 139761, -123212),
(11141, 6, 139692, -123232),
(11141, 7, 138958, -124326),
(11141, 8, 138963, -124390),
(11141, 9, 139944, -125040),
(11141, 10, 140099, -125045),
(11141, 11, 140345, -124698),
(11141, 12, 140443, -124758),
(11141, 13, 140589, -124706),
(11141, 14, 141068, -125029),
(11141, 15, 141132, -125257),
(11141, 16, 141258, -125329),
(11141, 17, 141476, -125423),
(11141, 18, 141546, -125437),
(11141, 19, 141621, -125429),
(11141, 20, 141693, -125398),
(11141, 21, 141764, -125345),
(11141, 22, 141826, -125271),
(11141, 23, 141869, -125185),
(11141, 24, 141899, -124802),
(11141, 25, 141524, -124591);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'HotSpring' WHERE `id` = '62';

-- Добавляем новых НПС
INSERT IGNORE INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideTitle`,`class`,`collision_radius`,`collision_height`,`level`,`sex`,`type`,`attackrange`,`hp`,`mp`,`hpreg`,`mpreg`,`str`,`con`,`dex`,`int`,`wit`,`men`,`exp`,`sp`,`patk`,`pdef`,`matk`,`mdef`,`atkspd`,`aggro`,`matkspd`,`rhand`,`lhand`,`armor`,`walkspd`,`runspd`,`faction_id`,`faction_range`,`isUndead`,`absorb_level`,`absorb_type`) VALUES
(75001,30146,'Galadriel',1,'Rainbow Springs Steward',1,'NPC.a_teleporter_FElf',8.50,23.50,70,'female','L2ClanHallManager',40,3862,3059,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75002,30148,'Feliel',1,'Rainbow Springs Gatekeeper',1,'NPC.a_trader_FElf',8.00,24.00,70,'female','L2Doormen',40,3862,3059,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75015,30148,'Eliade',1,'Rainbow Springs Gatekeeper',1,'NPC.a_trader_FElf',8.00,24.00,70,'female','L2Doormen',40,3862,3059,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75016,30148,'D''Alorna',1,'Rainbow Springs Gatekeeper',1,'NPC.a_trader_FElf',8.00,24.00,70,'female','L2Doormen',40,3862,3059,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT');

-- Спавн
INSERT IGNORE INTO `spawnlist` VALUES
(NULL,'Hot Springs - Clan Hall NPC',1,75001,141107,-124320,-1869,0,0,42569,60,0,'0'),
(NULL,'Hot Springs - Clan Hall NPC',1,75002,141138,-124252,-1869,0,0,10721,60,0,'0'),
(NULL,'Hot Springs - Clan Hall NPC',1,75015,140768,-124356,-1869,0,0,26809,60,0,'0'),
(NULL,'Hot Springs - Clan Hall NPC',1,75016,141324,-124732,-1869,0,0,58383,60,0,'0');

-- Новые магазины
INSERT IGNORE INTO merchant_shopids VALUES (175001,'75001');
INSERT IGNORE INTO merchant_shopids VALUES (275001,'75001');
INSERT IGNORE INTO merchant_shopids VALUES (375001,'75001');

-- Добавляем в магазин
DELETE FROM `merchant_buylists` WHERE `shop_id` like '%75001';
INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,time) VALUES
(6902,12900,175001,1,-1,0),
(1829,500,175001,2,5,1),
(5169,300,175001,3,5,1),
(6902,12900,275001,1,-1,0),
(1829,500,275001,2,5,1),
(5858,100000,275001,3,1,2),
(5169,300,275001,4,10,1),
(7133,35000,275001,5,1,1),
(7135,35000,275001,6,1,1),
(6902,12900,375001,1,-1,0),
(1829,500,375001,2,5,1),
(5858,100000,375001,3,3,1),
(5169,300,375001,4,10,1),
(7133,35000,375001,5,1,1),
(7135,35000,375001,6,1,1),
(7583,500000,375001,7,1,2),
(7584,500000,375001,8,1,2),
(7585,500000,375001,9,1,2),
(6928,180,375001,10,1,1),
(6935,600,375001,11,1,1),
(6936,1200,375001,12,1,1),
(6938,1200,375001,13,1,1),
(6921,250,375001,14,1,1),
(6923,100000,375001,15,1,1),
(7691,100000,375001,16,1,1),
(6940,4000,375001,17,1,1),
(6941,4000,375001,18,1,1),
(6942,4000,375001,19,1,1),
(6943,4000,375001,20,1,1),
(6944,4000,375001,21,1,1),
(6945,4000,375001,22,1,1),
(6946,4000,375001,23,1,1),
(6947,4000,375001,24,1,1),
(6948,4000,375001,25,1,1),
(6949,4000,375001,26,1,1),
(6950,4000,375001,27,1,1),
(6951,4000,375001,28,1,1),
(6952,4000,375001,29,1,1),
(6953,4000,375001,30,1,1),
(7002,29000,375001,31,1,1),
(7003,29000,375001,32,1,1),
(7004,29000,375001,33,1,1),
(7005,29000,375001,34,1,1),
(7006,29000,375001,35,1,1),
(7007,29000,375001,36,1,1),
(7008,29000,375001,37,1,1),
(7009,29000,375001,38,1,1),
(7010,29000,375001,39,1,1),
(7011,29000,375001,40,1,1),
(7012,29000,375001,41,1,1),
(7013,29000,375001,42,1,1);

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Goddard',75001,147928,-55273,-2734,500,0),
('Clan Hall -> Hot Springs',75002,144880,-113468,-2560,0,0);

--
-- Wild Beast Reserve
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11142';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11142, 0, 55277, -93040),
(11142, 1, 55340, -93256),
(11142, 2, 55378, -93270),
(11142, 3, 55849, -93388),
(11142, 4, 55964, -93824),
(11142, 5, 55856, -94196),
(11142, 6, 56357, -94673),
(11142, 7, 56775, -94550),
(11142, 8, 58389, -94904),
(11142, 9, 58686, -95066),
(11142, 10, 59235, -94865),
(11142, 11, 59859, -94758),
(11142, 12, 60695, -94773),
(11142, 13, 61250, -93734),
(11142, 14, 61058, -93225),
(11142, 15, 60327, -92013),
(11142, 16, 59941, -91872),
(11142, 17, 59600, -91198),
(11142, 18, 58832, -90502),
(11142, 19, 58685, -90244),
(11142, 20, 57993, -90129),
(11142, 21, 57750, -90439),
(11142, 22, 56144, -91175),
(11142, 23, 55803, -91221),
(11142, 24, 55488, -91838),
(11142, 25, 55606, -92098),
(11142, 26, 55582, -92804);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'BeastFarm' WHERE `id` = '63';

-- Добавляем новых НПС
INSERT IGNORE INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideTitle`,`class`,`collision_radius`,`collision_height`,`level`,`sex`,`type`,`attackrange`,`hp`,`mp`,`hpreg`,`mpreg`,`str`,`con`,`dex`,`int`,`wit`,`men`,`exp`,`sp`,`patk`,`pdef`,`matk`,`mdef`,`atkspd`,`aggro`,`matkspd`,`rhand`,`lhand`,`armor`,`walkspd`,`runspd`,`faction_id`,`faction_range`,`isUndead`,`absorb_level`,`absorb_type`) VALUES
(75003,31366,'Cole',1,'Beast Manager',1,'NPC.a_traderD_Mhuman',8.00,25.30,70,'male','L2ClanHallManager',40,3862,3059,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75004,31537,'Tom',1,'Beast Keeper',1,'NPC.a_common_peopleC_Mhuman',10.00,24.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75005,31537,'Richard',1,'Beast Keeper',1,'NPC.a_common_peopleC_Mhuman',10.00,24.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT'),
(75006,31537,'Harry',1,'Beast Keeper',1,'NPC.a_common_peopleC_Mhuman',10.00,24.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,
0,0,55,132,NULL,0,1,0,'LAST_HIT');

-- Спавн
INSERT IGNORE INTO `spawnlist` VALUES
(NULL,'Beast Farm - Clan Hall NPC',1,75003,60916,-94279,-1350,0,0,27932,60,0,'0'),
(NULL,'Beast Farm - Clan Hall NPC',1,75004,55175,-93025,-1361,0,0,35782,60,0,'0'),
(NULL,'Beast Farm - Clan Hall NPC',1,75005,55577,-93235,-1359,0,0,15186,60,0,'0'),
(NULL,'Beast Farm - Clan Hall NPC',1,75006,59950,-94058,-1354,0,0,27391,60,0,'0');

-- Новые магазины
INSERT IGNORE INTO merchant_shopids VALUES (175003,'75003');
INSERT IGNORE INTO merchant_shopids VALUES (275003,'75003');
INSERT IGNORE INTO merchant_shopids VALUES (375003,'75003');

-- Добавляем в магазин
DELETE FROM `merchant_buylists` WHERE `shop_id` like '%75003';
INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,time) VALUES
(6902,12900,175003,1,-1,0),
(1829,500,175003,2,5,1),
(5169,300,175003,3,5,1),
(6643,25,175003,4,-1,0),
(6644,25,175003,5,-1,0),
(6902,12900,275003,1,-1,0),
(1829,500,275003,2,5,1),
(5858,100000,275003,3,1,2),
(5169,300,275003,4,10,1),
(6643,25,275003,5,-1,0),
(6644,25,275003,6,-1,0),
(7133,35000,275003,7,1,1),
(7135,35000,275003,8,1,1),
(6902,12900,375003,1,-1,0),
(1829,500,375003,2,5,1),
(5858,100000,375003,3,3,1),
(5169,300,375003,4,10,1),
(6643,25,375003,5,-1,0),
(6644,25,375003,6,-1,0),
(7133,35000,375003,7,1,1),
(7135,35000,375003,8,1,1),
(7583,500000,375003,9,1,2),
(7584,500000,375003,10,1,2),
(7585,500000,375003,11,1,2),
(6928,180,375003,12,1,1),
(6935,600,375003,13,1,1),
(6936,1200,375003,14,1,1),
(6938,1200,375003,15,1,1),
(6921,250,375003,16,1,1),
(6923,100000,375003,17,1,1),
(7691,100000,375003,18,1,1),
(6940,4000,375003,19,1,1),
(6941,4000,375003,20,1,1),
(6942,4000,375003,21,1,1),
(6943,4000,375003,22,1,1),
(6944,4000,375003,23,1,1),
(6945,4000,375003,24,1,1),
(6946,4000,375003,25,1,1),
(6947,4000,375003,26,1,1),
(6948,4000,375003,27,1,1),
(6949,4000,375003,28,1,1),
(6950,4000,375003,29,1,1),
(6951,4000,375003,30,1,1),
(6952,4000,375003,31,1,1),
(6953,4000,375003,32,1,1),
(7002,29000,375003,33,1,1),
(7003,29000,375003,34,1,1),
(7004,29000,375003,35,1,1),
(7005,29000,375003,36,1,1),
(7006,29000,375003,37,1,1),
(7007,29000,375003,38,1,1),
(7008,29000,375003,39,1,1),
(7009,29000,375003,40,1,1),
(7010,29000,375003,41,1,1),
(7011,29000,375003,42,1,1),
(7012,29000,375003,43,1,1),
(7013,29000,375003,44,1,1);

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Rune Castle Town',75004,43835,-47749,-796,500,0),
('Clan Hall -> Beast Farm',75005,42598,-88832,-3124,0,0);

--
-- Fortress of the Dead
--

-- Корректируем зоны
DELETE FROM `zone_vertices` WHERE `id`='11143';
INSERT INTO `zone_vertices` (`id`, `order`, `x`, `y`) VALUES
(11143, 0, 56471, -27772),
(11143, 1, 56474, -29068),
(11143, 2, 56555, -29373),
(11143, 3, 57147, -30056),
(11143, 4, 57326, -29998),
(11143, 5, 57541, -29560),
(11143, 6, 57763, -29468),
(11143, 7, 58147, -29468),
(11143, 8, 58368, -29561),
(11143, 9, 58599, -29998),
(11143, 10, 58775, -30051),
(11143, 11, 59374, -29376),
(11143, 12, 59443, -29059),
(11143, 13, 59446, -25778),
(11143, 14, 59328, -25682),
(11143, 15, 58513, -25674),
(11143, 16, 58439, -25709),
(11143, 17, 57461, -25701),
(11143, 18, 57384, -25683),
(11143, 19, 56579, -25681),
(11143, 20, 56465, -25777),
(11143, 21, 56465, -27482);

-- Изменяем КХ
UPDATE `clanhall` SET `location` = 'DeadForest' WHERE `id` = '64';

-- Добавляем новых НПС
INSERT IGNORE INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSideTitle`,`class`,`collision_radius`,`collision_height`,`level`,`sex`,`type`,`attackrange`,`hp`,`mp`,`hpreg`,`mpreg`,`str`,`con`,`dex`,`int`,`wit`,`men`,`exp`,`sp`,`patk`,`pdef`,`matk`,`mdef`,`atkspd`,`aggro`,`matkspd`,`rhand`,`lhand`,`armor`,`walkspd`,`runspd`,`faction_id`,`faction_range`,`isUndead`,`absorb_level`,`absorb_type`) VALUES
(75007,21591,'Carrie',1,'Undead Matron',1,'Monster2.vampire_wizard',5.50,28.00,73,'female','L2ClanHallManager',40,4086,3059,13.43,3.09,40,43,30,21,20,10,0,0,1770,415,885,407,278,0,333,99
,0,0,50,198,NULL,300,0,0,'LAST_HIT'),
(75008,21587,'Freddy',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT'),
(75009,21587,'Hannibal',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT'),
(75010,21587,'Jason',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT'),
(75011,21587,'Michael',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT'),
(75012,21587,'Matt',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT'),
(75013,21587,'Charles',1,'Undead Butler',1,'Monster2.vampire_soldier_20_bi',10.00,29.00,72,'male','L2Doormen',40,4013,1565,13.43,3.09,40,43,30,21,20,10,0,0,1710,406,849,399,278,0,333,23
4,0,0,66,209,NULL,300,0,0,'LAST_HIT');

-- Спавн
INSERT IGNORE INTO `spawnlist` VALUES
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75007,58770,-27504,579,0,0,33264,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75008,57826,-29529,569,0,0,49467,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75009,57842,-29422,569,0,0,15850,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75010,57888,-26447,593,0,0,49152,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75011,57888,-26333,593,0,0,16838,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75012,56932,-27335,578,0,0,33140,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,75013,57119,-27169,578,0,0,0,60,0,'0'),
(NULL,'Fortress of the Dead - Clan Hall NPC',1,35638,57022,-28268,607,0,0,48457,60,0,'0');

-- Новые магазины
INSERT IGNORE INTO merchant_shopids VALUES (175007,'75007');
INSERT IGNORE INTO merchant_shopids VALUES (275007,'75007');
INSERT IGNORE INTO merchant_shopids VALUES (375007,'75007');

-- Добавляем в магазин
DELETE FROM `merchant_buylists` WHERE `shop_id` like '%75007';
INSERT INTO `merchant_buylists` (`item_id`,`price`,`shop_id`,`order`,`count`,time) VALUES
(6902,12900,175007,1,-1,0),
(1829,500,175007,2,5,1),
(5169,300,175007,3,5,1),
(6902,12900,275007,1,-1,0),
(1829,500,275007,2,5,1),
(5858,100000,275007,3,1,2),
(5169,300,275007,4,10,1),
(7134,35000,275007,5,1,1),
(7133,35000,275007,6,1,1),
(6902,12900,375007,1,-1,0),
(1829,500,375007,2,5,1),
(5858,100000,375007,3,3,1),
(5169,300,375007,4,10,1),
(7134,35000,375007,5,1,1),
(7133,35000,375007,6,1,1),
(7583,500000,375007,7,1,2),
(7584,500000,375007,8,1,2),
(7585,500000,375007,9,1,2),
(6928,180,375007,10,1,1),
(6935,600,375007,11,1,1),
(6936,1200,375007,12,1,1),
(6938,1200,375007,13,1,1),
(6921,250,375007,14,1,1),
(6923,100000,375007,15,1,1),
(7691,100000,375007,16,1,1),
(6940,4000,375007,17,1,1),
(6941,4000,375007,18,1,1),
(6942,4000,375007,19,1,1),
(6943,4000,375007,20,1,1),
(6944,4000,375007,21,1,1),
(6945,4000,375007,22,1,1),
(6946,4000,375007,23,1,1),
(6947,4000,375007,24,1,1),
(6948,4000,375007,25,1,1),
(6949,4000,375007,26,1,1),
(6950,4000,375007,27,1,1),
(6951,4000,375007,28,1,1),
(6952,4000,375007,29,1,1),
(6953,4000,375007,30,1,1),
(7002,29000,375007,31,1,1),
(7003,29000,375007,32,1,1),
(7004,29000,375007,33,1,1),
(7005,29000,375007,34,1,1),
(7006,29000,375007,35,1,1),
(7007,29000,375007,36,1,1),
(7008,29000,375007,37,1,1),
(7009,29000,375007,38,1,1),
(7010,29000,375007,39,1,1),
(7011,29000,375007,40,1,1),
(7012,29000,375007,41,1,1),
(7013,29000,375007,42,1,1);

-- Добавляем новые телепорты из КХ
INSERT IGNORE INTO teleport VALUES
('Clan Hall -> Forest of the Dead - East Entrance',75006,61868,-48890,-3128,0,0),
('Clan Hall -> Forest of the Dead - West Entrance',75007,45555,-56081,-3667,0,0);

INSERT IGNORE INTO `auction` VALUES
(21, 0, 'NPC', 'NPC Clan', 'ClanHall', 21, 0, 'Fortress of Resistance', 1, 50000000, 0, 1164841200000),
(34, 0, 'NPC', 'NPC Clan', 'ClanHall', 34, 0, 'Devastated Castle', 1, 75000000, 0, 1164841200000),
(35, 0, 'NPC', 'NPC Clan', 'ClanHall', 35, 0, 'Bandit Stronghold', 1, 50000000, 0, 1164841200000),
(62, 0, 'NPC', 'NPC Clan', 'ClanHall', 62, 0, 'Rainbow Springs Chateau', 1, 50000000, 0, 1164841200000),
(63, 0, 'NPC', 'NPC Clan', 'ClanHall', 63, 0, 'Beast Farm', 1, 50000000, 0, 1164841200000),
(64, 0, 'NPC', 'NPC Clan', 'ClanHall', 64, 0, 'Fortress of the Dead', 1, 75000000, 0, 1164841200000);

Index: datapack_development/data/zones/zone.xml
===================================================================
--- datapack_development/data/zones/zone.xml (revision 3760)
+++ datapack_development/data/zones/zone.xml (working copy)
@@ -286,7 +286,7 @@
</zone>

<!-- Clan hall zones -->
- <zone id='11100' type='ClanHallZone' shape='Cuboid' minZ='-2000' maxZ='-1800'>
+ <zone id='11100' type='ClanHallZone' shape='NPoly' minZ='-2100' maxZ='-1800'>
<stat name='clanHallId' val='21'/>
<stat name='spawnX' val='43399'/>
<stat name='spawnY' val='108888'/>
@@ -364,13 +364,13 @@
<stat name='spawnY' val='146150'/>
<stat name='spawnZ' val='-3111'/>
</zone>
- <zone id='11113' type='ClanHallZone' shape='Cuboid' minZ='0' maxZ='0'>
+ <zone id='11113' type='ClanHallZone' shape='NPoly' minZ='-2600' maxZ='-1700'>
<stat name='clanHallId' val='34'/>
- <stat name='spawnX' val='0'/>
- <stat name='spawnY' val='0'/>
- <stat name='spawnZ' val='0'/>
+ <stat name='spawnX' val='177937'/>
+ <stat name='spawnY' val='-18601'/>
+ <stat name='spawnZ' val='-2239'/>
</zone>
- <zone id='11114' type='ClanHallZone' shape='Cuboid' minZ='-2000' maxZ='-1800'>
+ <zone id='11114' type='ClanHallZone' shape='NPoly' minZ='-2100' maxZ='-1400'>
<stat name='clanHallId' val='35'/>
<stat name='spawnX' val='80182'/>
<stat name='spawnY' val='-15484'/>
@@ -532,23 +532,23 @@
<stat name='spawnY' val='-143190'/>
<stat name='spawnZ' val='-1328'/>
</zone>
- <zone id='11141' type='ClanHallZone' shape='Cuboid' minZ='-2000' maxZ='-1200'>
+ <zone id='11141' type='ClanHallZone' shape='NPoly' minZ='-2100' maxZ='-1500'>
<stat name='clanHallId' val='62'/>
<stat name='spawnX' val='141002'/>
<stat name='spawnY' val='-124607'/>
- <stat name='spawnZ' val='-1896'/>
+ <stat name='spawnZ' val='-1869'/>
</zone>
- <zone id='11142' type='ClanHallZone' shape='Cuboid' minZ='0' maxZ='0'>
+ <zone id='11142' type='ClanHallZone' shape='NPoly' minZ='-1500' maxZ='-1200'>
<stat name='clanHallId' val='63'/>
- <stat name='spawnX' val='0'/>
- <stat name='spawnY' val='0'/>
- <stat name='spawnZ' val='0'/>
+ <stat name='spawnX' val='60525'/>
+ <stat name='spawnY' val='-94058'/>
+ <stat name='spawnZ' val='-1350'/>
</zone>
- <zone id='11143' type='ClanHallZone' shape='Cuboid' minZ='0' maxZ='0'>
+ <zone id='11143' type='ClanHallZone' shape='NPoly' minZ='300' maxZ='800'>
<stat name='clanHallId' val='64'/>
- <stat name='spawnX' val='0'/>
- <stat name='spawnY' val='0'/>
- <stat name='spawnZ' val='0'/>
+ <stat name='spawnX' val='58127'/>
+ <stat name='spawnY' val='-27511'/>
+ <stat name='spawnZ' val='579'/>
</zone>

<!-- Castle zones -->

Index: L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java
===================================================================
--- L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java (revision 1434)
+++ L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java (working copy)
@@ -93,6 +93,12 @@
@Override
public double getDistanceToZone(int x, int y)
{
+ // Since we aren't given a z coordinate to test against
+ // we just use the minimum z coordinate to prevent the
+ // function from saying we aren't in the zone because
+ // of a bad z coordinate.
+ if (isInsideZone(x, y, _z1))
+ return 0; // If you are inside the zone distance to zone is 0.
double test, shortestDist = Math.pow(_x1-x, 2) + Math.pow(_y1-y, 2);

test = Math.pow(_x1-x, 2) + Math.pow(_y2-y, 2);
Index: L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java
===================================================================
--- L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java (revision 1434)
+++ L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java (working copy)
@@ -76,6 +76,12 @@
@Override
public double getDistanceToZone(int x, int y)
{
+ // Since we aren't given a z coordinate to test against
+ // we just use the minimum z coordinate to prevent the
+ // function from saying we aren't in the zone because
+ // of a bad z coordinate.
+ if (isInsideZone(x, y, _z1))
+ return 0; // If you are inside the zone distance to zone is 0.
return (Math.sqrt( (Math.pow(_x-x, 2) + Math.pow(_y-y, 2)) ) - _rad);
}

Index: L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneNPoly.java
===================================================================
--- L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneNPoly.java (revision 1434)
+++ L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/form/ZoneNPoly.java (working copy)
@@ -91,6 +91,12 @@
@Override
public double getDistanceToZone(int x, int y)
{
+ // Since we aren't given a z coordinate to test against
+ // we just use the minimum z coordinate to prevent the
+ // function from saying we aren't in the zone because
+ // of a bad z coordinate.
+ if (isInsideZone(x, y, _z1))
+ return 0; // If you are inside the zone distance to zone is 0.
double test, shortestDist = Math.pow(_x[0]-x, 2) + Math.pow(_y[0]-y, 2);

for (int i = 1; i < _y.length; i++)

Index: L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java
===================================================================
--- L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java (revision 1434)
+++ L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java (working copy)
@@ -19,6 +19,8 @@

import net.sf.l2j.gameserver.ai.CtrlIntention;
import net.sf.l2j.gameserver.datatables.SkillTable;
+import net.sf.l2j.gameserver.instancemanager.ClanHallManager;
+import net.sf.l2j.gameserver.model.entity.ClanHall;
import net.sf.l2j.gameserver.network.SystemMessageId;
import net.sf.l2j.gameserver.serverpackets.ActionFailed;
import net.sf.l2j.gameserver.serverpackets.MyTargetSelected;
@@ -30,6 +32,8 @@

public class L2WyvernManagerInstance extends L2CastleChamberlainInstance
{
+ protected static final int COND_CLAN_OWNER = 3;
+ private int _clanHallId = -1;

public L2WyvernManagerInstance (int objectId, L2NpcTemplate template)
{
@@ -148,12 +152,16 @@
{
player.sendPacket( new ActionFailed() );
String filename = "data/html/wyvernmanager/wyvernmanager-no.htm";
+ if (getClanHall() != null)
+ filename = "data/html/wyvernmanager/wyvernmanager-clan-no.htm";

int condition = validateCondition(player);
if (condition > COND_ALL_FALSE)
{
if (condition == COND_OWNER) // Clan owns castle
filename = "data/html/wyvernmanager/wyvernmanager.htm"; // Owner message window
+ else if (condition == COND_CLAN_OWNER)
+ filename = "data/html/wyvernmanager/wyvernmanager-clan.htm";
}
NpcHtmlMessage html = new NpcHtmlMessage(1);
html.setFile(filename);
@@ -161,4 +169,43 @@
html.replace("%npcname%", getName());
player.sendPacket(html);
}
+
+ /** Return the L2ClanHall this L2NpcInstance belongs to. */
+ public final ClanHall getClanHall()
+ {
+ if (_clanHallId < 0)
+ {
+ ClanHall temp = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), 500);
+
+ if (temp != null)
+ _clanHallId = temp.getId();
+
+ if (_clanHallId < 0) return null;
+ }
+ return ClanHallManager.getInstance().getClanHallById(_clanHallId);
+ }
+
+ @Override
+ protected int validateCondition(L2PcInstance player)
+ {
+ if (getClanHall() != null && player.getClan() != null)
+ {
+ if (getClanHall().getOwnerId() == player.getClanId()
+ && player.isClanLeader())
+ return COND_CLAN_OWNER; // Owner of the clanhall
+ }
+ else if (super.getCastle() != null && super.getCastle().getCastleId() > 0)
+ {
+ if (player.getClan() != null)
+ {
+ if (super.getCastle().getSiege().getIsInProgress())
+ return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
+ else if (super.getCastle().getOwnerId() == player.getClanId() // Clan owns castle
+ && player.isClanLeader()) // Leader of clan
+ return COND_OWNER; // Owner
+ }
+ }
+
+ return COND_ALL_FALSE;
+ }
}

Index: datapack_development/data/html/clanHallManager/edit_recovery.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_recovery.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_recovery.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
+Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font> Adena/%hpRate% Day(s))<br>
Period: Withdraw the fee for the next time at %hpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 140">140%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 200">200%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 260">260%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font> Adena/%mpRate% Day(s))<br>
Period Withdraw the fee for the next time at %mpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
+Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font> Adena/%expRate% Day(s))<br>
Period Withdraw the fee for the next time at %expDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 40">40%</a>]<br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_other.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_other.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_other.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
+Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font> Adena/%teleRate% Day(s))<br>
Period Withdraw the fee for the next time at %teleDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other tele 3">Level 3</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
+Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font> Adena/%supportRate% Day(s))<br>
Period Withdraw the fee for the next time at %supportDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
+Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font> Adena/%itemRate% Day(s))<br>
Period Withdraw the fee for the next time at %itemDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_other0.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_other0.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_other0.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
+Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font> Adena/%teleRate% Day(s))<br>
Period Withdraw the fee for the next time at %teleDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
+Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font> Adena/%supportRate% Day(s))<br>
Period Withdraw the fee for the next time at %supportDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
+Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font> Adena/%itemRate% Day(s))<br>
Period Withdraw the fee for the next time at %itemDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_other1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_other1.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_other1.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
+Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font> Adena/%teleRate% Day(s))<br>
Period Withdraw the fee for the next time at %teleDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
+Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font> Adena/%supportRate% Day(s))<br>
Period Withdraw the fee for the next time at %supportDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other support 4">Level 4</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
+Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font> Adena/%itemRate% Day(s))<br>
Period Withdraw the fee for the next time at %itemDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_other2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_other2.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_other2.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
+Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font> Adena/%teleRate% Day(s))<br>
Period Withdraw the fee for the next time at %teleDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
+Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font> Adena/%supportRate% Day(s))<br>
Period Withdraw the fee for the next time at %supportDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>][<a action="bypass -h npc_%objectId%_manage other support 4">Level 4</a>][<a action="bypass -h npc_%objectId%_manage other support 5">Level 5</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
+Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font> Adena/%itemRate% Day(s))<br>
Period Withdraw the fee for the next time at %itemDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_other3.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_other3.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_other3.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
+Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font> Adena/%teleRate% Day(s))<br>
Period Withdraw the fee for the next time at %teleDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
+Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font> Adena/%supportRate% Day(s))<br>
Period Withdraw the fee for the next time at %supportDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>][<a action="bypass -h npc_%objectId%_manage other support 5">Level 5</a>][<a action="bypass -h npc_%objectId%_manage other support 7">Level 7</a>][<a action="bypass -h npc_%objectId%_manage other support 8">Level 8</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
+Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font> Adena/%itemRate% Day(s))<br>
Period Withdraw the fee for the next time at %itemDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/deco.htm
===================================================================
--- datapack_development/data/html/clanHallManager/deco.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/deco.htm (working copy)
@@ -1,10 +1,10 @@
<html><body>%npcname%:
<br>
[Clan Hall Facilities Managment]<br><br>
-Function Curtains <font color="55FFFF">Level %curtain%</font> (<font color="LEVEL">%curtainPrice%</font>Adena/1 Day)<br>
+Function Curtains <font color="55FFFF">Level %curtain%</font> (<font color="LEVEL">%curtainPrice%</font> Adena/%curtainRate% Day(s))<br>
Period Withdraw the fee for the next time at %curtainDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage deco curtains 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage deco curtains 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage deco curtains 2">Level 2</a>]<br><br>
-Function Front Porch <font color="55FFFF">Level %porch%</font> (<font color="LEVEL">%porchPrice%</font>Adena/1 Day)<br>
+Function Front Porch <font color="55FFFF">Level %porch%</font> (<font color="LEVEL">%porchPrice%</font> Adena/%porchRate% Day(s))<br>
Period Withdraw the fee for the next time at %porchDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage deco porch 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage deco porch 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage deco porch 2">Level 2</a>]<br><br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_recovery0.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_recovery0.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_recovery0.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
+Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font> Adena/%hpRate% Day(s))<br>
Period: Withdraw the fee for the next time at %hpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 20">20%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 40">40%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 220">220%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font> Adena/%mpRate% Day(s))<br>
Period Withdraw the fee for the next time at %mpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 10">10%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 25">25%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
+Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font> Adena/%expRate% Day(s))<br>
Period Withdraw the fee for the next time at %expDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 10">10%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>]<br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_recovery1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_recovery1.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_recovery1.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
+Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font> Adena/%hpRate% Day(s))<br>
Period: Withdraw the fee for the next time at %hpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 40">40%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 100">100%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 160">160%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font> Adena/%mpRate% Day(s))<br>
Period Withdraw the fee for the next time at %mpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 25">25%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
+Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font> Adena/%expRate% Day(s))<br>
Period Withdraw the fee for the next time at %expDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 30">30%</a>]<br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_recovery2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_recovery2.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_recovery2.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
+Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font> Adena/%hpRate% Day(s))<br>
Period: Withdraw the fee for the next time at %hpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 140">140%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 200">200%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 260">260%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font> Adena/%mpRate% Day(s))<br>
Period Withdraw the fee for the next time at %mpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
+Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font> Adena/%expRate% Day(s))<br>
Period Withdraw the fee for the next time at %expDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 40">40%</a>]<br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
Index: datapack_development/data/html/clanHallManager/edit_recovery3.htm
===================================================================
--- datapack_development/data/html/clanHallManager/edit_recovery3.htm (revision 3760)
+++ datapack_development/data/html/clanHallManager/edit_recovery3.htm (working copy)
@@ -1,12 +1,12 @@
<html><body>%npcname%:<br>
<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
+Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font> Adena/%hpRate% Day(s))<br>
Period: Withdraw the fee for the next time at %hpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 120">120%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 180">180%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 240">240%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 300">300%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font> Adena/%mpRate% Day(s))<br>
Period Withdraw the fee for the next time at %mpDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 40">40%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
+Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font> Adena/%expRate% Day(s))<br>
Period Withdraw the fee for the next time at %expDate%<br>
Change [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 35">35%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 50">50%</a>]<br>
<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">

Index: L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
===================================================================
--- L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (revision 1434)
+++ L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (working copy)
@@ -191,7 +191,7 @@
if (st.countTokens() >= 1)
{
int fee;
- if (Config.DEBUG) _log.warning("Mp editing invoked");
+ if (Config.DEBUG) _log.warning("Hp editing invoked");
val = st.nextToken();
int percent = Integer.valueOf(val);
switch (percent)
@@ -328,28 +328,34 @@
html.replace("%hp%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%");
html.replace("%hpPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()));
html.replace("%hpDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTi
me()));
+ html.replace("%hpRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getRate() / 86400000));
}else{
html.replace("%hp%", "0");
html.replace("%hpPrice%", "0");
html.replace("%hpDate%","0");
+ html.replace("%hpRate%", String.valueOf(Config.CH_HPREG_FEE_RATIO / 86400000));
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null){
html.replace("%exp%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "%");
html.replace("%expPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()))
;
html.replace("%expDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndT
ime()));
+ html.replace("%expRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getRate() / 86400000));
}else{
html.replace("%exp%", "0");
html.replace("%expPrice%", "0");
html.replace("%expDate%","0");
+ html.replace("%expRate%", String.valueOf(Config.CH_EXPREG_FEE_RATIO / 86400000));
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null ){
html.replace("%mp%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "%");
html.replace("%mpPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()));
html.replace("%mpDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTi
me()));
+ html.replace("%mpRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getRate() / 86400000));
}else{
html.replace("%mp%", "0");
html.replace("%mpPrice%", "0");
html.replace("%mpDate%","0");
+ html.replace("%mpRate%", String.valueOf(Config.CH_MPREG_FEE_RATIO / 86400000));
}
sendHtmlMessage(player, html);
}
@@ -472,28 +478,34 @@
html.replace("%tele%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()));
html.replace("%telePrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()));
html.replace("%teleDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime
()));
+ html.replace("%teleRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getRate() / 86400000));
}else{
html.replace("%tele%", "0");
html.replace("%telePrice%", "0");
html.replace("%teleDate%","0");
+ html.replace("%teleRate%", String.valueOf(Config.CH_TELE_FEE_RATIO / 86400000));
}
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null){
html.replace("%support%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()));
html.replace("%supportPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()));
html.replace("%supportDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime(
)));
+ html.replace("%supportRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getRate() / 86400000));
}else{
html.replace("%support%", "0");
html.replace("%supportPrice%", "0");
html.replace("%supportDate%","0");
+ html.replace("%supportRate%", String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 86400000));
}
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null){
html.replace("%item%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()));
html.replace("%itemPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()))
;
html.replace("%itemDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndT
ime()));
+ html.replace("%itemRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getRate() / 86400000));
}else{
html.replace("%item%", "0");
html.replace("%itemPrice%", "0");
html.replace("%itemDate%","0");
+ html.replace("%itemRate%", String.valueOf(Config.CH_ITEM_FEE_RATIO / 86400000));
}
sendHtmlMessage(player, html);
}
@@ -562,19 +574,23 @@
html.replace("%curtain%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()))
;
html.replace("%curtainPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()
));
html.replace("%curtainDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEn
dTime()));
+ html.replace("%curtainRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getRate() / 86400000));
}else{
html.replace("%curtain%", "0");
html.replace("%curtainPrice%", "0");
html.replace("%curtainDate%","0");
+ html.replace("%curtainRate%", String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 86400000));
}
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null){
html.replace("%porch%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getL
vl()));
html.replace("%porchPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getL
ease()));
html.replace("%porchDate%",format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM)
.getEndTime()));
+ html.replace("%porchRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getR
ate() / 86400000));
}else{
html.replace("%porch%", "0");
html.replace("%porchPrice%", "0");
html.replace("%porchDate%","0");
+ html.replace("%porchRate%", String.valueOf(Config.CH_FRONT_FEE_RATIO / 86400000));
}
sendHtmlMessage(player, html);
}
@@ -708,7 +724,7 @@
protected int validateCondition(L2PcInstance player)
{
if (getClanHall() == null) return COND_ALL_FALSE;
- if (player.isGM()) return COND_OWNER;
+ //if (player.isGM()) return COND_OWNER;
if (player.getClan() != null)
{
if (getClanHall().getOwnerId() == player.getClanId())

Index: datapack_development/data/html/clanHallManager/teleBandit1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleBandit1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleBandit1.htm (revision 0)
@@ -0,0 +1,3 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75008" msg="811;Town of Oren">Town of Oren - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleBandit2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleBandit2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleBandit2.htm (revision 0)
@@ -0,0 +1,10 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75008" msg="811;Town of Oren">Town of Oren - 500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 75014" msg="811;Bandit Stronghold">Bandit Stronghold - 0 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75012" msg="811;Outlaw Forest">Outlaw Forest - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75013" msg="811;Border Outpost">Border Outpost - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75011" msg="811;Forest of Evil">Forest of Evil - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75009" msg="811;Ivory Tower">Ivory Tower - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75010" msg="811;Sea of Spores">Sea of Spores - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleDeadForest1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleDeadForest1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleDeadForest1.htm (revision 0)
@@ -0,0 +1,4 @@
+<html><body>
+Region where teleporting is possible<br>
+<a action="bypass -h npc_%objectId%_goto 75004" msg="811;Rune Castle Town">Rune Castle Town - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleDeadForest2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleDeadForest2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleDeadForest2.htm (revision 0)
@@ -0,0 +1,11 @@
+<html><body>
+Region where teleporting is possible<br>
+<a action="bypass -h npc_%objectId%_goto 75004" msg="811;Rune Castle Town">Rune Castle Town - 500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 625" msg="811;Beast Farm">Beast Farm - 5000 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75006" msg="811;Forest of the Dead - East Enterance">Forest of the Dead - East Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75007" msg="811;Forest of the Dead - West Enterance">Forest of the Dead - West Enteranc - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 628" msg="811;Swamp of Screams - East Enterance">Swamp of Screams - East Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 629" msg="811;Swamp of Screams - West Enterance">Swamp of Screams - West Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 630" msg="811;Valley of the Saints">Valley of the Saints - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/telePartisan1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/telePartisan1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/telePartisan1.htm (revision 0)
@@ -0,0 +1,3 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75003" msg="811;Dion Castle Town">Dion Castle Town - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/telePartisan2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/telePartisan2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/telePartisan2.htm (revision 0)
@@ -0,0 +1,13 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75003" msg="811;Dion Castle Town">Dion Castle Town - 500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 504" msg="811;Cruma Marshlands">Cruma Marshlands-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12031" msg="811;Plains of Dion">Plains of Dion-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 522" msg="811;Pirate Tunnel">Pirate Tunnel - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12032" msg="811;Piligrims Necropolis">Piligrims Necropolis - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 502" msg="811;Execution Ground">Execution Ground - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12045" msg="811;Giran Territory">Giran Territory - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 505" msg="811;Cruma Tower">Cruma Tower - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 665" msg="811;Ant Cave East Entrance">Ant Cave East Entrance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 661" msg="811;The Ant Nest">The Ant Nest - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleDevastated1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleDevastated1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleDevastated1.htm (revision 0)
@@ -0,0 +1,3 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75015" msg="811;Town of Aden">Town of Aden-500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleDevastated2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleDevastated2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleDevastated2.htm (revision 0)
@@ -0,0 +1,23 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75015" msg="811;Town of Aden">Town of Aden-500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 613" msg="811;Ancient Battleground">Ancient Battleground-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 603" msg="811;Northern Pathway of Enchanted Valley">Northern Pathway of Enchanted Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12005" msg="811;Southern Pathway of Enchanted Valley">Southern Pathway of Enchanted Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 608" msg="811;Path to Hunters Village">Path to Hunters Village-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 599" msg="811;Blazing Swamp">Blazing Swamp-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12006" msg="811;East of Blazing Swamp">East of Blazing Swamp-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12007" msg="811;Plains of Glory">Plains of Glory-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12008" msg="811;Plains of Fierce Battle">Plains of Fierce Battle-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12009" msg="811;Path to Forest of Wirrors">Path to Forest of Wirrors-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12010" msg="811;The Front of Anghel Waterfall">The Front of Anghel Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75016" msg="811;Fields of Massacre">Fields of Massacre-0 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12011" msg="811;Disciples Necropolis">Disciples Necropolis-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12012" msg="811;North Path to The Cementery">North Path to The Cementery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12013" msg="811;South Path to The Cementery">South Path to The Cementery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12014" msg="811;West Path to The Cementery">West Path to The Cementery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 601" msg="811;Forbidden Gateway">Forbidden Gateway-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 614" msg="811;Forsaken Plains ">Forsaken Plains -500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 598" msg="811;Tower of Insolence">Tower of Insolence-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 602" msg="811;The Giant's Cave">The Giant's Cave-500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleBeastFarm1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleBeastFarm1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleBeastFarm1.htm (revision 0)
@@ -0,0 +1,4 @@
+<html><body>
+Region where teleporting is possible<br>
+<a action="bypass -h npc_%objectId%_goto 75004" msg="811;Rune Castle Town">Rune Castle Town - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleBeastFarm2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleBeastFarm2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleBeastFarm2.htm (revision 0)
@@ -0,0 +1,11 @@
+<html><body>
+Region where teleporting is possible<br>
+<a action="bypass -h npc_%objectId%_goto 75004" msg="811;Rune Castle Town">Rune Castle Town - 500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 75005" msg="811;Beast Farm">Beast Farm - 0 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 626" msg="811;Forest of the Dead - East Enterance">Forest of the Dead - East Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 627" msg="811;Forest of the Dead - West Enterance">Forest of the Dead - West Enteranc - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 628" msg="811;Swamp of Screams - East Enterance">Swamp of Screams - East Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 629" msg="811;Swamp of Screams - West Enterance">Swamp of Screams - West Enterance - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 630" msg="811;Valley of the Saints">Valley of the Saints - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleHotSpring1.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleHotSpring1.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleHotSpring1.htm (revision 0)
@@ -0,0 +1,4 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75002" msg="811;Hot Springs">Hot Springs - 0 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75001" msg="811;Goddard Castle Town">Goddard Castle Town - 500 Adena</a><br1>
+</body></html>
\ No newline at end of file
Index: datapack_development/data/html/clanHallManager/teleHotSpring2.htm
===================================================================
--- datapack_development/data/html/clanHallManager/teleHotSpring2.htm (revision 0)
+++ datapack_development/data/html/clanHallManager/teleHotSpring2.htm (revision 0)
@@ -0,0 +1,14 @@
+<html><body>%npcname%:<br>
+<a action="bypass -h npc_%objectId%_goto 75002" msg="811;Hot Springs">Hot Springs - 0 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 75001" msg="811;Goddard Castle Town">Goddard Castle Town - 500 Adena</a><br1>
+<br1>
+<a action="bypass -h npc_%objectId%_goto 647" msg="811;Varka Silenos Outpost">Varka Silenos Outpost - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 635" msg="811;Forge of the Gods">Forge of the Gods - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 640" msg="811;Wall of Argos">Wall of Argos - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 642" msg="811;Ketra Orc Outpost - 500 Adena">Ketra Orc Outpost - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 643" msg="811;Goddard Border Checkpoint">Goddard Border Checkpoint - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 644" msg="811;Aden Border Checkpoint">Aden Border Checkpoint - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 636" msg="811;Garden of Beasts">Garden of Beasts - 500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 646" msg="811;Devil's Pass">Devil's Pass - 500 Adena</a><br1>
+
+</body></html>
\ No newline at end of file