Sync with L2JServer Jan 24th 2015.

trunk/dist/tools/sql/game/announcements.sql

@@ -9,4 +9,5 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO announcements (`type`, `author`, `content`) VALUES (0, 'Mobius', 'Powered by www.l2jmobius.com');
+INSERT INTO announcements (`type`, `author`, `content`) VALUES 
+(0, 'Mobius', 'Powered by www.l2jmobius.com');

trunk/dist/tools/sql/game/character_summons.sql

@@ -1,5 +1,6 @@
 CREATE TABLE IF NOT EXISTS `character_summons` (
   `ownerId` int(10) unsigned NOT NULL,
+  `summonId` int(10) unsigned NOT NULL,
   `summonSkillId` int(10) unsigned NOT NULL,
   `curHp` int(9) unsigned DEFAULT '0',
   `curMp` int(9) unsigned DEFAULT '0',

trunk/dist/tools/sql/game/spawnlist.sql

@@ -1635,106 +1635,14 @@ INSERT INTO `spawnlist` VALUES
 ("Kamael Island", 1, 22242, -103050, 46123, -1144, 0, 0, 51177, 60, 0, 0, 0),
 ("Kamael Island", 1, 22242, -103366, 46353, -1144, 0, 0, 3895, 60, 0, 0, 0),
 ("Kamael Island", 1, 22242, -102373, 46844, -1128, 0, 0, 63341, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("unset", 1, 30990, -117079, 47175, 448, 0, 0, 16384, 60, 0, 0, 0),
--- Grand Olympiad Manager
-("unset", 1, 31688, -115008, 47488, 496, 0, 0, 37504, 60, 0, 0, 0),
--- Monument of Heroes 
-("unset", 1, 31690, -114991, 47563, 496, 0, 0, 32768, 60, 0, 0, 0),
--- Mr. Cat
-("Kamael Village", 1, 31756, -116948, 46841, 360, 0, 0, 3355, 60, 0, 0, 0),
--- Miss Queen
-("Kamael Village", 1, 31757, -116902, 46841, 360, 0, 0, 49151, 60, 0, 0, 0),
 -- Perwan
 ("unset", 1, 32133, -125872, 38208, 1232, 0, 0, 0, 60, 0, 0, 0),
 -- Newbie Helper
 ("unset", 1, 32134, -125872, 38016, 1232, 0, 0, 0, 60, 0, 0, 0),
--- Newbie Helper
-("unset", 1, 32135, -119692, 44504, 360, 0, 0, 33324, 60, 0, 0, 0),
 -- Basil
 ("unset", 1, 32136, -122400, 38432, 1440, 0, 0, 0, 60, 0, 0, 0),
 -- Sucrete
 ("unset", 1, 32137, -122396, 37784, 1432, 0, 0, 0, 60, 0, 0, 0),
--- Kekropus
-("unset", 1, 32138, -118080, 42835, 712, 0, 0, 15964, 60, 0, 0, 0),
--- Casca
-("unset", 1, 32139, -118132, 42788, 712, 0, 0, 17008, 60, 0, 0, 0),
--- Zenya
-("unset", 1, 32140, -118028, 42778, 712, 0, 0, 16688, 60, 0, 0, 0),
--- Nerga
-("unset", 1, 32141, -119104, 43280, 544, 0, 0, 0, 60, 0, 0, 0),
--- Tenor
-("unset", 1, 32142, -119104, 43152, 544, 0, 0, 0, 60, 0, 0, 0),
--- Belkis
-("unset", 1, 32143, -117056, 43168, 544, 0, 0, 33556, 60, 0, 0, 0),
--- Xonia
-("unset", 1, 32144, -117060, 43296, 544, 0, 0, 32568, 60, 0, 0, 0),
--- Maynard
-("unset", 1, 32145, -118192, 42384, 824, 0, 0, 16400, 60, 0, 0, 0),
--- Valfar
-("unset", 1, 32146, -117968, 42384, 824, 0, 0, 15880, 60, 0, 0, 0),
--- Rivian
-("unset", 1, 32147, -120400, 46921, 400, 0, 0, 0, 60, 0, 0, 0),
--- Cindet
-("unset", 1, 32148, -120407, 46755, 408, 0, 0, 0, 60, 0, 0, 0),
--- Ennear
-("unset", 1, 32149, -120442, 47125, 408, 0, 0, 0, 60, 0, 0, 0),
--- Took
-("unset", 1, 32150, -120294, 46013, 384, 0, 0, 16416, 60, 0, 0, 0),
--- Herz
-("unset", 1, 32151, -120157, 45813, 344, 0, 0, 16416, 60, 0, 0, 0),
--- Henri
-("unset", 1, 32152, -120158, 46221, 344, 0, 0, 49252, 60, 0, 0, 0),
--- Franco
-("unset", 1, 32153, -120432, 45296, 408, 0, 0, 45056, 60, 0, 0, 0),
--- Aldenia
-("unset", 1, 32154, -120706, 45079, 408, 0, 0, 6956, 60, 0, 0, 0),
--- Nabot
-("unset", 1, 32155, -120356, 45293, 408, 0, 0, 45392, 60, 0, 0, 0),
--- Talbot
-("unset", 1, 32156, -120604, 44960, 408, 0, 0, 24308, 60, 0, 0, 0),
--- Moka
-("unset", 1, 32157, -117824, 48080, 464, 0, 0, 50060, 60, 0, 0, 0),
--- Fisler
-("unset", 1, 32158, -117605, 48079, 456, 0, 0, 43644, 60, 0, 0, 0),
--- Kincaid
-("unset", 1, 32159, -118030, 47930, 456, 0, 0, 0, 60, 0, 0, 0),
--- Devon
-("unset", 1, 32160, -118720, 48062, 464, 0, 0, 49308, 60, 0, 0, 0),
--- Black
-("unset", 1, 32161, -118527, 47955, 464, 0, 0, 32936, 60, 0, 0, 0),
--- Martika
-("unset", 1, 32162, -118918, 47956, 464, 0, 0, 0, 60, 0, 0, 0),
--- Teleport Device
-("unset", 1, 32163, -116879, 46591, 360, 0, 0, 44352, 60, 0, 0, 0),
--- Erinu
-("unset", 1, 32164, -115888, 43568, 524, 0, 0, 8372, 60, 0, 0, 0),
--- Zakone
-("unset", 1, 32165, -115486, 43567, 525, 0, 0, 24616, 60, 0, 0, 0),
--- Trevor
-("unset", 1, 32166, -116749, 48077, 462, 0, 0, 41732, 60, 0, 0, 0),
--- Nika
-("unset", 1, 32167, -117153, 48075, 456, 0, 0, 58116, 60, 0, 0, 0),
--- Benis
-("unset", 1, 32170, -114975, 44658, 512, 0, 0, 15332, 60, 0, 0, 0),
--- Hoffa
-("unset", 1, 32171, -114802, 44821, 524, 0, 0, 32144, 60, 0, 0, 0),
--- Saylem
-("unset", 1, 32172, -114801, 45031, 525, 0, 0, 32164, 60, 0, 0, 0),
--- Marcela
-("unset", 1, 32173, -119378, 49242, 8, 0, 0, 32812, 60, 0, 0, 0),
--- Maddy
-("unset", 1, 32174, -119774, 49245, 8, 0, 0, 0, 60, 0, 0, 0),
--- Bixon
-("unset", 1, 32175, -119830, 51860, -792, 0, 0, 2960, 60, 0, 0, 0),
--- Ambra
-("unset", 1, 32176, -119362, 51862, -792, 0, 0, 31496, 60, 0, 0, 0),
--- Syzar
-("unset", 1, 32177, -112872, 46850, 48, 0, 0, 8944, 60, 0, 0, 0),
--- Carver
-("unset", 1, 32178, -112352, 47392, 48, 0, 0, 41568, 60, 0, 0, 0),
--- Putin
-("unset", 1, 32179, -110544, 49040, -1128, 0, 0, 63440, 60, 0, 0, 0),
 -- Kato
 ("unset", 1, 32180, -110536, 45162, -1128, 0, 0, 3072, 60, 0, 0, 0),
 -- Hanarin
@@ -1755,22 +1663,6 @@ INSERT INTO `spawnlist` VALUES
 ("Kamael Island", 1, 32335, -122260, 60127, -2392, 0, 0, 38351, 60, 0, 0, 0),
 ("Kamael Island", 1, 32335, -122074, 56592, -1976, 0, 0, 6659, 60, 0, 0, 0),
 ("Kamael Island", 1, 32335, -117290, 50962, -744, 0, 0, 6996, 60, 0, 0, 0),
--- Adventure Guildsman
-("unset", 1, 32337, -119808, 47760, 384, 0, 0, 0, 60, 0, 0, 0),
--- Adventure Guildsman
-("unset", 1, 32338, -120048, 45296, 392, 0, 0, 0, 60, 0, 0, 0),
--- Adventure Guildsman
-("unset", 1, 32339, -115680, 44144, 496, 0, 0, 17712, 60, 0, 0, 0),
--- Adventure Guildsman
-("unset", 1, 32340, -115088, 46784, 496, 0, 0, 32964, 60, 0, 0, 0),
--- Burang
-("unset", 1, 32348, -116944, 48144, 456, 0, 0, 49152, 60, 0, 0, 0),
--- Eindburgh
-("Kamael Village", 1, 32469, -111519, 41742, 2175, 0, 0, 31385, 60, 0, 0, 0),
--- Dimensional Merchant
-("unset", 1, 32478, -115215, 45059, 496, 0, 0, 32768, 60, 0, 0, 0),
--- Manor Manager
-("unset", 1, 36456, -115169, 44156, 512, 0, 0, 25360, 60, 0, 0, 0),
 
 -- [16_20]
 
@@ -17496,117 +17388,6 @@ INSERT INTO `spawnlist` VALUES
 ("Elven_Village", 1, 27017, 34721, 36156, -3640, 0, 0, 0, 30, 0, 0, 0),
 -- Kracha
 ("Elven_Village", 1, 27060, 36910, 61471, -3616, 0, 0, 0, 180, 0, 0, 0),
--- Teleport Device
-("Elven_Village_Npc", 1, 30146, 46926, 51511, -2976, 0, 0, 43000, 60, 0, 0, 0),
--- Unoren
-("Elven_Village_Npc", 1, 30147, 44667, 46896, -2982, 0, 0, 31000, 60, 0, 0, 0),
--- Ariel
-("Elven_Village_Npc", 1, 30148, 44683, 46952, -2981, 0, 0, 28672, 60, 0, 0, 0),
--- Creamees
-("Elven_Village_Npc", 1, 30149, 42700, 50057, -2984, 0, 0, 14500, 60, 0, 0, 0),
--- Herbiel
-("Elven_Village_Npc", 1, 30150, 42766, 50037, -2984, 0, 0, 11500, 60, 0, 0, 0),
--- Chad
-("Elven_Village_Npc", 1, 30151, 47868, 50167, -2983, 0, 0, 50000, 60, 0, 0, 0),
--- Julia
-("Elven_Village_Npc", 1, 30152, 47912, 50170, -2983, 0, 0, 50000, 60, 0, 0, 0),
--- Markius
-("Elven_Village_Npc", 1, 30153, 47780, 49568, -2984, 0, 0, 4096, 60, 0, 0, 0),
--- Asterios
-("Elven_Village_Npc", 1, 30154, 44692, 52261, -2792, 0, 0, 0, 60, 0, 0, 0),
--- Ellenia
-("Elven_Village_Npc", 1, 30155, 45725, 52105, -2792, 0, 0, 16384, 60, 0, 0, 0),
--- Esrandell
-("Elven_Village_Npc", 1, 30156, 44823, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
--- Greenis
-("Elven_Village_Npc", 1, 30157, 45000, 52101, -2792, 0, 0, 16384, 60, 0, 0, 0),
--- Esrandell
-("Elven_Village_Npc", 1, 30158, 45919, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
--- Wheeler
-("Elven_Village_Npc", 1, 30216, 45778, 46534, -2992, 0, 0, 40960, 60, 0, 0, 0),
--- Berros
-("Elven_Village_Npc", 1, 30217, 45487, 46511, -2992, 0, 0, 57344, 60, 0, 0, 0),
--- Kendell
-("Elven_Village_Npc", 1, 30218, 47595, 51569, -2992, 0, 0, 16384, 60, 0, 0, 0),
--- Veltress
-("Elven_Village_Npc", 1, 30219, 47401, 51764, -2992, 0, 0, 0, 60, 0, 0, 0),
--- Starden
-("Elven_Village_Npc", 1, 30220, 42971, 51372, -2992, 0, 0, 32768, 60, 0, 0, 0),
--- Rayen
-("Elven_Village_Npc", 1, 30221, 42812, 51138, -2992, 0, 0, 16384, 60, 0, 0, 0),
--- Alshupes
-("Elven_Village_Npc", 1, 30222, 45859, 50827, -3056, 0, 0, 45056, 60, 0, 0, 0),
--- Arujien
-("Elven_Village_Npc", 1, 30223, 42978, 49115, -2992, 0, 0, 0, 60, 0, 0, 0),
--- Alberius
-("Elven_Village_Npc", 1, 30284, 45727, 51721, -2800, 0, 0, 49152, 60, 0, 0, 0),
--- Gartrandell
-("Elven_Village_Npc", 1, 30285, 44995, 51706, -2800, 0, 0, 49352, 60, 0, 0, 0),
--- Rizraell
-("Elven_Village_Npc", 1, 30361, 45610, 49008, -3056, 0, 0, 53248, 60, 0, 0, 0),
--- Andellia
-("Elven_Village_Npc", 1, 30362, 46475, 50495, -3056, 0, 0, 61440, 60, 0, 0, 0),
--- Aios
-("Elven_Village_Npc", 1, 30363, 44476, 47153, -2984, 0, 0, 46000, 60, 0, 0, 0),
--- Nerupa
-("Elven_Village_Npc", 1, 30370, 46048, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
--- Newbie Helper
-("Elven_Village_Npc", 1, 30400, 46112, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
--- Rosella
-("Elven_Village_Npc", 1, 30414, 43673, 49683, -3048, 0, 0, 0, 60, 0, 0, 0),
--- Newbie Helper
-("Elven_Village_Npc", 1, 30599, 45475, 48359, -3056, 0, 0, 49152, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Elven_Village_Npc", 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0),
--- Broadcasting Tower
-("Elven_Village_Npc", 1, 31031, 46450, 50822, -3056, 0, 0, 16384, 5, 0, 0, 0),
--- Sentinel
-("Elven_Village_Npc", 1, 31033, 48885, 44208, -3504, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 39175, 37179, -3608, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 49442, 55892, -3448, 0, 0, 14536, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 38222, 44301, -3648, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 43649, 59039, -3632, 0, 0, 0, 60, 0, 0, 0),
--- Kasiel
-("Elven_Village", 1, 31358, 43936, 51092, -2994, 0, 0, 0, 60, 0, 0, 0),
--- Jaradine
-("Elven_Village", 1, 31359, 44947, 50556, -3056, 0, 0, 0, 60, 0, 0, 0),
--- Perelin
-("Elven_Village_Npc", 1, 31563, 42672, 50352, -2984, 0, 0, 63500, 60, 0, 0, 0),
--- Grand Olympiad Manager
-("Elven_Village_Npc", 1, 31688, 44652, 50972, -3056, 0, 0, 49000, 60, 0, 0, 0),
--- Mr. Cat
-("Elven Village", 1, 31756, 45472, 49312, -3067, 0, 0, 53000, 60, 0, 0, 0),
-("Elven Village", 1, 31756, 47648, 51296, -2989, 0, 0, 38500, 60, 0, 0, 0),
--- Miss Queen
-("Elven Village", 1, 31757, 45414, 49296, -3067, 0, 0, 53000, 60, 0, 0, 0),
-("Elven Village", 1, 31757, 47680, 51255, -2989, 0, 0, 38500, 60, 0, 0, 0),
--- Monument of Heroes
-("Elven_Village_Npc", 1, 31769, 44602, 50979, -3056, 0, 0, 49000, 60, 0, 0, 0),
--- Adventure Guildsman
-("Elven_Village_Npc", 1, 31780, 45443, 48357, -3056, 0, 0, 50000, 60, 0, 0, 0),
--- Adventure Guildsman
-("Elven_Village_Npc", 1, 31781, 43136, 51376, -2992, 0, 0, 59000, 60, 0, 0, 0),
--- Pixy
-("Elven_Village_Npc", 1, 31848, 44336, 45127, -3704, 0, 0, 4676, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 48468, 37228, -3568, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 53396, 54646, -3480, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 47891, 45145, -3680, 0, 0, 28372, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 52948, 64124, -3472, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 36370, 52378, -3520, 0, 0, 47819, 60, 0, 0, 0),
--- Treant
-("Elven_Village_Npc", 1, 31851, 43496, 38808, -3488, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 50944, 38828, -3520, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 56274, 53431, -3592, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 50640, 60470, -3440, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 57036, 62656, -3360, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 42211, 58300, -3664, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 35592, 57852, -3680, 0, 0, 0, 60, 0, 0, 0),
--- Pixy Murika
-("Elven_Village_Npc", 1, 31852, 49262, 53607, -3216, 0, 0, 53248, 60, 0, 0, 0),
--- Treant Bremec
-("Elven_Village_Npc", 1, 31853, 50592, 54896, -3352, 0, 0, 40960, 60, 0, 0, 0),
--- Dimensional Merchant
-("Elven_Village_Npc", 1, 32478, 47600, 49920, -2992, 0, 0, 33500, 60, 0, 0, 0),
 -- 
 ("oren03_npc2119_01", 1, 32529, 46199, 39120, -3511, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_02", 1, 32529, 46723, 39231, -3511, 0, 0, 0, 60, 0, 0, 0),
@@ -17628,8 +17409,6 @@ INSERT INTO `spawnlist` VALUES
 ("oren03_npc2119_18", 1, 32529, 46216, 39585, -3510, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_19", 1, 32529, 46139, 41117, -3508, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_20", 1, 32529, 45580, 40728, -3509, 0, 0, 0, 60, 0, 0, 0),
--- Manor Manager
-("Elven_Village_Npc", 1, 35230, 43849, 50558, -3056, 0, 0, 1448, 60, 0, 0, 0),
 
 -- [21_20]
 
@@ -42469,7 +42248,14 @@ INSERT INTO `spawnlist` VALUES
 ('21_16', 1, 31757, 44294, -47642, -792, 0, 0, 50000, 60, 0, 0, 0), -- Miss Queen
 -- New Orc Village
 ('18_14', 1, 30994, -45266, -112468, -240, 0, 0, 500, 60, 0, 0, 0), -- Lottery Ticket Seller
-('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0); -- Teleport Device
+('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
+-- New Elven Village
+('21_19', 1, 30146, 45173, 48889, -3056, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
+('21_19', 1, 33786, 45256, 49556, -3064, 0, 0, 27964, 60, 0, 0, 0), -- Mother Tree
+('21_19', 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0), -- Lottery Ticket Seller
+-- New Kamael Village
+('16_19', 1, 32163, -116882, 46565, 360, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
+('16_19', 1, 30990, -117079, 47175, 448, 0, 0, 16384, 60, 0, 0, 0); -- Lottery Ticket Seller
 
 -- Dr. Chaos
 DELETE FROM spawnlist WHERE (npc_templateid = 32033);
@@ -42477,3 +42263,4 @@ DELETE FROM spawnlist WHERE (npc_templateid = 32033);
 -- Faeron NPC correct Z value
 UPDATE spawnlist SET locz=-3289 WHERE npc_templateid=33937;
 UPDATE spawnlist SET locz=-3360 WHERE npc_templateid=33943;
+