From d87cbd508ce49d00886a024f26eb97f0edc04239 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 01:35:02 +0000 Subject: [PATCH 002/129] Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14416 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/char_sql/char.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 102d4d249f..e1e4837949 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/10/10 + * Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. [Paradox924X] 2010/10/06 * Rev. 14413 Touched up the party booking patch, seems I forgot some lines in clif.c...and managed to duplicate a line in map.c. [L0ne_W0lf] 2010/10/05 diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 459fc76fcd..4ddc3df317 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1511,7 +1511,7 @@ int delete_char_sql(int char_id) Sql_ShowDebug(sql_handle); */ - if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `master` = '%s'", guild_db, esc_name) ) + if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `char_id` = '%d'", guild_db, char_id) ) Sql_ShowDebug(sql_handle); else if( Sql_NumRows(sql_handle) > 0 ) mapif_parse_BreakGuild(0,guild_id); From c6826a25254dba8b2c65489500e61b2ca90f19a9 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 01:57:27 +0000 Subject: [PATCH 003/129] Pull `name` from character table instead of using `master` from guild table when loading guild data. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14417 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/char_sql/int_guild.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e1e4837949..21d4ab9f2a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Pull `name` from character table instead of using `master` from guild table when loading guild data. [Paradox924X] * Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. [Paradox924X] 2010/10/06 * Rev. 14413 Touched up the party booking patch, seems I forgot some lines in clif.c...and managed to duplicate a line in map.c. [L0ne_W0lf] diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 93a4c9dedb..8c165e92cb 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -382,8 +382,8 @@ struct guild * inter_guild_fromsql(int guild_id) ShowInfo("Guild load request (%d)...\n", guild_id); #endif - if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `name`,`master`,`guild_lv`,`connect_member`,`max_member`,`average_lv`,`exp`,`next_exp`,`skill_point`,`mes1`,`mes2`,`emblem_len`,`emblem_id`,`emblem_data` " - "FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id) ) + if( SQL_ERROR == Sql_Query(sql_handle, "SELECT g.`name`,c.`name`,g.`guild_lv`,g.`connect_member`,g.`max_member`,g.`average_lv`,g.`exp`,g.`next_exp`,g.`skill_point`,g.`mes1`,g.`mes2`,g.`emblem_len`,g.`emblem_id`,g.`emblem_data` " + "FROM `%s` g LEFT JOIN `%s` c ON c.`char_id` = g.`char_id` WHERE g.`guild_id`='%d'", guild_db, char_db, guild_id) ) { Sql_ShowDebug(sql_handle); return NULL; From 83ff1eed2b5f94aa6667977c0e04b4a8e89ae292 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 11 Oct 2010 02:21:49 +0000 Subject: [PATCH 004/129] Follow up from r14413, should take care of the errors from bugreport:4472. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14418 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/clif.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 21d4ab9f2a..ba0aabc66f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Rev. 14418 Follow up from r14413, should take care of the errors from bugreport:4472. [L0ne_W0lf] * Pull `name` from character table instead of using `master` from guild table when loading guild data. [Paradox924X] * Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. [Paradox924X] 2010/10/06 diff --git a/src/map/clif.h b/src/map/clif.h index 1def2233f4..d3a3679f19 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -25,6 +25,7 @@ struct party_data; struct guild; struct battleground_data; struct quest; +struct party_booking_ad_info; #include // packet DB #define MAX_PACKET_DB 0x900 From 863160b00444af4b98eaed5a509f6910bae22a1b Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 03:10:11 +0000 Subject: [PATCH 005/129] Added a missing const qualifier to a variable. (bugreport:4472) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14419 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/clif.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ba0aabc66f..245268a886 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X] * Rev. 14418 Follow up from r14413, should take care of the errors from bugreport:4472. [L0ne_W0lf] * Pull `name` from character table instead of using `master` from guild table when loading guild data. [Paradox924X] * Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index 2502209315..dfc464fb95 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7377,7 +7377,7 @@ void clif_wedding_effect(struct block_list *bl) void clif_callpartner(struct map_session_data *sd) { unsigned char buf[26]; - char *p; + const char *p; nullpo_retv(sd); From c37cd6b2f0179e0173152e1763c9c1d651e22c1c Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 03:46:06 +0000 Subject: [PATCH 006/129] Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14420 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/guild.c | 34 ---------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 245268a886..f1653fecd1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X] * Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X] * Rev. 14418 Follow up from r14413, should take care of the errors from bugreport:4472. [L0ne_W0lf] * Pull `name` from character table instead of using `master` from guild table when loading guild data. [Paradox924X] diff --git a/src/map/guild.c b/src/map/guild.c index 73d2096538..b89e1a3688 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -61,13 +61,7 @@ struct{ }need[6]; } guild_skill_tree[MAX_GUILDSKILL]; -// timer for auto saving guild data during WoE -#define GUILD_SAVE_INTERVAL 300000 -int guild_save_timer = INVALID_TIMER; -int guild_save_timer2 = INVALID_TIMER; - int guild_payexp_timer(int tid, unsigned int tick, int id, intptr data); -int guild_save_sub(int tid, unsigned int tick, int id, intptr data); static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr data); /*========================================== @@ -1896,8 +1890,6 @@ int guild_agit_start(void) { // Run All NPC_Event[OnAgitStart] int c = npc_event_doall("OnAgitStart"); ShowStatus("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c); - // Start auto saving - guild_save_timer = add_timer_interval (gettick() + GUILD_SAVE_INTERVAL, guild_save_sub, 0, 0, GUILD_SAVE_INTERVAL); return 0; } @@ -1905,8 +1897,6 @@ int guild_agit_end(void) { // Run All NPC_Event[OnAgitEnd] int c = npc_event_doall("OnAgitEnd"); ShowStatus("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c); - // Stop auto saving - delete_timer (guild_save_timer, guild_save_sub); return 0; } @@ -1914,8 +1904,6 @@ int guild_agit2_start(void) { // Run All NPC_Event[OnAgitStart2] int c = npc_event_doall("OnAgitStart2"); ShowStatus("NPC_Event:[OnAgitStart2] Run (%d) Events by @AgitStart2.\n",c); - // Start auto saving - guild_save_timer2 = add_timer_interval (gettick() + GUILD_SAVE_INTERVAL, guild_save_sub, 0, 0, GUILD_SAVE_INTERVAL); return 0; } @@ -1923,27 +1911,6 @@ int guild_agit2_end(void) { // Run All NPC_Event[OnAgitEnd2] int c = npc_event_doall("OnAgitEnd2"); ShowStatus("NPC_Event:[OnAgitEnd2] Run (%d) Events by @AgitEnd2.\n",c); - // Stop auto saving - delete_timer (guild_save_timer2, guild_save_sub); - return 0; -} - -int guild_save_sub(int tid, unsigned int tick, int id, intptr data) -{ - static int Gid[MAX_GUILDCASTLE]; // previous owning guild - struct guild_castle *gc; - int i; - - for(i = 0; i < MAX_GUILDCASTLE; i++) { // [Yor] - gc = guild_castle_search(i); - if (!gc) continue; - if (gc->guild_id != Gid[i]) { - // Re-save guild id if its owner guild has changed - guild_castledatasave(gc->castle_id, 1, gc->guild_id); - Gid[i] = gc->guild_id; - } - } - return 0; } @@ -2008,7 +1975,6 @@ void do_init_guild(void) guild_read_guildskill_tree_db(); //guild skill tree [Komurka] add_timer_func_list(guild_payexp_timer,"guild_payexp_timer"); - add_timer_func_list(guild_save_sub, "guild_save_sub"); add_timer_func_list(guild_send_xy_timer, "guild_send_xy_timer"); add_timer_interval(gettick()+GUILD_PAYEXP_INVERVAL,guild_payexp_timer,0,0,GUILD_PAYEXP_INVERVAL); add_timer_interval(gettick()+GUILD_SEND_XY_INVERVAL,guild_send_xy_timer,0,0,GUILD_SEND_XY_INVERVAL); From a9de18e42de799c505bf3b2d28bee5bf35c9c30f Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 11 Oct 2010 03:51:07 +0000 Subject: [PATCH 007/129] * Renewal Update to warp portals, and deleted disabled_warps.txt. - Only disabled warps, some coordinates might have slipped past me. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14421 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 ++ npc/scripts_warps.conf | 2 +- npc/warps/cities/rachel.txt | 2 +- npc/warps/cities/yggdrasil.txt | 5 +++- npc/warps/disabled_warps.txt | 45 ------------------------------ npc/warps/dungeons/abyss.txt | 14 +++++----- npc/warps/dungeons/anthell.txt | 8 +++--- npc/warps/fields/com_fild.txt | 8 +++--- npc/warps/fields/geffen_fild.txt | 20 ++++++------- npc/warps/fields/hugel_fild.txt | 37 +++++++++++++----------- npc/warps/fields/payon_fild.txt | 48 ++++++++++++++++---------------- npc/warps/fields/rachel_fild.txt | 30 ++++++++++---------- npc/warps/fields/veins_fild.txt | 19 ++++++++----- npc/warps/fields/yuno_fild.txt | 47 ++++++++++++++++--------------- 14 files changed, 130 insertions(+), 158 deletions(-) delete mode 100644 npc/warps/disabled_warps.txt diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 5a290bc719..44fad0822f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2010/10/10 + * Rev. 14421 Renewal Update to warp portals, and deleted disabled_warps.txt. [L0ne_W0lf] + - Only disabled warps, some coordinates might have slipped past me. 2010/09/18 * Rev 14409 Updates, and bugfixes, the usual stuff. [L0ne_W0lf] * Updated Sage quest skill quest with the file curtosy of 5511. diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 48d0423e58..f652899202 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -65,7 +65,7 @@ npc: npc/warps/dungeons/tha_t.txt npc: npc/warps/dungeons/thor_v.txt npc: npc/warps/dungeons/treasure.txt npc: npc/warps/dungeons/tur_dun.txt -npc: npc/warps/dungeons/um_dun.txt +//npc: npc/warps/dungeons/um_dun.txt npc: npc/warps/dungeons/xmas_dun.txt // --------------------------- Fields --------------------------- npc: npc/warps/fields/abyss_warper.txt diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt index f614f778f0..8dc9f9675f 100644 --- a/npc/warps/cities/rachel.txt +++ b/npc/warps/cities/rachel.txt @@ -105,7 +105,7 @@ ra_temsky,99,135,0 warp rachel71 1,1,ra_temsky,99,113 ra_temsky,137,139,0 warp rachel72 1,1,ra_temsky,109,143 ra_temsky,62,139,0 warp rachel73 1,1,ra_temsky,91,143 -rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226 +//rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226 rachel,275,125,0 warp rachel75 1,1,ra_fild12,40,226 rachel,130,21,0 warp rachel76 1,1,ve_fild02,195,377 diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt index 84a51400f9..da7f05ece8 100644 --- a/npc/warps/cities/yggdrasil.txt +++ b/npc/warps/cities/yggdrasil.txt @@ -13,7 +13,10 @@ //============================================================ //Umbala Entrance -um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63 +//um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63 + +// RE Yggdrasil Entrance +umbala,106,285,1 warp ygGate_yg1 1,1,yggdrasil01,39,63 //Niflheim Exit yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66 diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt deleted file mode 100644 index f980083d1e..0000000000 --- a/npc/warps/disabled_warps.txt +++ /dev/null @@ -1,45 +0,0 @@ -//===== eAthena Script ======================================= -//= Disabled Warps -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.2 -//===== Description: ========================================= -//= Disabled Warp's for entire Athena -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//= Beach Dungeon ============================================ -//beach_dun,89,28,0 warp cmd00a 3,3,beach_dun2,15,182 -//beach_dun2,13,182,0 warp cmd00b 3,3,beach_dun,89,30 - -//= Comodo Field -//moc_fild12,35,303,0 warp cmd011 3,3,cmd_fild08,331,319 -//cmd_fild09,14,120,0 warp cmdf14-3 3,3,cmd_fild07,386,96 - - -//= Morroc Field ============================================= -//moc_fild04,219,327,0 warp mocf016 3,4,anthell01,35,262 -//moc_fild15,258,253,0 warp mocf017 3,3,anthell01,35,262 - -//= Ant Hell ================================================= -//anthell01,35,267,0 warp ant001 1,1,moc_fild04,213,327 -//anthell02,171,169,0 warp ant002 1,2,moc_fild04,213,327 - -//= Morroc Ruins ============================================= -//morocc_in,108,179,0 warp w280 3,2,morocc,284,175 - -//= Morroc Town ============================================== -//morocc_in,72,67,0 warp w341 2,2,morocc_in,44,162 - -//= Izlude Town ============================================== -//= Due to Job Quest -//izlude_in,62,170,0 warp w1039 1,1,izlude_in,68,165 - -//= Payon Cave -//pay_dun03,127,62,0 warp payd04 1,2,pay_dun04,201,204 - -// Airplane (no direct access there) -//airplane,255,55,0 warp ein044 1,1,airplane,90,68 -//airplane,88,68,0 warp ein044a 1,1,airplane,253,55 diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 71abfabcf3..4d39ff5913 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -3,18 +3,18 @@ //===== By: ================================================== //= Muad-Dib (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Abyss Lake Dungeon //===== Additional Comments: ================================= //= 1.0 Thanks to Muad-Dib for the temp warps [Lupus] +//= 1.1 Renewal warp adjustments. //============================================================ -//hu_fild05,197,210,0 warp abysslakedunwarp001 2,3,abyss_01,264,271 -abyss_01,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05,192,207 -abyss_01,26,23,0 warp abysslakedunwarp003 1,1,abyss_02,275,270 -abyss_02,278,270,0 warp abysslakedunwarp004 1,1,abyss_01,26,26 -abyss_02,145,281,0 warp abysslakedunwarp005 1,1,abyss_03,116,27 -abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278 +abyss_01,25,24,0 warp abysslakedunwarp001 1,1,abyss_02,271,270 +abyss_02,145,280,0 warp abysslakedunwarp002 1,1,abyss_03,115,30 +abyss_02,277,270,0 warp abysslakedunwarp003 1,1,abyss_01,25,30 +abyss_03,115,25,0 warp abysslakedunwarp004 1,1,abyss_02,145,275 +abyss_01,265,274,0 warp abysslakedunwarp005 1,1,hu_fild05,177,211 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index 44625e45dc..f10a14db87 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -15,10 +15,10 @@ //============================================================ //= Ant Hell ================================================= -moc_fild20,156,143,0 warp moc_ant1-1 3,4,anthell01,35,262 -anthell01,35,267,0 warp moc_ant1-2 1,1,moc_fild20,164,145 -moc_fild20,337,315,0 warp moc_ant2-1 3,3,anthell01,35,262 -anthell02,172,169,0 warp moc_ant2-2 1,1,moc_fild20,330,314 +cmd_fild08,335,355,0 warp moc_ant1-1 3,4,anthell01,35,262 +anthell01,35,267,0 warp moc_ant1-2 1,1,cmd_fild08,330,355 +cmd_fild08,348,82,0 warp moc_ant2-1 3,3,anthell02,168,170 +anthell02,172,169,0 warp moc_ant2-2 1,1,cmd_fild08,344,82 anthell01,253,32,0 warp ant01 2,1,anthell02,34,263 anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt index a44fff6903..020034d944 100644 --- a/npc/warps/fields/com_fild.txt +++ b/npc/warps/fields/com_fild.txt @@ -22,14 +22,14 @@ cmd_fild02,358,95,0 warp cmd_fild02-3 1,1,cmd_fild04,35,94 cmd_fild03,23,269,0 warp cmd_fild03-1 1,1,cmd_fild01,359,260 cmd_fild03,23,68,0 warp cmd_fild03-2 1,1,cmd_fild01,359,76 cmd_fild03,181,17,0 warp cmd_fild03-3 1,1,cmd_fild04,181,367 -cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 +//cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 cmd_fild04,21,275,0 warp cmd_fild04-1 1,1,cmd_fild02,378,264 cmd_fild04,31,92,0 warp cmd_fild04-2 1,1,cmd_fild02,351,92 cmd_fild04,376,287,0 warp cmd_fild04-3 1,1,cmd_fild06,26,288 cmd_fild04,180,372,0 warp cmd_fild04-4 1,1,cmd_fild03,183,23 -cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 -cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 -cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 +//cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 +//cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 +//cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 cmd_fild06,21,285,0 warp cmd_fild06-4 1,1,cmd_fild04,371,288 cmd_fild06,151,27,0 warp cmd_fild06-5 1,1,cmd_fild07,147,370 cmd_fild06,368,96,0 warp cmd_fild06-6 1,1,cmd_fild08,25,102 diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt index 778b1b0638..d3bb984cdb 100644 --- a/npc/warps/fields/geffen_fild.txt +++ b/npc/warps/fields/geffen_fild.txt @@ -45,7 +45,7 @@ gef_fild07,18,191,0 warp geff10 2,4,gef_fild08,357,187 gef_fild07,40,19,0 warp geff13 1,1,gef_fild13,41,369 gef_fild08,200,355,0 warp geff09-1 4,2,gef_fild06,218,20 gef_fild08,360,187,0 warp geff10-1 2,4,gef_fild07,21,191 -gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 +//gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 gef_fild09,23,56,0 warp geff18-1 1,1,gef_fild13,376,56 gef_fild09,225,25,0 warp geff11 3,2,gef_fild10,251,368 gef_fild09,368,95,0 warp geff01-1 4,2,gef_fild01,19,102 @@ -57,16 +57,16 @@ gef_fild10,138,284,0 warp gef019 1,1,in_orcs01,29,114 gef_fild10,215,51,0 warp gef020 1,1,in_orcs01,162,53 gef_fild10,223,205,0 warp gef021 1,1,in_orcs01,108,89 gef_fild10,63,337,0 warp gef022 1,1,in_orcs01,30,157 -gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 +//gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 gef_fild11,377,293,0 warp gef023 2,4,prt_fild11,20,281 gef_fild11,111,364,0 warp geff12-1 6,3,gef_fild10,104,24 -gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 -gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 -gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 -gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 -gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 -gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 +//gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 +//gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 +//gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 +//gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 +//gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 +//gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56 gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23 -gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 -gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 +//gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 +//gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt index d8d9d2e411..327431b65f 100644 --- a/npc/warps/fields/hugel_fild.txt +++ b/npc/warps/fields/hugel_fild.txt @@ -19,29 +19,34 @@ ein_fild04,343,293,0 warp hugel001 1,1,ein_fild05,80,294 ein_fild05,76,294,0 warp hugel001a 1,1,ein_fild04,336,292 ein_fild05,376,183,0 warp hugel002 1,1,ein_fild06,47,166 ein_fild06,42,171,0 warp hugel002a 1,1,ein_fild05,371,183 -ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 -yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 -ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 -yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 -ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 -ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 -ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 -ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 -ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 -ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 +//ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 +//yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 +//ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 +//yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 +//ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 +//ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 +//ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 +//ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 +//ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 +//ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 hu_fild01,366,185,0 warp hugel007 1,1,hu_fild02,22,168 hu_fild02,17,168,0 warp hugel007a 1,1,hu_fild01,361,189 hu_fild04,47,372,0 warp hugel008 1,1,hu_fild02,40,27 hu_fild02,40,22,0 warp hugel008a 1,1,hu_fild04,48,368 hu_fild04,294,379,0 warp hugel009 1,1,hu_fild02,280,31 hu_fild02,283,28,0 warp hugel009a 1,1,hu_fild04,289,376 -hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 -hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 +//hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 +//hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 hu_fild05,353,126,0 warp hugel011 1,1,hu_fild06,34,119 hu_fild06,28,119,0 warp hugel011a 1,1,hu_fild05,347,130 hu_fild02,374,339,0 warp hugel012 1,1,hu_fild03,24,337 -hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 +//hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 hu_fild02,378,162,0 warp hugel013 1,1,hu_fild03,30,163 -hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 -yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 -yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 +//hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 +//yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 +//yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 + +// RE Addon +ein_fild01,106,34,0 warp EinF01Dn01_EinF05Up01 1,1,ein_fild05,172,366 +ein_fild01,234,34,0 warp EinF01Dn02_EinF05Up02 1,1,ein_fild05,172,366 +ein_fild05,172,371,0 warp EinF05Up01_EinF01Dn01 1,1,ein_fild01,106,40 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index 255b57a56c..3ae9920e4c 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -14,28 +14,28 @@ //============================================================ //= Payon Field's ============================================ -pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 -pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 -pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 -pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 -pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 -pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 -pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 -pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 -pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 -pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 -pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 -pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 -pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 -pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 -pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 -pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 -pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 -pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 -pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 -pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 -pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 -pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 +pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 +pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 +pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 +pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 +//pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 +//pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 +pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 +pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 +pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 +pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 +pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 +pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 +pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 +pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 +pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 +//pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 +//pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 +//pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 +pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 +pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 +pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 +pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 pay_fild07,382,290,0 warp payf12 2,5,pay_fild10,19,290 pay_fild08,160,16,0 warp payf11-1 4,2,pay_fild07,280,379 pay_fild08,17,75,0 warp payf006 1,1,payon,265,92 @@ -45,5 +45,5 @@ pay_fild09,16,91,0 warp payf13-1 2,4,pay_fild08,259,91 pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19 pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290 pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252 -pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 -pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 +//pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 +//pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt index f53d21039e..2cf3b81e03 100644 --- a/npc/warps/fields/rachel_fild.txt +++ b/npc/warps/fields/rachel_fild.txt @@ -19,12 +19,12 @@ ra_fild01,306,38,0 warp ra001 1,1,ra_fild04,322,371 ra_fild04,322,378,0 warp ra002 1,1,ra_fild01,306,43 ra_fild04,362,351,0 warp ra003 1,1,ra_fild05,39,353 ra_fild05,33,353,0 warp ra004 1,1,ra_fild04,356,351 -ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 -ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 +//ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 +//ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 ra_fild04,263,54,0 warp ra007 1,1,ra_fild08,287,365 ra_fild08,287,370,0 warp ra008 1,1,ra_fild04,263,60 -ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 -ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 +//ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 +//ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 ra_fild04,23,176,0 warp ra011 1,1,ra_fild03,370,172 ra_fild03,374,168,0 warp ra012 1,1,ra_fild04,29,176 ra_fild05,348,274,0 warp ra013 1,1,ra_fild06,24,277 @@ -34,14 +34,14 @@ lhz_fild01,296,382,0 warp ra016 1,1,ra_fild06,298,25 ra_fild12,36,225,0 warp ra017 1,1,rachel,270,125 ra_fild08,165,29,0 warp ra018 1,1,ra_fild12,149,369 ra_fild12,149,374,0 warp ra019 1,1,ra_fild08,165,36 -ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 -ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 -ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 -ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 -ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 -ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 -ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 -ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 -ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 -ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 -ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 +//ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 +//ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 +//ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 +//ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 +//ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 +//ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 +//ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 +//ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 +//ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 +//ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 +//ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt index 145b12dd42..fdb9074135 100644 --- a/npc/warps/fields/veins_fild.txt +++ b/npc/warps/fields/veins_fild.txt @@ -14,22 +14,23 @@ ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263 ve_fild01,184,20,0 warp ve_fild1-2 1,1,ve_fild04,174,334 -ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 -ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 +//ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 +//ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 ve_fild01,350,92,0 warp ve_fild1-5 1,1,ve_fild02,78,133 -ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 -ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 +//ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 +//ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 ve_fild02,195,382,0 warp ve_fild2-3 1,1,rachel,130,25 ve_fild02,31,263,0 warp ve_fild2-4 1,1,ve_fild01,361,267 ve_fild02,73,133,0 warp ve_fild2-5 1,1,ve_fild01,345,92 ve_fild03,355,223,0 warp ve_fild3-1 1,1,ve_fild04,49,249 -ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 +//ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 ve_fild04,174,339,0 warp ve_fild4-1 1,1,ve_fild01,184,25 ve_fild04,44,249,0 warp ve_fild4-2 1,1,ve_fild03,350,220 ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 -ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 -ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 +//ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 +//ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 +/* ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ if (rand(2)) warp "ve_fild04",115,55; @@ -37,8 +38,12 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ warp "ve_fild05",354,191; end; } +*/ ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 +// Renewal Addon +ve_fild06,81,177,0 warp VeF06S_VeF04S 1,1,ve_fild04,115,55 + //============================================================ // Old changelog //============================================================ diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt index cd5afe441a..331c4e853c 100644 --- a/npc/warps/fields/yuno_fild.txt +++ b/npc/warps/fields/yuno_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 5+ //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.1 - Updated for the new Yuno Fields //= 1.2 New field update - Hugel Field by Sara - Version 1 +//= 1.3 Renewal warp adjustments. //============================================================ //= Yuno Field =============================================== @@ -57,8 +58,8 @@ yuno_fild08,74,376,0 warp newjun12 1,1,yuno_fild02,70,25 yuno_fild02,70,23,0 warp newjun12a 1,1,yuno_fild08,74,374 yuno_fild08,286,386,0 warp newjun13 1,1,yuno_fild02,294,26 yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384 -yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 -yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 +//yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 +//yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 //= Al de Baran <-> Yuno Connection ========================== @@ -67,23 +68,23 @@ yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242 //= Hugel Field //= Version 1 -yuno_fild05,372,325,0 warp hu001 1,1,yuno_fild06,42,319 -yuno_fild06,40,319,0 warp hu001a 1,1,yuno_fild05,370,325 -yuno_fild06,217,27,0 warp hu002 1,1,yuno_fild03,214,381 -yuno_fild03,214,383,0 warp hu002a 1,1,yuno_fild06,217,29 -yuno_fild06,369,136,0 warp hu003 1,1,hu_fild04,28,126 -hu_fild04,26,126,0 warp hu003a 1,1,yuno_fild06,367,136 -hu_fild04,121,26,0 warp hu004 1,1,yuno_fild02,118,374 -yuno_fild02,118,376,0 warp hu004a 1,1,hu_fild04,121,28 -yuno_fild06,149,369,0 warp hu005 1,1,hu_fild01,139,37 -hu_fild01,139,35,0 warp hu005a 1,1,yuno_fild06,151,369 -hu_fild04,381,187,0 warp hu006 1,1,hu_fild05,34,202 -hu_fild05,32,202,0 warp hu006a 1,1,hu_fild04,379,187 -hu_fild05,91,42,0 warp hu007 1,1,hu_fild07,80,369 -hu_fild07,80,371,0 warp hu007a 1,1,hu_fild05,91,44 -hu_fild07,35,351,0 warp hu008 1,1,yuno_fild02,384,338 -yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351 -hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375 -yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38 -hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372 -yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38 +//yuno_fild05,370,321,0 warp hu001 1,1,yuno_fild06,48,322 +//yuno_fild06,41,319,0 warp hu001a 1,1,yuno_fild05,366,319 +yuno_fild06,214,27,0 warp hu002 1,1,yuno_fild03,215,375 +yuno_fild03,215,382,0 warp hu002a 1,1,yuno_fild06,218,33 +yuno_fild06,369,132,0 warp hu003 1,1,hu_fild04,34,126 +hu_fild04,27,126,0 warp hu003a 1,1,yuno_fild06,362,132 +hu_fild04,122,27,0 warp hu004 1,1,yuno_fild02,114,370 +yuno_fild02,117,375,0 warp hu004a 1,1,hu_fild04,122,35 +yuno_fild06,151,370,0 warp hu005 1,1,hu_fild01,135,42 +hu_fild01,141,36,0 warp hu005a 1,1,yuno_fild06,156,368 +hu_fild04,380,183,0 warp hu006 1,1,hu_fild05,39,206 +hu_fild05,33,198,0 warp hu006a 1,1,hu_fild04,373,181 +//hu_fild05,89,43,0 warp hu007 1,1,hu_fild07,80,365 +//hu_fild07,81,370,0 warp hu007a 1,1,hu_fild05,89,50 +//hu_fild07,36,352,0 warp hu008 1,1,yuno_fild02,378,336 +//yuno_fild02,383,339,0 warp hu008a 1,1,hu_fild07,42,351 +//hu_fild07,57,37,0 warp hu009 1,1,yuno_fild09,48,370 +//yuno_fild09,48,376,0 warp hu009a 1,1,hu_fild07,58,42 +//hu_fild07,226,38,0 warp hu010 1,1,yuno_fild09,220,368 +//yuno_fild09,220,373,0 warp hu010a 1,1,hu_fild07,224,43 From 48ea3119dc887daa0b85a0afa720af79662353cf Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 03:58:18 +0000 Subject: [PATCH 008/129] Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14422 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/map.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f1653fecd1..e557cf89f7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X] * Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X] * Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X] * Rev. 14418 Follow up from r14413, should take care of the errors from bugreport:4472. [L0ne_W0lf] diff --git a/src/map/map.c b/src/map/map.c index f7f1f3a494..be50cf8870 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2707,7 +2707,7 @@ int map_readfromcache(struct map_data *m, char *buffer, char *decode_buffer) { int i; struct map_cache_main_header *header = (struct map_cache_main_header *)buffer; - struct map_cache_map_info *info; + struct map_cache_map_info *info = NULL; unsigned char *p = buffer + sizeof(struct map_cache_main_header); for(i = 0; i < header->map_count; i++) { From 80df86d7f7582968ef782af0bf623ee43433c8f1 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 11 Oct 2010 03:59:15 +0000 Subject: [PATCH 009/129] * Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. - ...corrected the versions in the file headers as well. :P git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14423 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/warps/cities/rachel.txt | 3 ++- npc/warps/cities/yggdrasil.txt | 3 ++- npc/warps/dungeons/abyss.txt | 2 +- npc/warps/dungeons/anthell.txt | 3 ++- npc/warps/fields/com_fild.txt | 3 ++- npc/warps/fields/geffen_fild.txt | 3 ++- npc/warps/fields/hugel_fild.txt | 3 ++- npc/warps/fields/morroc_fild.txt | 2 +- npc/warps/fields/payon_fild.txt | 3 ++- npc/warps/fields/rachel_fild.txt | 3 ++- npc/warps/fields/veins_fild.txt | 3 ++- 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 44fad0822f..d6c5e98820 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2010/10/10 + * Rev. 14422 Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. [L0ne_W0lf] + - ...corrected the versions in the file headers as well. :P * Rev. 14421 Renewal Update to warp portals, and deleted disabled_warps.txt. [L0ne_W0lf] - Only disabled warps, some coordinates might have slipped past me. 2010/09/18 diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt index 8dc9f9675f..ea29173299 100644 --- a/npc/warps/cities/rachel.txt +++ b/npc/warps/cities/rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA & RockmanEXE //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] //= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.5 Renewal warp adjustments. //============================================================ rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30 diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt index da7f05ece8..a65ad4a12e 100644 --- a/npc/warps/cities/yggdrasil.txt +++ b/npc/warps/cities/yggdrasil.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= PKGINGO (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Yggdrasil Tree //===== Additional Comments: ================================= //= Extracted from Vidar -> Athena +//= 1.1 Renewal warp adjustments. //============================================================ //Umbala Entrance diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 4d39ff5913..509c832e9d 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -10,7 +10,7 @@ //= Warp Points for Abyss Lake Dungeon //===== Additional Comments: ================================= //= 1.0 Thanks to Muad-Dib for the temp warps [Lupus] -//= 1.1 Renewal warp adjustments. +//= 1.1 Corrected warp placements. //============================================================ abyss_01,25,24,0 warp abysslakedunwarp001 1,1,abyss_02,271,270 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index f10a14db87..dc542628ec 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.3 Changed var anthell to @anthell. Optimized [Lupus] //= 1.4 Removed Duplicates [Silent] //= 1.5 Updated warps for episode 12.1 [L0ne_W0lf] +//= 1.6 Renewal warp adjustments. //============================================================ //= Ant Hell ================================================= diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt index 020034d944..3eafebe271 100644 --- a/npc/warps/fields/com_fild.txt +++ b/npc/warps/fields/com_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Warp Points for Comodo Fields //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] +//= 1.2 Renewal warp adjustments. //============================================================ cmd_fild01,222,24,0 warp cmd_fild01-1 1,1,cmd_fild02,222,372 diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt index d3bb984cdb..657f5280de 100644 --- a/npc/warps/fields/geffen_fild.txt +++ b/npc/warps/fields/geffen_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen Field's //===== Additional Comments: ================================= //= No comment! +//= 1.1 Renewal warp adjustments. //============================================================ //= Geffen Field Warps ======================================= diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt index 327431b65f..45c06ac9f1 100644 --- a/npc/warps/fields/hugel_fild.txt +++ b/npc/warps/fields/hugel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Initial Release //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ //= Hugel Field ============================================== diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt index 328b7e412c..9d4944589f 100644 --- a/npc/warps/fields/morroc_fild.txt +++ b/npc/warps/fields/morroc_fild.txt @@ -35,7 +35,7 @@ moc_fild02,67,342,0 warp mocf02-3 11,3,moc_fild01,315,25 moc_fild02,71,18,0 warp mocf05 4,2,moc_fild13,146,365 moc_fild02,92,342,0 warp mocf02-4 11,3,moc_fild01,315,25 moc_fild03,17,37,0 warp mocf06 2,4,moc_fild13,305,49 -moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 +//moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 moc_fild03,303,170,0 warp mocf014 2,7,pay_fild01,17,152 moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,122,0 warp mocf07-1 1,11,moc_fild05,378,119 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index 3ae9920e4c..9f9a76c78b 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.3 //===== Compatible With: ===================================== //= Any eAthena Mod //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.1 Refixed payon field08 -> payon warp //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ //= Payon Field's ============================================ diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt index 2cf3b81e03..90002c8adf 100644 --- a/npc/warps/fields/rachel_fild.txt +++ b/npc/warps/fields/rachel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Playtester //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.0 Initial version [Playtester] //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ ra_fild01,233,333,0 warp ra000 1,1,ice_dun01,157,15 diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt index fdb9074135..e64bf05460 100644 --- a/npc/warps/fields/veins_fild.txt +++ b/npc/warps/fields/veins_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Veins Field //===== Additional Comments: ================================= //= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf +//= 1.5 Renewal warp adjustments. //============================================================ ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263 From bed93164f289afd7c244475650ed6dbf678b5e24 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 04:01:42 +0000 Subject: [PATCH 010/129] Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14424 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/script.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e557cf89f7..db96e56041 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/10 + * Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) [Paradox924X] * Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X] * Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X] * Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X] diff --git a/src/map/script.c b/src/map/script.c index 4304aeea7f..b37c31c1e2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9068,8 +9068,13 @@ BUILDIN_FUNC(warpwaitingpc) *------------------------------------------*/ BUILDIN_FUNC(attachrid) { - st->rid=script_getnum(st,2); - script_pushint(st,(map_id2sd(st->rid)!=NULL)); + int rid = script_getnum(st,2); + + if (map_id2sd(rid)) { + st->rid = rid; + script_pushint(st,1); + } else + script_pushint(st,0); return 0; } /*========================================== From fca83d74342988c9faabdcb9cdf11432c3b3af4e Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 04:30:26 +0000 Subject: [PATCH 011/129] Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14425 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/skill.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index db96e56041..7eee026ea1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/10/11 + * Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426) [Paradox924X] 2010/10/10 * Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) [Paradox924X] * Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X] diff --git a/src/map/skill.c b/src/map/skill.c index 6a7f94e1e7..b3dd475a1e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9902,6 +9902,9 @@ static int skill_trap_splash (struct block_list *bl, va_list ap) unit = (struct skill_unit *)src; tick = va_arg(ap,int); + if( !unit->alive || bl->prev == NULL ) + return 0; + nullpo_ret(sg = unit->group); nullpo_ret(ss = map_id2bl(sg->src_id)); From cfbb5acc1b503d0407696ec11643c84c22159abb Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 06:17:49 +0000 Subject: [PATCH 012/129] Implemented official cash food behavior, including use delay, not being dispelled (including on death), distinct status effects and icons from the ordinary food types. Updated items accordingly. (bugreport:2560) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14426 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 + conf/Changelog.txt | 2 + conf/battle/items.conf | 3 + db/Changelog.txt | 2 + db/const.txt | 6 ++ db/item_db.txt | 218 ++++++++++++++++++++--------------------- src/map/battle.c | 1 + src/map/battle.h | 1 + src/map/itemdb.h | 1 + src/map/pc.c | 11 ++- src/map/pc.h | 1 + src/map/skill.c | 56 ++++++----- src/map/status.c | 37 +++++++ src/map/status.h | 18 ++-- 14 files changed, 215 insertions(+), 144 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7eee026ea1..d2b287a575 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2010/10/11 + * Implemented official cash food behavior, including use delay, not being dispelled (including on death), + distinct status effects and icons from the ordinary food types. (bugreport:2560) [Paradox924X] * Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426) [Paradox924X] 2010/10/10 * Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) [Paradox924X] diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 82797a7f4a..7351258729 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2010/10/10 + * Added cashfood_use_interval config setting. [Paradox924X] 2010/05/25 * Rev. 14307 Added noteleport flag to nyd_dun02. [L0ne_W0lf] 2009/11/03 diff --git a/conf/battle/items.conf b/conf/battle/items.conf index 368a95c8dc..9dc7ca314b 100644 --- a/conf/battle/items.conf +++ b/conf/battle/items.conf @@ -75,6 +75,9 @@ item_check: no // On officials this is 0, but it's set to 100ms as a measure against bots/macros. item_use_interval: 100 +// How much time must pass between cash food uses? Default: 60000 (1 min) +cashfood_use_interval: 60000 + // Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card). // For example, if left at 50. An item can give bNoMagicDamage,40; // which reduces magic damage by 40%, but does not blocks status changes. diff --git a/db/Changelog.txt b/db/Changelog.txt index df300bbd6d..ec2ab549de 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/10/11 + * Updated cash items to use new cash food statuses. [Paradox924X] 2010/10/05 * Rev. 14412 Handfull of misc changes. [L0ne_W0lf] - Added two additional mercenaries and updated data. diff --git a/db/const.txt b/db/const.txt index e54f886b7b..8ea0ce92a5 100644 --- a/db/const.txt +++ b/db/const.txt @@ -845,6 +845,12 @@ SC_SPL_ATK 299 SC_SPL_DEF 300 SC_MANU_MATK 301 SC_SPL_MATK 302 +SC_FOOD_STR_CASH 303 +SC_FOOD_AGI_CASH 304 +SC_FOOD_VIT_CASH 305 +SC_FOOD_DEX_CASH 306 +SC_FOOD_INT_CASH 307 +SC_FOOD_LUK_CASH 308 e_gasp 0 e_what 1 diff --git a/db/item_db.txt b/db/item_db.txt index 76cfc8ede6..4e5ca0dda2 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -4409,66 +4409,66 @@ 12038,Lotto_Box04,Lotto Box 04,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_LottoBox),1; },{},{} 12039,Lotto_Box05,Lotto Box 05,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(7542,7546),1; },{},{} 12040,Stone_Of_Intelligence_,Stone of Sage,2,100000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ homevolution; },{},{} -12041,Str_Dish01,Fried Grasshopper Legs,0,2000,,60,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 1; percentheal 5,0; },{},{} -12042,Str_Dish02,Seasoned Sticky Webfoot,0,4000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 2; percentheal 5,0; },{},{} -12043,Str_Dish03,Bomber Steak,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 3; percentheal 5,0; },{},{} -12044,Str_Dish04,Herb Marinade Beef,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 4; percentheal 5,0; },{},{} -12045,Str_Dish05,Lutie Lady's Pancake,0,10000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 5; percentheal 10,0; },{},{} -12046,Int_Dish01,Grape Juice Herbal Tea,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 1; percentheal 0,5; },{},{} -12047,Int_Dish02,Autumn Red Tea,0,4000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 2; percentheal 0,5; },{},{} -12048,Int_Dish03,Honey Herbal Tea,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 3; percentheal 0,5; },{},{} -12049,Int_Dish04,Morroc Fruit Wine,0,8000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 4; percentheal 0,5; },{},{} -12050,Int_Dish05,Mastela Fruit Wine,0,10000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 5; percentheal 0,10; },{},{} -12051,Vit_Dish01,Steamed Crab Nippers,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 1; percentheal 5,0; },{},{} -12052,Vit_Dish02,Assorted Seafood,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 2; percentheal 5,0; },{},{} -12053,Vit_Dish03,Clam Soup,0,6000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 3; percentheal 5,0; },{},{} -12054,Vit_Dish04,Seasoned Jellyfish,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 4; percentheal 5,0; },{},{} -12055,Vit_Dish05,Spicy Fried Bao,0,10000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 5; percentheal 10,0; },{},{} -12056,Agi_Dish01,Frog Egg Squid Ink Soup,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 1; percentheal 3,1; },{},{} -12057,Agi_Dish02,Smooth Noodle,0,4000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 2; percentheal 3,1; },{},{} -12058,Agi_Dish03,Tentacle Cheese Gratin,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 3; percentheal 3,1; },{},{} -12059,Agi_Dish04,Lutie Cold Noodle,0,8000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 4; percentheal 3,1; },{},{} -12060,Agi_Dish05,Steamed Bat Wing in Pumpkin,0,10000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 5; percentheal 6,2; },{},{} -12061,Dex_Dish01,Honey Grape Juice,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 1; percentheal 2,2; },{},{} -12062,Dex_Dish02,Chocolate Mousse Cake,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 2; percentheal 2,2; },{},{} -12063,Dex_Dish03,Fruit Mix,0,6000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 3; percentheal 2,2; },{},{} -12064,Dex_Dish04,Cream Sandwich,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 4; percentheal 2,2; },{},{} -12065,Dex_Dish05,Green Salad,0,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 5; percentheal 5,5; },{},{} -12066,Luk_Dish01,Fried Monkey Tails,0,2000,,60,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 1; percentheal 3,2; },{},{} -12067,Luk_Dish02,Mixed Juice,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 2; percentheal 3,2; },{},{} -12068,Luk_Dish03,Fried Sweet Potato,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 3; percentheal 4,2; },{},{} -12069,Luk_Dish04,Steamed Ancient Lips,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 4; percentheal 4,2; },{},{} -12070,Luk_Dish05,Fried Scorpion Tails,0,10000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 5; percentheal 5,2; },{},{} -12071,Str_Dish06,Shiny Marinade Beef,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 6; percentheal 10,2; },{},{} -12072,Str_Dish07,Whole Roast,0,40000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 7; percentheal 10,4; },{},{} -12073,Str_Dish08,Bearfoot Special,0,60000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 8; percentheal 15,6; },{},{} -12074,Str_Dish09,Tendon Satay,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 9; percentheal 15,8; },{},{} -12075,Str_Dish10,Steamed Tongue,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 10; percentheal 20,20; },{},{} -12076,Int_Dish06,Red Mushroom Wine,0,20000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 6; percentheal 2,10; },{},{} -12077,Int_Dish07,Special Royal Jelly Herbal Tea,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 7; percentheal 4,10; },{},{} -12078,Int_Dish08,Royal Family Tea,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 8; percentheal 6,10; },{},{} -12079,Int_Dish09,Tristan XII,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 9; percentheal 8,15; },{},{} -12080,Int_Dish10,Dragon Breath Cocktail,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 10; percentheal 10,20; },{},{} -12081,Vit_Dish06,Awfully Bitter Bracer,0,20000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 6; percentheal 13,0; },{},{} -12082,Vit_Dish07,Sumptuous Feast,0,40000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 7; percentheal 16,0; },{},{} -12083,Vit_Dish08,Giant Burito,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 8; percentheal 19,0; },{},{} -12084,Vit_Dish09,Ascending Dragon Soup,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 9; percentheal 22,0; },{},{} -12085,Vit_Dish10,Immortal Stew,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 10; percentheal 25,0; },{},{} -12086,Agi_Dish06,Chile Shrimp Gratin,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 6; percentheal 7,2; },{},{} -12087,Agi_Dish07,Steamed Alligator with Vegetable,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 7; percentheal 8,2; },{},{} -12088,Agi_Dish08,Incredibly Spicy Curry,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 8; percentheal 9,2; },{},{} -12089,Agi_Dish09,Special Meat Stew,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 9; percentheal 10,2; },{},{} -12090,Agi_Dish10,Steamed Desert Scorpions,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 10; percentheal 15,5; },{},{} -12091,Dex_Dish06,Peach Cake,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 6; percentheal 5,6; },{},{} -12092,Dex_Dish07,Soul Haunted Bread,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 7; percentheal 5,7; },{},{} -12093,Dex_Dish08,Special Toast,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 8; percentheal 5,8; },{},{} -12094,Dex_Dish09,Heavenly Fruit Juice,0,80000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 9; percentheal 5,9; },{},{} -12095,Dex_Dish10,Hwergelmir's Tonic,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 10; percentheal 10,10; },{},{} -12096,Luk_Dish06,Lucky Soup,0,20000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 6; percentheal 6,3; },{},{} -12097,Luk_Dish07,Assorted Shish Kebob,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 7; percentheal 7,3; },{},{} -12098,Luk_Dish08,Strawberry Flavored Rice Ball,0,60000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 8; percentheal 9,3; },{},{} -12099,Luk_Dish09,Blood Flavored Soda,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 9; percentheal 10,4; },{},{} -12100,Luk_Dish10,Cooked Nine Tail's Tails,0,100000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 10; percentheal 14,8; },{},{} +12041,Str_Dish01,Fried Grasshopper Legs,0,2000,,60,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 1; percentheal 5,0; },{},{} +12042,Str_Dish02,Seasoned Sticky Webfoot,0,4000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 2; percentheal 5,0; },{},{} +12043,Str_Dish03,Bomber Steak,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 3; percentheal 5,0; },{},{} +12044,Str_Dish04,Herb Marinade Beef,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 4; percentheal 5,0; },{},{} +12045,Str_Dish05,Lutie Lady's Pancake,0,10000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 5; percentheal 10,0; },{},{} +12046,Int_Dish01,Grape Juice Herbal Tea,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 1; percentheal 0,5; },{},{} +12047,Int_Dish02,Autumn Red Tea,0,4000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 2; percentheal 0,5; },{},{} +12048,Int_Dish03,Honey Herbal Tea,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 3; percentheal 0,5; },{},{} +12049,Int_Dish04,Morroc Fruit Wine,0,8000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 4; percentheal 0,5; },{},{} +12050,Int_Dish05,Mastela Fruit Wine,0,10000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 5; percentheal 0,10; },{},{} +12051,Vit_Dish01,Steamed Crab Nippers,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 1; percentheal 5,0; },{},{} +12052,Vit_Dish02,Assorted Seafood,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 2; percentheal 5,0; },{},{} +12053,Vit_Dish03,Clam Soup,0,6000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 3; percentheal 5,0; },{},{} +12054,Vit_Dish04,Seasoned Jellyfish,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 4; percentheal 5,0; },{},{} +12055,Vit_Dish05,Spicy Fried Bao,0,10000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 5; percentheal 10,0; },{},{} +12056,Agi_Dish01,Frog Egg Squid Ink Soup,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 1; percentheal 3,1; },{},{} +12057,Agi_Dish02,Smooth Noodle,0,4000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 2; percentheal 3,1; },{},{} +12058,Agi_Dish03,Tentacle Cheese Gratin,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 3; percentheal 3,1; },{},{} +12059,Agi_Dish04,Lutie Cold Noodle,0,8000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 4; percentheal 3,1; },{},{} +12060,Agi_Dish05,Steamed Bat Wing in Pumpkin,0,10000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 5; percentheal 6,2; },{},{} +12061,Dex_Dish01,Honey Grape Juice,0,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 1; percentheal 2,2; },{},{} +12062,Dex_Dish02,Chocolate Mousse Cake,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 2; percentheal 2,2; },{},{} +12063,Dex_Dish03,Fruit Mix,0,6000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 3; percentheal 2,2; },{},{} +12064,Dex_Dish04,Cream Sandwich,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 4; percentheal 2,2; },{},{} +12065,Dex_Dish05,Green Salad,0,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 5; percentheal 5,5; },{},{} +12066,Luk_Dish01,Fried Monkey Tails,0,2000,,60,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 1; percentheal 3,2; },{},{} +12067,Luk_Dish02,Mixed Juice,0,4000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 2; percentheal 3,2; },{},{} +12068,Luk_Dish03,Fried Sweet Potato,0,6000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 3; percentheal 4,2; },{},{} +12069,Luk_Dish04,Steamed Ancient Lips,0,8000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 4; percentheal 4,2; },{},{} +12070,Luk_Dish05,Fried Scorpion Tails,0,10000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 5; percentheal 5,2; },{},{} +12071,Str_Dish06,Shiny Marinade Beef,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 6; percentheal 10,2; },{},{} +12072,Str_Dish07,Whole Roast,0,40000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 7; percentheal 10,4; },{},{} +12073,Str_Dish08,Bearfoot Special,0,60000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 8; percentheal 15,6; },{},{} +12074,Str_Dish09,Tendon Satay,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 9; percentheal 15,8; },{},{} +12075,Str_Dish10,Steamed Tongue,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 10; percentheal 20,20; },{},{} +12076,Int_Dish06,Red Mushroom Wine,0,20000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 6; percentheal 2,10; },{},{} +12077,Int_Dish07,Special Royal Jelly Herbal Tea,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 7; percentheal 4,10; },{},{} +12078,Int_Dish08,Royal Family Tea,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 8; percentheal 6,10; },{},{} +12079,Int_Dish09,Tristan XII,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 9; percentheal 8,15; },{},{} +12080,Int_Dish10,Dragon Breath Cocktail,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 10; percentheal 10,20; },{},{} +12081,Vit_Dish06,Awfully Bitter Bracer,0,20000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 6; percentheal 13,0; },{},{} +12082,Vit_Dish07,Sumptuous Feast,0,40000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 7; percentheal 16,0; },{},{} +12083,Vit_Dish08,Giant Burito,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 8; percentheal 19,0; },{},{} +12084,Vit_Dish09,Ascending Dragon Soup,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 9; percentheal 22,0; },{},{} +12085,Vit_Dish10,Immortal Stew,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 10; percentheal 25,0; },{},{} +12086,Agi_Dish06,Chile Shrimp Gratin,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 6; percentheal 7,2; },{},{} +12087,Agi_Dish07,Steamed Alligator with Vegetable,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 7; percentheal 8,2; },{},{} +12088,Agi_Dish08,Incredibly Spicy Curry,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 8; percentheal 9,2; },{},{} +12089,Agi_Dish09,Special Meat Stew,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 9; percentheal 10,2; },{},{} +12090,Agi_Dish10,Steamed Desert Scorpions,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 10; percentheal 15,5; },{},{} +12091,Dex_Dish06,Peach Cake,0,20000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 6; percentheal 5,6; },{},{} +12092,Dex_Dish07,Soul Haunted Bread,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 7; percentheal 5,7; },{},{} +12093,Dex_Dish08,Special Toast,0,60000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 8; percentheal 5,8; },{},{} +12094,Dex_Dish09,Heavenly Fruit Juice,0,80000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 9; percentheal 5,9; },{},{} +12095,Dex_Dish10,Hwergelmir's Tonic,0,100000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 10; percentheal 10,10; },{},{} +12096,Luk_Dish06,Lucky Soup,0,20000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 6; percentheal 6,3; },{},{} +12097,Luk_Dish07,Assorted Shish Kebob,0,40000,,800,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 7; percentheal 7,3; },{},{} +12098,Luk_Dish08,Strawberry Flavored Rice Ball,0,60000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 8; percentheal 9,3; },{},{} +12099,Luk_Dish09,Blood Flavored Soda,0,80000,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 9; percentheal 10,4; },{},{} +12100,Luk_Dish10,Cooked Nine Tail's Tails,0,100000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 10; percentheal 14,8; },{},{} 12101,Citron,Citron,0,20,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12102,Meat_Skewer,Grilled Skewer,0,20,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12103,Bloody_Dead_Branch,Bloody Branch,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",-3,1,""; },{},{} @@ -4490,9 +4490,9 @@ 12119,Resist_Water,Coldproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,20,0,0,-15; },{},{} 12120,Resist_Earth,Earthproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,0,20,-15,0; },{},{} 12121,Resist_Wind,Thunderproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,0,-15,0,20; },{},{} -12122,Sesame_Pastry,Sesame Pastry,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HitFood,1200000,30; },{},{} -12123,Honey_Pastry,Honey Pastry,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FleeFood,1200000,30; },{},{} -12124,Rainbow_Cake,Rainbow Cake,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFood,1200000,10; sc_start SC_MATKFood,120000,10; },{},{} +12122,Sesame_Pastry,Sesame Pastry,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1200000,30; },{},{} +12123,Honey_Pastry,Honey Pastry,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1200000,30; },{},{} +12124,Rainbow_Cake,Rainbow Cake,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFOOD,1200000,10; sc_start SC_MATKFOOD,120000,10; },{},{} 12125,Outdoor_Cooking_Kits,Outdoor Cooking Kit,2,500,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 11; },{},{} 12126,Indoor_Cooking_Kits,Home Cooking Kit,2,1000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 12; },{},{} 12127,High_end_Cooking_Kits,Professional Cooking Kit,2,2000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 13; },{},{} @@ -4510,7 +4510,7 @@ 12139,3rd_Stage_Prize,Third Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12140,4th_Stage_Prize,Fourth Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12141,5th_Stage_Prize,Fifth Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12142,Magic_Book,Book of Magic,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1800000, 10; },{},{} +12142,Magic_Book,Book of Magic,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1800000, 10; },{},{} 12143,Red_Can,Red Can,2,50000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12144,Sphere_Case_Wind,Lightning Sphere Pack,2,2,,350,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13204,500; },{},{} 12145,Sphere_Case_Darkness,Blind Sphere Pack,2,2,,350,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13206,500; },{},{} @@ -4571,12 +4571,12 @@ 12200,Event_Cake,X-mas Cake,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{} 12201,Red_Box_C,Commonplace Red Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // Cash Shop Usable Items -12202,Str_Dish10_,Steamed Tongue,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood,1800000, 10; percentheal 15,5; },{},{} -12203,Agi_Dish10_,Steamed Scorpion,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood,1800000, 10; percentheal 15,5; },{},{} -12204,Int_Dish10_,Dragon Breath Cocktail,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood,1800000, 10; percentheal 15,5; },{},{} -12205,Dex_Dish10_,Hwergelmir's Tonic,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood,1800000, 10; percentheal 15,5; },{},{} -12206,Luk_Dish10_,Cooked Nine Tail's Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood,1800000, 10; percentheal 15,5; },{},{} -12207,Vit_Dish10_,Stew Of Immortality,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood,1800000, 10; percentheal 15,5; },{},{} +12202,Str_Dish10_,Steamed Tongue,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STR_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12203,Agi_Dish10_,Steamed Scorpion,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGI_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12204,Int_Dish10_,Dragon Breath Cocktail,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INT_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12205,Dex_Dish10_,Hwergelmir's Tonic,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEX_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12206,Luk_Dish10_,Cooked Nine Tail's Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUK_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12207,Vit_Dish10_,Stew Of Immortality,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VIT_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} 12208,Battle_Manual,Battle Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{} 12209,Insurance,Life Insurance,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{} 12210,Bubble_Gum,Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{} @@ -4592,12 +4592,12 @@ 12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(isequipped(1301,1302,1303)) skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; },{},{} 12221,Megaphone_,Megaphone,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @Megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{} 12225,Sweet_Candy_Striper,Sweet Candy Cane,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{} -12226,Examination1,Examination 1,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_STRFood,5400000,10; sc_start SC_DEXFood,5400000,5; sc_start SC_ATKPOTION,5400000,22; sc_start SC_MATKFood,5400000,15; },{},{} -12227,Examination2,Examination 2,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_INTFood,5400000,8; sc_start SC_VITFood,5400000,7; sc_start SC_LUKFood,5400000,7; sc_start SC_ATKPOTION,5400000,10; },{},{} -12228,Examination3,Examination 3,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_AGIFood,5400000,15; sc_start SC_ATKPOTION,5400000,52; sc_start SC_MATKFood,5400000,10; },{},{} -12229,Examination4,Examination 4,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_STRFood,5400000,3; sc_start SC_AGIFood,5400000,5; sc_start SC_VITFood,5400000,10; sc_start SC_MATKFood,5400000,52; },{},{} -12230,Examination5,Examination 5,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_INTFood,5400000,3; sc_start SC_DEXFood,5400000,12; sc_start SC_ATKPOTION,5400000,20; sc_start SC_MATKFood,5400000,20; },{},{} -12231,Examination6,Examination 6,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,100; sc_start SC_SpeedUp0,5400000,0; sc_start SC_STRFood,5400000,6; sc_start SC_DEXFood,5400000,6; sc_start SC_AGIFood,5400000,6; sc_start SC_INTFood,5400000,6; sc_start SC_VITFood,5400000,6; sc_start SC_LUKFood,5400000,6; sc_start SC_ATKPOTION,5400000,24; sc_start SC_MATKFood,5400000,24; },{},{} +12226,Examination1,Examination 1,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_STRFOOD,5400000,10; sc_start SC_DEXFOOD,5400000,5; sc_start SC_ATKPOTION,5400000,22; sc_start SC_MATKFOOD,5400000,15; },{},{} +12227,Examination2,Examination 2,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_INTFOOD,5400000,8; sc_start SC_VITFOOD,5400000,7; sc_start SC_LUKFOOD,5400000,7; sc_start SC_ATKPOTION,5400000,10; },{},{} +12228,Examination3,Examination 3,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_AGIFOOD,5400000,15; sc_start SC_ATKPOTION,5400000,52; sc_start SC_MATKFOOD,5400000,10; },{},{} +12229,Examination4,Examination 4,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_STRFOOD,5400000,3; sc_start SC_AGIFOOD,5400000,5; sc_start SC_VITFOOD,5400000,10; sc_start SC_MATKFOOD,5400000,52; },{},{} +12230,Examination5,Examination 5,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_INTFOOD,5400000,3; sc_start SC_DEXFOOD,5400000,12; sc_start SC_ATKPOTION,5400000,20; sc_start SC_MATKFOOD,5400000,20; },{},{} +12231,Examination6,Examination 6,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,100; sc_start SC_SpeedUp0,5400000,0; sc_start SC_STRFOOD,5400000,6; sc_start SC_DEXFOOD,5400000,6; sc_start SC_AGIFOOD,5400000,6; sc_start SC_INTFOOD,5400000,6; sc_start SC_VITFOOD,5400000,6; sc_start SC_LUKFOOD,5400000,6; sc_start SC_ATKPOTION,5400000,24; sc_start SC_MATKFOOD,5400000,24; },{},{} 12232,Gingerbread,Ginger Bread,0,20,,150,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12233,Kvass,Kvass,0,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,100; },{},{} 12234,Cacao99,Fierce Cacao 99%,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 25,0; },{},{} @@ -4616,12 +4616,12 @@ 12247,Halohalo,Halo-Halo,2,2,,100,,,,,0xFFFFFFFF,7,2,,,20,,,{ sc_start SC_INCALLSTATUS,600000,3; },{},{} 12248,Masquerade_Ball_Box,Fancy Ball Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Masquerade),1; },{},{} 12249,Payroll_Of_Kafra_,Payment Statement for Kafra Employee,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12250,Str_Dish10_M,Steamed Tongue,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood,3600000,10; percentheal 20,20; },{},{} -12251,Agi_Dish10_M,Steamed Desert Scorpions,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood,3600000,10; percentheal 15,5; },{},{} -12252,Int_Dish10_M,Dragon Breath Cocktail,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood,3600000,10; percentheal 10,20; },{},{} -12253,Dex_Dish10_M,Hwergelmir's Tonic,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood,3600000,10; percentheal 10,10; },{},{} -12254,Luk_Dish10_M,Cooked Nine Tail,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood,3600000,10; percentheal 14,8; },{},{} -12255,Vit_Dish10_M,Immortal Stew,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood,3600000,10; percentheal 25,0; },{},{} +12250,Str_Dish10_M,Steamed Tongue,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,3600000,10; percentheal 20,20; },{},{} +12251,Agi_Dish10_M,Steamed Desert Scorpions,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD,3600000,10; percentheal 15,5; },{},{} +12252,Int_Dish10_M,Dragon Breath Cocktail,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD,3600000,10; percentheal 10,20; },{},{} +12253,Dex_Dish10_M,Hwergelmir's Tonic,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD,3600000,10; percentheal 10,10; },{},{} +12254,Luk_Dish10_M,Cooked Nine Tail,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD,3600000,10; percentheal 14,8; },{},{} +12255,Vit_Dish10_M,Immortal Stew,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD,3600000,10; percentheal 25,0; },{},{} 12256,PRO_Gift_Box,PRO Gift Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12257,Cold_Medicine,Cold Medicine,2,20,,100,,,,,0xFFFFFFFF,7,2,,,50,,,{ percentheal 25,25; },{},{} 12258,Bombring_Box,Bomb Poring Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",1904,1,""; },{},{} @@ -4632,9 +4632,9 @@ 12263,Comp_Battle_Manual,Field Manual,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{} 12264,Comp_Bubble_Gum,Bubble Gum,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{} 12265,Comp_Insurance,Life Insurrance,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{} -12266,Sesame_Pastry_,Sesame Pastry,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HitFood,1200000,30; },{},{} -12267,Honey_Pastry_,Honey Pastry,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FleeFood,1200000,30; },{},{} -12268,Rainbow_Cake_,Rainbow Cake,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFood,120000,10; },{},{} +12266,Sesame_Pastry_,Sesame Pastry,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1200000,30; },{},{} +12267,Honey_Pastry_,Honey Pastry,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1200000,30; },{},{} +12268,Rainbow_Cake_,Rainbow Cake,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,10; sc_start SC_MATKFOOD,120000,10; },{},{} 12269,Tasty_Colonel,Tasty Pink Ration,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,15; },{},{} 12270,Tasty_Major,Tasty White Ration,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,600000,15; },{},{} 12271,Mre_A,Military Ration A,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,0; },{},{} @@ -6032,36 +6032,36 @@ 14548,Fire_Cracker_Valentine,Valentine's Day Firecracker,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{} 14549,Fire_Cracker_Bday,Birthday Firecracker,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{} 14550,Fire_Cracker_Xmas,Xmas Firecracker,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{} -14551,Str_Dish01_,Fried Grasshopper Legs,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 1; percentheal 5,0; },{},{} -14552,Str_Dish02_,Seasoned Sticky Webfoot,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 2; percentheal 5,0; },{},{} -14553,Str_Dish03_,Bomber Steak,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 3; percentheal 5,0; },{},{} -14554,Int_Dish01_,Grape Juice Herbal Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 1; percentheal 0,5; },{},{} -14555,Int_Dish02_,Autumn Red Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 2; percentheal 0,5; },{},{} -14556,Int_Dish03_,Honey Herbal Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 3; percentheal 0,5; },{},{} -14557,Vit_Dish01_,Steamed Crab Nippers,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 1; percentheal 5,0; },{},{} -14558,Vit_Dish02_,Assorted Seafood,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 2; percentheal 5,0; },{},{} -14559,Vit_Dish03_,Clam Soup,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 3; percentheal 5,0; },{},{} -14560,Agi_Dish01_,Frog Egg Squid Ink Soup,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 1; percentheal 3,1; },{},{} -14561,Agi_Dish02_,Smooth Noodle,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 2; percentheal 3,1; },{},{} -14562,Agi_Dish03_,Tentacle Cheese Gratin,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 3; percentheal 3,1; },{},{} -14563,Dex_Dish01_,Honey Grape Juice,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 1; percentheal 2,2; },{},{} -14564,Dex_Dish02_,Chocolate Mousse Cake,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 2; percentheal 2,2; },{},{} -14565,Dex_Dish03_,Fruit Mix,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 3; percentheal 2,2; },{},{} -14566,Luk_Dish01_,Fried Monkey Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 1; percentheal 3,2; },{},{} -14567,Luk_Dish02_,Mixed Juice,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 2; percentheal 3,2; },{},{} -14568,Luk_Dish03_,Fried Sweet Potato,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 3; percentheal 4,2; },{},{} +14551,Str_Dish01_,Fried Grasshopper Legs,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 1; percentheal 5,0; },{},{} +14552,Str_Dish02_,Seasoned Sticky Webfoot,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 2; percentheal 5,0; },{},{} +14553,Str_Dish03_,Bomber Steak,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 3; percentheal 5,0; },{},{} +14554,Int_Dish01_,Grape Juice Herbal Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 1; percentheal 0,5; },{},{} +14555,Int_Dish02_,Autumn Red Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 2; percentheal 0,5; },{},{} +14556,Int_Dish03_,Honey Herbal Tea,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 3; percentheal 0,5; },{},{} +14557,Vit_Dish01_,Steamed Crab Nippers,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 1; percentheal 5,0; },{},{} +14558,Vit_Dish02_,Assorted Seafood,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 2; percentheal 5,0; },{},{} +14559,Vit_Dish03_,Clam Soup,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 3; percentheal 5,0; },{},{} +14560,Agi_Dish01_,Frog Egg Squid Ink Soup,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 1; percentheal 3,1; },{},{} +14561,Agi_Dish02_,Smooth Noodle,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 2; percentheal 3,1; },{},{} +14562,Agi_Dish03_,Tentacle Cheese Gratin,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 3; percentheal 3,1; },{},{} +14563,Dex_Dish01_,Honey Grape Juice,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 1; percentheal 2,2; },{},{} +14564,Dex_Dish02_,Chocolate Mousse Cake,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 2; percentheal 2,2; },{},{} +14565,Dex_Dish03_,Fruit Mix,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 3; percentheal 2,2; },{},{} +14566,Luk_Dish01_,Fried Monkey Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 1; percentheal 3,2; },{},{} +14567,Luk_Dish02_,Mixed Juice,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 2; percentheal 3,2; },{},{} +14568,Luk_Dish03_,Fried Sweet Potato,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 3; percentheal 4,2; },{},{} 14569,Knife_Goblin_Ring,Knife Goblin Ring,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1122; },{},{} 14570,Flail_Goblin_Ring,Flail Goblin Ring,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1123; },{},{} 14571,Hammer_Goblin_Ring,Hammer Goblin Ring,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1125; },{},{} 14572,Holy_Marble,Holy Marble,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1385; },{},{} 14573,Red_Burning_Stone,Red Burning Stone,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1382; },{},{} 14574,Skull_Of_Vagabond,Vagabond's Skull,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1208; },{},{} -14575,Str_Dish05_,Lutie Lady's Pancake,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 5; percentheal 10,0; },{},{} -14576,Int_Dish05_,Mastela Fruit Wine,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFood, 1200000, 5; percentheal 0,10; },{},{} -14577,Vit_Dish05_,Spicy Fried Bao,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFood, 1200000, 5; percentheal 10,0; },{},{} -14578,Agi_Dish05_,Steamed Bat Wing in Pumpkin,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood, 1200000, 5; percentheal 6,2; },{},{} -14579,Dex_Dish05_,Green Salad,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFood, 1200000, 5; percentheal 5,5; },{},{} -14580,Luk_Dish05_,Fried Scorpion Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFood, 1200000, 5; percentheal 5,2; },{},{} +14575,Str_Dish05_,Lutie Lady's Pancake,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD, 1200000, 5; percentheal 10,0; },{},{} +14576,Int_Dish05_,Mastela Fruit Wine,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INTFOOD, 1200000, 5; percentheal 0,10; },{},{} +14577,Vit_Dish05_,Spicy Fried Bao,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VITFOOD, 1200000, 5; percentheal 10,0; },{},{} +14578,Agi_Dish05_,Steamed Bat Wing in Pumpkin,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFOOD, 1200000, 5; percentheal 6,2; },{},{} +14579,Dex_Dish05_,Green Salad,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEXFOOD, 1200000, 5; percentheal 5,5; },{},{} +14580,Luk_Dish05_,Fried Scorpion Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUKFOOD, 1200000, 5; percentheal 5,2; },{},{} 14581,Dun_Tele_Scroll2,Dungeon Teleport Scroll II,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashDungeon"; },{},{} 14582,WOB_Rune,Yellow Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",1; },{},{} 14583,WOB_Schwaltz,Green Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",2; },{},{} diff --git a/src/map/battle.c b/src/map/battle.c index 2a7b4de183..fde6402a34 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3755,6 +3755,7 @@ static const struct _battle_data { { "combo_delay_rate", &battle_config.combo_delay_rate, 100, 0, INT_MAX, }, { "item_check", &battle_config.item_check, 0, 0, 1, }, { "item_use_interval", &battle_config.item_use_interval, 100, 0, INT_MAX, }, + { "cashfood_use_interval", &battle_config.cashfood_use_interval, 60000, 0, INT_MAX, }, { "wedding_modifydisplay", &battle_config.wedding_modifydisplay, 0, 0, 1, }, { "wedding_ignorepalette", &battle_config.wedding_ignorepalette, 0, 0, 1, }, { "xmas_ignorepalette", &battle_config.xmas_ignorepalette, 0, 0, 1, }, diff --git a/src/map/battle.h b/src/map/battle.h index 361867a9fc..230a860071 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -214,6 +214,7 @@ extern struct Battle_Config int combo_delay_rate; int item_check; int item_use_interval; //[Skotlex] + int cashfood_use_interval; int wedding_modifydisplay; int wedding_ignorepalette; //[Skotlex] int xmas_ignorepalette; // [Valaris] diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 5a3c042f60..62bbb2c5af 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -17,6 +17,7 @@ #define ITEMID_TRAP 1065 #define ITEMID_STONE 7049 #define ITEMID_SKULL_ 7420 +#define itemdb_iscashfood(id) ( (id) >= 12202 && (id) <= 12207 ) //The only item group required by the code to be known. See const.txt for the full list. #define IG_FINDINGORE 6 diff --git a/src/map/pc.c b/src/map/pc.c index 808d47792e..72fc4da90c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -851,6 +851,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim sd->pvp_timer = INVALID_TIMER; sd->canuseitem_tick = tick; + sd->canusecashfood_tick = tick; sd->canequip_tick = tick; sd->cantalk_tick = tick; sd->cansendmail_tick = tick; @@ -3666,7 +3667,9 @@ int pc_useitem(struct map_session_data *sd,int n) return 0; //Prevent mass item usage. [Skotlex] - if( DIFF_TICK(sd->canuseitem_tick, tick) > 0 ) + if( DIFF_TICK(sd->canuseitem_tick, tick) > 0 || + (itemdb_iscashfood(sd->status.inventory[n].nameid) && DIFF_TICK(sd->canusecashfood_tick, tick) > 0) + ) return 0; if( sd->sc.count && ( @@ -3718,7 +3721,11 @@ int pc_useitem(struct map_session_data *sd,int n) potion_flag = 3; //Even more effective potions. } - sd->canuseitem_tick= tick + battle_config.item_use_interval; //Update item use time. + //Update item use time. + sd->canuseitem_tick = tick + battle_config.item_use_interval; + if( itemdb_iscashfood(sd->status.inventory[n].nameid) ) + sd->canusecashfood_tick = tick + battle_config.cashfood_use_interval; + run_script(script,0,sd->bl.id,fake_nd->bl.id); potion_flag = 0; return 1; diff --git a/src/map/pc.h b/src/map/pc.h index 9c8b524af9..da666f9a7e 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -199,6 +199,7 @@ struct map_session_data { int invincible_timer; unsigned int canlog_tick; unsigned int canuseitem_tick; // [Skotlex] + unsigned int canusecashfood_tick; unsigned int canequip_tick; // [Inkfish] unsigned int cantalk_tick; unsigned int cansendmail_tick; // [Mail System Flood Protection] diff --git a/src/map/skill.c b/src/map/skill.c index b3dd475a1e..c7b60661ea 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4739,33 +4739,35 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (!tsc->data[i]) continue; switch (i) { - case SC_WEIGHT50: case SC_WEIGHT90: case SC_HALLUCINATION: - case SC_STRIPWEAPON: case SC_STRIPSHIELD: case SC_STRIPARMOR: - case SC_STRIPHELM: case SC_CP_WEAPON: case SC_CP_SHIELD: - case SC_CP_ARMOR: case SC_CP_HELM: case SC_COMBO: - case SC_STRFOOD: case SC_AGIFOOD: case SC_VITFOOD: - case SC_INTFOOD: case SC_DEXFOOD: case SC_LUKFOOD: - case SC_HITFOOD: case SC_FLEEFOOD: case SC_BATKFOOD: - case SC_WATKFOOD: case SC_MATKFOOD: case SC_DANCING: - case SC_GUILDAURA: case SC_EDP: case SC_AUTOBERSERK: - case SC_CARTBOOST: case SC_MELTDOWN: case SC_SAFETYWALL: - case SC_SMA: case SC_SPEEDUP0: case SC_NOCHAT: - case SC_ANKLE: case SC_SPIDERWEB: case SC_JAILED: - case SC_ITEMBOOST: case SC_EXPBOOST: case SC_LIFEINSURANCE: - case SC_BOSSMAPINFO: case SC_PNEUMA: case SC_AUTOSPELL: - case SC_INCHITRATE: case SC_INCATKRATE: case SC_NEN: - case SC_READYSTORM: case SC_READYDOWN: case SC_READYTURN: - case SC_READYCOUNTER:case SC_DODGE: case SC_WARM: - case SC_SPEEDUP1: case SC_AUTOTRADE: case SC_CRITICALWOUND: - case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: - case SC_HELLPOWER: case SC_MANU_ATK: case SC_MANU_DEF: - case SC_SPL_ATK: case SC_SPL_DEF: case SC_MANU_MATK: - case SC_SPL_MATK: case SC_RICHMANKIM: case SC_ETERNALCHAOS: - case SC_DRUMBATTLE: case SC_NIBELUNGEN: case SC_ROKISWEIL: - case SC_INTOABYSS: case SC_SIEGFRIED: case SC_WHISTLE: - case SC_ASSNCROS: case SC_POEMBRAGI: case SC_APPLEIDUN: - case SC_HUMMING: case SC_DONTFORGETME: case SC_FORTUNE: - case SC_SERVICE4U: + case SC_WEIGHT50: case SC_WEIGHT90: case SC_HALLUCINATION: + case SC_STRIPWEAPON: case SC_STRIPSHIELD: case SC_STRIPARMOR: + case SC_STRIPHELM: case SC_CP_WEAPON: case SC_CP_SHIELD: + case SC_CP_ARMOR: case SC_CP_HELM: case SC_COMBO: + case SC_STRFOOD: case SC_AGIFOOD: case SC_VITFOOD: + case SC_INTFOOD: case SC_DEXFOOD: case SC_LUKFOOD: + case SC_HITFOOD: case SC_FLEEFOOD: case SC_BATKFOOD: + case SC_WATKFOOD: case SC_MATKFOOD: case SC_DANCING: + case SC_GUILDAURA: case SC_EDP: case SC_AUTOBERSERK: + case SC_CARTBOOST: case SC_MELTDOWN: case SC_SAFETYWALL: + case SC_SMA: case SC_SPEEDUP0: case SC_NOCHAT: + case SC_ANKLE: case SC_SPIDERWEB: case SC_JAILED: + case SC_ITEMBOOST: case SC_EXPBOOST: case SC_LIFEINSURANCE: + case SC_BOSSMAPINFO: case SC_PNEUMA: case SC_AUTOSPELL: + case SC_INCHITRATE: case SC_INCATKRATE: case SC_NEN: + case SC_READYSTORM: case SC_READYDOWN: case SC_READYTURN: + case SC_READYCOUNTER: case SC_DODGE: case SC_WARM: + case SC_SPEEDUP1: case SC_AUTOTRADE: case SC_CRITICALWOUND: + case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: + case SC_HELLPOWER: case SC_MANU_ATK: case SC_MANU_DEF: + case SC_SPL_ATK: case SC_SPL_DEF: case SC_MANU_MATK: + case SC_SPL_MATK: case SC_RICHMANKIM: case SC_ETERNALCHAOS: + case SC_DRUMBATTLE: case SC_NIBELUNGEN: case SC_ROKISWEIL: + case SC_INTOABYSS: case SC_SIEGFRIED: case SC_WHISTLE: + case SC_ASSNCROS: case SC_POEMBRAGI: case SC_APPLEIDUN: + case SC_HUMMING: case SC_DONTFORGETME: case SC_FORTUNE: + case SC_SERVICE4U: case SC_FOOD_STR_CASH: case SC_FOOD_AGI_CASH: + case SC_FOOD_VIT_CASH: case SC_FOOD_DEX_CASH: case SC_FOOD_INT_CASH: + case SC_FOOD_LUK_CASH: continue; case SC_ASSUMPTIO: if( bl->type == BL_MOB ) diff --git a/src/map/status.c b/src/map/status.c index 4dc84652ad..91e7423230 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -486,6 +486,12 @@ void initChangeTables(void) StatusIconChangeTable[SC_MANU_MATK] = SI_MANU_MATK; StatusIconChangeTable[SC_SPL_MATK] = SI_SPL_MATK; //Cash Items + StatusIconChangeTable[SC_FOOD_STR_CASH] = SI_FOOD_STR_CASH; + StatusIconChangeTable[SC_FOOD_AGI_CASH] = SI_FOOD_AGI_CASH; + StatusIconChangeTable[SC_FOOD_VIT_CASH] = SI_FOOD_VIT_CASH; + StatusIconChangeTable[SC_FOOD_DEX_CASH] = SI_FOOD_DEX_CASH; + StatusIconChangeTable[SC_FOOD_INT_CASH] = SI_FOOD_INT_CASH; + StatusIconChangeTable[SC_FOOD_LUK_CASH] = SI_FOOD_LUK_CASH; StatusIconChangeTable[SC_EXPBOOST] = SI_EXPBOOST; StatusIconChangeTable[SC_ITEMBOOST] = SI_ITEMBOOST; StatusIconChangeTable[SC_JEXPBOOST] = SI_CASH_PLUSONLYJOBEXP; @@ -550,6 +556,13 @@ void initChangeTables(void) StatusChangeFlagTable[SC_SPCOST_RATE] |= SCB_ALL; StatusChangeFlagTable[SC_WALKSPEED] |= SCB_SPEED; StatusChangeFlagTable[SC_ITEMSCRIPT] |= SCB_ALL; + // Cash Items + StatusChangeFlagTable[SC_FOOD_STR_CASH] = SCB_STR; + StatusChangeFlagTable[SC_FOOD_AGI_CASH] = SCB_AGI; + StatusChangeFlagTable[SC_FOOD_VIT_CASH] = SCB_VIT; + StatusChangeFlagTable[SC_FOOD_DEX_CASH] = SCB_DEX; + StatusChangeFlagTable[SC_FOOD_INT_CASH] = SCB_INT; + StatusChangeFlagTable[SC_FOOD_LUK_CASH] = SCB_LUK; // Mercenary Bonus Effects StatusChangeFlagTable[SC_MERC_FLEEUP] |= SCB_FLEE; StatusChangeFlagTable[SC_MERC_ATKUP] |= SCB_WATK; @@ -3192,6 +3205,8 @@ static unsigned short status_calc_str(struct block_list *bl, struct status_chang str += sc->data[SC_INCSTR]->val1; if(sc->data[SC_STRFOOD]) str += sc->data[SC_STRFOOD]->val1; + if(sc->data[SC_FOOD_STR_CASH]) + str += sc->data[SC_FOOD_STR_CASH]->val1; if(sc->data[SC_BATTLEORDERS]) str += 5; if(sc->data[SC_GUILDAURA] && sc->data[SC_GUILDAURA]->val3>>16) @@ -3233,6 +3248,8 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang agi += sc->data[SC_INCAGI]->val1; if(sc->data[SC_AGIFOOD]) agi += sc->data[SC_AGIFOOD]->val1; + if(sc->data[SC_FOOD_AGI_CASH]) + agi += sc->data[SC_FOOD_AGI_CASH]->val1; if(sc->data[SC_GUILDAURA] && (sc->data[SC_GUILDAURA]->val4)>>16) agi += (sc->data[SC_GUILDAURA]->val4)>>16; if(sc->data[SC_TRUESIGHT]) @@ -3268,6 +3285,8 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang vit += sc->data[SC_INCVIT]->val1; if(sc->data[SC_VITFOOD]) vit += sc->data[SC_VITFOOD]->val1; + if(sc->data[SC_FOOD_VIT_CASH]) + vit += sc->data[SC_FOOD_VIT_CASH]->val1; if(sc->data[SC_CHANGE]) vit += sc->data[SC_CHANGE]->val2; if(sc->data[SC_GUILDAURA] && sc->data[SC_GUILDAURA]->val3&0xFFFF) @@ -3297,6 +3316,8 @@ static unsigned short status_calc_int(struct block_list *bl, struct status_chang int_ += sc->data[SC_INCINT]->val1; if(sc->data[SC_INTFOOD]) int_ += sc->data[SC_INTFOOD]->val1; + if(sc->data[SC_FOOD_INT_CASH]) + int_ += sc->data[SC_FOOD_INT_CASH]->val1; if(sc->data[SC_CHANGE]) int_ += sc->data[SC_CHANGE]->val3; if(sc->data[SC_BATTLEORDERS]) @@ -3337,6 +3358,8 @@ static unsigned short status_calc_dex(struct block_list *bl, struct status_chang dex += sc->data[SC_INCDEX]->val1; if(sc->data[SC_DEXFOOD]) dex += sc->data[SC_DEXFOOD]->val1; + if(sc->data[SC_FOOD_DEX_CASH]) + dex += sc->data[SC_FOOD_DEX_CASH]->val1; if(sc->data[SC_BATTLEORDERS]) dex += 5; if(sc->data[SC_GUILDAURA] && sc->data[SC_GUILDAURA]->val4&0xFFFF) @@ -3376,6 +3399,8 @@ static unsigned short status_calc_luk(struct block_list *bl, struct status_chang luk += sc->data[SC_INCLUK]->val1; if(sc->data[SC_LUKFOOD]) luk += sc->data[SC_LUKFOOD]->val1; + if(sc->data[SC_FOOD_LUK_CASH]) + luk += sc->data[SC_FOOD_LUK_CASH]->val1; if(sc->data[SC_TRUESIGHT]) luk += 5; if(sc->data[SC_GLORIA]) @@ -6274,6 +6299,12 @@ int status_change_clear(struct block_list* bl, int type) case SC_HELLPOWER: case SC_JEXPBOOST: case SC_AUTOTRADE: + case SC_FOOD_STR_CASH: + case SC_FOOD_AGI_CASH: + case SC_FOOD_VIT_CASH: + case SC_FOOD_DEX_CASH: + case SC_FOOD_INT_CASH: + case SC_FOOD_LUK_CASH: continue; } @@ -7302,6 +7333,12 @@ int status_change_clear_buffs (struct block_list* bl, int type) case SC_BATKFOOD: case SC_WATKFOOD: case SC_MATKFOOD: + case SC_FOOD_STR_CASH: + case SC_FOOD_AGI_CASH: + case SC_FOOD_VIT_CASH: + case SC_FOOD_DEX_CASH: + case SC_FOOD_INT_CASH: + case SC_FOOD_LUK_CASH: continue; //Debuffs that can be removed. diff --git a/src/map/status.h b/src/map/status.h index e2ec346a4b..e46494a360 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -323,6 +323,12 @@ typedef enum sc_type { SC_SPL_DEF, //300 SC_MANU_MATK, SC_SPL_MATK, + SC_FOOD_STR_CASH, + SC_FOOD_AGI_CASH, + SC_FOOD_VIT_CASH, + SC_FOOD_DEX_CASH, + SC_FOOD_INT_CASH, + SC_FOOD_LUK_CASH, SC_MAX, //Automatically updated max, used in for's to check we are within bounds. } sc_type; @@ -601,12 +607,12 @@ enum si_type { // SI_DA_EDARKNESS = 268, // SI_DA_EGUARDIAN = 269, // SI_DA_TIMEOUT = 270, -// SI_FOOD_STR_CASH = 271, -// SI_FOOD_AGI_CASH = 272, -// SI_FOOD_VIT_CASH = 273, -// SI_FOOD_DEX_CASH = 274, -// SI_FOOD_INT_CASH = 275, -// SI_FOOD_LUK_CASH = 276, + SI_FOOD_STR_CASH = 271, + SI_FOOD_AGI_CASH = 272, + SI_FOOD_VIT_CASH = 273, + SI_FOOD_DEX_CASH = 274, + SI_FOOD_INT_CASH = 275, + SI_FOOD_LUK_CASH = 276, SI_MERC_FLEEUP = 277, SI_MERC_ATKUP = 278, SI_MERC_HPUP = 279, From 4a5136364d7dfdc6b9ad2795be9a5f3a133c6958 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 11 Oct 2010 06:22:03 +0000 Subject: [PATCH 013/129] Renamed Changelog-Trunk.txt to Changelog-Renewal.txt in renewal branch. Removed unnecessary notice from top of Changelog-Trunk.txt and Changelog-Renewal.txt regarding updating of stable branch. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14427 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt => Changelog-Renewal.txt | 3 --- 1 file changed, 3 deletions(-) rename Changelog-Trunk.txt => Changelog-Renewal.txt (99%) diff --git a/Changelog-Trunk.txt b/Changelog-Renewal.txt similarity index 99% rename from Changelog-Trunk.txt rename to Changelog-Renewal.txt index d2b287a575..18629909c2 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Renewal.txt @@ -1,8 +1,5 @@ Date Added -AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. -IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. - 2010/10/11 * Implemented official cash food behavior, including use delay, not being dispelled (including on death), distinct status effects and icons from the ordinary food types. (bugreport:2560) [Paradox924X] From 2e7d224a8e4af36d9d245c2adad5109821ccddf0 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 13 Oct 2010 07:33:18 +0000 Subject: [PATCH 014/129] Prevented @stpoint and @skpoint from causing overflows. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14428 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/atcommand.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 18629909c2..9c263747da 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/10/13 + * Prevented @stpoint and @skpoint from causing overflows. [Paradox924X] 2010/10/11 * Implemented official cash food behavior, including use delay, not being dispelled (including on death), distinct status effects and icons from the ordinary food types. (bugreport:2560) [Paradox924X] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 9fe589e734..44c44ff23a 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2857,7 +2857,7 @@ int atcommand_statuspoint(const int fd, struct map_session_data* sd, const char* if (point < 0 && sd->status.status_point < -point) new_status_point = 0; else - new_status_point = sd->status.status_point + point; + new_status_point = cap_value(sd->status.status_point + point, 0, INT_MAX); if (new_status_point != (int)sd->status.status_point) { sd->status.status_point = new_status_point; @@ -2890,7 +2890,7 @@ int atcommand_skillpoint(const int fd, struct map_session_data* sd, const char* if (point < 0 && sd->status.skill_point < -point) new_skill_point = 0; else - new_skill_point = sd->status.skill_point + point; + new_skill_point = cap_value(sd->status.skill_point + point, 0, INT_MAX); if (new_skill_point != (int)sd->status.skill_point) { sd->status.skill_point = new_skill_point; From 9134d4db5fc3a628f1a387e07731eceb514742c4 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 13 Oct 2010 10:22:59 +0000 Subject: [PATCH 015/129] Prevented direct transformation into dummy jobs via @jobchange command. (bugreport:4227) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14429 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/atcommand.c | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 9c263747da..7a14afbc8f 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/10/13 + * Prevented direct transformation into dummy jobs via @jobchange command. (bugreport:4227) [Paradox924X] * Prevented @stpoint and @skpoint from causing overflows. [Paradox924X] 2010/10/11 * Implemented official cash food behavior, including use delay, not being dispelled (including on death), diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 44c44ff23a..eccce4eb14 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1340,33 +1340,35 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c if (!found) { clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange )."); - clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 Peco Crusader"); + clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 N/A"); clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A"); clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice"); clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger"); clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja"); clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A"); - clif_displaymessage(fd, " 6 Thief 13 Peco Knight 20 Dancer"); - clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 Peco Paladin"); + clif_displaymessage(fd, " 6 Thief 13 N/A 20 Dancer 27 N/A"); + clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 N/A"); clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion"); clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor"); clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker"); clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator"); clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown"); - clif_displaymessage(fd, "4007 Thief High 4014 Peco Lord Knight 4021 Gypsy"); - clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 Baby Peco Crusader"); + clif_displaymessage(fd, "4007 Thief High 4014 N/A 4021 Gypsy"); + clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 N/A"); clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby"); clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid"); clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master"); clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A"); clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker"); - clif_displaymessage(fd, "4029 Baby Thief 4036 Baby Peco-Knight 4043 Baby Dancer"); + clif_displaymessage(fd, "4029 Baby Thief 4036 N/A 4043 Baby Dancer"); clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job."); return -1; } } - if (job == 37 ||job == 45) + if (job == 13 || job == 21 || job == 22 || job == 26 || job == 27 + || job == 4014 || job == 4022 || job == 4036 || job == 4044 || job == 4048 + ) // Deny direct transformation into dummy jobs return 0; if (pcdb_checkid(job)) @@ -1378,28 +1380,28 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c return -1; } } else { - clif_displaymessage(fd, "Please, enter a valid job ID (usage: @job/@jobchange )."); - clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 Peco Crusader"); + clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange )."); + clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 N/A"); clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A"); clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice"); clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger"); clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja"); clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A"); - clif_displaymessage(fd, " 6 Thief 13 Peco Knight 20 Dancer"); - clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 Peco Paladin"); + clif_displaymessage(fd, " 6 Thief 13 N/A 20 Dancer 27 N/A"); + clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 N/A"); clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion"); clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor"); clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker"); clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator"); clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown"); - clif_displaymessage(fd, "4007 Thief High 4014 Peco Lord Knight 4021 Gypsy"); - clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 Baby Peco Crusader"); + clif_displaymessage(fd, "4007 Thief High 4014 N/A 4021 Gypsy"); + clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 N/A"); clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby"); clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid"); clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master"); clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A"); clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker"); - clif_displaymessage(fd, "4029 Baby Thief 4036 Baby Peco-Knight 4043 Baby Dancer"); + clif_displaymessage(fd, "4029 Baby Thief 4036 N/A 4043 Baby Dancer"); clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job."); return -1; } From 1e060a7adeac6420a545b51da900a90a6b23ce3a Mon Sep 17 00:00:00 2001 From: Inkfish Date: Wed, 13 Oct 2010 10:26:04 +0000 Subject: [PATCH 016/129] Fixed a typo in quests_13_1 git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14430 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/quests_13_1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 1171e9c5ad..e1b885d5d5 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -14551,7 +14551,7 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{ mes "......"; next; mes "......"; - mes "............"; + mes "............"; next; cutin "moc2_kid03",2; mes "[Mr. Kidd]"; From bd13f5341746e9b2796cedd4211e2d4da1d5a667 Mon Sep 17 00:00:00 2001 From: Gepard Date: Sun, 17 Oct 2010 19:02:45 +0000 Subject: [PATCH 017/129] Fixed wrong char info packet size for clients after 2010-07-27 (follow-up to r14368). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14432 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/char/char.c | 2 +- src/char_sql/char.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 7a14afbc8f..4396326b29 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/10/17 + * Fixed wrong char info packet size for clients after 2010-07-27. (bugreport:4413) [Gepard] 2010/10/13 * Prevented direct transformation into dummy jobs via @jobchange command. (bugreport:4227) [Paradox924X] * Prevented @stpoint and @skpoint from causing overflows. [Paradox924X] diff --git a/src/char/char.c b/src/char/char.c index 5178791b58..b3e219e3e4 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1736,7 +1736,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset += 2; #endif -#if PACKETVER >= 20100721 +#if PACKETVER >= 20100720 && PACKETVER <= 20100727 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 4ddc3df317..b73b8c32ae 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1596,7 +1596,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset+=2; #endif -#if PACKETVER >= 20100721 +#if PACKETVER >= 20100720 && PACKETVER <= 20100727 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif From 355bb58f5ce24f9f9414721eabb2e73f170c046f Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Wed, 20 Oct 2010 04:19:42 +0000 Subject: [PATCH 018/129] * Updated stats for monsters that spawn on Prontera Fields. * Updated spawns for Prontera fields to Rewnewal. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14433 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 + db/mob_db.txt | 64 +++++++++++----------- npc/Changelog.txt | 2 + npc/mobs/fields/prontera.txt | 103 ++++++++++++----------------------- 4 files changed, 71 insertions(+), 100 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index ec2ab549de..f4fe6cd6e7 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/10/20 + * Rev. 14433 Updated stats for monsters that spawn on Prontera Fields. [L0ne_W0lf] 2010/10/11 * Updated cash items to use new cash food statuses. [Paradox924X] 2010/10/05 diff --git a/db/mob_db.txt b/db/mob_db.txt index d6caef1484..d703085bc8 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -5,23 +5,23 @@ // Note: Keep the Sprite_Name field as it is (in the game client). You may change Name,JName field tough 1001,SCORPION,Scorpion,Scorpion,24,1109,0,287,176,1,80,135,30,0,1,24,24,5,52,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1 -1002,PORING,Poring,Poring,1,50,0,2,1,1,7,10,0,5,1,1,1,0,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1 +1002,PORING,Poring,Poring,1,60,0,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1 //1003,TESTEGG,Test Egg,Test Egg,2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1004,HORNET,Hornet,Hornet,8,169,0,19,15,1,22,27,5,5,6,20,8,10,17,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1 +1004,HORNET,Hornet,Hornet,11,90,0,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1 1005,FARMILIAR,Familiar,Familiar,8,155,0,28,15,1,20,28,0,0,1,12,8,5,28,0,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1 //1006,THIEF_BUG_LARVA,Thief Bug Larva,Thief Bug Larva,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1007,FABRE,Fabre,Fabre,2,63,0,3,2,1,8,11,0,0,1,2,4,0,7,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1 +1007,FABRE,Fabre,Fabre,6,72,0,54,41,1,12,15,24,0,12,5,3,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1 1008,PUPA,Pupa,Pupa,2,427,0,2,4,0,1,2,0,20,1,1,1,0,1,20,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1 1009,CONDOR,Condor,Condor,5,92,0,6,5,1,11,14,0,0,1,13,5,0,13,10,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1 -1010,WILOW,Willow,Willow,4,95,0,5,4,1,9,12,5,15,1,4,8,30,9,10,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1 +1010,WILOW,Willow,Willow,8,91,0,63,47,1,13,18,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1 1011,CHONCHON,Chonchon,Chonchon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1 -1012,RODA_FROG,Roda Frog,Roda Frog,5,133,0,6,5,1,11,14,0,5,1,5,5,5,10,5,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1 +1012,RODA_FROG,Roda Frog,Roda Frog,13,160,0,90,68,1,19,23,12,5,12,6,4,0,14,9,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1 1013,WOLF,Wolf,Wolf,25,919,0,329,199,1,37,46,0,0,1,20,28,15,32,20,10,12,1,2,22,0x1089,200,1054,504,432,0,0,0,0,0,0,0,0,1011,20,920,9000,2308,10,517,650,528,1050,919,5500,578,600,0,0,0,0,4029,1 1014,SPORE,Spore,Spore,16,510,0,66,108,1,24,48,0,5,1,12,12,5,19,8,10,12,1,3,21,0x81,200,1872,672,288,0,0,0,0,0,0,0,0,921,9000,507,800,510,50,743,10,2220,40,7033,5,578,600,0,0,0,0,4022,1 1015,ZOMBIE,Zombie,Zombie,15,534,0,50,33,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,957,9000,724,5,938,1000,958,50,727,70,0,0,0,0,0,0,0,0,4038,1 1016,ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,31,3040,0,483,283,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,0x2085,300,2864,864,576,0,0,0,0,0,0,0,0,932,4500,756,70,2285,3,1708,35,1752,1000,507,1800,1701,150,0,0,0,0,4094,1 //1017,THIEF_BUG_FEMALE,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,651,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,400,0,0,0,0,4026,1 -1018,CREAMY,Creamy,Creamy,16,595,0,105,70,1,53,64,0,30,1,40,16,15,16,55,10,12,0,4,24,0x181,150,1136,720,840,0,0,0,0,0,0,0,0,924,9000,2322,10,518,150,602,100,2207,2,712,500,692,100,0,0,0,0,4040,1 +1018,CREAMY,Creamy,Creamy,23,378,0,144,162,1,61,62,28,20,16,1,1,0,1,20,10,12,0,4,24,0x181,150,1136,720,840,0,0,0,0,0,0,0,0,924,9000,2322,10,518,150,602,100,2207,2,712,500,692,100,0,0,0,0,4040,1 1019,PECOPECO,Peco Peco,Peco Peco,19,531,0,159,72,1,50,64,0,0,1,13,13,25,27,9,10,12,2,2,23,0x1089,200,1564,864,576,0,0,0,0,0,0,0,0,925,9000,2402,20,508,200,507,900,1604,100,0,0,582,1000,0,0,0,0,4031,1 1020,MANDRAGORA,Mandragora,Mandragora,12,405,0,45,32,4,26,35,0,25,1,12,24,0,36,15,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,993,50,905,9000,1405,30,511,350,711,300,706,3,1967,10,0,0,0,0,4030,1 //1021,THIEF_BUG_MALE,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,653,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 @@ -34,9 +34,9 @@ 1028,SOLDIER_SKELETON,Soldier Skeleton,Soldier Skeleton,29,2334,0,372,226,1,221,245,10,15,1,15,22,5,40,15,10,12,1,1,29,0x3885,200,2276,576,432,0,0,0,0,0,0,0,0,932,5500,756,60,1214,12,507,700,934,10,1201,150,1216,50,0,0,0,0,4086,1 1029,ISIS,Isis,Isis,47,7003,0,3709,1550,1,423,507,10,35,38,65,43,50,66,15,10,12,2,6,27,0x3195,200,1384,768,336,0,0,0,0,0,0,0,0,936,5335,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1 1030,ANACONDAQ,Anacondaq,Anacondaq,23,1109,0,300,149,1,124,157,0,0,1,23,28,10,36,5,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,0,1011,50,937,9000,1455,10,926,1500,936,200,508,150,756,50,0,0,0,0,4062,1 -1031,POPORING,Poporing,Poporing,14,344,0,81,44,1,59,72,0,10,1,14,14,0,19,15,10,12,1,3,25,0x83,300,1672,672,480,0,0,0,0,0,0,0,0,938,5500,910,1500,511,500,514,200,512,5,1207,5,512,250,0,0,0,0,4033,1 +1031,POPORING,Poporing,Poporing,30,524,0,198,224,1,74,94,36,17,17,26,20,18,36,5,10,12,1,3,25,0x83,300,1672,672,480,0,0,0,0,0,0,0,0,938,5500,910,1500,511,500,514,200,512,5,1207,5,512,250,0,0,0,0,4033,1 1032,VERIT,Verit,Verit,38,5272,0,835,517,1,389,469,0,5,1,19,38,0,38,20,10,12,1,1,29,0x83,250,2468,768,480,0,0,0,0,0,0,0,0,929,9000,912,700,930,1100,509,600,2609,1,2612,200,639,20,0,0,0,0,4107,1 -1033,ELDER_WILOW,Elder Willow,Elder Willow,20,693,0,163,101,1,58,70,10,30,1,20,25,35,38,30,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,0,990,50,907,9000,1019,350,757,40,2329,30,690,100,604,100,0,0,0,0,4052,1 +1033,ELDER_WILOW,Elder Willow,Elder Willow,34,599,0,233,263,1,80,94,45,30,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,0,990,50,907,9000,1019,350,757,40,2329,30,690,100,604,100,0,0,0,0,4052,1 1034,THARA_FROG,Thara Frog,Thara Frog,22,2152,0,219,138,1,105,127,0,10,1,22,22,5,34,10,10,12,1,5,41,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,1011,45,908,5500,911,600,509,30,725,5,918,2000,0,0,0,0,0,0,4058,1 1035,HUNTER_FLY,Hunter Fly,Hunter Fly,42,5242,0,1517,952,1,246,333,25,15,33,105,32,15,72,30,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,996,30,999,100,943,5335,912,1300,756,129,2259,1,1226,2,0,0,0,0,4115,1 1036,GHOUL,Ghoul,Ghoul,40,5418,0,1088,622,1,420,500,5,20,1,20,29,0,45,20,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,958,6000,756,110,509,700,511,800,2609,60,934,150,1260,1,0,0,0,0,4110,1 @@ -51,22 +51,22 @@ 1045,MARC,Marc,Marc,36,6900,0,988,625,1,220,280,5,10,1,36,36,20,56,30,10,12,1,5,41,0x3885,150,1272,72,480,0,0,0,0,0,0,0,0,995,18,956,9000,756,95,951,1000,720,10,717,200,509,700,0,0,0,0,4105,1 1046,DOPPELGANGER,Doppelganger,Doppelganger,72,249000,0,51480,10725,1,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,0x37B5,100,480,480,288,25740,10000,724,1500,505,6000,0,0,2317,250,1162,220,1168,150,2258,350,1411,550,985,3686,984,2700,0,0,0,0,4142,1 1047,PECOPECO_EGG,Peco Peco Egg,Peco Peco Egg,3,420,0,4,4,0,1,2,20,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,250,935,1500,2102,2,507,400,507,400,713,1800,736,10,0,0,0,0,4007,1 -1048,THIEF_BUG_EGG,Thief Bug Egg,Thief Bug Egg,4,48,0,8,4,0,13,17,20,0,1,6,4,0,14,20,10,12,0,4,27,0x100,1000,701,1,1,0,0,0,0,0,0,0,0,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,250,0,0,0,0,4012,1 +1048,THIEF_BUG_EGG,Thief Bug Egg,Thief Bug Egg,20,344,0,126,143,0,1,2,64,10,10,1,50,0,3,15,10,12,0,4,27,0x100,1000,701,1,1,0,0,0,0,0,0,0,0,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,250,0,0,0,0,4012,1 1049,PICKY,Picky,Picky,3,80,0,4,3,1,9,12,0,0,1,3,3,5,10,30,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,1 1050,PICKY_,Picky,Picky,4,83,0,5,4,1,8,11,20,0,1,3,3,10,11,20,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,1 -1051,THIEF_BUG,Thief Bug,Thief Bug,6,126,0,17,5,1,18,24,5,0,1,6,6,0,11,0,10,12,0,4,60,0x118B,150,1288,288,768,0,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1 -1052,ROCKER,Rocker,Rocker,9,198,0,20,16,1,24,29,5,10,1,9,18,10,14,15,10,12,1,4,22,0x181,200,1864,864,540,0,0,0,0,0,0,0,0,940,9000,1916,10,2298,4,1402,80,520,10,752,10,703,10,0,0,0,0,4021,1 +1051,THIEF_BUG,Thief Bug,Thief Bug,21,354,0,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x118B,150,1288,288,768,0,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1 +1052,ROCKER,Rocker,Rocker,15,185,0,99,74,1,19,24,16,3,12,18,8,10,17,5,10,12,1,4,22,0x181,200,1864,864,540,0,0,0,0,0,0,0,0,940,9000,1916,10,2298,4,1402,80,520,10,752,10,703,10,0,0,0,0,4021,1 1053,THIEF_BUG_,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1 1054,THIEF_BUG__,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 1055,MUKA,Muka,Muka,17,610,0,273,120,1,40,49,5,5,15,15,30,5,20,10,10,12,2,3,22,0x81,300,1960,960,384,0,0,0,0,0,0,0,0,993,70,952,9000,713,2000,511,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1 1056,SMOKIE,Smokie,Smokie,18,641,0,134,86,1,61,72,0,10,1,18,36,25,26,35,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,945,5500,919,5500,516,800,2213,1,754,2,912,5,729,2,0,0,0,0,4044,1 -1057,YOYO,Yoyo,Yoyo,21,879,0,280,111,1,71,82,0,0,1,24,30,35,32,55,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,0,942,9000,513,1500,508,200,7182,900,753,10,756,24,578,1000,0,0,0,0,4051,1 -1058,METALLER,Metaller,Metaller,22,926,0,241,152,1,131,159,15,30,1,22,22,20,49,50,10,12,1,4,23,0x118B,200,1708,1008,540,0,0,0,0,0,0,0,0,990,60,940,6500,911,400,757,49,707,20,935,3000,1914,10,0,0,0,0,4057,1 +1057,YOYO,Yoyo,Yoyo,38,898,0,270,305,1,63,74,40,0,20,11,34,20,10,10,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,0,942,9000,513,1500,508,200,7182,900,753,10,756,24,578,1000,0,0,0,0,4051,1 +1058,METALLER,Metaller,Metaller,55,1687,0,450,507,1,187,228,72,12,52,24,10,0,47,31,10,12,1,4,23,0x118B,200,1708,1008,540,0,0,0,0,0,0,0,0,990,60,940,6500,911,400,757,49,707,20,935,3000,1914,10,0,0,0,0,4057,1 1059,MISTRESS,Mistress,Mistress,74,212000,0,39325,27170,1,880,1110,40,60,50,165,60,95,70,130,10,12,0,4,84,0x37B5,100,1148,648,300,19662,10000,996,1500,526,4000,722,3000,1413,150,518,10000,2249,250,616,1000,7018,10,985,4268,16001,100,0,0,0,0,4132,1 1060,BIGFOOT,Bigfoot,Bigfoot,25,1619,0,310,188,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,948,9000,2289,5,919,5000,740,80,516,1500,518,450,756,43,0,0,0,0,4074,1 1061,NIGHTMARE,Nightmare,Nightmare,49,4437,0,1912,1912,1,447,529,0,40,1,74,25,15,64,10,10,12,2,6,68,0x3395,150,1816,816,432,0,0,0,0,0,0,0,0,944,6000,510,500,2608,2,603,30,505,100,1261,1,984,60,0,0,0,0,4127,1 1062,PORING_,Santa Poring,Santa Poring,3,69,0,4,5,1,12,16,0,0,1,14,3,10,12,90,10,12,1,3,26,0x81,400,1672,672,480,0,0,0,0,0,0,0,0,529,2000,530,1000,507,1000,512,1000,2236,100,512,7,0,0,0,0,0,0,4005,1 -1063,LUNATIC,Lunatic,Lunatic,3,60,0,6,2,1,9,12,0,20,1,3,3,10,8,60,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,0,0,0,0,4006,1 +1063,LUNATIC,Lunatic,Lunatic,3,55,0,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,0,0,0,0,4006,1 1064,MEGALODON,Megalodon,Megalodon,24,1648,0,215,132,1,155,188,0,15,1,12,24,0,26,5,10,12,1,1,29,0x81,200,2492,792,432,0,0,0,0,0,0,0,0,959,5500,932,1500,510,80,717,120,719,10,603,2,624,20,0,0,0,0,4067,1 1065,STROUF,Strouf,Strouf,48,11990,0,3080,2098,1,200,1250,5,50,1,40,45,92,43,65,10,12,2,5,61,0x3885,150,1872,672,384,0,0,0,0,0,0,0,0,951,5335,756,115,2241,2,1461,2,949,3000,720,20,956,1500,0,0,0,0,4111,1 1066,VADON,Vadon,Vadon,19,1017,0,135,85,1,74,85,20,0,1,19,16,10,36,15,10,12,0,5,21,0x91,300,1632,432,540,0,0,0,0,0,0,0,0,991,40,960,9000,910,3000,2313,5,943,100,757,40,717,50,0,0,0,0,4049,1 @@ -91,13 +91,13 @@ 1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,7033,5500,0,0,0,0 1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,64,126000,0,14300,7150,1,870,1145,60,45,65,75,35,45,85,150,10,12,2,4,43,0x11AB,100,768,768,480,7150,10000,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1 1087,ORK_HERO,Orc Hero,Orc Hero,77,585700,0,58630,32890,1,2257,2542,40,45,1,91,30,70,105,90,10,12,2,7,42,0x37B5,150,1678,780,648,29315,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1 -1088,VOCAL,Vocal,Vocal,18,3016,0,110,88,1,71,82,10,30,77,28,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,645,700,1917,10,0,0,0,0,4211,1 +1088,VOCAL,Vocal,Vocal,18,3317,0,99,79,1,71,82,77,26,77,26,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,645,700,1917,10,0,0,0,0,4211,1 1089,TOAD,Toad,Toad,10,5065,0,100,50,1,26,32,0,0,1,5,10,10,10,25,10,12,1,5,21,0x37B5,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,5125,1000,0,0,0,0,4306,1 1090,MASTERING,Mastering,Mastering,2,2415,0,30,10,1,18,24,0,10,1,2,2,0,17,60,10,12,1,3,21,0x37B5,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,2116,1000,512,8000,512,8000,531,4000,0,0,0,0,4197,1 1091,DRAGON_FLY,Dragon Fly,Dragon Fly,8,2400,0,88,44,1,22,27,40,0,1,20,8,15,17,5,10,12,0,4,24,0x37B5,100,1076,576,480,0,0,0,0,0,0,0,0,2245,200,507,8000,719,1500,742,2000,2607,3000,625,50,533,3000,0,0,0,0,4179,1 1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,24,12240,0,247,176,1,135,159,10,0,57,45,48,20,50,65,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,725,10,626,50,0,0,0,0,4183,1 -1093,ECLIPSE,Eclipse,Eclipse,6,1800,0,60,55,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,746,1500,706,30,622,50,2355,1000,0,0,0,0,4266,1 -1094,AMBERNITE,Ambernite,Ambernite,13,495,0,57,38,1,39,46,30,0,1,13,13,5,18,5,10,12,2,4,21,0x191,400,2048,648,648,0,0,0,0,0,0,0,0,991,50,946,9000,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1 +1093,ECLIPSE,Eclipse,Eclipse,31,625,0,207,233,1,60,80,50,20,20,28,35,17,27,55,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,746,1500,706,30,622,50,2355,1000,0,0,0,0,4266,1 +1094,AMBERNITE,Ambernite,Ambernite,19,340,0,117,87,1,26,37,28,0,16,20,11,10,21,5,10,12,2,4,21,0x191,400,2048,648,648,0,0,0,0,0,0,0,0,991,50,946,9000,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1 1095,ANDRE,Andre,Andre,17,688,0,109,71,1,60,71,10,0,1,17,24,20,26,20,10,12,0,4,22,0x118B,300,1288,288,384,0,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1 1096,ANGELING,Angeling,Angeling,20,55000,0,163,144,1,120,195,0,70,1,50,20,75,68,200,10,12,1,8,86,0x37B5,200,1072,672,672,0,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,509,2000,512,28,714,40,0,0,0,0,4054,1 1097,ANT_EGG,Ant Egg,Ant Egg,4,420,0,5,4,0,1,2,20,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,320,935,2000,909,2000,938,650,713,2000,1002,200,0,0,0,0,0,0,4013,1 @@ -107,7 +107,7 @@ 1101,BAPHOMET_,Baphomet Jr.,Baphomet Jr.,50,8578,0,2706,1480,1,487,590,15,25,1,75,55,1,93,45,10,12,0,6,27,0x3795,100,868,480,120,0,0,0,0,0,0,0,0,923,500,984,63,1464,2,607,50,610,100,508,1300,2405,50,0,0,0,0,4129,1 1102,BATHORY,Bathory,Bathory,44,5415,0,2503,1034,1,198,398,0,60,1,76,24,85,65,15,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,0,1001,200,1061,4850,2252,3,1611,5,1000,30,1006,15,637,20,0,0,0,0,4119,1 1103,CARAMEL,Caramel,Caramel,23,1424,0,264,162,1,90,112,5,5,35,23,46,5,38,10,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1 -1104,COCO,Coco,Coco,17,817,0,120,78,1,56,67,0,0,24,17,34,20,24,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1 +1104,COCO,Coco,Coco,38,836,0,270,305,1,71,82,37,0,22,13,30,20,38,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1 1105,DENIRO,Deniro,Deniro,19,760,0,135,85,1,68,79,15,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1 1106,DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,427,266,1,169,208,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,1217,140,0,0,0,0,4082,1 1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,9,164,0,20,16,1,30,36,0,0,1,9,9,5,21,40,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,517,600,2301,200,13011,5,582,1000,0,0,0,0,4023,1 @@ -125,13 +125,13 @@ 1119,FRILLDORA,Frilldora,Frilldora,30,2023,0,529,319,1,200,239,0,10,35,30,38,15,53,30,10,12,1,2,23,0x3885,300,1540,720,432,0,0,0,0,0,0,0,0,1012,5500,757,90,903,1500,721,15,715,200,507,800,912,120,0,0,0,0,4088,1 1120,GHOSTRING,Ghostring,Ghostring,18,73300,0,101,108,1,82,122,0,60,40,27,18,45,72,30,10,12,1,6,88,0x37B5,300,1220,1080,648,0,0,0,0,0,0,0,0,1059,5335,2274,100,2336,50,604,500,603,10,714,30,695,100,0,0,0,0,4047,1 1121,GIEARTH,Giearth,Giearth,29,2252,0,495,301,1,154,185,10,50,25,29,46,60,64,105,10,12,0,6,22,0x191,200,1848,1296,432,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2227,10,1001,100,0,0,0,0,0,0,4087,1 -1122,GOBLIN_1,Goblin,Goblin,25,1176,0,310,188,1,118,140,10,5,1,53,25,20,38,10,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,998,270,911,9000,756,43,2297,3,1211,10,2104,5,507,1800,0,0,0,0,4060,1 -1123,GOBLIN_2,Goblin,Goblin,24,1034,0,287,176,1,88,100,10,5,1,24,24,15,66,10,10,12,1,7,23,0x3095,150,1320,620,240,0,0,0,0,0,0,0,0,998,250,911,9000,5010,3,1511,10,2104,1,507,1550,2297,3,0,0,0,0,4060,1 -1124,GOBLIN_3,Goblin,Goblin,24,1034,0,357,176,1,132,165,10,5,1,24,24,15,24,10,10,12,1,7,25,0x308D,250,1624,624,240,0,0,0,0,0,0,0,0,998,230,911,9000,2275,3,5088,15,2104,1,507,1550,508,220,0,0,0,0,4060,1 -1125,GOBLIN_4,Goblin,Goblin,23,1359,0,264,164,1,109,131,10,5,1,23,46,15,36,10,10,12,1,7,22,0x308D,200,1624,624,240,0,0,0,0,0,0,0,0,993,100,998,170,5087,15,2263,3,1508,10,2104,1,507,1500,0,0,0,0,4060,1 -1126,GOBLIN_5,Goblin,Goblin,22,1952,0,241,152,1,105,127,10,5,1,22,22,15,32,10,10,12,1,7,21,0x308D,300,3074,1874,480,0,0,0,0,0,0,0,0,998,150,911,9000,1605,15,2104,1,5089,15,507,1500,508,220,0,0,0,0,4060,1 +1122,GOBLIN_1,Goblin,Goblin,48,1058,0,369,414,1,87,121,56,5,37,54,25,20,36,10,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,998,270,911,9000,756,43,2297,3,1211,10,2104,5,507,1800,0,0,0,0,4060,1 +1123,GOBLIN_2,Goblin,Goblin,44,931,0,333,374,1,94,122,52,5,33,16,24,15,58,10,10,12,1,7,23,0x3095,150,1320,620,240,0,0,0,0,0,0,0,0,998,250,911,9000,5010,3,1511,10,2104,1,507,1550,2297,3,0,0,0,0,4060,1 +1124,GOBLIN_3,Goblin,Goblin,44,930,0,333,374,1,88,121,47,5,30,16,24,15,17,10,10,12,1,7,25,0x308D,250,1624,624,240,0,0,0,0,0,0,0,0,998,230,911,9000,2275,3,5088,15,2104,1,507,1550,508,220,0,0,0,0,4060,1 +1125,GOBLIN_4,Goblin,Goblin,49,1494,0,396,446,1,72,94,70,3,31,27,46,15,34,10,10,12,1,7,22,0x308D,200,1624,624,240,0,0,0,0,0,0,0,0,993,100,998,170,5087,15,2263,3,1508,10,2104,1,507,1500,0,0,0,0,4060,1 +1126,GOBLIN_5,Goblin,Goblin,56,2342,0,486,548,1,159,190,64,5,51,37,22,15,38,10,10,12,1,7,21,0x308D,300,3074,1874,480,0,0,0,0,0,0,0,0,998,150,911,9000,1605,15,2104,1,5089,15,507,1500,508,220,0,0,0,0,4060,1 1127,HODE,Hode,Hode,26,2282,0,550,300,1,146,177,0,30,1,26,42,5,49,40,10,12,1,2,42,0x81,200,1480,480,720,0,0,0,0,0,0,0,0,993,120,1055,9000,757,80,938,3000,1147,10,7021,1,632,20,0,0,0,0,4081,1 -1128,HORN,Horn,Horn,18,659,0,134,86,1,58,69,10,0,22,18,28,10,47,15,10,12,1,4,22,0x191,200,1528,528,288,0,0,0,0,0,0,0,0,993,80,1011,35,947,5500,1452,15,935,5500,943,70,0,0,0,0,0,0,4045,1 +1128,HORN,Horn,Horn,32,705,0,216,243,1,64,75,52,8,10,12,36,25,21,35,10,12,1,4,22,0x191,200,1528,528,288,0,0,0,0,0,0,0,0,993,80,1011,35,947,5500,1452,15,935,5500,943,70,0,0,0,0,0,0,4045,1 1129,HORONG,Horong,Horong,34,1939,0,786,479,1,275,327,99,50,1,34,10,0,50,0,10,12,0,0,83,0x308D,400,1888,1152,828,0,0,0,0,0,0,0,0,953,6500,912,500,2279,5,1752,10000,757,118,633,20,970,50,0,0,0,0,4103,1 1130,JAKK,Jakk,Jakk,38,3581,0,1408,880,1,315,382,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,0,1062,9000,912,900,985,31,2331,5,1008,5,535,1000,0,0,0,0,0,0,4109,1 1131,JOKER,Joker,Joker,57,12450,0,3706,2362,1,621,738,10,35,1,143,47,75,98,175,10,12,2,7,84,0x3695,100,1364,864,432,0,0,0,0,0,0,0,0,912,2000,616,2,641,20,508,1000,1259,1,984,100,695,100,0,0,0,0,4139,1 @@ -141,7 +141,7 @@ 1135,KOBOLD_3,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x308D,300,1228,528,360,0,0,0,0,0,0,0,0,990,35,999,100,1034,5335,912,200,1355,5,2104,3,508,100,0,0,0,0,4091,1 //1136,KOBOLD_4,Kobold,Kobold,31,2179,0,806,407,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,0x31AD,200,1528,528,360,0,0,0,0,0,0,0,0,999,50,1034,5335,912,100,1355,5,2104,3,508,100,1301,150,0,0,0,0,4091,1 //1137,KOBOLD_5,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x31AD,300,1228,528,360,0,0,0,0,0,0,0,0,999,40,1034,5335,912,100,1514,5,2104,3,508,100,1501,150,0,0,0,0,4091,1 -1138,MAGNOLIA,Magnolia,Magnolia,26,3195,0,393,248,1,120,151,5,30,1,26,26,0,39,5,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,508,400,12127,5,0,0,0,0,4076,1 +1138,MAGNOLIA,Magnolia,Magnolia,53,1984,0,441,495,1,91,256,51,8,49,25,21,50,28,85,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,508,400,12127,5,0,0,0,0,4076,1 1139,MANTIS,Mantis,Mantis,26,2472,0,393,248,1,118,149,10,0,1,26,24,5,45,15,10,12,1,4,22,0x3195,200,1528,660,432,0,0,0,0,0,0,0,0,993,110,1031,9000,911,1400,757,70,943,250,721,10,507,650,0,0,0,0,4079,1 1140,MARDUK,Marduk,Marduk,40,4214,0,1238,752,1,315,382,0,60,1,40,20,79,78,20,10,12,2,7,23,0x3095,300,1540,840,504,0,0,0,0,0,0,0,0,994,35,1045,4365,1608,10,2617,1,1614,3,691,100,642,20,0,0,0,0,4112,1 1141,MARINA,Marina,Marina,21,2087,0,218,140,1,84,106,0,5,1,21,21,0,36,10,10,12,0,3,41,0x81,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1 @@ -170,14 +170,14 @@ 1164,REQUIEM,Requiem,Requiem,35,3089,0,800,458,1,220,272,0,15,1,53,35,5,57,2,10,12,1,7,27,0x3885,400,1516,816,432,0,0,0,0,0,0,0,0,603,35,714,1,912,2500,958,3500,934,1500,2308,10,7477,1,0,0,0,0,4104,1 1165,SAND_MAN,Sandman,Sandman,34,3413,0,810,492,1,180,205,10,25,24,34,58,38,60,5,10,12,1,0,62,0x3885,250,1672,720,288,0,0,0,0,0,0,0,0,997,35,1056,5335,757,118,7043,350,1001,200,1257,1,1622,5,0,0,0,0,4101,1 1166,SAVAGE,Savage,Savage,26,2092,0,521,248,1,120,150,10,5,1,26,54,10,37,15,10,12,2,2,42,0x91,150,1960,960,384,0,0,0,0,0,0,0,0,1028,9000,514,300,702,2,2276,1,605,10,757,70,526,2,0,0,0,0,4078,1 -1167,SAVAGE_BABE,Savage Babe,Savage Babe,7,182,0,14,12,1,20,25,0,0,1,7,14,5,12,35,10,12,0,2,22,0x81,400,1624,624,576,0,0,0,0,0,0,0,0,919,9000,1302,100,517,500,1750,1000,949,850,1010,80,627,40,0,0,0,0,4017,1 +1167,SAVAGE_BABE,Savage Babe,Savage Babe,14,180,0,90,68,1,19,25,22,0,16,8,9,5,21,18,10,12,0,2,22,0x81,400,1624,624,576,0,0,0,0,0,0,0,0,919,9000,1302,100,517,500,1750,1000,949,850,1010,80,627,40,0,0,0,0,4017,1 //1168,SCORPION_KING,Scorpion King,Scorpion King,50,6354,0,2187,1346,1,500,603,40,10,1,50,47,1,83,30,10,12,2,7,23,0x1B1,200,1700,1000,500,0,0,0,0,0,0,0,0,994,45,1046,4850,1005,15,904,5000,943,3000,509,700,0,0,0,0,0,0,4130,1 1169,SKEL_WORKER,Skeleton Worker,Skeleton Worker,30,2872,0,397,240,1,242,288,0,15,1,15,30,5,42,10,10,12,1,1,29,0x3885,400,2420,720,384,0,0,0,0,0,0,0,0,998,400,1041,5500,757,90,5009,2,999,100,1003,200,1002,800,0,0,0,0,4092,1 1170,SOHEE,Sohee,Sohee,33,5628,0,739,455,1,210,251,0,10,1,33,33,10,58,15,10,12,1,6,21,0x191,250,2112,912,576,0,0,0,0,0,0,0,0,1020,9000,1049,50,2277,1,2504,5,1217,5,507,1000,662,350,0,0,0,0,4100,1 //1171,SOLDIER_ANDRE,Soldier Andre,Soldier Andre,22,1245,0,219,138,1,105,127,20,0,1,22,44,20,40,10,10,12,0,4,42,0x3095,200,1001,1,1,0,0,0,0,0,0,0,0,1014,2700,911,800,757,10,1111,15,1001,30,943,150,0,0,0,0,0,0,4059,1 //1172,SOLDIER_DENIRO,Soldier Deniro,Soldier Deniro,29,2047,0,450,274,1,162,193,20,0,1,29,58,20,54,10,10,12,0,4,42,0x3095,200,2000,1000,500,0,0,0,0,0,0,0,0,1014,5500,911,2000,757,15,1111,20,943,270,1001,50,0,0,0,0,0,0,4059,1 //1173,SOLDIER_PIERE,Soldier Piere,Soldier Piere,23,1217,0,240,149,1,109,131,25,0,1,23,46,20,38,10,10,12,0,4,42,0x3095,200,1001,1,1,0,0,0,0,0,0,0,0,1014,3100,911,800,911,10,1114,15,1001,35,943,200,0,0,0,0,0,0,4059,1 -1174,STAINER,Stainer,Stainer,16,538,0,105,70,1,53,64,10,0,1,40,16,5,30,5,10,12,0,4,24,0x191,200,1688,1188,612,0,0,0,0,0,0,0,0,992,70,1011,30,1013,9000,910,2100,757,25,943,10,1002,300,0,0,0,0,4039,1 +1174,STAINER,Stainer,Stainer,21,365,0,126,143,1,65,74,65,74,10,10,24,5,39,15,10,12,0,4,24,0x191,200,1688,1188,612,0,0,0,0,0,0,0,0,992,70,1011,30,1013,9000,910,2100,757,25,943,10,1002,300,0,0,0,0,4039,1 1175,TAROU,Tarou,Tarou,11,284,0,57,28,1,34,45,0,0,1,20,11,10,24,5,10,12,0,2,27,0x91,150,1744,1044,684,0,0,0,0,0,0,0,0,1016,9000,919,3000,949,800,528,1000,701,2,0,0,0,0,0,0,0,0,4028,1 1176,VITATA,Vitata,Vitata,20,894,0,163,101,1,69,80,15,20,1,20,25,65,40,70,10,12,0,4,22,0x191,300,1768,768,384,0,0,0,0,0,0,0,0,993,90,955,5000,911,200,518,350,518,350,526,200,756,26,0,0,0,0,4053,1 1177,ZENORC,Zenorc,Zenorc,31,2585,0,967,407,1,188,223,0,15,1,77,15,0,76,10,10,12,1,7,27,0x83,150,1180,480,360,0,0,0,0,0,0,0,0,1044,5500,756,70,938,2500,1006,5,508,100,640,20,0,0,0,0,0,0,4096,1 @@ -217,7 +217,7 @@ 1211,BRILIGHT,Brilight,Brilight,46,5562,0,1826,1331,1,298,383,30,5,1,90,15,10,50,35,10,12,0,4,23,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7009,5335,992,200,912,1200,602,1000,757,220,610,250,509,2600,0,0,0,0,4213,1 1212,IRON_FIST,Iron Fist,Iron Fist,47,4221,0,1435,1520,1,430,590,40,5,1,25,15,10,81,20,10,12,1,4,60,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7010,5335,757,229,757,22,1002,750,999,180,998,300,0,0,0,0,0,0,4239,1 1213,HIGH_ORC,High Orc,High Orc,52,6890,0,3618,1639,1,428,533,15,5,55,46,55,35,82,40,10,12,2,7,43,0x3695,150,1500,500,1000,0,0,0,0,0,0,0,0,7002,2500,1304,10,999,90,931,7500,912,1300,756,196,508,900,0,0,0,0,4322,1 -1214,CHOCO,Choco,Choco,43,4278,0,1265,1265,1,315,402,5,5,65,68,55,45,65,25,10,12,0,2,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1 +1214,CHOCO,Choco,Choco,48,1080,0,369,414,1,120,167,70,30,40,45,32,19,42,20,10,12,0,2,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1 1215,STEM_WORM,Stem Worm,Stem Worm,40,6136,0,1452,939,2,290,375,5,10,1,30,26,15,79,35,10,12,1,3,24,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,1454,20,608,45,0,0,0,0,4224,1 1216,PENOMENA,Penomena,Penomena,57,7256,0,2870,2200,7,415,565,5,50,1,5,35,15,136,30,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1 1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,79,36140,0,8469,6268,1,1600,2150,55,50,66,68,64,25,135,50,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,1162,1,985,369,984,259,0,0,0,0,4140,1 @@ -259,7 +259,7 @@ 1255,NERAID,Neraid,Nereid,40,4120,0,1126,684,1,325,360,0,10,1,45,50,5,64,5,10,12,0,2,22,0x3695,200,776,576,288,0,0,0,0,0,0,0,0,1055,5100,7053,1000,510,230,1966,10,514,250,757,180,985,37,0,0,0,0,4167,1 1256,PEST,Pest,Pest,40,3240,0,1238,752,1,375,450,0,5,1,60,22,5,80,5,10,12,0,2,47,0x3695,165,700,648,480,0,0,0,0,0,0,0,0,1055,5500,7054,200,702,10,605,100,716,250,0,0,756,115,0,0,0,0,4315,1 1257,INJUSTICE,Injustice,Injustice,51,7600,0,2118,1488,1,480,600,0,0,84,42,39,0,71,35,10,12,1,1,47,0x3695,400,770,720,336,0,0,0,0,0,0,0,0,999,300,7054,5335,7053,3500,2313,5,2316,2,660,2,1255,2,0,0,0,0,4268,1 -1258,GOBLIN_ARCHER,Goblin Archer,Goblin Archer,28,1750,0,461,284,9,89,113,0,0,10,15,20,15,72,20,10,12,0,7,25,0x2085,200,1172,672,420,0,0,0,0,0,0,0,0,2297,3,998,250,911,1000,1765,3000,507,600,1705,25,514,300,0,0,0,0,4157,1 +1258,GOBLIN_ARCHER,Goblin Archer,Goblin Archer,55,1575,0,450,507,9,95,119,69,0,50,34,20,15,48,20,10,12,0,7,25,0x2085,200,1172,672,420,0,0,0,0,0,0,0,0,2297,3,998,250,911,1000,1765,3000,507,600,1705,25,514,300,0,0,0,0,4157,1 1259,GRYPHON,Gryphon,Gryphon,72,27800,0,5896,4400,1,880,1260,35,35,68,95,78,65,115,75,10,12,2,2,84,0x37B5,100,704,504,432,0,0,0,0,0,0,0,0,7048,2500,7054,5335,7063,120,1452,1500,1417,1,984,185,996,150,0,0,0,0,4163,1 1260,DARK_FRAME,Dark Frame,Dark Frame,59,7500,0,3652,3271,1,960,1210,10,45,1,72,42,45,85,25,10,12,1,6,67,0x3795,200,920,720,200,0,0,0,0,0,0,0,0,7054,4656,734,1000,2505,30,0,0,0,0,1000,80,747,3,0,0,0,0,4170,1 1261,WILD_ROSE,Wild Rose,Wild Rose,38,2980,0,1113,688,1,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,0x83,100,964,864,288,0,0,0,0,0,0,0,0,7053,5335,748,50,5037,120,1767,3000,624,35,528,600,2244,2,0,0,0,0,4257,1 @@ -281,7 +281,7 @@ 1277,GREATEST_GENERAL,Greatest General,Greatest General,40,3632,0,1238,752,3,350,400,15,15,1,20,60,55,82,140,10,12,1,0,43,0x84,200,1152,1152,384,0,0,0,0,0,0,0,0,7054,2000,1019,2000,1501,100,662,300,2272,1,508,250,686,100,0,0,0,0,4283,1 1278,STALACTIC_GOLEM,Stalactic Golem,Stalactic Golem,60,18700,0,5808,2695,1,950,1260,50,5,73,45,85,5,90,25,10,12,2,0,80,0x91,200,1264,864,288,0,0,0,0,0,0,0,0,7004,2000,7054,4850,1000,250,997,30,757,250,0,0,985,163,0,0,0,0,4223,1 1279,TRI_JOINT,Tri Joint,Tri Joint,32,2300,0,386,220,1,178,206,20,5,1,48,24,10,67,20,10,12,0,4,22,0x3795,200,860,660,624,0,0,0,0,0,0,0,0,7053,100,943,380,606,200,993,160,1001,140,0,0,757,106,0,0,0,0,4308,1 -1280,STEAM_GOBLIN,Steam Goblin,Goblin Steamrider,35,2490,0,864,495,1,234,269,20,5,58,59,32,15,75,25,10,12,1,7,44,0x91,200,1008,1008,528,0,0,0,0,0,0,0,0,911,2500,7053,3880,998,300,999,55,1003,320,13104,5,757,124,0,0,0,0,4156,1 +1280,STEAM_GOBLIN,Steam Goblin,Goblin Steamrider,66,2241,0,680,765,1,280,315,85,5,52,61,32,15,82,25,10,12,1,7,44,0x91,200,1008,1008,528,0,0,0,0,0,0,0,0,911,2500,7053,3880,998,300,999,55,1003,320,13104,5,757,124,0,0,0,0,4156,1 1281,SAGEWORM,Sage Worm,Sage Worm,43,3850,0,1155,1320,1,120,280,0,50,1,52,24,88,79,55,10,12,0,2,60,0x91,200,936,936,288,0,0,0,0,0,0,0,0,2716,5,1097,1000,1055,3000,691,100,505,40,689,100,5012,1,0,0,0,0,4219,1 1282,KOBOLD_ARCHER,Kobold Archer,Kobold Archer,33,2560,0,739,455,9,155,185,10,5,10,20,15,30,100,25,10,12,0,7,23,0x2085,200,1008,1008,384,0,0,0,0,0,0,0,0,912,250,999,60,1034,4850,5118,50,1763,2000,1711,5,756,79,0,0,0,0,4292,1 1283,CHIMERA,Chimera,Chimera,70,32600,0,4950,3000,1,1200,1320,30,10,1,72,110,88,75,85,10,12,2,2,63,0x37B5,200,772,672,360,0,0,0,0,0,0,0,0,7054,5335,1048,2500,568,1000,1306,1,7295,1500,1364,1,984,160,0,0,0,0,4300,1 @@ -309,7 +309,7 @@ 1305,ANCIENT_WORM,Ancient Worm,Ancient Worm,67,22598,0,8174,3782,1,948,1115,35,30,5,35,56,55,81,72,10,12,2,4,25,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,1042,4413,912,2500,2406,9,2727,5,1096,680,938,3500,7054,2500,0,0,0,0,4249,1 1306,LEIB_OLMAI,Leib Olmai,Leib Olmai,58,24233,0,6011,2171,1,740,1390,27,31,5,35,95,5,64,85,10,12,2,2,22,0x3695,175,1260,230,192,0,0,0,0,0,0,0,0,948,4550,2289,8,740,120,518,500,2717,5,969,5,7053,800,0,0,0,0,4188,1 1307,CAT_O_NINE_TAIL,Cat o' Nine Tails,Cat o' Nine Tails,76,64512,0,10869,4283,1,1112,1275,61,55,55,75,55,82,86,120,10,12,1,6,63,0x37B5,155,1276,576,288,0,0,0,0,0,0,0,0,5008,1,638,150,10008,5,985,600,984,800,969,6,617,1,0,0,0,0,4290,1 -1308,PANZER_GOBLIN,Panzer Goblin,Panzer Goblin,59,14130,0,7212,2697,1,683,878,41,28,60,60,40,20,81,160,10,12,1,7,44,0x3695,200,960,1008,840,0,0,0,0,0,0,0,0,7053,4413,7054,3500,999,180,998,360,1003,580,13158,5,994,160,0,0,0,0,4310,1 +1308,PANZER_GOBLIN,Panzer Goblin,Panzer Goblin,52,1471,0,446,504,1,122,180,60,25,62,60,35,35,68,31,10,12,1,7,44,0x3695,200,960,1008,840,0,0,0,0,0,0,0,0,7053,4413,7054,3500,999,180,998,360,1003,580,13158,5,994,160,0,0,0,0,4310,1 1309,GAJOMART,Gajomart,Gajomart,63,13669,0,6625,2900,1,917,950,85,50,5,34,10,5,75,140,10,12,0,0,83,0x3695,300,1000,1152,828,0,0,0,0,0,0,0,0,953,6500,912,2300,508,870,2279,8,1752,10000,2131,20,994,180,0,0,0,0,4151,1 1310,MAJORUROS,Majoruros,Majoruros,66,57991,0,8525,3799,1,780,1300,10,25,65,50,75,50,85,48,10,12,2,2,43,0x3695,250,1100,960,780,0,0,0,0,0,0,0,0,941,4413,1361,4,568,300,984,16,509,1850,2611,160,1000,250,0,0,0,0,4201,1 1311,GULLINBURSTI,Gullinbursti,Gullinbursti,62,21331,0,5814,2376,1,699,1431,10,15,55,25,60,5,70,45,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,1028,3500,514,290,702,6,2276,1,605,15,2627,1,912,160,0,0,0,0,4164,1 @@ -393,7 +393,7 @@ 1389,DRACULA,Dracula,Dracula,85,320096,0,120157,38870,3,1625,1890,45,76,1,95,90,87,85,100,10,12,2,6,87,0x37B5,145,1290,1140,576,60078,10000,607,5500,732,5000,522,5000,607,4700,1473,5,1722,5,2507,15,2621,4,1557,4,0,0,0,0,0,0,4134,1 1390,VIOLY,Violy,Violy,75,18257,0,6353,3529,10,738,982,37,36,1,93,54,58,101,83,10,12,1,7,40,0x2085,170,1356,1056,540,0,0,0,0,0,0,0,0,1060,6305,12127,50,740,1200,1919,50,526,1400,12020,1000,1902,500,0,0,0,0,4209,1 1391,GALAPAGO,Galapago,Galapago,61,9145,0,3204,1966,1,457,608,33,33,1,56,56,45,66,57,10,12,0,2,22,0x108B,165,1430,1080,1080,0,0,0,0,0,0,0,0,7053,5335,610,100,508,3500,606,100,605,100,5111,1,582,1000,0,0,0,0,4152,1 -1392,ROTAR_ZAIRO,Rotar Zairo,Rotar Zairo,25,1209,0,351,215,10,109,137,4,34,1,62,45,26,55,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,7126,500,2312,1,7053,1000,999,450,984,1,912,2500,910,5500,0,0,0,0,4192,1 +1392,ROTAR_ZAIRO,Rotar Zairo,Rotar Zairo,48,1088,0,399,449,10,75,115,57,34,29,70,45,26,61,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,7126,500,2312,1,7053,1000,999,450,984,1,912,2500,910,5500,0,0,0,0,4192,1 1393,G_MUMMY,Mummy,Mummy,37,5176,0,0,0,1,305,360,0,10,28,19,32,0,63,20,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1394,G_ZOMBIE,Zombie,Zombie,15,534,0,0,0,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1395,CRYSTAL_1,Wind Crystal,Wind Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,999,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,5097,7000,532,6500,558,5000,607,200,0,0,0,0 diff --git a/npc/Changelog.txt b/npc/Changelog.txt index d6c5e98820..fbf081763d 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2010/10/20 + * Rev. 14433 Updated spawns for Prontera fields to Rewnewal. [L0ne_W0lf] 2010/10/10 * Rev. 14422 Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. [L0ne_W0lf] - ...corrected the versions in the file headers as well. :P diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt index 6a44259aab..7b64863878 100644 --- a/npc/mobs/fields/prontera.txt +++ b/npc/mobs/fields/prontera.txt @@ -10,132 +10,99 @@ //= 1.2 fixed some map name typos [Lupus] //= 1.3 Official kRO 10.1 spawns [Playtester] //= 1.4 More accurate spawns [Playtester] +//= 1.5 Updated to Renewal spawns. //============================================================ //================================================== // prt_fild00 - Prontera Field //================================================== -prt_fild00,0,0,0,0 monster Creamy 1018,10,0,0,0 -prt_fild00,0,0,0,0 monster Fabre 1007,20,0,0,0 -prt_fild00,0,0,0,0 monster Pupa 1008,30,0,0,0 -prt_fild00,0,0,0,0 monster Lunatic 1063,30,0,0,0 -prt_fild00,0,0,0,0 monster Poring 1002,40,0,0,0 -prt_fild00,0,0,0,0 monster Hornet 1004,70,0,0,0 -prt_fild00,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1 -prt_fild00,285,138,10,10 monster Green Plant 1080,5,360000,180000,1 +prt_fild00,0,0,0,0 monster Roda Frog 1012,130,0,0,0 +prt_fild00,0,0,0,0 monster Ambernite 1094,50,0,0,0 +prt_fild00,0,0,0,0 monster Savage Babe 1167,20,0,0,0 //================================================== // prt_fild01 - Prontera Field //================================================== -prt_fild01,0,0,0,0 monster Thief Bug 1051,30,0,0,0 -prt_fild01,0,0,0,0 monster Fabre 1007,20,0,0,0 -prt_fild01,0,0,0,0 monster Pupa 1008,10,0,0,0 -prt_fild01,0,0,0,0 monster Lunatic 1063,80,0,0,0 +prt_fild01,0,0,0,0 monster Lunatic 1063,140,0,0,0 prt_fild01,0,0,0,0 monster Poring 1002,30,0,0,0 -prt_fild01,199,266,3,3 monster Green Plant 1080,3,360000,180000,1 -prt_fild01,199,266,3,3 monster Blue Plant 1079,1,900000,450000,1 +prt_fild01,0,0,0,0 monster Fabre 1007,30,0,0,0 //================================================== // prt_fild02 - Prontera Field //================================================== -prt_fild02,0,0,0,0 monster Mandragora 1020,70,0,0,0 -prt_fild02,0,0,0,0 monster Fabre 1007,50,0,0,0 -prt_fild02,0,0,0,0 monster Pupa 1008,20,0,0,0 -prt_fild02,0,0,0,0 monster Lunatic 1063,10,0,0,0 -prt_fild02,0,0,0,0 monster Poring 1002,30,0,0,0 +prt_fild02,0,0,0,0 monster Stainer 1174,140,0,0,0 +prt_fild02,0,0,0,0 monster Creamy 1018,30,0,0,0 +prt_fild02,0,0,0,0 monster Poporing 1031,30,0,0,0 prt_fild02,0,0,0,0 monster Eclipse 1093,1,1800000,1200000,0 -prt_fild02,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1 -prt_fild02,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1 //================================================== // prt_fild03 - Prontera Field //================================================== -prt_fild03,0,0,0,0 monster Yoyo 1057,80,0,0,0 -prt_fild03,0,0,0,0 monster Smokie 1056,40,0,0,0 +prt_fild03,0,0,0,0 monster Yoyo 1057,100,0,0,0 +prt_fild03,0,0,0,0 monster Poporing 1031,30,0,0,0 +prt_fild03,0,0,0,0 monster Horn 1128,30,0,0,0 prt_fild03,0,0,0,0 monster Choco 1214,1,0,0,0 -prt_fild03,0,0,0,0 monster Poporing 1031,10,0,0,0 -prt_fild03,296,58,15,15 monster Green Plant 1080,5,180000,90000,1 -prt_fild03,296,58,15,15 monster Blue Plant 1079,2,900000,450000,1 -prt_fild03,307,75,5,5 monster Green Plant 1080,5,360000,180000,1 -prt_fild03,0,0,0,0 monster Green Plant 1080,5,360000,180000,1 -prt_fild03,148,107,5,5 monster Green Plant 1080,5,360000,180000,1 //================================================== // prt_fild04 - Prontera Field //================================================== -prt_fild04,0,0,0,0 monster Rocker 1052,70,0,0,0 -prt_fild04,0,0,0,0 monster Creamy 1018,40,0,0,0 -prt_fild04,0,0,0,0 monster Pupa 1008,10,0,0,0 -prt_fild04,0,0,0,0 monster Poring 1002,30,0,0,0 +prt_fild04,0,0,0,0 monster Roda Frog 1012,80,0,0,0 +prt_fild04,0,0,0,0 monster Ambernite 1094,20,0,0,0 prt_fild04,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 -prt_fild04,350,114,10,10 monster Green Plant 1080,5,900000,450000,1 //================================================== // prt_fild05 - Prontera Field //================================================== -prt_fild05,0,0,0,0 monster Poring 1002,70,0,0,0 -prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0 -prt_fild05,0,0,0,0 monster Lunatic 1063,30,0,0,0 -prt_fild05,0,0,0,0 monster Pupa 1008,30,0,0,0 -prt_fild05,0,0,0,0 monster Thief Bug 1051,10,0,0,0 -prt_fild05,208,37,10,10 monster Green Plant 1080,6,900000,450000,1 -prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1 +prt_fild05,0,0,0,0 monster Hornet 1004,140,0,0,0 +prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,0,0,0 +prt_fild05,0,0,0,0 monster Thief Bug 1051,30,0,0,0 //================================================== // prt_fild06 - Prontera Field //================================================== -prt_fild06,0,0,0,0 monster Lunatic 1063,60,0,0,0 -prt_fild06,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0 -prt_fild06,0,0,0,0 monster Thief Bug 1051,10,0,0,0 -prt_fild06,0,0,0,0 monster Pupa 1008,20,0,0,0 -prt_fild06,0,0,0,0 monster Poring 1002,60,0,0,0 -prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1 +prt_fild06,0,0,0,0 monster Fabre 1007,140,0,0,0 +prt_fild06,0,0,0,0 monster Poring 1002,30,0,0,0 +prt_fild06,0,0,0,0 monster Lunatic 1063,30,0,0,0 //================================================== // prt_fild07 - Prontera Field //================================================== -prt_fild07,0,0,0,0 monster Rocker 1052,80,0,0,0 -prt_fild07,0,0,0,0 monster Poporing 1031,30,0,0,0 +prt_fild07,0,0,0,0 monster Rocker 1052,150,0,0,0 +prt_fild07,0,0,0,0 monster Savage Babe 1167,50,0,0,0 prt_fild07,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 -prt_fild07,225,110,5,5 monster Black Mushroom 1084,3,360000,180000,1 //================================================== // prt_fild08 - Prontera Field //================================================== +prt_fild08,0,0,0,0 monster Poring 1002,140,0,0,0 +prt_fild08,0,0,0,0 monster Fabre 1007,40,0,0,0 prt_fild08,0,0,0,0 monster Lunatic 1063,40,0,0,0 -prt_fild08,0,0,0,0 monster Pupa 1008,20,0,0,0 -prt_fild08,0,0,0,0 monster Poring 1002,70,0,0,0 -prt_fild08,0,0,0,0 monster Drops 1113,10,0,0,0 //================================================== // prt_fild09 - Prontera Field //================================================== -prt_fild09,0,0,0,0 monster Savage Babe 1167,70,0,0,0 -prt_fild09,0,0,0,0 monster Baby Desert Wolf 1107,20,0,0,0 -prt_fild09,0,0,0,0 monster Peco Peco Egg 1047,20,0,0,0 -prt_fild09,0,0,0,0 monster Picky 1049,20,0,0,0 -prt_fild09,0,0,0,0 monster Condor 1009,10,0,0,0 -prt_fild09,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1 +prt_fild09,0,0,0,0 monster Magnolia 1138,140,0,0,0 +prt_fild09,0,0,0,0 monster Metaller 1058,60,0,0,0 //================================================== // prt_fild10 - Prontera Field //================================================== -prt_fild10,0,0,0,0 monster Savage 1166,70,0,0,0 -prt_fild10,0,0,0,0 monster Savage Babe 1167,40,0,0,0 +prt_fild10,0,0,0,0 monster Elder Willow 1033,140,0,0,0 prt_fild10,0,0,0,0 monster Poporing 1031,20,0,0,0 -prt_fild10,0,0,0,0 monster Thief Bug 1051,10,0,0,0 +prt_fild03,0,0,0,0 monster coco 1104,20,0,0,0 +prt_fild03,0,0,0,0 monster Horn 1128,20,0,0,0 prt_fild10,99,114,20,5 monster Red Mushroom 1085,15,360000,180000,1 -prt_fild10,155,179,10,10 monster Shining Plant 1083,1,1800000,900000,1 //================================================== // prt_fild11 - Prontera Field //================================================== prt_fild11,0,0,0,0 monster Goblin 1122,10,0,0,0 -prt_fild11,0,0,0,0 monster Goblin 1123,20,0,0,0 -prt_fild11,0,0,0,0 monster Goblin 1124,20,0,0,0 -prt_fild11,0,0,0,0 monster Goblin 1125,30,0,0,0 -prt_fild11,0,0,0,0 monster Goblin 1126,30,0,0,0 -prt_fild11,0,0,0,0 monster Goblin Archer 1258,10,0,0,0 +prt_fild11,0,0,0,0 monster Goblin 1123,10,0,0,0 +prt_fild11,0,0,0,0 monster Goblin 1124,10,0,0,0 +prt_fild11,0,0,0,0 monster Goblin 1125,10,0,0,0 +prt_fild11,0,0,0,0 monster Goblin 1126,60,0,0,0 +prt_fild11,0,0,0,0 monster Goblin Archer 1258,50,0,0,0 prt_fild11,0,0,0,0 monster Panzer Goblin 1308,1,1800000,1200000,0 prt_fild11,0,0,0,0 monster Goblin Steamrider 1280,30,0,0,0 +prt_fild11,0,0,0,0 monster Rotar Zairo 1280,50,0,0,0 prt_fild11,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1 From fa5f2d25eea7563c6ab03cf5db848274cd190b17 Mon Sep 17 00:00:00 2001 From: Gepard Date: Thu, 21 Oct 2010 00:38:57 +0000 Subject: [PATCH 019/129] * Removed unused 'indoors' mapflag (follow-up to r3729). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 + conf/mapflag/indoors.txt | 119 -------------------------------------- db/const.txt | 1 - doc/script_commands.txt | 2 +- npc/scripts_mapflags.conf | 1 - src/map/atcommand.c | 2 - src/map/map.h | 1 - src/map/npc.c | 2 - src/map/script.c | 7 +-- 9 files changed, 5 insertions(+), 132 deletions(-) delete mode 100644 conf/mapflag/indoors.txt diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 4396326b29..ec31d55d3c 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/10/21 + * Removed unused 'indoors' mapflag. [Gepard] 2010/10/17 * Fixed wrong char info packet size for clients after 2010-07-27. (bugreport:4413) [Gepard] 2010/10/13 diff --git a/conf/mapflag/indoors.txt b/conf/mapflag/indoors.txt deleted file mode 100644 index dc9a804ee5..0000000000 --- a/conf/mapflag/indoors.txt +++ /dev/null @@ -1,119 +0,0 @@ -//===== eAthena Script ======================================= -//= Map Flags for Indoors Buildings or Dungeons -//===== By: ================================================== -//= eAthena Dev Team -//===== Current Version: ===================================== -//= 1.3a [Lupus] -//===== Compatible With: ===================================== -//= -//===== Description: ========================================= -//= 'indoors' turns off all night effects. -//============================================================ - -alberta_in mapflag indoors -ama_test mapflag indoors -izlude_in mapflag indoors -gef_tower mapflag indoors -geffen_in mapflag indoors -moc_castle mapflag indoors -morocc_in mapflag indoors -mosk_in mapflag indoors -payon_in01 mapflag indoors -payon_in02 mapflag indoors -payon_in03 mapflag indoors -prt_in mapflag indoors -prt_castle mapflag indoors -prt_church mapflag indoors -in_orcs01 mapflag indoors -aldeba_in mapflag indoors -monk_in mapflag indoors -nameless_in mapflag indoors -prt_are_in mapflag indoors -arena_room mapflag indoors -job_sword1 mapflag indoors -xmas_in mapflag indoors -cmd_in01 mapflag indoors -cmd_in02 mapflag indoors -yuno_in01 mapflag indoors -yuno_in02 mapflag indoors -yuno_in03 mapflag indoors -yuno_in04 mapflag indoors -yuno_in05 mapflag indoors -alde_alche mapflag indoors -sec_in01 mapflag indoors -ama_in01 mapflag indoors -ama_in02 mapflag indoors -gon_in mapflag indoors -um_in mapflag indoors -nif_in mapflag indoors -lou_in01 mapflag indoors -lou_in02 mapflag indoors -jawaii_in mapflag indoors -que_god01 mapflag indoors -que_god02 mapflag indoors -ayo_in01 mapflag indoors -ayo_in02 mapflag indoors -que_sign01 mapflag indoors -ein_in01 mapflag indoors -airport mapflag indoors -airplane mapflag indoors -airplane_01 mapflag indoors -y_airport mapflag indoors -lhz_airport mapflag indoors -lhz_in01 mapflag indoors -lhz_in02 mapflag indoors -lhz_in03 mapflag indoors -lhz_cube mapflag indoors -hu_in01 mapflag indoors -auction_01 mapflag indoors -auction_02 mapflag indoors -ra_in01 mapflag indoors -ra_temin mapflag indoors -que_rachel mapflag indoors -yuno_pre mapflag indoors -lhz_que01 mapflag indoors -que_job01 mapflag indoors -thana_step mapflag indoors -kh_mansion mapflag indoors -kh_rossi mapflag indoors -kh_school mapflag indoors -kh_vila mapflag indoors -que_bingo mapflag indoors -que_ng mapflag indoors -ve_in mapflag indoors -ve_in02 mapflag indoors - -//Episdoe 12 ===================== -nameless_in mapflag indoors -abbey01 mapflag indoors -abbey02 mapflag indoors -abbey03 mapflag indoors -que_san04 mapflag indoors -mosk_in mapflag indoors -z_agit mapflag indoors -cave mapflag indoors -que_ba mapflag indoors -que_moc_16 mapflag indoors -que_moon mapflag indoors -bat_room mapflag indoors - -//Sealed Shrine ================== -1@cata mapflag indoors -2@cata mapflag indoors - -//Endless Tower ================== -1@tower mapflag indoors -2@tower mapflag indoors -3@tower mapflag indoors -4@tower mapflag indoors -5@tower mapflag indoors -6@tower mapflag indoors - -//Episode 13 ===================== -mid_campin mapflag indoors -schg_dun01 mapflag indoors -arug_dun01 mapflag indoors -man_in01 mapflag indoors -spl_in01 mapflag indoors -spl_in02 mapflag indoors - diff --git a/db/const.txt b/db/const.txt index 8ea0ce92a5..c6a8bcbffd 100644 --- a/db/const.txt +++ b/db/const.txt @@ -199,7 +199,6 @@ mf_fog 17 mf_sakura 18 mf_leaves 19 mf_rain 20 -mf_indoors 21 mf_nogo 22 mf_clouds 23 mf_clouds2 24 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index f235d75634..2d00cbbffd 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -5674,7 +5674,7 @@ mf_noteleport, mf_nowarp, mf_nogo), storing location when disconnected mf_pvp_noguild), WoE behavior (mf_gvg,mf_gvg_noparty), ability to use skills or open up trade deals (mf_notrade, mf_novending, mf_noskill, mf_noicewall), current weather effects (mf_snow, mf_fog, mf_sakura, mf_leaves, mf_rain, mf_clouds, -mf_fireworks) and whether day/night will be in effect on this map (mf_indoors). +mf_fireworks) and whether night will be in effect on this map (mf_nightenabled). --------------------------------------- diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index 9ba8cf6295..93587fe08d 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -3,7 +3,6 @@ // -------------------------------------------------------------- npc: conf/mapflag/nopvp.txt npc: conf/mapflag/gvg.txt -npc: conf/mapflag/indoors.txt npc: conf/mapflag/jail.txt npc: conf/mapflag/nightmare.txt npc: conf/mapflag/nobranch.txt diff --git a/src/map/atcommand.c b/src/map/atcommand.c index eccce4eb14..bed466f48d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4366,8 +4366,6 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com strcat(atcmd_output, "Leaves | "); if (map[m_id].flag.rain) strcat(atcmd_output, "Rain | "); - if (map[m_id].flag.indoors) - strcat(atcmd_output, "Indoors | "); if (map[m_id].flag.nightenabled) strcat(atcmd_output, "Displays Night | "); clif_displaymessage(fd, atcmd_output); diff --git a/src/map/map.h b/src/map/map.h index f5da4a4378..199db618da 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -453,7 +453,6 @@ struct map_data { unsigned sakura : 1; // [Valaris] unsigned leaves : 1; // [Valaris] unsigned rain : 1; // [Valaris] - unsigned indoors : 1; // celest unsigned nogo : 1; // [Valaris] unsigned nobaseexp : 1; // [Lorky] added by Lupus unsigned nojobexp : 1; // [Lorky] diff --git a/src/map/npc.c b/src/map/npc.c index 425967da70..8eb1c1ba7c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2977,8 +2977,6 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con map[m].flag.leaves=state; else if (!strcmpi(w3,"rain")) map[m].flag.rain=state; - else if (!strcmpi(w3,"indoors")) - map[m].flag.indoors=state; else if (!strcmpi(w3,"nightenabled")) map[m].flag.nightenabled=state; else if (!strcmpi(w3,"nogo")) diff --git a/src/map/script.c b/src/map/script.c index b37c31c1e2..ac7ac9163e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -312,8 +312,8 @@ enum { MF_SAKURA, MF_LEAVES, MF_RAIN, //20 - MF_INDOORS, - MF_NOGO, + // 21 free + MF_NOGO = 22, MF_CLOUDS, MF_CLOUDS2, MF_FIREWORKS, @@ -9161,7 +9161,6 @@ BUILDIN_FUNC(getmapflag) case MF_SAKURA: script_pushint(st,map[m].flag.sakura); break; case MF_LEAVES: script_pushint(st,map[m].flag.leaves); break; case MF_RAIN: script_pushint(st,map[m].flag.rain); break; - case MF_INDOORS: script_pushint(st,map[m].flag.indoors); break; case MF_NIGHTENABLED: script_pushint(st,map[m].flag.nightenabled); break; case MF_NOGO: script_pushint(st,map[m].flag.nogo); break; case MF_NOBASEEXP: script_pushint(st,map[m].flag.nobaseexp); break; @@ -9231,7 +9230,6 @@ BUILDIN_FUNC(setmapflag) case MF_SAKURA: map[m].flag.sakura=1; break; case MF_LEAVES: map[m].flag.leaves=1; break; case MF_RAIN: map[m].flag.rain=1; break; - case MF_INDOORS: map[m].flag.indoors=1; break; case MF_NIGHTENABLED: map[m].flag.nightenabled=1; break; case MF_NOGO: map[m].flag.nogo=1; break; case MF_NOBASEEXP: map[m].flag.nobaseexp=1; break; @@ -9298,7 +9296,6 @@ BUILDIN_FUNC(removemapflag) case MF_SAKURA: map[m].flag.sakura=0; break; case MF_LEAVES: map[m].flag.leaves=0; break; case MF_RAIN: map[m].flag.rain=0; break; - case MF_INDOORS: map[m].flag.indoors=0; break; case MF_NIGHTENABLED: map[m].flag.nightenabled=0; break; case MF_NOGO: map[m].flag.nogo=0; break; case MF_NOBASEEXP: map[m].flag.nobaseexp=0; break; From 83bc339cefa0749e801f1eb046846e08e58e31ff Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 28 Oct 2010 15:42:15 +0000 Subject: [PATCH 020/129] * Updated stats for monsters that spawn on Geffen Fields. * Packet_db now uses packet_db_ver set to default * Updated spawns for Geffen fields to Rewnewal. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14435 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 3 + db/mob_db.txt | 30 ++--- db/packet_db.txt | 3 +- npc/Changelog.txt | 2 + npc/mobs/fields/geffen.txt | 207 ++++++++++------------------------- npc/mobs/fields/prontera.txt | 2 +- 6 files changed, 78 insertions(+), 169 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index f4fe6cd6e7..d825eba00f 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,9 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/10/23 + * Rev. 14435 Updated stats for monsters that spawn on Geffen Fields. [L0ne_W0lf] + * Packet_db now uses packet_db_ver set to default 2010/10/20 * Rev. 14433 Updated stats for monsters that spawn on Prontera Fields. [L0ne_W0lf] 2010/10/11 diff --git a/db/mob_db.txt b/db/mob_db.txt index d703085bc8..c6fbbd99ec 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -11,10 +11,10 @@ 1005,FARMILIAR,Familiar,Familiar,8,155,0,28,15,1,20,28,0,0,1,12,8,5,28,0,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1 //1006,THIEF_BUG_LARVA,Thief Bug Larva,Thief Bug Larva,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1007,FABRE,Fabre,Fabre,6,72,0,54,41,1,12,15,24,0,12,5,3,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1 -1008,PUPA,Pupa,Pupa,2,427,0,2,4,0,1,2,0,20,1,1,1,0,1,20,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1 +1008,PUPA,Pupa,Pupa,4,66,0,36,27,0,1,4,24,2,11,1,3,3,8,6,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1 1009,CONDOR,Condor,Condor,5,92,0,6,5,1,11,14,0,0,1,13,5,0,13,10,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1 1010,WILOW,Willow,Willow,8,91,0,63,47,1,13,18,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1 -1011,CHONCHON,Chonchon,Chonchon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1 +1011,CHONCHON,Chonchon,Chonchon,5,57,0,45,36,1,13,4,27,0,8,5,4,5,12,2,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1 1012,RODA_FROG,Roda Frog,Roda Frog,13,160,0,90,68,1,19,23,12,5,12,6,4,0,14,9,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1 1013,WOLF,Wolf,Wolf,25,919,0,329,199,1,37,46,0,0,1,20,28,15,32,20,10,12,1,2,22,0x1089,200,1054,504,432,0,0,0,0,0,0,0,0,1011,20,920,9000,2308,10,517,650,528,1050,919,5500,578,600,0,0,0,0,4029,1 1014,SPORE,Spore,Spore,16,510,0,66,108,1,24,48,0,5,1,12,12,5,19,8,10,12,1,3,21,0x81,200,1872,672,288,0,0,0,0,0,0,0,0,921,9000,507,800,510,50,743,10,2220,40,7033,5,578,600,0,0,0,0,4022,1 @@ -23,10 +23,10 @@ //1017,THIEF_BUG_FEMALE,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,651,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,400,0,0,0,0,4026,1 1018,CREAMY,Creamy,Creamy,23,378,0,144,162,1,61,62,28,20,16,1,1,0,1,20,10,12,0,4,24,0x181,150,1136,720,840,0,0,0,0,0,0,0,0,924,9000,2322,10,518,150,602,100,2207,2,712,500,692,100,0,0,0,0,4040,1 1019,PECOPECO,Peco Peco,Peco Peco,19,531,0,159,72,1,50,64,0,0,1,13,13,25,27,9,10,12,2,2,23,0x1089,200,1564,864,576,0,0,0,0,0,0,0,0,925,9000,2402,20,508,200,507,900,1604,100,0,0,582,1000,0,0,0,0,4031,1 -1020,MANDRAGORA,Mandragora,Mandragora,12,405,0,45,32,4,26,35,0,25,1,12,24,0,36,15,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,993,50,905,9000,1405,30,511,350,711,300,706,3,1967,10,0,0,0,0,4030,1 +1020,MANDRAGORA,Mandragora,Mandragora,13,156,0,97,73,4,20,23,13,2,12,3,5,5,10,5,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,993,50,905,9000,1405,30,511,350,711,300,706,3,1967,10,0,0,0,0,4030,1 //1021,THIEF_BUG_MALE,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,653,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 //1022,WEREWOLF,Werewolf,Werewolf,80,28600,0,11813,7289,2,2560,3280,65,35,1,97,60,1,135,52,10,10,2,0,40,163,200,1500,768,652,0,0,0,0,0,0,0,0,999,500,1034,4000,984,500,985,500,7017,800,0,0,1912,300,0,0,0,0,0,0 -1023,ORK_WARRIOR,Orc Warrior,Orc Warrior,24,1400,0,408,160,1,104,126,10,5,1,24,48,25,34,10,10,12,1,7,22,0x3885,200,1864,864,288,0,0,0,0,0,0,0,0,998,210,931,9000,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1 +1023,ORK_WARRIOR,Orc Warrior,Orc Warrior,44,1434,0,350,540,1,72,104,52,3,32,15,23,15,16,10,10,12,1,7,22,0x3885,200,1864,864,288,0,0,0,0,0,0,0,0,998,210,931,9000,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1 1024,WORM_TAIL,Wormtail,Wormtail,14,426,0,59,40,2,42,51,5,0,1,14,28,5,46,5,10,12,1,3,22,0x91,200,1048,48,192,0,0,0,0,0,0,0,0,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,100,0,0,0,0,4034,1 1025,SNAKE,Snake,Boa,15,471,0,72,48,1,46,55,0,0,1,15,15,10,35,5,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,0,926,9000,1117,15,507,900,1011,35,937,800,954,1,578,600,0,0,0,0,4037,1 1026,MUNAK,Munak,Munak,30,2872,0,601,318,1,150,230,0,0,1,15,20,5,46,15,10,12,1,1,29,0x3885,200,2468,768,288,0,0,0,0,0,0,0,0,901,9000,2264,2,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,1 @@ -40,7 +40,7 @@ 1034,THARA_FROG,Thara Frog,Thara Frog,22,2152,0,219,138,1,105,127,0,10,1,22,22,5,34,10,10,12,1,5,41,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,1011,45,908,5500,911,600,509,30,725,5,918,2000,0,0,0,0,0,0,4058,1 1035,HUNTER_FLY,Hunter Fly,Hunter Fly,42,5242,0,1517,952,1,246,333,25,15,33,105,32,15,72,30,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,996,30,999,100,943,5335,912,1300,756,129,2259,1,1226,2,0,0,0,0,4115,1 1036,GHOUL,Ghoul,Ghoul,40,5418,0,1088,622,1,420,500,5,20,1,20,29,0,45,20,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,958,6000,756,110,509,700,511,800,2609,60,934,150,1260,1,0,0,0,0,4110,1 -1037,SIDE_WINDER,Side Winder,Side Winder,43,4929,0,1996,993,1,240,320,5,10,38,43,40,15,115,20,10,12,1,2,25,0x3095,200,1576,576,576,0,0,0,0,0,0,0,0,954,5335,912,1400,756,134,1120,2,937,2500,926,5000,509,1000,0,0,0,0,4117,1 +1037,SIDE_WINDER,Side Winder,Side Winder,70,2736,0,720,810,1,301,331,101,12,52,32,35,20,66,15,10,12,1,2,25,0x3095,200,1576,576,576,0,0,0,0,0,0,0,0,954,5335,912,1400,756,134,1120,2,937,2500,926,5000,509,1000,0,0,0,0,4117,1 1038,OSIRIS,Osiris,Osiris,78,415400,0,71500,28600,1,780,2880,10,25,1,75,30,37,86,40,10,12,1,1,89,0x37B5,100,1072,672,384,35750,10000,603,4000,608,3000,751,500,617,2000,1232,150,2235,200,1255,600,1009,1000,5053,150,1285,100,0,0,0,0,4144,1 1039,BAPHOMET,Baphomet,Baphomet,81,668000,0,107250,37895,2,3220,4040,35,45,1,152,30,85,120,95,10,12,2,6,67,0x37B5,100,768,768,576,53625,10000,607,2000,750,500,923,5000,1466,200,2256,200,1476,50,714,500,5160,10,985,5432,984,4171,0,0,0,0,4147,1 1040,GOLEM,Golem,Golem,25,3900,0,465,94,1,175,187,40,0,1,15,25,0,15,0,10,12,2,0,60,0x91,300,1608,816,396,0,0,0,0,0,0,0,0,999,150,953,9000,912,220,757,70,1003,210,715,200,998,350,0,0,0,0,4072,1 @@ -59,7 +59,7 @@ 1053,THIEF_BUG_,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1 1054,THIEF_BUG__,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 1055,MUKA,Muka,Muka,17,610,0,273,120,1,40,49,5,5,15,15,30,5,20,10,10,12,2,3,22,0x81,300,1960,960,384,0,0,0,0,0,0,0,0,993,70,952,9000,713,2000,511,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1 -1056,SMOKIE,Smokie,Smokie,18,641,0,134,86,1,61,72,0,10,1,18,36,25,26,35,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,945,5500,919,5500,516,800,2213,1,754,2,912,5,729,2,0,0,0,0,4044,1 +1056,SMOKIE,Smokie,Smokie,29,591,0,180,203,1,70,81,26,0,16,34,16,5,27,5,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,945,5500,919,5500,516,800,2213,1,754,2,912,5,729,2,0,0,0,0,4044,1 1057,YOYO,Yoyo,Yoyo,38,898,0,270,305,1,63,74,40,0,20,11,34,20,10,10,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,0,942,9000,513,1500,508,200,7182,900,753,10,756,24,578,1000,0,0,0,0,4051,1 1058,METALLER,Metaller,Metaller,55,1687,0,450,507,1,187,228,72,12,52,24,10,0,47,31,10,12,1,4,23,0x118B,200,1708,1008,540,0,0,0,0,0,0,0,0,990,60,940,6500,911,400,757,49,707,20,935,3000,1914,10,0,0,0,0,4057,1 1059,MISTRESS,Mistress,Mistress,74,212000,0,39325,27170,1,880,1110,40,60,50,165,60,95,70,130,10,12,0,4,84,0x37B5,100,1148,648,300,19662,10000,996,1500,526,4000,722,3000,1413,150,518,10000,2249,250,616,1000,7018,10,985,4268,16001,100,0,0,0,0,4132,1 @@ -90,9 +90,9 @@ 1084,BLACK_MUSHROOM,Black Mushroom,Black Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,7033,5500,0,0,0,0 1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,7033,5500,0,0,0,0 1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,64,126000,0,14300,7150,1,870,1145,60,45,65,75,35,45,85,150,10,12,2,4,43,0x11AB,100,768,768,480,7150,10000,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1 -1087,ORK_HERO,Orc Hero,Orc Hero,77,585700,0,58630,32890,1,2257,2542,40,45,1,91,30,70,105,90,10,12,2,7,42,0x37B5,150,1678,780,648,29315,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1 +1087,ORK_HERO,Orc Hero,Orc Hero,50,362000,0,106920,97200,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,29315,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1 1088,VOCAL,Vocal,Vocal,18,3317,0,99,79,1,71,82,77,26,77,26,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,645,700,1917,10,0,0,0,0,4211,1 -1089,TOAD,Toad,Toad,10,5065,0,100,50,1,26,32,0,0,1,5,10,10,10,25,10,12,1,5,21,0x37B5,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,5125,1000,0,0,0,0,4306,1 +1089,TOAD,Toad,Toad,27,660,0,162,183,1,70,89,24,6,32,19,27,10,24,5,10,12,1,5,21,0x37B5,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,5125,1000,0,0,0,0,4306,1 1090,MASTERING,Mastering,Mastering,2,2415,0,30,10,1,18,24,0,10,1,2,2,0,17,60,10,12,1,3,21,0x37B5,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,2116,1000,512,8000,512,8000,531,4000,0,0,0,0,4197,1 1091,DRAGON_FLY,Dragon Fly,Dragon Fly,8,2400,0,88,44,1,22,27,40,0,1,20,8,15,17,5,10,12,0,4,24,0x37B5,100,1076,576,480,0,0,0,0,0,0,0,0,2245,200,507,8000,719,1500,742,2000,2607,3000,625,50,533,3000,0,0,0,0,4179,1 1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,24,12240,0,247,176,1,135,159,10,0,57,45,48,20,50,65,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,725,10,626,50,0,0,0,0,4183,1 @@ -121,7 +121,7 @@ 1115,EDDGA,Eddga,Eddga,65,152000,0,25025,12870,1,1215,1565,15,15,78,70,85,66,90,85,10,12,2,2,23,0x37B5,300,872,1344,432,12512,10000,1029,5000,1030,1000,994,3000,1133,150,2268,250,518,10000,1258,500,1030,250,985,2300,13046,100,0,0,0,0,4123,1 1116,EGGYRA,Eggyra,Eggyra,24,633,0,215,220,1,85,107,20,25,1,36,24,0,32,0,10,12,1,0,48,0x91,200,1816,816,288,0,0,0,0,0,0,0,0,911,1000,5015,20,7032,550,507,1000,643,300,645,250,757,57,0,0,0,0,4070,1 1117,EVIL_DRUID,Evil Druid,Evil Druid,58,16506,0,2890,1827,1,420,670,5,60,1,29,58,80,68,30,10,12,2,1,89,0x3695,300,2276,576,336,0,0,0,0,0,0,0,0,2217,10,1615,1,2508,2,1551,10,610,200,7478,4,509,2000,0,0,0,0,4141,1 -1118,FLORA,Flora,Flora,26,2092,0,357,226,3,242,273,10,35,1,26,35,5,43,80,10,12,2,3,22,0x84,1000,1432,432,576,0,0,0,0,0,0,0,0,1032,9000,2253,3,704,10,521,50,629,20,905,2000,748,1,0,0,0,0,4080,1 +1118,FLORA,Flora,Flora,59,2301,0,531,597,3,155,186,99,29,49,29,35,5,42,80,10,12,2,3,22,0x84,1000,1432,432,576,0,0,0,0,0,0,0,0,1032,9000,2253,3,704,10,521,50,629,20,905,2000,748,1,0,0,0,0,4080,1 1119,FRILLDORA,Frilldora,Frilldora,30,2023,0,529,319,1,200,239,0,10,35,30,38,15,53,30,10,12,1,2,23,0x3885,300,1540,720,432,0,0,0,0,0,0,0,0,1012,5500,757,90,903,1500,721,15,715,200,507,800,912,120,0,0,0,0,4088,1 1120,GHOSTRING,Ghostring,Ghostring,18,73300,0,101,108,1,82,122,0,60,40,27,18,45,72,30,10,12,1,6,88,0x37B5,300,1220,1080,648,0,0,0,0,0,0,0,0,1059,5335,2274,100,2336,50,604,500,603,10,714,30,695,100,0,0,0,0,4047,1 1121,GIEARTH,Giearth,Giearth,29,2252,0,495,301,1,154,185,10,50,25,29,46,60,64,105,10,12,0,6,22,0x191,200,1848,1296,432,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2227,10,1001,100,0,0,0,0,0,0,4087,1 @@ -142,7 +142,7 @@ //1136,KOBOLD_4,Kobold,Kobold,31,2179,0,806,407,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,0x31AD,200,1528,528,360,0,0,0,0,0,0,0,0,999,50,1034,5335,912,100,1355,5,2104,3,508,100,1301,150,0,0,0,0,4091,1 //1137,KOBOLD_5,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x31AD,300,1228,528,360,0,0,0,0,0,0,0,0,999,40,1034,5335,912,100,1514,5,2104,3,508,100,1501,150,0,0,0,0,4091,1 1138,MAGNOLIA,Magnolia,Magnolia,53,1984,0,441,495,1,91,256,51,8,49,25,21,50,28,85,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,508,400,12127,5,0,0,0,0,4076,1 -1139,MANTIS,Mantis,Mantis,26,2472,0,393,248,1,118,149,10,0,1,26,24,5,45,15,10,12,1,4,22,0x3195,200,1528,660,432,0,0,0,0,0,0,0,0,993,110,1031,9000,911,1400,757,70,943,250,721,10,507,650,0,0,0,0,4079,1 +1139,MANTIS,Mantis,Mantis,65,2719,0,594,669,1,178,209,90,0,55,33,24,5,42,15,10,12,1,4,22,0x3195,200,1528,660,432,0,0,0,0,0,0,0,0,993,110,1031,9000,911,1400,757,70,943,250,721,10,507,650,0,0,0,0,4079,1 1140,MARDUK,Marduk,Marduk,40,4214,0,1238,752,1,315,382,0,60,1,40,20,79,78,20,10,12,2,7,23,0x3095,300,1540,840,504,0,0,0,0,0,0,0,0,994,35,1045,4365,1608,10,2617,1,1614,3,691,100,642,20,0,0,0,0,4112,1 1141,MARINA,Marina,Marina,21,2087,0,218,140,1,84,106,0,5,1,21,21,0,36,10,10,12,0,3,41,0x81,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1 1142,MARINE_SPHERE,Marine Sphere,Marine Sphere,28,3518,0,461,284,1,120,320,0,40,1,28,28,0,33,50,10,12,0,3,41,0x0,800,1201,1,1,0,0,0,0,0,0,0,0,1050,5000,1051,2500,1520,10,720,10,717,150,10003,10,0,0,0,0,0,0,4084,1 @@ -158,8 +158,8 @@ 1152,ORC_SKELETON,Orc Skeleton,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,0,30,15,10,12,1,1,29,0x3885,200,2420,720,648,0,0,0,0,0,0,0,0,922,5500,932,3500,757,80,2299,2,1358,10,511,50,0,0,0,0,0,0,4085,1 1153,ORC_ZOMBIE,Orc Zombie,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,0,24,5,10,12,1,1,29,0x3885,400,2852,1152,840,0,0,0,0,0,0,0,0,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,1 1154,PASANA,Pasana,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,59,43,10,12,1,7,43,0x3095,165,976,576,288,0,0,0,0,0,0,0,0,7110,4365,7121,2500,757,20,1105,500,1217,150,2522,100,0,0,0,0,0,0,4099,1 -1155,PETIT,Petite,Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,55,79,60,10,12,1,9,22,0x3095,200,1624,620,384,0,0,0,0,0,0,0,0,1035,5335,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1 -1156,PETIT_,Petite,Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,55,73,80,10,12,1,9,24,0x3095,150,1420,1080,528,0,0,0,0,0,0,0,0,1036,5335,1037,300,985,61,509,1000,13006,5,912,1500,606,15,0,0,0,0,4120,1 +1155,PETIT,Petite,Petite,86,5799,0,1170,1317,1,292,358,99,4955,32,38,37,54,20,60,10,12,1,9,22,0x3095,200,1624,620,384,0,0,0,0,0,0,0,0,1035,5335,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1 +1156,PETIT_,Petite,Petite,79,3556,0,900,1013,1,280,316,86,42,63,39,31,55,72,85,10,12,1,9,24,0x3095,150,1420,1080,528,0,0,0,0,0,0,0,0,1036,5335,1037,300,985,61,509,1000,13006,5,912,1500,606,15,0,0,0,0,4120,1 1157,PHARAOH,Pharaoh,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,0x37B5,125,868,768,288,57495,10000,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1 1158,PHEN,Phen,Phen,26,3347,0,357,226,1,138,150,0,15,1,26,26,0,88,75,10,12,1,5,41,0x91,150,2544,1344,1152,0,0,0,0,0,0,0,0,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1 1159,PHREEONI,Phreeoni,Phreeoni,69,188000,0,32175,16445,1,880,1530,10,20,1,85,78,35,130,60,10,12,2,2,60,0x37B5,200,1020,1020,288,16087,10000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1 @@ -193,7 +193,7 @@ 1187,SWITCH,Switch,Switch,1,2,0,1,1,1,1,2,0,0,1,1,1,0,1,0,1,12,1,0,20,0x0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1188,BON_GUN,Bongun,Bongun,32,3520,0,424,242,1,220,260,0,0,45,15,36,10,48,15,10,12,1,1,29,0x3095,200,1720,500,420,0,0,0,0,0,0,0,0,1094,5500,7014,40,618,60,5046,1,609,15,508,1000,508,1250,0,0,0,0,4212,1 1189,ORC_ARCHER,Orc Archer,Orc Archer,49,7440,0,1729,1787,9,310,390,10,5,1,44,25,20,125,20,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,0,1063,4656,1753,1000,1756,2500,1755,2500,1734,2,507,1400,509,900,0,0,0,0,4256,1 -1190,ORC_LORD,Orc Lord,Orc Lord,74,783000,0,62205,8580,1,3700,4150,40,5,85,82,30,70,110,85,10,12,2,7,82,0x37B5,100,1248,500,360,31102,10000,968,5500,617,2000,0,0,1363,200,2601,500,5007,150,1371,400,617,1000,985,4268,16000,3100,0,0,0,0,4135,1 +1190,ORC_LORD,Orc Lord,Orc Lord,55,552000,0,156240,122760,1,780,1428,256,92,95,95,103,96,155,85,10,12,2,7,82,0x37B5,100,1248,500,360,31102,10000,968,5500,617,2000,0,0,1363,200,2601,500,5007,150,1371,400,617,1000,985,4268,16000,3100,0,0,0,0,4135,1 1191,MIMIC,Mimic,Mimic,51,6120,182,165,165,1,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,0x3095,100,972,500,288,0,0,0,0,0,0,0,0,617,5,603,45,1065,1200,611,3000,714,3,2626,1,757,270,0,0,0,0,4205,1 1192,WRAITH,Wraith,Wraith,53,10999,0,2199,1099,1,580,760,5,30,1,95,30,65,95,35,10,12,2,1,89,0x3695,300,1816,576,240,0,0,0,0,0,0,0,0,1059,5820,2206,10,2506,2,716,650,602,1300,2505,10,731,5,0,0,0,0,4190,1 1193,ALARM,Alarm,Alarm,58,10647,0,3987,2300,1,480,600,15,15,1,62,72,10,85,45,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,0,1095,5335,2607,1,7005,1500,611,1300,984,105,7026,20,912,1500,0,0,0,0,4244,1 @@ -274,7 +274,7 @@ 1270,C_TOWER_MANAGER,Clock Tower Manager,Clock Tower Manager,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,0,1095,5335,7054,5335,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1 1271,ALLIGATOR,Alligator,Alligator,42,6962,0,1379,866,1,315,360,2,5,1,45,50,10,69,65,10,12,1,2,21,0x91,200,1100,900,480,0,0,0,0,0,0,0,0,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1 1272,DARK_LORD,Dark Lord,Dark Lord,80,720000,0,65780,45045,2,2800,3320,30,70,1,120,30,118,99,60,10,12,2,6,89,0x37B5,100,868,768,480,32890,10000,7005,6000,5093,500,617,2000,1615,800,2004,100,1237,300,2334,300,2507,100,985,5141,984,3977,0,0,0,0,4168,1 -1273,ORC_LADY,Orc Lady,Orc Lady,31,2000,0,644,407,1,135,170,10,10,35,42,25,15,69,55,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,7053,4656,998,300,2602,1,2206,1,12127,10,7477,3,2338,1,0,0,0,0,4255,1 +1273,ORC_LADY,Orc Lady,Orc Lady,45,1520,0,380,435,1,77,110,83,17,36,11,28,57,10,5,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,7053,4656,998,300,2602,1,2206,1,12127,10,7477,3,2338,1,0,0,0,0,4255,1 1274,MEGALITH,Megalith,Megalith,45,5300,0,1758,1075,9,264,314,50,25,1,45,60,5,95,5,10,12,2,0,80,0x84,200,1332,1332,672,0,0,0,0,0,0,0,0,912,100,7049,1000,617,1,0,0,0,0,985,61,757,207,0,0,0,0,4200,1 1275,ALICE,Alice,Alice,62,10000,221,3583,2400,1,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,0x91,200,502,2304,480,0,0,0,0,0,0,0,0,7047,2500,637,40,2407,3,739,30,5085,1,12128,10,12002,100,0,0,0,0,4253,1 1276,RAYDRIC_ARCHER,Raydric Archer,Raydric Archer,52,5250,0,3025,2125,9,415,500,35,5,15,25,22,5,145,35,10,12,1,6,47,0x2185,200,1152,1152,480,0,0,0,0,0,0,0,0,7054,4656,0,0,2315,2,1701,150,1764,2000,1715,3,985,106,0,0,0,0,4187,1 @@ -300,7 +300,7 @@ 1296,KOBOLD_LEADER,Kobold Leader,Kobold Leader,65,18313,0,7432,2713,1,649,958,37,37,5,90,36,30,77,59,10,12,1,7,44,0x3695,150,1028,528,360,0,0,0,0,0,0,0,0,999,450,1034,6305,912,1200,1511,6,1613,2,525,150,526,100,0,0,0,0,4291,1 1297,ANCIENT_MUMMY,Ancient Mummy,Ancient Mummy,64,40599,0,8040,3499,1,836,1129,27,27,28,19,32,5,83,35,10,12,1,1,49,0x3695,175,1772,120,384,0,0,0,0,0,0,0,0,930,4413,934,1800,2624,1,2611,150,508,650,756,150,757,100,0,0,0,0,4248,1 1298,ZOMBIE_MASTER,Zombie Master,Zombie Master,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1 -1299,GOBLIN_LEADER,Goblin Leader,Goblin Leader,64,20152,0,6036,2184,1,663,752,48,16,5,55,37,30,69,58,10,12,1,7,24,0x3695,120,1120,620,240,0,0,0,0,0,0,0,0,7054,1500,999,800,756,120,5090,50,2106,2,508,650,5113,10,0,0,0,0,4155,1 +1299,GOBLIN_LEADER,Goblin Leader,Goblin Leader,55,21692,0,4450,5007,1,165,214,72,30,60,67,45,18,66,23,10,12,1,7,24,0x3695,120,1120,620,240,0,0,0,0,0,0,0,0,7054,1500,999,800,756,120,5090,50,2106,2,508,650,5113,10,0,0,0,0,4155,1 1300,CATERPILLAR,Caterpillar,Caterpillar,64,14439,0,6272,3107,1,894,1447,47,29,35,25,85,15,69,45,10,12,0,4,22,0x3795,300,1672,672,480,0,0,0,0,0,0,0,0,949,3000,7054,5335,13034,20,1000,100,997,50,505,12,508,500,0,0,0,0,4289,1 1301,AM_MUT,Am Mut,Am Mut,61,12099,0,7709,2690,1,1040,1121,50,10,50,65,40,35,83,45,10,12,0,6,27,0x3795,200,1156,456,384,0,0,0,0,0,0,0,0,1021,4550,757,250,1517,3,969,5,2282,1,616,1,746,250,0,0,0,0,4245,1 1302,DARK_ILLUSION,Dark Illusion,Dark Illusion,77,103631,0,11163,4181,2,1300,1983,64,70,5,100,40,100,97,40,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,1615,3,5017,2,2508,3,7054,5335,522,120,509,1550,1162,2,0,0,0,0,4169,1 diff --git a/db/packet_db.txt b/db/packet_db.txt index da97c77ef0..e8e9ee5ae7 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -8,8 +8,7 @@ // Main packet version of the DB to use (default = max available version) // Client detection is faster when all clients use this version. // Version 23 is the latest Sakexe (above versions are for Renewal clients) -packet_db_ver: 23 -//packet_db_ver: default +packet_db_ver: default packet_ver: 5 diff --git a/npc/Changelog.txt b/npc/Changelog.txt index fbf081763d..cb351350f9 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2010/10/23 + * Rev. 14435 Updated spawns for Geffen fields to Rewnewal. [L0ne_W0lf] 2010/10/20 * Rev. 14433 Updated spawns for Prontera fields to Rewnewal. [L0ne_W0lf] 2010/10/10 diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt index e08ad551ad..1eaedab20e 100644 --- a/npc/mobs/fields/geffen.txt +++ b/npc/mobs/fields/geffen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -11,220 +11,125 @@ //= 1.3 Official kRO 10.1 spawns + future changes [Playtester] //= 1.4 More accurate spawns [Playtester] //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf] +//= 1.6 Updated to renewal spawns. [L0ne_W0lf] //============================================================ //================================================== // gef_fild00 - Geffen Field //================================================== -gef_fild00,0,0,0,0 monster Poring 1002,50,0,0,0 -gef_fild00,0,0,0,0 monster Fabre 1007,50,0,0,0 -gef_fild00,0,0,0,0 monster Pupa 1008,20,0,0,0 -gef_fild00,0,0,0,0 monster Poporing 1031,10,0,0,0 -gef_fild00,95,128,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild00,124,321,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild00,54,212,5,5 monster Green Plant 1080,3,360000,180000,1 -gef_fild00,54,186,5,5 monster Green Plant 1080,3,360000,180000,1 +gef_fild00,0,0,0,0 monster Chonchon 1011,140,0,0,0 +gef_fild00,0,0,0,0 monster Poring 1002,30,0,0,0 +gef_fild00,0,0,0,0 monster Fabre 1007,30,0,0,0 //================================================== // gef_fild01 - Geffen Field //================================================== -gef_fild01,0,0,0,0 monster Roda Frog 1012,50,0,0,0 -gef_fild01,0,0,0,0 monster Poporing 1031,20,0,0,0 +gef_fild01,0,0,0,0 monster Roda Frog 1012,80,0,0,0 +gef_fild01,0,0,0,0 monster Ambernite 1094,20,0,0,0 gef_fild01,0,0,0,0 monster Toad 1089,1,3600000,1800000,1 -gef_fild01,215,225,10,10 monster Green Plant 1080,5,360000,180000,1 //================================================== // gef_fild02 - Geffen Field //================================================== -gef_fild02,0,0,0,0 monster Yoyo 1057,10,0,0,0 -gef_fild02,0,0,0,0 monster Orc Warrior 1023,60,0,0,0 -gef_fild02,0,0,0,0 monster Coco 1104,10,0,0,0 -gef_fild02,0,0,0,0 monster Smokie 1056,10,0,0,0 -gef_fild02,0,0,0,0 monster Choco 1214,1,0,0,0 -gef_fild02,0,0,0,0 boss_monster Orc Hero 1087,1,86400000,600000,1 -gef_fild02,227,316,6,6 monster Green Plant 1080,8,360000,180000,1 +gef_fild02,0,0,0,0 monster Coco 1104,140,0,0,0 +gef_fild02,0,0,0,0 monster Poporing 1031,20,0,0,0 +gef_fild02,0,0,0,0 monster Elder Willow 1033,20,0,0,0 +gef_fild02,0,0,0,0 monster Horn 1128,20,0,0,0 +//gef_fild02,0,0,0,0 boss_monster Orc Hero 1087,1,86400000,600000,1 gef_fild02,87,48,6,6 monster Red Mushroom 1085,5,360000,180000,1 -gef_fild02,215,209,2,1 monster Blue Plant 1079,2,360000,180000,1 -gef_fild02,207,214,1,1 monster Blue Plant 1079,1,360000,180000,1 -gef_fild02,220,214,1,1 monster Blue Plant 1079,1,360000,180000,1 -gef_fild02,164,194,1,1 monster Shining Plant 1083,1,1800000,900000,1 //================================================== // gef_fild03 - Geffen Field //================================================== -gef_fild03,0,0,0,0 monster Orc Warrior 1023,60,0,0,0 -gef_fild03,0,0,0,0 monster High Orc 1213,1,0,0,0 -gef_fild03,0,0,0,0 monster Savage 1166,40,0,0,0 -gef_fild03,0,0,0,0 monster Poporing 1031,20,0,0,0 -gef_fild03,45,350,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,66,300,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,80,252,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,118,281,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,135,344,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,210,363,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,215,345,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,359,316,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,350,247,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,304,202,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,285,223,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,282,192,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,316,143,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,337,104,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,348,42,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,326,79,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,280,92,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,216,135,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,169,92,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,45,93,3,3 monster Green Plant 1080,1,180000,90000,1 -gef_fild03,44,133,3,3 monster Green Plant 1080,1,180000,90000,1 +gef_fild03,0,0,0,0 monster Orc Lady 1273,130,0,0,0 +gef_fild03,0,0,0,0 monster Orc Baby 1686,60,0,0,0 +gef_fild03,0,0,0,0 monster Orc Warrior 1023,20,0,0,0 +gef_fild03,0,0,0,0 boss_monster Orc Hero 1087,1,3600000,600000,1 //================================================== // gef_fild04 - Geffen Field //================================================== -gef_fild04,0,0,0,0 monster Poring 1002,30,0,0,0 -gef_fild04,0,0,0,0 monster Chonchon 1011,30,0,0,0 -gef_fild04,0,0,0,0 monster Pupa 1008,60,0,0,0 -gef_fild04,0,0,0,0 monster Fabre 1007,20,0,0,0 -gef_fild04,0,0,0,0 monster Roda Frog 1012,20,0,0,0 -gef_fild04,224,82,5,2 monster Green Plant 1080,3,360000,180000,1 -gef_fild04,152,82,5,2 monster Green Plant 1080,3,360000,180000,1 +gef_fild04,0,0,0,0 monster Mandragora 1020,124,0,0,0 +gef_fild04,0,0,0,0 monster Fabre 1007,25,0,0,0 +gef_fild04,0,0,0,0 monster Chonchon 1011,25,0,0,0 +gef_fild04,0,0,0,0 monster Lunatic 1063,25,0,0,0 //================================================== // gef_fild05 - Geffen Field //================================================== -gef_fild05,0,0,0,0 monster Poring 1002,30,0,0,0 -gef_fild05,0,0,0,0 monster Kobold Archer 1282,10,0,0,0 -gef_fild05,0,0,0,0 monster Wild Rose 1261,50,0,0,0 -gef_fild05,0,0,0,0 monster Dustiness 1114,30,0,0,0 -gef_fild05,235,322,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,238,326,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,170,337,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,108,317,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,56,285,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,65,256,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,74,228,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,50,189,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,51,166,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,146,161,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,153,180,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,124,207,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,187,249,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,187,265,0,0 monster Red Plant 1078,1,180000,90000,1 -gef_fild05,130,293,0,0 monster Red Plant 1078,1,180000,90000,1 +gef_fild05,0,0,0,0 monster Creamy 1018,140,0,0,0 +gef_fild05,0,0,0,0 monster Smokie 1056,20,0,0,0 +gef_fild05,0,0,0,0 monster Stainer 1174,20,0,0,0 +gef_fild05,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0 +gef_fild05,0,0,0,0 monster Thief Bug 1051,10,0,0,0 //================================================== // gef_fild06 - Geffen Field //================================================== -gef_fild06,0,0,0,0 monster Kobold 1133,20,0,0,0 -gef_fild06,0,0,0,0 monster Kobold 1134,10,0,0,0 -gef_fild06,0,0,0,0 monster Kobold 1135,10,0,0,0 -gef_fild06,0,0,0,0 monster Petite 1156,50,0,0,0 -gef_fild06,0,0,0,0 monster Poporing 1031,10,0,0,0 -gef_fild06,0,0,0,0 monster Mantis 1139,20,0,0,0 -gef_fild06,0,0,0,0 monster Shining Plant 1083,4,1800000,900000,1 +gef_fild06,0,0,0,0 monster Petite 1155,130,0,0,0 +gef_fild06,0,0,0,0 monster Side Winder 1037,30,0,0,0 +gef_fild06,0,0,0,0 monster Mantis 1139,30,0,0,0 //================================================== // gef_fild07 - Geffen Field //================================================== +gef_fild07,0,0,0,0 monster Pupa 1008,130,0,0,0 gef_fild07,0,0,0,0 monster Poring 1002,20,0,0,0 -gef_fild07,0,0,0,0 monster Chonchon 1011,30,0,0,0 -gef_fild07,0,0,0,0 monster Pupa 1008,10,0,0,0 -gef_fild07,0,0,0,0 monster Fabre 1007,60,0,0,0 -gef_fild07,122,221,0,0 monster Green Plant 1080,3,360000,180000,1 -gef_fild07,185,247,0,0 monster Shining Plant 1083,1,1800000,900000,1 -gef_fild07,269,289,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild07,269,289,3,3 monster Green Plant 1080,3,360000,180000,1 +gef_fild07,0,0,0,0 monster Fabre 1007,30,0,0,0 +gef_fild07,0,0,0,0 monster Chonchon 1011,20,0,0,0 //================================================== // gef_fild08 - Geffen Field //================================================== -gef_fild08,0,0,0,0 monster Kobold 1133,20,0,0,0 -gef_fild08,0,0,0,0 monster Kobold 1134,40,0,0,0 -gef_fild08,0,0,0,0 monster Kobold 1135,20,0,0,0 -gef_fild08,0,0,0,0 monster Golem 1040,40,0,0,0 -gef_fild08,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0 -gef_fild08,0,0,0,0 monster Poison Spore 1077,20,0,0,0 -gef_fild08,65,341,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,111,319,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,59,91,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,70,80,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,144,140,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,344,78,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,325,311,0,0 monster Blue Plant 1079,1,900000,450000,1 -gef_fild08,162,247,0,0 monster Blue Plant 1079,1,900000,450000,1 +gef_fild08,0,0,0,0 monster Petite 1156,130,0,0,0 +gef_fild08,0,0,0,0 monster Flora 1118,30,0,0,0 +gef_fild08,0,0,0,0 monster Mantis 1139,30,0,0,0 //================================================== // gef_fild09 - Geffen Field //================================================== -gef_fild09,0,0,0,0 monster Ambernite 1094,60,0,0,0 -gef_fild09,0,0,0,0 monster Poporing 1031,10,0,0,0 -gef_fild09,0,0,0,0 monster Poison Spore 1077,10,0,0,0 +gef_fild09,0,0,0,0 monster Ambernite 1094,80,0,0,0 +gef_fild09,0,0,0,0 monster Roda Frog 1012,20,0,0,0 gef_fild09,51,43,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,125,53,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,148,74,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,184,66,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,207,54,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,245,62,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,268,45,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,258,24,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,325,36,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,344,51,0,0 monster Red Mushroom 1085,1,180000,90000,1 -gef_fild09,277,201,5,5 monster Blue Plant 1079,3,900000,450000,1 //================================================== // gef_fild10 - Geffen Field //================================================== +gef_fild10,0,0,0,0 monster Orc Warrior 1023,130,0,0,0 +gef_fild10,0,0,0,0 monster Orc Lady 1273,40,0,0,0 +gef_fild10,0,0,0,0 monster Orc Baby 1686,20,0,0,0 gef_fild10,0,0,0,0 boss_monster Orc Lord 1190,1,7200000,600000,0 -gef_fild10,0,0,0,0 monster Orc Warrior 1023,20,0,0,0 -gef_fild10,0,0,0,0 monster Orc Lady 1273,70,0,0,0 -gef_fild10,0,0,0,0 monster Poporing 1031,15,0,0,0 -gef_fild10,0,0,0,0 monster Orc Baby 1686,5,0,0,0 -gef_fild10,46,350,5,5 monster Blue Plant 1079,3,900000,450000,1 -gef_fild10,287,61,5,5 monster Blue Plant 1079,3,900000,450000,1 -gef_fild10,300,253,5,5 monster Green Plant 1080,3,360000,180000,1 //================================================== // gef_fild11 - Geffen Field //================================================== +gef_fild11,0,0,0,0 monster Goblin 1122,50,0,0,0 +gef_fild11,0,0,0,0 monster Goblin 1123,50,0,0,0 +gef_fild11,0,0,0,0 monster Goblin 1124,50,0,0,0 +gef_fild11,0,0,0,0 monster Goblin 1125,50,0,0,0 gef_fild11,0,0,0,0 monster Goblin Leader 1299,1,1800000,1200000,0 -gef_fild11,0,0,0,0 monster Goblin 1122,30,0,0,0 -gef_fild11,0,0,0,0 monster Goblin 1123,20,0,0,0 -gef_fild11,0,0,0,0 monster Goblin 1124,20,0,0,0 -gef_fild11,0,0,0,0 monster Goblin 1125,20,0,0,0 -gef_fild11,0,0,0,0 monster Goblin 1126,20,0,0,0 -gef_fild11,0,0,0,0 monster Goblin Archer 1258,20,0,0,0 -gef_fild11,0,0,0,0 monster Poporing 1031,15,0,0,0 -gef_fild11,0,0,0,0 monster Rotar Zairo 1392,10,0,0,0 -gef_fild11,101,277,4,1 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,176,288,1,4 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,253,357,1,4 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,247,249,1,4 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,257,209,1,4 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,174,240,1,3 monster Black Mushroom 1084,3,360000,180000,1 -gef_fild11,283,100,4,1 monster Black Mushroom 1084,3,360000,180000,1 //================================================== // gef_fild12 - Kordt Forest //================================================== -gef_fild12,0,0,0,0 monster Kobold 1133,20,0,0,0 -gef_fild12,0,0,0,0 monster Kobold 1134,30,0,0,0 -gef_fild12,0,0,0,0 monster Kobold 1135,30,0,0,0 -gef_fild12,0,0,0,0 monster Kobold Archer 1282,40,0,0,0 -gef_fild12,0,0,0,0 monster Poporing 1031,20,0,0,0 -gef_fild12,0,0,0,0 monster Kobold Leader 1296,1,1800000,1200000,0 +//gef_fild12,0,0,0,0 monster Kobold 1133,20,0,0,0 +//gef_fild12,0,0,0,0 monster Kobold 1134,30,0,0,0 +//gef_fild12,0,0,0,0 monster Kobold 1135,30,0,0,0 +//gef_fild12,0,0,0,0 monster Kobold Archer 1282,40,0,0,0 +//gef_fild12,0,0,0,0 monster Poporing 1031,20,0,0,0 +//gef_fild12,0,0,0,0 monster Kobold Leader 1296,1,1800000,1200000,0 //================================================== // gef_fild13 - Britoniah //================================================== -gef_fild13,0,0,0,0 monster Poporing 1031,20,0,0,0 -gef_fild13,0,0,0,0 monster Creamy 1018,40,0,0,0 -gef_fild13,0,0,0,0 monster Ambernite 1094,30,0,0,0 +//gef_fild13,0,0,0,0 monster Poporing 1031,20,0,0,0 +//gef_fild13,0,0,0,0 monster Creamy 1018,40,0,0,0 +//gef_fild13,0,0,0,0 monster Ambernite 1094,30,0,0,0 //================================================== // gef_fild14 - West Orc Village //================================================== -gef_fild14,0,0,0,0 monster Orc Lady 1273,20,0,0,0 -gef_fild14,0,0,0,0 boss_monster Orc Hero 1087,1,3600000,600000,1 -gef_fild14,0,0,0,0 monster Orc Warrior 1023,10,0,0,0 -gef_fild14,0,0,0,0 monster Orc Archer 1189,30,0,0,0 -gef_fild14,0,0,0,0 monster High Orc 1213,70,0,0,0 +//gef_fild14,0,0,0,0 monster Orc Lady 1273,20,0,0,0 +//gef_fild14,0,0,0,0 monster Orc Warrior 1023,10,0,0,0 +//gef_fild14,0,0,0,0 monster Orc Archer 1189,30,0,0,0 +//gef_fild14,0,0,0,0 monster High Orc 1213,70,0,0,0 diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt index 7b64863878..93dcecb0f1 100644 --- a/npc/mobs/fields/prontera.txt +++ b/npc/mobs/fields/prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= From dcc8df7702b1ff5ca976a9fa67d18c9583757bbd Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 01:36:14 +0000 Subject: [PATCH 021/129] Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14436 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/atcommand.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index ec31d55d3c..534edf3b3d 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/01 + * Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values. [Paradox924X] 2010/10/21 * Removed unused 'indoors' mapflag. [Gepard] 2010/10/17 diff --git a/src/map/atcommand.c b/src/map/atcommand.c index bed466f48d..a6eb86163f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2859,7 +2859,7 @@ int atcommand_statuspoint(const int fd, struct map_session_data* sd, const char* if (point < 0 && sd->status.status_point < -point) new_status_point = 0; else - new_status_point = cap_value(sd->status.status_point + point, 0, INT_MAX); + new_status_point = cap_value((int64)sd->status.status_point + point, 0, INT_MAX); if (new_status_point != (int)sd->status.status_point) { sd->status.status_point = new_status_point; @@ -2892,7 +2892,7 @@ int atcommand_skillpoint(const int fd, struct map_session_data* sd, const char* if (point < 0 && sd->status.skill_point < -point) new_skill_point = 0; else - new_skill_point = cap_value(sd->status.skill_point + point, 0, INT_MAX); + new_skill_point = cap_value((int64)sd->status.skill_point + point, 0, INT_MAX); if (new_skill_point != (int)sd->status.skill_point) { sd->status.skill_point = new_skill_point; @@ -2978,7 +2978,7 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma status[5] = &sd->status.luk; max = SHRT_MAX; - new_value = cap_value(*status[i] + value, 1, max); + new_value = cap_value((int64)*status[i] + value, 1, max); if (new_value != (int)*status[i]) { *status[i] = new_value; From 2cf15a8d36b98df681eb05ee554927dd03cf9823 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 03:38:24 +0000 Subject: [PATCH 022/129] Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14437 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/status.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 534edf3b3d..e937f0ffb4 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/01 + * Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X] * Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values. [Paradox924X] 2010/10/21 * Removed unused 'indoors' mapflag. [Gepard] diff --git a/src/map/status.c b/src/map/status.c index 91e7423230..b8767fde08 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4913,6 +4913,54 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if( bl->type != BL_MER ) return 0; // Stats only for Mercenaries break; + case SC_STRFOOD: + if (sc->data[SC_FOOD_STR_CASH] && sc->data[SC_FOOD_STR_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_AGIFOOD: + if (sc->data[SC_FOOD_AGI_CASH] && sc->data[SC_FOOD_AGI_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_VITFOOD: + if (sc->data[SC_FOOD_VIT_CASH] && sc->data[SC_FOOD_VIT_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_INTFOOD: + if (sc->data[SC_FOOD_INT_CASH] && sc->data[SC_FOOD_INT_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_DEXFOOD: + if (sc->data[SC_FOOD_DEX_CASH] && sc->data[SC_FOOD_DEX_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_LUKFOOD: + if (sc->data[SC_FOOD_LUK_CASH] && sc->data[SC_FOOD_LUK_CASH]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_STR_CASH: + if (sc->data[SC_STRFOOD] && sc->data[SC_STRFOOD]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_AGI_CASH: + if (sc->data[SC_AGIFOOD] && sc->data[SC_AGIFOOD]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_VIT_CASH: + if (sc->data[SC_VITFOOD] && sc->data[SC_VITFOOD]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_INT_CASH: + if (sc->data[SC_INTFOOD] && sc->data[SC_INTFOOD]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_DEX_CASH: + if (sc->data[SC_DEXFOOD] && sc->data[SC_DEXFOOD]->val1 > sc->data[type]->val1) + return 0; + break; + case SC_FOOD_LUK_CASH: + if (sc->data[SC_LUKFOOD] && sc->data[SC_LUKFOOD]->val1 > sc->data[type]->val1) + return 0; + break; } //Check for BOSS resistances @@ -5034,6 +5082,54 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val status_change_end(bl,SC_BLESSING,-1); status_change_end(bl,SC_INCREASEAGI,-1); break; + case SC_STRFOOD: + if (sc->data[SC_FOOD_STR_CASH] && sc->data[SC_FOOD_STR_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_STR_CASH,-1); + break; + case SC_AGIFOOD: + if (sc->data[SC_FOOD_AGI_CASH] && sc->data[SC_FOOD_AGI_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_AGI_CASH,-1); + break; + case SC_VITFOOD: + if (sc->data[SC_FOOD_VIT_CASH] && sc->data[SC_FOOD_VIT_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_VIT_CASH,-1); + break; + case SC_INTFOOD: + if (sc->data[SC_FOOD_INT_CASH] && sc->data[SC_FOOD_INT_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_INT_CASH,-1); + break; + case SC_DEXFOOD: + if (sc->data[SC_FOOD_DEX_CASH] && sc->data[SC_FOOD_DEX_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_DEX_CASH,-1); + break; + case SC_LUKFOOD: + if (sc->data[SC_FOOD_LUK_CASH] && sc->data[SC_FOOD_LUK_CASH]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_FOOD_LUK_CASH,-1); + break; + case SC_FOOD_STR_CASH: + if (sc->data[SC_STRFOOD] && sc->data[SC_STRFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_STRFOOD,-1); + break; + case SC_FOOD_AGI_CASH: + if (sc->data[SC_AGIFOOD] && sc->data[SC_AGIFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_AGIFOOD,-1); + break; + case SC_FOOD_VIT_CASH: + if (sc->data[SC_VITFOOD] && sc->data[SC_VITFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_VITFOOD,-1); + break; + case SC_FOOD_INT_CASH: + if (sc->data[SC_INTFOOD] && sc->data[SC_INTFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_INTFOOD,-1); + break; + case SC_FOOD_DEX_CASH: + if (sc->data[SC_DEXFOOD] && sc->data[SC_DEXFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_DEXFOOD,-1); + break; + case SC_FOOD_LUK_CASH: + if (sc->data[SC_LUKFOOD] && sc->data[SC_LUKFOOD]->val1 <= sc->data[type]->val1) + status_change_end(bl,SC_LUKFOOD,-1); + break; } //Check for overlapping fails From 41a9a64170ab8a1855eea2eb06214665caf02825 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 04:24:46 +0000 Subject: [PATCH 023/129] Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14438 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/clif.c | 4 +--- src/map/guild.c | 3 +-- src/map/map.c | 4 ++-- src/map/npc.c | 3 +-- src/map/script.c | 9 ++------- src/map/skill.c | 10 +--------- src/map/status.c | 4 ---- 8 files changed, 10 insertions(+), 29 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index e937f0ffb4..7539962be2 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/02 + * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X] 2010/11/01 * Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X] * Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values. [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index dfc464fb95..a13811913e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4191,7 +4191,7 @@ int clif_outsight(struct block_list *bl,va_list ap) { //tsd has lost sight of the bl object. switch(bl->type){ case BL_PC: - if (((TBL_PC*)bl)->vd.class_ != INVISIBLE_CLASS) + if (sd->vd.class_ != INVISIBLE_CLASS) clif_clearunit_single(bl->id,0,tsd->fd); if(sd->chatID){ struct chat_data *cd; @@ -13128,10 +13128,8 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) { int fail = 0, amount, points; short nameid; - struct npc_data *nd; nullpo_retv(sd); - nd = (struct npc_data *)map_id2bl(sd->npc_shopid); nameid = RFIFOW(fd,2); amount = RFIFOW(fd,4); points = RFIFOL(fd,6); // Not Implemented. Should be 0 diff --git a/src/map/guild.c b/src/map/guild.c index b89e1a3688..1b91dfc931 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1203,11 +1203,10 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp) // Celest int guild_getexp(struct map_session_data *sd,int exp) { - struct guild *g; struct guild_expcache *c; nullpo_ret(sd); - if (sd->status.guild_id == 0 || (g = guild_search(sd->status.guild_id)) == NULL) + if (sd->status.guild_id == 0 || guild_search(sd->status.guild_id) == NULL) return 0; c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, i2key(sd->status.char_id), create_expcache, sd); diff --git a/src/map/map.c b/src/map/map.c index be50cf8870..e696b874d1 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2673,7 +2673,7 @@ int map_eraseipport(unsigned short mapindex, uint32 ip, uint16 port) *------------------------------------------*/ static char *map_init_mapcache(FILE *fp) { - size_t size = 0, read_size; + size_t size = 0; char *buffer; // No file open? Return.. @@ -2691,7 +2691,7 @@ static char *map_init_mapcache(FILE *fp) nullpo_ret(buffer); // Read file into buffer.. - if((read_size = fread(buffer, sizeof(char), size, fp)) != size) { + if(fread(buffer, sizeof(char), size, fp) != size) { ShowError("map_init_mapcache: Could not read entire mapcache file\n"); return NULL; } diff --git a/src/map/npc.c b/src/map/npc.c index 8eb1c1ba7c..95981ad55c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -135,12 +135,11 @@ int npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd) *------------------------------------------*/ int npc_enable_sub(struct block_list *bl, va_list ap) { - struct map_session_data *sd; struct npc_data *nd; nullpo_ret(bl); nullpo_ret(nd=va_arg(ap,struct npc_data *)); - if(bl->type == BL_PC && (sd=(struct map_session_data *)bl)) + if(bl->type == BL_PC) { TBL_PC *sd = (TBL_PC*)bl; diff --git a/src/map/script.c b/src/map/script.c index ac7ac9163e..68f291f2c2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7517,7 +7517,6 @@ BUILDIN_FUNC(getmobdrops) { int class_ = script_getnum(st,2); int i, j = 0; - struct item_data *i_data; struct mob_db *mob; if( !mobdb_checkid(class_) ) @@ -7532,7 +7531,7 @@ BUILDIN_FUNC(getmobdrops) { if( mob->dropitem[i].nameid < 1 ) continue; - if( (i_data = itemdb_exists(mob->dropitem[i].nameid)) == NULL ) + if( itemdb_exists(mob->dropitem[i].nameid) == NULL ) continue; mapreg_setreg(add_str("$@MobDrop_item") + (j<<24), mob->dropitem[i].nameid); @@ -10039,10 +10038,9 @@ BUILDIN_FUNC(divorce) BUILDIN_FUNC(ispartneron) { TBL_PC *sd=script_rid2sd(st); - TBL_PC *p_sd=NULL; if(sd==NULL || !pc_ismarried(sd) || - (p_sd=map_charid2sd(sd->status.partner_id)) == NULL) { + map_charid2sd(sd->status.partner_id) == NULL) { script_pushint(st,0); return 0; } @@ -11352,12 +11350,9 @@ BUILDIN_FUNC(movenpc) *------------------------------------------*/ BUILDIN_FUNC(message) { - TBL_PC *sd; const char *msg,*player; TBL_PC *pl_sd = NULL; - sd = script_rid2sd(st); - player = script_getstr(st,2); msg = script_getstr(st,3); diff --git a/src/map/skill.c b/src/map/skill.c index c7b60661ea..a54bedc206 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -323,9 +323,6 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, int skill // Making plagiarize check its own function [Aru] int can_copy (struct map_session_data *sd, int skillid, struct block_list* bl) { - struct status_change* sc; - sc = status_get_sc(bl); - // Never copy NPC/Wedding Skills if (skill_get_inf2(skillid)&(INF2_NPC_SKILL|INF2_WEDDING_SKILL)) return 0; @@ -2483,7 +2480,7 @@ static int skill_reveal_trap (struct block_list *bl, va_list ap) *------------------------------------------*/ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag) { - struct map_session_data *sd = NULL, *tsd = NULL; + struct map_session_data *sd = NULL; struct status_data *tstatus; struct status_change *sc; @@ -2499,7 +2496,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int return 1; sd = BL_CAST(BL_PC, src); - tsd = BL_CAST(BL_PC, bl); if (status_isdead(bl)) return 1; @@ -7408,7 +7404,6 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns { struct skill_unit_group *sg; struct block_list *ss; - TBL_PC* sd; TBL_PC* tsd; struct status_data *tstatus, *sstatus; struct status_change *tsc, *sc; @@ -7425,7 +7420,6 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns nullpo_ret(sg=src->group); nullpo_ret(ss=map_id2bl(sg->src_id)); - sd = BL_CAST(BL_PC, ss); tsd = BL_CAST(BL_PC, bl); tsc = status_get_sc(bl); tstatus = status_get_status_data(bl); @@ -9041,11 +9035,9 @@ int skill_castfix (struct block_list *bl, int skill_id, int skill_lv) { int time = skill_get_cast(skill_id, skill_lv); struct map_session_data *sd; - struct status_change *sc; nullpo_ret(bl); sd = BL_CAST(BL_PC, bl); - sc = status_get_sc(bl); // calculate base cast time (reduced by dex) if( !(skill_get_castnodex(skill_id, skill_lv)&1) ) diff --git a/src/map/status.c b/src/map/status.c index b8767fde08..3b34d0e53f 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -7326,7 +7326,6 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data) *------------------------------------------*/ int status_change_timer_sub(struct block_list* bl, va_list ap) { - struct map_session_data *sd, *tsd; struct status_change* tsc; struct block_list* src = va_arg(ap,struct block_list*); @@ -7339,9 +7338,6 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) tsc = status_get_sc(bl); - sd = BL_CAST(BL_PC, src); - tsd = BL_CAST(BL_PC, bl); - switch( type ) { case SC_SIGHT: /* TCg */ From caece0ff5b01e160aa1ef59c66929cf0643aa2e5 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 04:37:41 +0000 Subject: [PATCH 024/129] Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14439 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + doc/script_commands.txt | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 7539962be2..430d69baba 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/02 + * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X] * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X] 2010/11/01 * Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X] diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 2d00cbbffd..5efdaa3803 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1063,7 +1063,7 @@ segment NPC talking, this command is used A LOT. See 'mes'. *close; This command will create a 'close' button in the message window for the invoking -character. If no window is currently on screen, it will be created. This is one +character. If no window is currently on screen, the script execution will end. This is one of the ways to end a speech from an NPC. Once the button is clicked, the NPC script execution will end, and the message box will disappear. @@ -1077,10 +1077,10 @@ script execution will end, and the message box will disappear. *close2; This command will create a 'close' button in the message window for the invoking -character. If no window is currently on screen, it will be created. See 'close'. -There is one important difference, though - even though the message box will -have closed, the script execution will not stop, and commands after 'close2' -will still run, meaning an 'end' has to be used to stop the script, unless you +character. WARNING: If no window is currently on screen, the script execution will halt +indefinitely! See 'close'. There is one important difference, though - even though +the message box will have closed, the script execution will not stop, and commands after +'close2' will still run, meaning an 'end' has to be used to stop the script, unless you make it stop in some other manner. mes "[Woman]"; From 11fd59555f3ae2e4f14281c3b0663dc42be5149b Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 04:46:03 +0000 Subject: [PATCH 025/129] Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14440 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char/char.c | 2 +- src/char_sql/char.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 430d69baba..6edc0cb83e 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/02 + * Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X] * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X] * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X] 2010/11/01 diff --git a/src/char/char.c b/src/char/char.c index b3e219e3e4..98a213316b 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1736,7 +1736,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset += 2; #endif -#if PACKETVER >= 20100720 && PACKETVER <= 20100727 +#if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif diff --git a/src/char_sql/char.c b/src/char_sql/char.c index b73b8c32ae..df3ea7fd63 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1596,7 +1596,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset+=2; #endif -#if PACKETVER >= 20100720 && PACKETVER <= 20100727 +#if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif From 32af9864c1776abe5306c951350548328f7ab726 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 04:54:34 +0000 Subject: [PATCH 026/129] Fixed incorrect status change constants being used in cash food scripts. (bugreport:4477) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14441 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/item_db.txt | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index d825eba00f..a2b1ddd68b 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/02 + * Fixed incorrect status change constants being used in cash food scripts. (bugreport:4477) [Paradox924X] 2010/10/23 * Rev. 14435 Updated stats for monsters that spawn on Geffen Fields. [L0ne_W0lf] * Packet_db now uses packet_db_ver set to default diff --git a/db/item_db.txt b/db/item_db.txt index 4e5ca0dda2..4e1dc27eae 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -4571,12 +4571,12 @@ 12200,Event_Cake,X-mas Cake,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{} 12201,Red_Box_C,Commonplace Red Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // Cash Shop Usable Items -12202,Str_Dish10_,Steamed Tongue,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STR_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} -12203,Agi_Dish10_,Steamed Scorpion,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGI_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} -12204,Int_Dish10_,Dragon Breath Cocktail,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INT_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} -12205,Dex_Dish10_,Hwergelmir's Tonic,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_DEX_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} -12206,Luk_Dish10_,Cooked Nine Tail's Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LUK_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} -12207,Vit_Dish10_,Stew Of Immortality,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_VIT_FOOD_CASH,1800000,10; percentheal 15,5; },{},{} +12202,Str_Dish10_,Steamed Tongue,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_STR_CASH,1800000,10; percentheal 15,5; },{},{} +12203,Agi_Dish10_,Steamed Scorpion,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_AGI_CASH,1800000,10; percentheal 15,5; },{},{} +12204,Int_Dish10_,Dragon Breath Cocktail,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_INT_CASH,1800000,10; percentheal 15,5; },{},{} +12205,Dex_Dish10_,Hwergelmir's Tonic,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_DEX_CASH,1800000,10; percentheal 15,5; },{},{} +12206,Luk_Dish10_,Cooked Nine Tail's Tails,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_LUK_CASH,1800000,10; percentheal 15,5; },{},{} +12207,Vit_Dish10_,Stew Of Immortality,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FOOD_VIT_CASH,1800000,10; percentheal 15,5; },{},{} 12208,Battle_Manual,Battle Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{} 12209,Insurance,Life Insurance,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{} 12210,Bubble_Gum,Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{} From 85923fd182510ddc241f4396f5d8a164914499a2 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 05:27:19 +0000 Subject: [PATCH 027/129] Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14442 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char_sql/char.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 6edc0cb83e..6a0422f8ce 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/02 + * Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X] * Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X] * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X] * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X] diff --git a/src/char_sql/char.c b/src/char_sql/char.c index df3ea7fd63..1a81b5d858 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -459,6 +459,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p) (p->base_exp != cp->base_exp) || (p->base_level != cp->base_level) || (p->job_level != cp->job_level) || (p->job_exp != cp->job_exp) || (p->zeny != cp->zeny) || + strcmp(p->last_point.map, cp->last_point.map) (p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) || (p->max_hp != cp->max_hp) || (p->hp != cp->hp) || (p->max_sp != cp->max_sp) || (p->sp != cp->sp) || From 0637dd55ac7a1be4d052253097f75de68873d0a3 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 2 Nov 2010 16:28:45 +0000 Subject: [PATCH 028/129] Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14443 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char_sql/char.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 6a0422f8ce..649ea12d5b 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/02 + * Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X] * Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X] * Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X] * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X] diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 1a81b5d858..f27395a80d 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -459,7 +459,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p) (p->base_exp != cp->base_exp) || (p->base_level != cp->base_level) || (p->job_level != cp->job_level) || (p->job_exp != cp->job_exp) || (p->zeny != cp->zeny) || - strcmp(p->last_point.map, cp->last_point.map) + (p->last_point.map != cp->last_point.map) || (p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) || (p->max_hp != cp->max_hp) || (p->hp != cp->hp) || (p->max_sp != cp->max_sp) || (p->sp != cp->sp) || From 1d60af7268e0536e4c6ce1190d7ddbfc14f49564 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 2 Nov 2010 22:21:02 +0000 Subject: [PATCH 029/129] Added mapflags for the map 'cave' used in the Crow of Fate quest. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14444 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/nobranch.txt | 1 + conf/mapflag/nomemo.txt | 1 + conf/mapflag/nopvp.txt | 1 + conf/mapflag/noteleport.txt | 1 + conf/mapflag/nowarpto.txt | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 014fa01691..8013e26356 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -94,6 +94,7 @@ ra_temsky mapflag nobranch ve_in mapflag nobranch ve_in02 mapflag nobranch thor_camp mapflag nobranch +cave mapflag nobanch // Job Quests ================== job_sword1 mapflag nobranch diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 11958b25a5..9e2d412a20 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -194,6 +194,7 @@ ve_fild02 mapflag nomemo ve_fild03 mapflag nomemo ve_fild04 mapflag nomemo ve_fild06 mapflag nomemo +cave mapflag nomemo // Job Quests ================ // First Job Class diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt index 5e7fd83fea..f982a1285f 100644 --- a/conf/mapflag/nopvp.txt +++ b/conf/mapflag/nopvp.txt @@ -107,4 +107,5 @@ ayothaya mapflag pvp off veins mapflag pvp off ve_in mapflag pvp off ve_in02 mapflag pvp off +cave mapflag pvp off //evt_zombie mapflag pvp off diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index b88cb01884..a00dc26a76 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -155,6 +155,7 @@ poring_c02 mapflag noteleport que_job01 mapflag noteleport que_job02 mapflag noteleport que_job03 mapflag noteleport +cave mapflag noteleport // Guild Castles ================= aldeg_cas01 mapflag noteleport diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index 01d27eda53..c99acc8ff7 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -1,4 +1,4 @@ -//===== eAthena Script ======================================= +/===== eAthena Script ======================================= //= Map flags that disable warpto //===== By: ================================================== //= eAthena Dev Team @@ -52,6 +52,7 @@ ama_test mapflag nowarpto gon_test mapflag nowarpto que_rachel mapflag nowarpto que_san04 mapflag nowarpto +cave mapflag nowarpto //Aldebaran Turbo Track ======== turbo_n_1 mapflag nowarpto turbo_n_4 mapflag nowarpto From ee121cab6b0b715b5a087f9f9f3db3bc9c6f5f84 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 4 Nov 2010 23:09:49 +0000 Subject: [PATCH 030/129] This update renders this branch unplayable due to the defense value of monsters. * Updated monster database. Most spawning monsters stats are now updated. - 'Ghost' mobs, and event monsters are not updated at this time. - Information collected from RODE by Gepard. * Added demonstrative mob_penalty_db. (unused.) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14445 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/mob_db.txt | 1022 ++++++++++++++++++++--------------------- db/mob_penalty_db.txt | 40 ++ 2 files changed, 551 insertions(+), 511 deletions(-) create mode 100644 db/mob_penalty_db.txt diff --git a/db/mob_db.txt b/db/mob_db.txt index c6fbbd99ec..ffd97b473d 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -4,223 +4,223 @@ // ID,Sprite_Name,kROName,iROName,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,aDelay,aMotion,dMotion,MEXP,ExpPer,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper // Note: Keep the Sprite_Name field as it is (in the game client). You may change Name,JName field tough -1001,SCORPION,Scorpion,Scorpion,24,1109,0,287,176,1,80,135,30,0,1,24,24,5,52,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1 +1001,SCORPION,Scorpion,Scorpion,16,153,0,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1 1002,PORING,Poring,Poring,1,60,0,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1 //1003,TESTEGG,Test Egg,Test Egg,2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1004,HORNET,Hornet,Hornet,11,90,0,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1 -1005,FARMILIAR,Familiar,Familiar,8,155,0,28,15,1,20,28,0,0,1,12,8,5,28,0,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1 +1005,FARMILIAR,Familiar,Familiar,24,427,0,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1 //1006,THIEF_BUG_LARVA,Thief Bug Larva,Thief Bug Larva,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1007,FABRE,Fabre,Fabre,6,72,0,54,41,1,12,15,24,0,12,5,3,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1 -1008,PUPA,Pupa,Pupa,4,66,0,36,27,0,1,4,24,2,11,1,3,3,8,6,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1 -1009,CONDOR,Condor,Condor,5,92,0,6,5,1,11,14,0,0,1,13,5,0,13,10,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1 +1007,FABRE,Fabre,Fabre,6,72,0,54,41,1,12,15,24,0,12,5,5,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1 +1008,PUPA,Pupa,Pupa,4,66,0,36,27,1,1,4,24,2,11,1,3,3,8,6,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1 +1009,CONDOR,Condor,Condor,12,114,0,81,60,1,14,20,7,5,14,7,6,0,13,5,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1 1010,WILOW,Willow,Willow,8,91,0,63,47,1,13,18,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1 -1011,CHONCHON,Chonchon,Chonchon,5,57,0,45,36,1,13,4,27,0,8,5,4,5,12,2,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1 +1011,CHONCHON,Chonchon,Chonchon,5,57,0,45,36,1,11,14,27,0,13,4,4,0,8,5,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1 1012,RODA_FROG,Roda Frog,Roda Frog,13,160,0,90,68,1,19,23,12,5,12,6,4,0,14,9,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1 -1013,WOLF,Wolf,Wolf,25,919,0,329,199,1,37,46,0,0,1,20,28,15,32,20,10,12,1,2,22,0x1089,200,1054,504,432,0,0,0,0,0,0,0,0,1011,20,920,9000,2308,10,517,650,528,1050,919,5500,578,600,0,0,0,0,4029,1 -1014,SPORE,Spore,Spore,16,510,0,66,108,1,24,48,0,5,1,12,12,5,19,8,10,12,1,3,21,0x81,200,1872,672,288,0,0,0,0,0,0,0,0,921,9000,507,800,510,50,743,10,2220,40,7033,5,578,600,0,0,0,0,4022,1 -1015,ZOMBIE,Zombie,Zombie,15,534,0,50,33,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,957,9000,724,5,938,1000,958,50,727,70,0,0,0,0,0,0,0,0,4038,1 -1016,ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,31,3040,0,483,283,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,0x2085,300,2864,864,576,0,0,0,0,0,0,0,0,932,4500,756,70,2285,3,1708,35,1752,1000,507,1800,1701,150,0,0,0,0,4094,1 +1013,WOLF,Wolf,Wolf,45,1219,0,342,386,1,80,91,55,3,27,24,30,15,33,5,10,12,1,2,22,0x1089,200,1054,504,432,0,0,0,0,0,0,0,0,1011,20,920,9000,2308,10,517,650,528,1050,919,5500,578,600,0,0,0,0,4029,1 +1014,SPORE,Spore,Spore,18,280,0,117,87,1,25,33,12,10,15,5,10,0,12,0,10,12,1,3,21,0x81,200,1872,672,288,0,0,0,0,0,0,0,0,921,9000,507,800,510,50,743,10,2220,40,7033,5,578,600,0,0,0,0,4022,1 +1015,ZOMBIE,Zombie,Zombie,17,234,0,117,87,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,957,9000,724,5,938,1000,958,50,727,70,0,0,0,0,0,0,0,0,4038,1 +1016,ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,50,1646,0,405,455,9,90,113,47,10,30,29,20,10,32,5,10,12,1,1,29,0x2085,300,2864,864,576,0,0,0,0,0,0,0,0,932,4500,756,70,2285,3,1708,35,1752,1000,507,1800,1701,150,0,0,0,0,4094,1 //1017,THIEF_BUG_FEMALE,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,651,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,400,0,0,0,0,4026,1 1018,CREAMY,Creamy,Creamy,23,378,0,144,162,1,61,62,28,20,16,1,1,0,1,20,10,12,0,4,24,0x181,150,1136,720,840,0,0,0,0,0,0,0,0,924,9000,2322,10,518,150,602,100,2207,2,712,500,692,100,0,0,0,0,4040,1 -1019,PECOPECO,Peco Peco,Peco Peco,19,531,0,159,72,1,50,64,0,0,1,13,13,25,27,9,10,12,2,2,23,0x1089,200,1564,864,576,0,0,0,0,0,0,0,0,925,9000,2402,20,508,200,507,900,1604,100,0,0,582,1000,0,0,0,0,4031,1 +1019,PECOPECO,Peco Peco,Peco Peco,25,446,0,162,183,1,76,83,48,0,21,10,13,5,28,5,10,12,2,2,23,0x1089,200,1564,864,576,0,0,0,0,0,0,0,0,925,9000,2402,20,508,200,507,900,1604,100,0,0,582,1000,0,0,0,0,4031,1 1020,MANDRAGORA,Mandragora,Mandragora,13,156,0,97,73,4,20,23,13,2,12,3,5,5,10,5,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,993,50,905,9000,1405,30,511,350,711,300,706,3,1967,10,0,0,0,0,4030,1 //1021,THIEF_BUG_MALE,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,653,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 //1022,WEREWOLF,Werewolf,Werewolf,80,28600,0,11813,7289,2,2560,3280,65,35,1,97,60,1,135,52,10,10,2,0,40,163,200,1500,768,652,0,0,0,0,0,0,0,0,999,500,1034,4000,984,500,985,500,7017,800,0,0,1912,300,0,0,0,0,0,0 -1023,ORK_WARRIOR,Orc Warrior,Orc Warrior,44,1434,0,350,540,1,72,104,52,3,32,15,23,15,16,10,10,12,1,7,22,0x3885,200,1864,864,288,0,0,0,0,0,0,0,0,998,210,931,9000,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1 -1024,WORM_TAIL,Wormtail,Wormtail,14,426,0,59,40,2,42,51,5,0,1,14,28,5,46,5,10,12,1,3,22,0x91,200,1048,48,192,0,0,0,0,0,0,0,0,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,100,0,0,0,0,4034,1 -1025,SNAKE,Snake,Boa,15,471,0,72,48,1,46,55,0,0,1,15,15,10,35,5,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,0,926,9000,1117,15,507,900,1011,35,937,800,954,1,578,600,0,0,0,0,4037,1 -1026,MUNAK,Munak,Munak,30,2872,0,601,318,1,150,230,0,0,1,15,20,5,46,15,10,12,1,1,29,0x3885,200,2468,768,288,0,0,0,0,0,0,0,0,901,9000,2264,2,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,1 +1023,ORK_WARRIOR,Orc Warrior,Orc Warrior,44,1434,0,350,540,1,71,104,52,3,32,15,24,15,16,10,10,12,1,7,22,0x3885,200,1864,864,288,0,0,0,0,0,0,0,0,998,210,931,9000,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1 +1024,WORM_TAIL,Wormtail,Wormtail,17,200,0,117,87,1,22,27,16,0,10,6,14,5,12,35,10,12,1,3,22,0x91,200,1048,48,192,0,0,0,0,0,0,0,0,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,100,0,0,0,0,4034,1 +1025,SNAKE,Snake,Boa,18,217,0,117,87,1,23,28,9,8,10,8,18,10,14,15,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,0,926,9000,1117,15,507,900,1011,35,937,800,954,1,578,600,0,0,0,0,4037,1 +1026,MUNAK,Munak,Munak,58,2445,0,495,557,1,175,205,77,15,53,9,25,10,30,10,10,12,1,1,29,0x3885,200,2468,768,288,0,0,0,0,0,0,0,0,901,9000,2264,2,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,1 //1027,RAPTICE,Raptice,Raptice,17,600,0,100,55,1,0,0,5,10,5,20,20,0,28,10,10,12,1,2,22,131,200,2000,1000,500,0,0,0,0,0,0,0,0,909,7000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1028,SOLDIER_SKELETON,Soldier Skeleton,Soldier Skeleton,29,2334,0,372,226,1,221,245,10,15,1,15,22,5,40,15,10,12,1,1,29,0x3885,200,2276,576,432,0,0,0,0,0,0,0,0,932,5500,756,60,1214,12,507,700,934,10,1201,150,1216,50,0,0,0,0,4086,1 -1029,ISIS,Isis,Isis,47,7003,0,3709,1550,1,423,507,10,35,38,65,43,50,66,15,10,12,2,6,27,0x3195,200,1384,768,336,0,0,0,0,0,0,0,0,936,5335,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1 -1030,ANACONDAQ,Anacondaq,Anacondaq,23,1109,0,300,149,1,124,157,0,0,1,23,28,10,36,5,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,0,1011,50,937,9000,1455,10,926,1500,936,200,508,150,756,50,0,0,0,0,4062,1 +1028,SOLDIER_SKELETON,Soldier Skeleton,Soldier Skeleton,34,804,0,216,243,1,84,98,53,5,14,10,32,5,29,3,10,12,1,1,29,0x3885,200,2276,576,432,0,0,0,0,0,0,0,0,932,5500,756,60,1214,12,507,700,934,10,1201,150,1216,50,0,0,0,0,4086,1 +1029,ISIS,Isis,Isis,59,2092,0,531,597,1,192,229,83,5,58,43,22,5,39,15,10,12,2,6,27,0x3195,200,1384,768,336,0,0,0,0,0,0,0,0,936,5335,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1 +1030,ANACONDAQ,Anacondaq,Anacondaq,100,8510,0,1602,1202,1,388,443,92,0,79,46,28,43,56,25,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,0,1011,50,937,9000,1455,10,926,1500,936,200,508,150,756,50,0,0,0,0,4062,1 1031,POPORING,Poporing,Poporing,30,524,0,198,224,1,74,94,36,17,17,26,20,18,36,5,10,12,1,3,25,0x83,300,1672,672,480,0,0,0,0,0,0,0,0,938,5500,910,1500,511,500,514,200,512,5,1207,5,512,250,0,0,0,0,4033,1 -1032,VERIT,Verit,Verit,38,5272,0,835,517,1,389,469,0,5,1,19,38,0,38,20,10,12,1,1,29,0x83,250,2468,768,480,0,0,0,0,0,0,0,0,929,9000,912,700,930,1100,509,600,2609,1,2612,200,639,20,0,0,0,0,4107,1 -1033,ELDER_WILOW,Elder Willow,Elder Willow,34,599,0,233,263,1,80,94,45,30,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,0,990,50,907,9000,1019,350,757,40,2329,30,690,100,604,100,0,0,0,0,4052,1 -1034,THARA_FROG,Thara Frog,Thara Frog,22,2152,0,219,138,1,105,127,0,10,1,22,22,5,34,10,10,12,1,5,41,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,1011,45,908,5500,911,600,509,30,725,5,918,2000,0,0,0,0,0,0,4058,1 -1035,HUNTER_FLY,Hunter Fly,Hunter Fly,42,5242,0,1517,952,1,246,333,25,15,33,105,32,15,72,30,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,996,30,999,100,943,5335,912,1300,756,129,2259,1,1226,2,0,0,0,0,4115,1 -1036,GHOUL,Ghoul,Ghoul,40,5418,0,1088,622,1,420,500,5,20,1,20,29,0,45,20,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,958,6000,756,110,509,700,511,800,2609,60,934,150,1260,1,0,0,0,0,4110,1 +1032,VERIT,Verit,Verit,52,1944,0,414,467,1,132,152,63,10,51,4,25,10,5,5,10,12,1,1,29,0x83,250,2468,768,480,0,0,0,0,0,0,0,0,929,9000,912,700,930,1100,509,600,2609,1,2612,200,639,20,0,0,0,0,4107,1 +1033,ELDER_WILOW,Elder Willow,Elder Willow,34,599,0,233,263,1,80,94,45,0,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,0,990,50,907,9000,1019,350,757,40,2329,30,690,100,604,100,0,0,0,0,4052,1 +1034,THARA_FROG,Thara Frog,Thara Frog,40,1157,0,311,350,1,73,103,37,17,25,10,10,18,30,2,10,12,1,5,41,0x81,200,2016,816,288,0,0,0,0,0,0,0,0,1011,45,908,5500,911,600,509,30,725,5,918,2000,0,0,0,0,0,0,4058,1 +1035,HUNTER_FLY,Hunter Fly,Hunter Fly,63,2050,0,604,681,1,120,140,46,20,32,72,22,25,79,15,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,996,30,999,100,943,5335,912,1300,756,129,2259,1,1226,2,0,0,0,0,4115,1 +1036,GHOUL,Ghoul,Ghoul,61,2614,0,583,656,1,216,245,78,5,56,12,19,11,27,10,10,12,1,1,49,0x3885,250,2456,912,504,0,0,0,0,0,0,0,0,958,6000,756,110,509,700,511,800,2609,60,934,150,1260,1,0,0,0,0,4110,1 1037,SIDE_WINDER,Side Winder,Side Winder,70,2736,0,720,810,1,301,331,101,12,52,32,35,20,66,15,10,12,1,2,25,0x3095,200,1576,576,576,0,0,0,0,0,0,0,0,954,5335,912,1400,756,134,1120,2,937,2500,926,5000,509,1000,0,0,0,0,4117,1 -1038,OSIRIS,Osiris,Osiris,78,415400,0,71500,28600,1,780,2880,10,25,1,75,30,37,86,40,10,12,1,1,89,0x37B5,100,1072,672,384,35750,10000,603,4000,608,3000,751,500,617,2000,1232,150,2235,200,1255,600,1009,1000,5053,150,1285,100,0,0,0,0,4144,1 -1039,BAPHOMET,Baphomet,Baphomet,81,668000,0,107250,37895,2,3220,4040,35,45,1,152,30,85,120,95,10,12,2,6,67,0x37B5,100,768,768,576,53625,10000,607,2000,750,500,923,5000,1466,200,2256,200,1476,50,714,500,5160,10,985,5432,984,4171,0,0,0,0,4147,1 -1040,GOLEM,Golem,Golem,25,3900,0,465,94,1,175,187,40,0,1,15,25,0,15,0,10,12,2,0,60,0x91,300,1608,816,396,0,0,0,0,0,0,0,0,999,150,953,9000,912,220,757,70,1003,210,715,200,998,350,0,0,0,0,4072,1 -1041,MUMMY,Mummy,Mummy,37,5176,0,800,602,1,305,360,0,10,28,19,32,0,63,20,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,0,930,9000,756,100,934,550,2604,1,2611,10,525,250,508,850,0,0,0,0,4106,1 -1042,STEEL_CHONCHON,Steel Chonchon,Steel Chonchon,17,530,0,109,71,1,54,65,15,0,1,43,17,5,33,10,10,12,0,4,24,0x118B,150,1076,576,480,0,0,0,0,0,0,0,0,992,90,999,30,910,2400,935,9000,943,30,998,200,1002,300,0,0,0,0,4042,1 +1038,OSIRIS,Osiris,Osiris,68,475840,0,245520,200880,1,1580,2483,172,164,97,99,86,131,145,67,10,12,1,1,89,0x37B5,100,1072,672,384,122760,10000,603,4000,608,3000,751,500,617,2000,1232,150,2235,200,1255,600,1009,1000,5053,150,1285,100,0,0,0,0,4144,1 +1039,BAPHOMET,Baphomet,Baphomet,81,668000,0,396525,334106,2,2864,4148,279,45,120,125,30,85,155,85,10,12,2,6,67,0x37B5,100,768,768,576,198262,10000,607,2000,750,500,923,5000,1466,200,2256,200,1476,50,714,500,5160,10,985,5432,984,4171,0,0,0,0,4147,1 +1040,GOLEM,Golem,Golem,61,2245,0,540,608,1,198,223,190,12,70,27,67,5,31,5,10,12,2,0,60,0x91,300,1608,816,396,0,0,0,0,0,0,0,0,999,150,953,9000,912,220,757,70,1003,210,715,200,998,350,0,0,0,0,4072,1 +1041,MUMMY,Mummy,Mummy,55,2155,0,486,548,1,171,192,95,3,54,4,14,1,62,0,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,0,930,9000,756,100,934,550,2604,1,2611,10,525,250,508,850,0,0,0,0,4106,1 +1042,STEEL_CHONCHON,Steel Chonchon,Steel Chonchon,48,1199,0,369,414,1,77,112,57,20,30,62,20,10,56,10,10,12,0,4,24,0x118B,150,1076,576,480,0,0,0,0,0,0,0,0,992,90,999,30,910,2400,935,9000,943,30,998,200,1002,300,0,0,0,0,4042,1 //1043,SEAHORES,Seahorse,Seahorse,18,1452,0,122,78,3,100,150,15,7,1,1,1,1,1,1,10,10,0,5,22,131,200,1500,800,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1044,OBEAUNE,Obeaune,Obeaune,31,3952,0,644,407,1,141,165,0,40,1,31,31,55,74,85,10,12,1,5,41,0x3095,200,1872,672,288,0,0,0,0,0,0,0,0,995,13,950,9000,5014,1,2326,10,720,10,951,500,748,30,0,0,0,0,4093,1 -1045,MARC,Marc,Marc,36,6900,0,988,625,1,220,280,5,10,1,36,36,20,56,30,10,12,1,5,41,0x3885,150,1272,72,480,0,0,0,0,0,0,0,0,995,18,956,9000,756,95,951,1000,720,10,717,200,509,700,0,0,0,0,4105,1 -1046,DOPPELGANGER,Doppelganger,Doppelganger,72,249000,0,51480,10725,1,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,0x37B5,100,480,480,288,25740,10000,724,1500,505,6000,0,0,2317,250,1162,220,1168,150,2258,350,1411,550,985,3686,984,2700,0,0,0,0,4142,1 -1047,PECOPECO_EGG,Peco Peco Egg,Peco Peco Egg,3,420,0,4,4,0,1,2,20,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,250,935,1500,2102,2,507,400,507,400,713,1800,736,10,0,0,0,0,4007,1 +1044,OBEAUNE,Obeaune,Obeaune,53,2158,0,476,534,1,102,147,48,26,54,47,21,40,36,25,10,12,1,5,41,0x3095,200,1872,672,288,0,0,0,0,0,0,0,0,995,13,950,9000,5014,1,2326,10,720,10,951,500,748,30,0,0,0,0,4093,1 +1045,MARC,Marc,Marc,56,2522,0,525,590,1,138,163,55,24,50,24,22,15,48,20,10,12,1,5,41,0x3885,150,1272,72,480,0,0,0,0,0,0,0,0,995,18,956,9000,756,95,951,1000,720,10,717,200,509,700,0,0,0,0,4105,1 +1046,DOPPELGANGER,Doppelganger,Doppelganger,77,380000,0,313200,250560,1,1639,2815,246,86,122,122,105,67,169,72,10,12,1,6,67,0x37B5,100,480,480,288,156600,10000,724,1500,505,6000,0,0,2317,250,1162,220,1168,150,2258,350,1411,550,985,3686,984,2700,0,0,0,0,4142,1 +1047,PECOPECO_EGG,Peco Peco Egg,Peco Peco Egg,7,75,0,54,41,0,1,1,16,5,4,10,22,8,10,5,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,250,935,1500,2102,2,507,400,507,400,713,1800,736,10,0,0,0,0,4007,1 1048,THIEF_BUG_EGG,Thief Bug Egg,Thief Bug Egg,20,344,0,126,143,0,1,2,64,10,10,1,50,0,3,15,10,12,0,4,27,0x100,1000,701,1,1,0,0,0,0,0,0,0,0,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,250,0,0,0,0,4012,1 -1049,PICKY,Picky,Picky,3,80,0,4,3,1,9,12,0,0,1,3,3,5,10,30,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,1 -1050,PICKY_,Picky,Picky,4,83,0,5,4,1,8,11,20,0,1,3,3,10,11,20,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,1 +1049,PICKY,Picky,Picky,9,95,0,63,47,1,18,19,21,3,14,9,10,0,10,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,1 +1050,PICKY_,Picky,Picky,10,89,0,72,54,1,18,38,48,10,15,8,8,5,9,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,9000,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,1 1051,THIEF_BUG,Thief Bug,Thief Bug,21,354,0,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x118B,150,1288,288,768,0,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1 1052,ROCKER,Rocker,Rocker,15,185,0,99,74,1,19,24,16,3,12,18,8,10,17,5,10,12,1,4,22,0x181,200,1864,864,540,0,0,0,0,0,0,0,0,940,9000,1916,10,2298,4,1402,80,520,10,752,10,703,10,0,0,0,0,4021,1 -1053,THIEF_BUG_,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1 -1054,THIEF_BUG__,Thief Bug Male,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 -1055,MUKA,Muka,Muka,17,610,0,273,120,1,40,49,5,5,15,15,30,5,20,10,10,12,2,3,22,0x81,300,1960,960,384,0,0,0,0,0,0,0,0,993,70,952,9000,713,2000,511,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1 +1053,THIEF_BUG_,Thief Bug Female,Thief Bug Female,28,531,0,180,203,1,42,58,28,7,12,10,23,10,24,10,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1 +1054,THIEF_BUG__,Thief Bug Male,Thief Bug Male,30,595,0,198,224,1,46,67,40,20,17,37,22,5,31,13,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1 +1055,MUKA,Muka,Muka,23,468,0,144,162,1,66,75,28,0,18,9,28,5,43,5,10,12,2,3,22,0x81,300,1960,960,384,0,0,0,0,0,0,0,0,993,70,952,9000,713,2000,511,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1 1056,SMOKIE,Smokie,Smokie,29,591,0,180,203,1,70,81,26,0,16,34,16,5,27,5,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,945,5500,919,5500,516,800,2213,1,754,2,912,5,729,2,0,0,0,0,4044,1 -1057,YOYO,Yoyo,Yoyo,38,898,0,270,305,1,63,74,40,0,20,11,34,20,10,10,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,0,942,9000,513,1500,508,200,7182,900,753,10,756,24,578,1000,0,0,0,0,4051,1 +1057,YOYO,Yoyo,Yoyo,38,898,0,270,305,1,63,74,40,0,20,11,34,20,19,10,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,0,942,9000,513,1500,508,200,7182,900,753,10,756,24,578,1000,0,0,0,0,4051,1 1058,METALLER,Metaller,Metaller,55,1687,0,450,507,1,187,228,72,12,52,24,10,0,47,31,10,12,1,4,23,0x118B,200,1708,1008,540,0,0,0,0,0,0,0,0,990,60,940,6500,911,400,757,49,707,20,935,3000,1914,10,0,0,0,0,4057,1 -1059,MISTRESS,Mistress,Mistress,74,212000,0,39325,27170,1,880,1110,40,60,50,165,60,95,70,130,10,12,0,4,84,0x37B5,100,1148,648,300,19662,10000,996,1500,526,4000,722,3000,1413,150,518,10000,2249,250,616,1000,7018,10,985,4268,16001,100,0,0,0,0,4132,1 -1060,BIGFOOT,Bigfoot,Bigfoot,25,1619,0,310,188,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,948,9000,2289,5,919,5000,740,80,516,1500,518,450,756,43,0,0,0,0,4074,1 -1061,NIGHTMARE,Nightmare,Nightmare,49,4437,0,1912,1912,1,447,529,0,40,1,74,25,15,64,10,10,12,2,6,68,0x3395,150,1816,816,432,0,0,0,0,0,0,0,0,944,6000,510,500,2608,2,603,30,505,100,1261,1,984,60,0,0,0,0,4127,1 +1059,MISTRESS,Mistress,Mistress,78,378000,0,368280,301320,1,985,2352,187,192,76,186,88,113,172,79,10,12,0,4,84,0x37B5,100,1148,648,300,184140,10000,996,1500,526,4000,722,3000,1413,150,518,10000,2249,250,616,1000,7018,10,985,4268,16001,100,0,0,0,0,4132,1 +1060,BIGFOOT,Bigfoot,Bigfoot,29,587,0,180,203,1,50,62,55,7,18,4,7,0,12,0,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,948,9000,2289,5,919,5000,740,80,516,1500,518,450,756,43,0,0,0,0,4074,1 +1061,NIGHTMARE,Nightmare,Nightmare,69,2872,0,501,1032,1,283,345,116,15,57,32,20,15,70,15,10,12,2,6,68,0x3395,150,1816,816,432,0,0,0,0,0,0,0,0,944,6000,510,500,2608,2,603,30,505,100,1261,1,984,60,0,0,0,0,4127,1 1062,PORING_,Santa Poring,Santa Poring,3,69,0,4,5,1,12,16,0,0,1,14,3,10,12,90,10,12,1,3,26,0x81,400,1672,672,480,0,0,0,0,0,0,0,0,529,2000,530,1000,507,1000,512,1000,2236,100,512,7,0,0,0,0,0,0,4005,1 1063,LUNATIC,Lunatic,Lunatic,3,55,0,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,0,0,0,0,4006,1 -1064,MEGALODON,Megalodon,Megalodon,24,1648,0,215,132,1,155,188,0,15,1,12,24,0,26,5,10,12,1,1,29,0x81,200,2492,792,432,0,0,0,0,0,0,0,0,959,5500,932,1500,510,80,717,120,719,10,603,2,624,20,0,0,0,0,4067,1 -1065,STROUF,Strouf,Strouf,48,11990,0,3080,2098,1,200,1250,5,50,1,40,45,92,43,65,10,12,2,5,61,0x3885,150,1872,672,384,0,0,0,0,0,0,0,0,951,5335,756,115,2241,2,1461,2,949,3000,720,20,956,1500,0,0,0,0,4111,1 -1066,VADON,Vadon,Vadon,19,1017,0,135,85,1,74,85,20,0,1,19,16,10,36,15,10,12,0,5,21,0x91,300,1632,432,540,0,0,0,0,0,0,0,0,991,40,960,9000,910,3000,2313,5,943,100,757,40,717,50,0,0,0,0,4049,1 -1067,CORNUTUS,Cornutus,Cornutus,23,1620,0,240,149,1,109,131,30,0,1,23,23,5,36,12,10,12,0,5,21,0x91,200,1248,48,480,0,0,0,0,0,0,0,0,991,45,961,5500,911,800,757,53,2106,5,943,1000,717,100,0,0,0,0,4061,1 -1068,HYDRA,Hydra,Hydra,14,660,0,59,40,7,22,28,0,40,1,14,14,0,40,2,10,12,0,3,41,0x84,1000,800,432,600,0,0,0,0,0,0,0,0,1011,25,962,5500,938,1500,971,20,525,5,517,700,0,0,0,0,0,0,4035,1 -1069,SWORD_FISH,Swordfish,Swordfish,30,4299,0,1251,638,1,168,199,5,20,1,30,30,41,62,30,10,12,2,5,41,0x3885,200,1968,768,384,0,0,0,0,0,0,0,0,995,10,963,9000,756,33,2257,2,757,50,1117,25,956,600,0,0,0,0,4089,1 -1070,KUKRE,Kukre,Kukre,11,507,0,38,28,1,28,37,15,0,1,11,11,5,16,2,10,12,0,5,21,0x83,150,1776,576,288,0,0,0,0,0,0,0,0,991,30,955,5500,910,400,528,500,507,650,928,450,623,20,0,0,0,0,4027,1 -1071,PIRATE_SKEL,Pirate Skeleton,Pirate Skeleton,25,1676,0,233,142,1,145,178,10,15,25,13,25,5,25,10,10,12,1,1,29,0x3885,200,1754,554,288,0,0,0,0,0,0,0,0,932,3000,2287,15,7477,5,2211,250,1104,250,756,43,628,20,0,0,0,0,4073,1 -1072,KAHO,Kaho,Kaho,60,8409,0,3990,450,1,110,760,5,50,1,55,43,88,80,46,10,12,1,6,83,0x3985,150,1700,1000,500,0,0,0,0,0,0,0,0,994,30,1003,150,7097,3000,690,100,757,1000,716,300,970,5,0,0,0,0,4065,1 -1073,CRAB,Crab,Crab,20,2451,0,163,101,1,71,81,35,0,18,20,15,0,36,15,7,12,0,5,21,0x81,200,992,792,360,0,0,0,0,0,0,0,0,964,5500,960,1500,7049,700,1001,13,0,0,0,0,757,37,0,0,0,0,4153,1 -1074,SHELLFISH,Shellfish,Shellfish,15,920,0,66,44,1,35,42,35,0,1,12,8,0,32,5,10,12,0,5,21,0x91,200,864,864,384,0,0,0,0,0,0,0,0,965,5500,966,1000,7049,500,1056,1000,1001,10,0,0,757,18,0,0,0,0,4273,1 +1064,MEGALODON,Megalodon,Megalodon,46,1335,0,342,386,1,117,149,52,28,35,24,30,28,29,15,10,12,1,1,29,0x81,200,2492,792,432,0,0,0,0,0,0,0,0,959,5500,932,1500,510,80,717,120,719,10,603,2,624,20,0,0,0,0,4067,1 +1065,STROUF,Strouf,Strouf,61,3052,0,626,705,1,162,192,67,21,49,16,31,20,33,20,10,12,2,5,61,0x3885,150,1872,672,384,0,0,0,0,0,0,0,0,951,5335,756,115,2241,2,1461,2,949,3000,720,20,956,1500,0,0,0,0,4111,1 +1066,VADON,Vadon,Vadon,45,1252,0,342,386,1,78,103,54,21,35,21,28,20,33,15,10,12,0,5,21,0x91,300,1632,432,540,0,0,0,0,0,0,0,0,991,40,960,9000,910,3000,2313,5,943,100,757,40,717,50,0,0,0,0,4049,1 +1067,CORNUTUS,Cornutus,Cornutus,48,1450,0,369,414,1,79,126,42,28,32,27,45,26,27,15,10,12,0,5,21,0x91,200,1248,48,480,0,0,0,0,0,0,0,0,991,45,961,5500,911,800,757,53,2106,5,943,1000,717,100,0,0,0,0,4061,1 +1068,HYDRA,Hydra,Hydra,34,854,0,233,263,7,35,41,20,32,10,9,14,0,35,2,10,12,0,3,41,0x84,1000,800,432,600,0,0,0,0,0,0,0,0,1011,25,962,5500,938,1500,971,20,525,5,517,700,0,0,0,0,0,0,4035,1 +1069,SWORD_FISH,Swordfish,Swordfish,57,2600,0,525,590,1,149,184,52,12,50,56,25,15,40,15,10,12,2,5,41,0x3885,200,1968,768,384,0,0,0,0,0,0,0,0,995,10,963,9000,756,33,2257,2,757,50,1117,25,956,600,0,0,0,0,4089,1 +1070,KUKRE,Kukre,Kukre,42,1111,0,315,354,1,65,93,33,23,25,30,22,20,32,20,10,12,0,5,21,0x83,150,1776,576,288,0,0,0,0,0,0,0,0,991,30,955,5500,910,400,528,500,507,650,928,450,623,20,0,0,0,0,4027,1 +1071,PIRATE_SKEL,Pirate Skeleton,Pirate Skeleton,48,1411,0,369,414,1,105,125,53,20,35,25,25,15,30,10,10,12,1,1,29,0x3885,200,1754,554,288,0,0,0,0,0,0,0,0,932,3000,2287,15,7477,5,2211,250,1104,250,756,43,628,20,0,0,0,0,4073,1 +1072,KAHO,Kaho,Kaho,98,7045,0,1953,1463,1,504,728,106,55,81,61,55,65,66,73,10,12,1,6,83,0x3985,150,1700,1000,500,0,0,0,0,0,0,0,0,994,30,1003,150,7097,3000,690,100,757,1000,716,300,970,5,0,0,0,0,4065,1 +1073,CRAB,Crab,Crab,43,1233,0,315,354,1,69,79,36,11,22,14,24,7,28,15,7,12,0,5,21,0x81,200,992,792,360,0,0,0,0,0,0,0,0,964,5500,960,1500,7049,700,1001,13,0,0,0,0,757,37,0,0,0,0,4153,1 +1074,SHELLFISH,Shellfish,Shellfish,50,1680,0,405,455,1,70,92,43,5,42,11,48,25,26,10,10,12,0,5,21,0x91,200,864,864,384,0,0,0,0,0,0,0,0,965,5500,966,1000,7049,500,1056,1000,1001,10,0,0,757,18,0,0,0,0,4273,1 //1075,TURTLE,Turtle,Turtle,3,77,0,0,0,1,1,2,35,0,1,1,1,1,1,1,7,12,0,5,22,0x81,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1076,SKELETON,Skeleton,Skeleton,10,234,0,18,14,1,39,47,10,10,1,5,10,0,12,0,10,12,1,1,29,0x91,200,2228,528,576,0,0,0,0,0,0,0,0,1010,90,932,800,1505,80,909,3000,507,850,2609,30,0,0,0,0,0,0,4025,1 -1077,POISON_SPORE,Poison Spore,Poison Spore,19,665,0,186,93,1,89,101,0,0,1,19,25,0,24,0,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,510,60,972,50,921,1200,912,5,0,0,0,0,4048,1 -1078,RED_PLANT,Red Plant,Red Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,906,300,914,500,708,50,2269,2,0,0,0,0 -1079,BLUE_PLANT,Blue Plant,Blue Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,510,5500,712,1000,711,1000,905,500,906,300,522,50,514,1000,2270,2,0,0,0,0 -1080,GREEN_PLANT,Green Plant,Green Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,511,7000,712,1000,621,20,905,3000,906,1500,704,50,521,50,2270,2,0,0,0,0 -1081,YELLOW_PLANT,Yellow Plant,Yellow Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,906,300,707,5,914,500,2269,2,0,0,0,0 -1082,WHITE_PLANT,White Plant,White Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,906,1500,521,50,703,50,2269,2,0,0,0,0 -1083,SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,2,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,510,5500,508,1000,509,1000,710,5,608,20,518,500,607,50,714,1,0,0,0,0 -1084,BLACK_MUSHROOM,Black Mushroom,Black Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,7033,5500,0,0,0,0 -1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,7033,5500,0,0,0,0 -1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,64,126000,0,14300,7150,1,870,1145,60,45,65,75,35,45,85,150,10,12,2,4,43,0x11AB,100,768,768,480,7150,10000,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1 -1087,ORK_HERO,Orc Hero,Orc Hero,50,362000,0,106920,97200,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,29315,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1 +1076,SKELETON,Skeleton,Skeleton,27,612,0,162,183,1,78,102,21,2,24,15,30,5,19,1,10,12,1,1,29,0x91,200,2228,528,576,0,0,0,0,0,0,0,0,1010,90,932,800,1505,80,909,3000,507,850,2609,30,0,0,0,0,0,0,4025,1 +1077,POISON_SPORE,Poison Spore,Poison Spore,26,456,0,162,183,1,68,83,40,8,19,17,22,5,20,5,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,510,60,972,50,921,1200,912,5,0,0,0,0,4048,1 +1078,RED_PLANT,Red Plant,Red Plant,1,10,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,906,300,914,500,708,50,2269,2,0,0,0,0 +1079,BLUE_PLANT,Blue Plant,Blue Plant,1,10,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,510,5500,712,1000,711,1000,905,500,906,300,522,50,514,1000,2270,2,0,0,0,0 +1080,GREEN_PLANT,Green Plant,Green Plant,1,10,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,511,7000,712,1000,621,20,905,3000,906,1500,704,50,521,50,2270,2,0,0,0,0 +1081,YELLOW_PLANT,Yellow Plant,Yellow Plant,1,10,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,906,300,707,5,914,500,2269,2,0,0,0,0 +1082,WHITE_PLANT,White Plant,White Plant,1,10,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,906,1500,521,50,703,50,2269,2,0,0,0,0 +1083,SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,2,0,0,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,510,5500,508,1000,509,1000,710,5,608,20,518,500,607,50,714,1,0,0,0,0 +1084,BLACK_MUSHROOM,Black Mushroom,Black Mushroom,1,15,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,7033,5500,0,0,0,0 +1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,0,0,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,7033,5500,0,0,0,0 +1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,65,222750,0,194400,155520,1,907,1750,159,81,71,77,80,62,127,76,10,12,2,4,43,0x11AB,100,768,768,480,97200,10000,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1 +1087,ORK_HERO,Orc Hero,Orc Hero,50,362000,0,106920,97200,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,53460,10000,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1 1088,VOCAL,Vocal,Vocal,18,3317,0,99,79,1,71,82,77,26,77,26,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,645,700,1917,10,0,0,0,0,4211,1 1089,TOAD,Toad,Toad,27,660,0,162,183,1,70,89,24,6,32,19,27,10,24,5,10,12,1,5,21,0x37B5,200,1236,336,432,0,0,0,0,0,0,0,0,2244,50,518,2000,729,1000,746,1500,970,100,971,100,5125,1000,0,0,0,0,4306,1 -1090,MASTERING,Mastering,Mastering,2,2415,0,30,10,1,18,24,0,10,1,2,2,0,17,60,10,12,1,3,21,0x37B5,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,2116,1000,512,8000,512,8000,531,4000,0,0,0,0,4197,1 -1091,DRAGON_FLY,Dragon Fly,Dragon Fly,8,2400,0,88,44,1,22,27,40,0,1,20,8,15,17,5,10,12,0,4,24,0x37B5,100,1076,576,480,0,0,0,0,0,0,0,0,2245,200,507,8000,719,1500,742,2000,2607,3000,625,50,533,3000,0,0,0,0,4179,1 -1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,24,12240,0,247,176,1,135,159,10,0,57,45,48,20,50,65,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,725,10,626,50,0,0,0,0,4183,1 +1090,MASTERING,Mastering,Mastering,42,1260,0,315,354,1,80,120,48,31,35,21,41,12,29,60,10,12,1,3,21,0x37B5,300,1072,672,480,0,0,0,0,0,0,0,0,2257,200,619,50,722,1000,2116,1000,512,8000,512,8000,531,4000,0,0,0,0,4197,1 +1091,DRAGON_FLY,Dragon Fly,Dragon Fly,47,1035,0,360,405,1,102,135,57,28,37,44,30,15,44,15,10,12,0,4,24,0x37B5,100,1076,576,480,0,0,0,0,0,0,0,0,2245,200,507,8000,719,1500,742,2000,2607,3000,625,50,533,3000,0,0,0,0,4179,1 +1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,93,8203,0,1422,2601,1,399,445,102,51,72,63,55,29,90,15,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,725,10,626,50,0,0,0,0,4183,1 1093,ECLIPSE,Eclipse,Eclipse,31,625,0,207,233,1,60,80,50,20,20,28,35,17,27,55,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,746,1500,706,30,622,50,2355,1000,0,0,0,0,4266,1 1094,AMBERNITE,Ambernite,Ambernite,19,340,0,117,87,1,26,37,28,0,16,20,11,10,21,5,10,12,2,4,21,0x191,400,2048,648,648,0,0,0,0,0,0,0,0,991,50,946,9000,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1 -1095,ANDRE,Andre,Andre,17,688,0,109,71,1,60,71,10,0,1,17,24,20,26,20,10,12,0,4,22,0x118B,300,1288,288,384,0,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1 -1096,ANGELING,Angeling,Angeling,20,55000,0,163,144,1,120,195,0,70,1,50,20,75,68,200,10,12,1,8,86,0x37B5,200,1072,672,672,0,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,509,2000,512,28,714,40,0,0,0,0,4054,1 -1097,ANT_EGG,Ant Egg,Ant Egg,4,420,0,5,4,0,1,2,20,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,320,935,2000,909,2000,938,650,713,2000,1002,200,0,0,0,0,0,0,4013,1 -1098,ANUBIS,Anubis,Anubis,75,38000,0,28000,22000,1,530,1697,25,31,5,65,10,82,77,33,10,12,2,7,49,0x3695,150,1250,768,360,0,0,0,0,0,0,0,0,930,3000,1625,10,934,550,984,105,1045,4365,2617,1,1614,3,0,0,0,0,4138,1 -1099,ARGIOPE,Argiope,Argiope,41,4382,0,1797,849,1,395,480,30,0,1,41,31,10,56,30,10,12,2,4,25,0x3795,300,1792,792,336,0,0,0,0,0,0,0,0,1042,5335,912,1200,757,175,2406,5,511,1500,719,10,0,0,0,0,0,0,4114,1 -1100,ARGOS,Argos,Argos,25,1117,0,388,188,1,158,191,15,0,1,25,25,5,32,15,10,12,2,4,25,0x3195,300,1468,468,768,0,0,0,0,0,0,0,0,1025,9000,911,1200,1042,500,757,61,511,670,508,250,10017,15,0,0,0,0,4075,1 -1101,BAPHOMET_,Baphomet Jr.,Baphomet Jr.,50,8578,0,2706,1480,1,487,590,15,25,1,75,55,1,93,45,10,12,0,6,27,0x3795,100,868,480,120,0,0,0,0,0,0,0,0,923,500,984,63,1464,2,607,50,610,100,508,1300,2405,50,0,0,0,0,4129,1 -1102,BATHORY,Bathory,Bathory,44,5415,0,2503,1034,1,198,398,0,60,1,76,24,85,65,15,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,0,1001,200,1061,4850,2252,3,1611,5,1000,30,1006,15,637,20,0,0,0,0,4119,1 -1103,CARAMEL,Caramel,Caramel,23,1424,0,264,162,1,90,112,5,5,35,23,46,5,38,10,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1 +1095,ANDRE,Andre,Andre,33,724,0,216,243,1,51,72,55,16,11,20,40,10,24,10,10,12,0,4,22,0x118B,300,1288,288,384,0,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1 +1096,ANGELING,Angeling,Angeling,77,19800,0,3060,2693,1,355,500,72,238,58,50,33,105,67,200,10,12,1,8,86,0x37B5,200,1072,672,672,0,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,509,2000,512,28,714,40,0,0,0,0,4054,1 +1097,ANT_EGG,Ant Egg,Ant Egg,28,530,0,180,203,0,1,2,68,45,5,1,65,5,10,30,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,0,1010,320,935,2000,909,2000,938,650,713,2000,1002,200,0,0,0,0,0,0,4013,1 +1098,ANUBIS,Anubis,Anubis,105,18826,0,3356,2450,1,480,695,103,48,88,67,40,128,89,55,10,12,2,7,49,0x3695,150,1250,768,360,0,0,0,0,0,0,0,0,930,3000,1625,10,934,550,984,105,1045,4365,2617,1,1614,3,0,0,0,0,4138,1 +1099,ARGIOPE,Argiope,Argiope,75,3105,0,810,912,1,292,342,88,32,60,23,40,30,20,30,10,12,2,4,25,0x3795,300,1792,792,336,0,0,0,0,0,0,0,0,1042,5335,912,1200,757,175,2406,5,511,1500,719,10,0,0,0,0,0,0,4114,1 +1100,ARGOS,Argos,Argos,47,1005,0,360,405,1,96,129,58,8,38,17,25,5,26,15,10,12,2,4,25,0x3195,300,1468,468,768,0,0,0,0,0,0,0,0,1025,9000,911,1200,1042,500,757,61,511,670,508,250,10017,15,0,0,0,0,4075,1 +1101,BAPHOMET_,Baphomet Jr.,Baphomet Jr.,57,2035,0,486,548,1,186,219,70,25,52,60,36,17,52,25,10,12,0,6,27,0x3795,100,868,480,120,0,0,0,0,0,0,0,0,923,500,984,63,1464,2,607,50,610,100,508,1300,2405,50,0,0,0,0,4129,1 +1102,BATHORY,Bathory,Bathory,86,5242,0,1170,1364,1,229,325,61,89,66,38,40,77,56,50,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,0,1001,200,1061,4850,2252,3,1611,5,1000,30,1006,15,637,20,0,0,0,0,4119,1 +1103,CARAMEL,Caramel,Caramel,25,518,0,162,183,1,67,76,39,0,19,10,15,10,32,5,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1 1104,COCO,Coco,Coco,38,836,0,270,305,1,71,82,37,0,22,13,30,20,38,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1 -1105,DENIRO,Deniro,Deniro,19,760,0,135,85,1,68,79,15,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1 -1106,DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,427,266,1,169,208,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,1217,140,0,0,0,0,4082,1 -1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,9,164,0,20,16,1,30,36,0,0,1,9,9,5,21,40,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,517,600,2301,200,13011,5,582,1000,0,0,0,0,4023,1 -1108,DEVIACE,Deviace,Deviace,47,20090,0,9988,7207,1,514,1024,10,20,1,47,62,48,62,25,10,12,1,5,81,0x91,400,1680,480,384,0,0,0,0,0,0,0,0,995,25,1053,9000,1054,1000,5011,2,971,200,1256,3,756,161,0,0,0,0,4125,1 -1109,DEVIRUCHI,Deviruchi,Deviruchi,46,6666,0,2662,1278,1,475,560,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,0,1038,5335,1039,400,984,2,1458,2,1009,5,912,1500,756,154,0,0,0,0,4122,1 -1110,DOKEBI,Dokebi,Dokebi,33,2697,0,889,455,1,197,249,0,10,50,50,40,35,69,40,10,12,0,6,27,0x191,250,1156,456,384,0,0,0,0,0,0,0,0,1021,9000,757,150,1517,2,1613,1,969,1,1501,300,1005,5,0,0,0,0,4098,1 -1111,DRAINLIAR,Drainliar,Drainliar,24,1162,0,431,176,1,74,84,0,0,1,36,24,0,78,0,10,12,0,2,47,0x3095,250,1276,576,384,0,0,0,0,0,0,0,0,1011,60,913,3000,725,20,507,1000,7006,5500,7006,1500,756,40,0,0,0,0,4069,1 -1112,DRAKE,Drake,Drake,70,326666,0,28600,22880,1,1800,2100,20,35,85,80,49,75,79,50,10,12,1,1,29,0x37B5,400,620,420,360,14300,10000,504,5000,719,500,0,0,1127,600,1125,950,1135,150,1128,400,5019,350,985,3200,1189,100,0,0,0,0,4137,1 -1113,DROPS,Drops,Drops,3,55,0,4,3,1,10,13,0,0,1,3,3,0,12,15,10,12,1,3,23,0x83,400,1372,672,480,0,0,0,0,0,0,0,0,909,7500,1602,80,938,500,512,1100,713,1700,512,800,620,20,0,0,0,0,4004,1 -1114,DUSTINESS,Dustiness,Dustiness,21,1044,0,218,140,1,80,102,0,10,1,53,17,0,38,5,10,12,0,4,44,0x191,150,1004,504,384,0,0,0,0,0,0,0,0,1057,9000,1058,500,2291,4,928,2000,1001,10,507,1200,0,0,0,0,0,0,4056,1 -1115,EDDGA,Eddga,Eddga,65,152000,0,25025,12870,1,1215,1565,15,15,78,70,85,66,90,85,10,12,2,2,23,0x37B5,300,872,1344,432,12512,10000,1029,5000,1030,1000,994,3000,1133,150,2268,250,518,10000,1258,500,1030,250,985,2300,13046,100,0,0,0,0,4123,1 -1116,EGGYRA,Eggyra,Eggyra,24,633,0,215,220,1,85,107,20,25,1,36,24,0,32,0,10,12,1,0,48,0x91,200,1816,816,288,0,0,0,0,0,0,0,0,911,1000,5015,20,7032,550,507,1000,643,300,645,250,757,57,0,0,0,0,4070,1 -1117,EVIL_DRUID,Evil Druid,Evil Druid,58,16506,0,2890,1827,1,420,670,5,60,1,29,58,80,68,30,10,12,2,1,89,0x3695,300,2276,576,336,0,0,0,0,0,0,0,0,2217,10,1615,1,2508,2,1551,10,610,200,7478,4,509,2000,0,0,0,0,4141,1 +1105,DENIRO,Deniro,Deniro,31,671,0,207,233,1,45,61,52,16,15,16,30,10,23,15,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1 +1106,DESERT_WOLF,Desert Wolf,Desert Wolf,103,9447,0,1800,1350,1,520,579,114,47,93,69,63,61,82,42,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,1217,140,0,0,0,0,4082,1 +1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,14,140,0,90,68,1,33,41,13,0,10,12,8,5,17,7,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,517,600,2301,200,13011,5,582,1000,0,0,0,0,4023,1 +1108,DEVIACE,Deviace,Deviace,60,3135,0,658,740,1,160,189,51,16,57,26,32,25,45,15,10,12,1,5,81,0x91,400,1680,480,384,0,0,0,0,0,0,0,0,995,25,1053,9000,1054,1000,5011,2,971,200,1256,3,756,161,0,0,0,0,4125,1 +1109,DEVIRUCHI,Deviruchi,Deviruchi,93,8912,0,1806,2166,1,367,549,72,16,61,49,30,85,99,5,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,0,1038,5335,1039,400,984,2,1458,2,1009,5,912,1500,756,154,0,0,0,0,4122,1 +1110,DOKEBI,Dokebi,Dokebi,68,2820,0,675,759,1,317,347,85,20,52,56,35,20,60,25,10,12,0,6,27,0x191,250,1156,456,384,0,0,0,0,0,0,0,0,1021,9000,757,150,1517,2,1613,1,969,1,1501,300,1005,5,0,0,0,0,4098,1 +1111,DRAINLIAR,Drainliar,Drainliar,47,1162,0,389,438,1,100,142,50,15,35,34,24,22,50,20,10,12,0,2,47,0x3095,250,1276,576,384,0,0,0,0,0,0,0,0,1011,60,913,3000,725,20,507,1000,7006,5500,7006,1500,756,40,0,0,0,0,4069,1 +1112,DRAKE,Drake,Drake,91,804500,0,515160,417960,1,1938,3341,279,135,121,103,114,107,135,71,10,12,1,1,29,0x37B5,400,620,420,360,257580,10000,504,5000,719,500,0,0,1127,600,1125,950,1135,150,1128,400,5019,350,985,3200,1189,100,0,0,0,0,4137,1 +1113,DROPS,Drops,Drops,2,45,0,27,20,1,12,13,16,0,8,1,1,0,6,2,10,12,1,3,23,0x83,400,1372,672,480,0,0,0,0,0,0,0,0,909,7500,1602,80,938,500,512,1100,713,1700,512,800,620,20,0,0,0,0,4004,1 +1114,DUSTINESS,Dustiness,Dustiness,62,2026,0,602,678,1,158,189,69,50,46,22,46,60,68,105,10,12,0,4,44,0x191,150,1004,504,384,0,0,0,0,0,0,0,0,1057,9000,1058,500,2291,4,928,2000,1001,10,507,1200,0,0,0,0,0,0,4056,1 +1115,EDDGA,Eddga,Eddga,65,247500,0,198000,148500,1,866,1342,166,70,92,80,103,66,90,85,10,12,2,2,23,0x37B5,300,872,1344,432,99000,10000,1029,5000,1030,1000,994,3000,1133,150,2268,250,518,10000,1258,500,1030,250,985,2300,13046,100,0,0,0,0,4123,1 +1116,EGGYRA,Eggyra,Eggyra,53,1676,0,330,689,1,105,145,85,20,46,25,25,15,52,20,10,12,1,0,48,0x91,200,1816,816,288,0,0,0,0,0,0,0,0,911,1000,5015,20,7032,550,507,1000,643,300,645,250,757,57,0,0,0,0,4070,1 +1117,EVIL_DRUID,Evil Druid,Evil Druid,80,5149,0,1339,1280,1,344,412,88,45,62,32,24,45,71,5,10,12,2,1,89,0x3695,300,2276,576,336,0,0,0,0,0,0,0,0,2217,10,1615,1,2508,2,1551,10,610,200,7478,4,509,2000,0,0,0,0,4141,1 1118,FLORA,Flora,Flora,59,2301,0,531,597,3,155,186,99,29,49,29,35,5,42,80,10,12,2,3,22,0x84,1000,1432,432,576,0,0,0,0,0,0,0,0,1032,9000,2253,3,704,10,521,50,629,20,905,2000,748,1,0,0,0,0,4080,1 -1119,FRILLDORA,Frilldora,Frilldora,30,2023,0,529,319,1,200,239,0,10,35,30,38,15,53,30,10,12,1,2,23,0x3885,300,1540,720,432,0,0,0,0,0,0,0,0,1012,5500,757,90,903,1500,721,15,715,200,507,800,912,120,0,0,0,0,4088,1 -1120,GHOSTRING,Ghostring,Ghostring,18,73300,0,101,108,1,82,122,0,60,40,27,18,45,72,30,10,12,1,6,88,0x37B5,300,1220,1080,648,0,0,0,0,0,0,0,0,1059,5335,2274,100,2336,50,604,500,603,10,714,30,695,100,0,0,0,0,4047,1 -1121,GIEARTH,Giearth,Giearth,29,2252,0,495,301,1,154,185,10,50,25,29,46,60,64,105,10,12,0,6,22,0x191,200,1848,1296,432,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2227,10,1001,100,0,0,0,0,0,0,4087,1 +1119,FRILLDORA,Frilldora,Frilldora,57,1821,0,486,548,1,172,214,84,10,48,38,38,15,46,30,10,12,1,2,23,0x3885,300,1540,720,432,0,0,0,0,0,0,0,0,1012,5500,757,90,903,1500,721,15,715,200,507,800,912,120,0,0,0,0,4088,1 +1120,GHOSTRING,Ghostring,Ghostring,90,26700,0,4305,4467,1,350,512,88,72,66,85,66,66,99,66,10,12,1,6,88,0x37B5,300,1220,1080,648,0,0,0,0,0,0,0,0,1059,5335,2274,100,2336,50,604,500,603,10,714,30,695,100,0,0,0,0,4047,1 +1121,GIEARTH,Giearth,Giearth,42,1118,0,315,354,1,70,85,52,16,27,19,30,10,28,15,10,12,0,6,22,0x191,200,1848,1296,432,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2227,10,1001,100,0,0,0,0,0,0,4087,1 1122,GOBLIN_1,Goblin,Goblin,48,1058,0,369,414,1,87,121,56,5,37,54,25,20,36,10,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,998,270,911,9000,756,43,2297,3,1211,10,2104,5,507,1800,0,0,0,0,4060,1 1123,GOBLIN_2,Goblin,Goblin,44,931,0,333,374,1,94,122,52,5,33,16,24,15,58,10,10,12,1,7,23,0x3095,150,1320,620,240,0,0,0,0,0,0,0,0,998,250,911,9000,5010,3,1511,10,2104,1,507,1550,2297,3,0,0,0,0,4060,1 1124,GOBLIN_3,Goblin,Goblin,44,930,0,333,374,1,88,121,47,5,30,16,24,15,17,10,10,12,1,7,25,0x308D,250,1624,624,240,0,0,0,0,0,0,0,0,998,230,911,9000,2275,3,5088,15,2104,1,507,1550,508,220,0,0,0,0,4060,1 1125,GOBLIN_4,Goblin,Goblin,49,1494,0,396,446,1,72,94,70,3,31,27,46,15,34,10,10,12,1,7,22,0x308D,200,1624,624,240,0,0,0,0,0,0,0,0,993,100,998,170,5087,15,2263,3,1508,10,2104,1,507,1500,0,0,0,0,4060,1 1126,GOBLIN_5,Goblin,Goblin,56,2342,0,486,548,1,159,190,64,5,51,37,22,15,38,10,10,12,1,7,21,0x308D,300,3074,1874,480,0,0,0,0,0,0,0,0,998,150,911,9000,1605,15,2104,1,5089,15,507,1500,508,220,0,0,0,0,4060,1 -1127,HODE,Hode,Hode,26,2282,0,550,300,1,146,177,0,30,1,26,42,5,49,40,10,12,1,2,42,0x81,200,1480,480,720,0,0,0,0,0,0,0,0,993,120,1055,9000,757,80,938,3000,1147,10,7021,1,632,20,0,0,0,0,4081,1 +1127,HODE,Hode,Hode,63,2676,0,632,710,1,170,215,91,24,61,16,42,5,29,40,10,12,1,2,42,0x81,200,1480,480,720,0,0,0,0,0,0,0,0,993,120,1055,9000,757,80,938,3000,1147,10,7021,1,632,20,0,0,0,0,4081,1 1128,HORN,Horn,Horn,32,705,0,216,243,1,64,75,52,8,10,12,36,25,21,35,10,12,1,4,22,0x191,200,1528,528,288,0,0,0,0,0,0,0,0,993,80,1011,35,947,5500,1452,15,935,5500,943,70,0,0,0,0,0,0,4045,1 -1129,HORONG,Horong,Horong,34,1939,0,786,479,1,275,327,99,50,1,34,10,0,50,0,10,12,0,0,83,0x308D,400,1888,1152,828,0,0,0,0,0,0,0,0,953,6500,912,500,2279,5,1752,10000,757,118,633,20,970,50,0,0,0,0,4103,1 -1130,JAKK,Jakk,Jakk,38,3581,0,1408,880,1,315,382,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,0,1062,9000,912,900,985,31,2331,5,1008,5,535,1000,0,0,0,0,0,0,4109,1 -1131,JOKER,Joker,Joker,57,12450,0,3706,2362,1,621,738,10,35,1,143,47,75,98,175,10,12,2,7,84,0x3695,100,1364,864,432,0,0,0,0,0,0,0,0,912,2000,616,2,641,20,508,1000,1259,1,984,100,695,100,0,0,0,0,4139,1 -1132,KHALITZBURG,Khalitzburg,Khalitzburg,63,19276,0,4378,2750,1,875,1025,45,10,58,65,48,5,73,40,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,932,8000,985,191,5017,1,2108,2,1004,10,509,2000,1127,2,0,0,0,0,4136,1 -1133,KOBOLD_1,Kobold,Kobold,36,3893,0,988,625,1,265,318,15,10,1,90,36,30,52,20,10,12,1,7,44,0x308D,150,1028,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,700,757,25,1220,2,2104,5,0,0,0,0,0,0,4091,1 -1134,KOBOLD_2,Kobold,Kobold,31,2179,0,806,407,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,0x308D,200,1528,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,200,2104,3,508,100,2101,100,0,0,0,0,0,0,4091,1 -1135,KOBOLD_3,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x308D,300,1228,528,360,0,0,0,0,0,0,0,0,990,35,999,100,1034,5335,912,200,1355,5,2104,3,508,100,0,0,0,0,4091,1 +1129,HORONG,Horong,Horong,66,2304,0,781,879,1,262,332,84,35,36,32,35,45,56,25,10,12,0,0,83,0x308D,400,1888,1152,828,0,0,0,0,0,0,0,0,953,6500,912,500,2279,5,1752,10000,757,118,633,20,970,50,0,0,0,0,4103,1 +1130,JAKK,Jakk,Jakk,63,2054,0,632,710,1,218,255,90,25,58,43,42,25,55,15,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,0,1062,9000,912,900,985,31,2331,5,1008,5,535,1000,0,0,0,0,0,0,4109,1 +1131,JOKER,Joker,Joker,90,6022,0,1618,1821,1,288,348,64,76,84,99,30,50,77,35,10,12,2,7,84,0x3695,100,1364,864,432,0,0,0,0,0,0,0,0,912,2000,616,2,641,20,508,1000,1259,1,984,100,695,100,0,0,0,0,4139,1 +1132,KHALITZBURG,Khalitzburg,Khalitzburg,118,23986,0,2862,2147,1,737,833,125,10,121,48,40,31,89,32,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,932,8000,985,191,5017,1,2108,2,1004,10,509,2000,1127,2,0,0,0,0,4136,1 +1133,KOBOLD_1,Kobold,Kobold,107,10483,0,2274,1706,1,539,626,103,25,109,76,61,53,82,30,10,12,1,7,44,0x308D,150,1028,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,700,757,25,1220,2,2104,5,0,0,0,0,0,0,4091,1 +1134,KOBOLD_2,Kobold,Kobold,102,9152,0,1944,1458,1,367,429,117,59,96,61,55,48,79,20,10,12,1,7,45,0x308D,200,1528,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,200,2104,3,508,100,2101,100,0,0,0,0,0,0,4091,1 +1135,KOBOLD_3,Kobold,Kobold,101,9078,0,1827,1371,1,360,424,109,48,103,64,59,42,67,20,10,12,1,7,43,0x308D,300,1228,528,360,0,0,0,0,0,0,0,0,990,35,999,100,1034,5335,912,200,1355,5,2104,3,508,100,0,0,0,0,4091,1 //1136,KOBOLD_4,Kobold,Kobold,31,2179,0,806,407,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,0x31AD,200,1528,528,360,0,0,0,0,0,0,0,0,999,50,1034,5335,912,100,1355,5,2104,3,508,100,1301,150,0,0,0,0,4091,1 //1137,KOBOLD_5,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x31AD,300,1228,528,360,0,0,0,0,0,0,0,0,999,40,1034,5335,912,100,1514,5,2104,3,508,100,1501,150,0,0,0,0,4091,1 -1138,MAGNOLIA,Magnolia,Magnolia,53,1984,0,441,495,1,91,256,51,8,49,25,21,50,28,85,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,508,400,12127,5,0,0,0,0,4076,1 +1138,MAGNOLIA,Magnolia,Magnolia,53,1984,0,441,495,1,91,256,51,8,49,25,21,50,28,85,10,12,0,6,21,0x183,200,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,508,400,12127,5,0,0,0,0,4076,1 1139,MANTIS,Mantis,Mantis,65,2719,0,594,669,1,178,209,90,0,55,33,24,5,42,15,10,12,1,4,22,0x3195,200,1528,660,432,0,0,0,0,0,0,0,0,993,110,1031,9000,911,1400,757,70,943,250,721,10,507,650,0,0,0,0,4079,1 -1140,MARDUK,Marduk,Marduk,40,4214,0,1238,752,1,315,382,0,60,1,40,20,79,78,20,10,12,2,7,23,0x3095,300,1540,840,504,0,0,0,0,0,0,0,0,994,35,1045,4365,1608,10,2617,1,1614,3,691,100,642,20,0,0,0,0,4112,1 -1141,MARINA,Marina,Marina,21,2087,0,218,140,1,84,106,0,5,1,21,21,0,36,10,10,12,0,3,41,0x81,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1 -1142,MARINE_SPHERE,Marine Sphere,Marine Sphere,28,3518,0,461,284,1,120,320,0,40,1,28,28,0,33,50,10,12,0,3,41,0x0,800,1201,1,1,0,0,0,0,0,0,0,0,1050,5000,1051,2500,1520,10,720,10,717,150,10003,10,0,0,0,0,0,0,4084,1 -1143,MARIONETTE,Marionette,Marionette,41,3222,0,1078,1276,1,355,422,0,25,1,62,36,44,69,45,10,12,0,6,68,0x3195,300,1480,480,1056,0,0,0,0,0,0,0,0,1060,9000,2294,5,2605,1,699,100,1520,15,2407,1,5141,3,0,0,0,0,4113,1 -1144,MARSE,Marse,Marse,31,5034,0,586,370,1,211,252,0,5,1,31,25,5,52,30,10,12,0,5,41,0x91,300,1956,756,528,0,0,0,0,0,0,0,0,1024,9000,962,3000,717,200,720,10,995,12,1007,5,514,300,0,0,0,0,4095,1 -1145,MARTIN,Martin,Martin,18,1109,0,134,86,1,52,63,0,5,12,18,30,15,15,5,10,12,0,2,42,0x81,300,1480,480,480,0,0,0,0,0,0,0,0,1017,9000,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,1 -1146,MATYR,Matyr,Matyr,31,2585,0,967,407,1,134,160,0,0,1,47,38,5,64,5,10,12,1,2,27,0x3095,150,432,432,360,0,0,0,0,0,0,0,0,2618,10,528,5000,919,5500,537,400,757,100,514,200,0,0,0,0,0,0,4097,1 -1147,MAYA,Maya,Maya,81,169000,0,42900,17875,1,1800,2070,60,25,95,97,76,95,82,105,10,12,2,4,82,0x37B5,100,864,1000,480,21450,10000,730,2000,603,3000,617,2000,10006,500,2615,200,2234,200,639,500,7020,10,985,3500,2005,100,0,0,0,0,4146,1 -1148,MEDUSA,Medusa,Medusa,79,16408,0,6876,4697,1,827,1100,28,18,1,74,50,57,77,69,10,12,1,6,40,0x3795,180,1720,1320,360,0,0,0,0,0,0,0,0,1048,5335,1965,250,702,200,1973,20,722,250,967,3500,1007,3,0,0,0,0,4124,1 -1149,MINOROUS,Minorous,Minorous,52,7431,0,2750,1379,1,590,770,15,5,65,42,61,66,52,25,10,12,2,2,43,0x3095,200,1360,960,432,0,0,0,0,0,0,0,0,941,5335,756,196,1361,2,1005,10,516,1500,1301,200,568,300,0,0,0,0,4126,1 -1150,MOONLIGHT,Moonlight Flower,Moonlight Flower,67,120000,0,27500,14300,1,1200,1700,10,55,55,99,55,82,95,120,10,12,1,6,63,0x37B5,150,1276,576,288,13750,10000,1022,5000,504,1500,728,500,1477,500,1234,100,1525,150,10008,500,638,650,985,2600,1648,100,0,0,0,0,4131,1 -1151,MYST,Myst,Myst,38,3745,0,1391,688,1,365,445,0,40,1,38,18,0,53,10,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,0,5005,2,1019,800,10005,10,756,65,757,97,605,20,514,35,0,0,0,0,4108,1 -1152,ORC_SKELETON,Orc Skeleton,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,0,30,15,10,12,1,1,29,0x3885,200,2420,720,648,0,0,0,0,0,0,0,0,922,5500,932,3500,757,80,2299,2,1358,10,511,50,0,0,0,0,0,0,4085,1 -1153,ORC_ZOMBIE,Orc Zombie,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,0,24,5,10,12,1,1,29,0x3885,400,2852,1152,840,0,0,0,0,0,0,0,0,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,1 -1154,PASANA,Pasana,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,59,43,10,12,1,7,43,0x3095,165,976,576,288,0,0,0,0,0,0,0,0,7110,4365,7121,2500,757,20,1105,500,1217,150,2522,100,0,0,0,0,0,0,4099,1 -1155,PETIT,Petite,Petite,86,5799,0,1170,1317,1,292,358,99,4955,32,38,37,54,20,60,10,12,1,9,22,0x3095,200,1624,620,384,0,0,0,0,0,0,0,0,1035,5335,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1 -1156,PETIT_,Petite,Petite,79,3556,0,900,1013,1,280,316,86,42,63,39,31,55,72,85,10,12,1,9,24,0x3095,150,1420,1080,528,0,0,0,0,0,0,0,0,1036,5335,1037,300,985,61,509,1000,13006,5,912,1500,606,15,0,0,0,0,4120,1 -1157,PHARAOH,Pharaoh,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,0x37B5,125,868,768,288,57495,10000,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1 -1158,PHEN,Phen,Phen,26,3347,0,357,226,1,138,150,0,15,1,26,26,0,88,75,10,12,1,5,41,0x91,150,2544,1344,1152,0,0,0,0,0,0,0,0,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1 -1159,PHREEONI,Phreeoni,Phreeoni,69,188000,0,32175,16445,1,880,1530,10,20,1,85,78,35,130,60,10,12,2,2,60,0x37B5,200,1020,1020,288,16087,10000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1 -1160,PIERE,Piere,Piere,18,733,0,122,78,1,64,75,15,0,1,18,26,20,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1 -1161,PLANKTON,Plankton,Plankton,10,354,0,23,18,1,26,31,0,5,1,10,10,0,15,0,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,0,1052,9000,910,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1 -1162,RAFFLESIA,Rafflesia,Rafflesia,17,1333,0,333,333,3,105,127,0,2,1,18,24,11,37,10,10,12,0,3,22,0x3885,150,512,528,240,0,0,0,0,0,0,0,0,1033,5500,911,1600,706,2,708,10,703,10,711,550,509,30,0,0,0,0,4083,1 -1163,RAYDRIC,Raydric,Raydric,52,8613,0,3410,1795,1,830,930,40,15,58,47,42,5,69,26,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,0,985,106,2266,1,2315,2,1158,2,1116,100,1004,10,7054,4850,0,0,0,0,4133,1 -1164,REQUIEM,Requiem,Requiem,35,3089,0,800,458,1,220,272,0,15,1,53,35,5,57,2,10,12,1,7,27,0x3885,400,1516,816,432,0,0,0,0,0,0,0,0,603,35,714,1,912,2500,958,3500,934,1500,2308,10,7477,1,0,0,0,0,4104,1 -1165,SAND_MAN,Sandman,Sandman,34,3413,0,810,492,1,180,205,10,25,24,34,58,38,60,5,10,12,1,0,62,0x3885,250,1672,720,288,0,0,0,0,0,0,0,0,997,35,1056,5335,757,118,7043,350,1001,200,1257,1,1622,5,0,0,0,0,4101,1 -1166,SAVAGE,Savage,Savage,26,2092,0,521,248,1,120,150,10,5,1,26,54,10,37,15,10,12,2,2,42,0x91,150,1960,960,384,0,0,0,0,0,0,0,0,1028,9000,514,300,702,2,2276,1,605,10,757,70,526,2,0,0,0,0,4078,1 +1140,MARDUK,Marduk,Marduk,73,2893,0,774,872,1,180,292,66,43,66,49,21,40,66,25,10,12,2,7,23,0x3095,300,1540,840,504,0,0,0,0,0,0,0,0,994,35,1045,4365,1608,10,2617,1,1614,3,691,100,642,20,0,0,0,0,4112,1 +1141,MARINA,Marina,Marina,42,1209,0,340,381,1,73,98,20,19,24,27,18,22,29,15,10,12,0,3,41,0x81,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1 +1142,MARINE_SPHERE,Marine Sphere,Marine Sphere,51,1924,0,446,503,1,1,2,41,28,10,16,35,25,26,5,10,12,0,3,41,0x0,800,1201,1,1,0,0,0,0,0,0,0,0,1050,5000,1051,2500,1520,10,720,10,717,150,10003,10,0,0,0,0,0,0,4084,1 +1143,MARIONETTE,Marionette,Marionette,90,7166,0,1442,2009,1,202,392,35,24,52,79,28,105,72,20,10,12,0,6,68,0x3195,300,1480,480,1056,0,0,0,0,0,0,0,0,1060,9000,2294,5,2605,1,699,100,1520,15,2407,1,5141,3,0,0,0,0,4113,1 +1144,MARSE,Marse,Marse,47,1456,0,389,438,1,85,105,38,18,33,17,25,10,33,10,10,12,0,5,41,0x91,300,1956,756,528,0,0,0,0,0,0,0,0,1024,9000,962,3000,717,200,720,10,995,12,1007,5,514,300,0,0,0,0,4095,1 +1145,MARTIN,Martin,Martin,39,1056,0,311,350,1,70,88,58,19,25,29,28,15,30,10,10,12,0,2,42,0x81,300,1480,480,480,0,0,0,0,0,0,0,0,1017,9000,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,1 +1146,MATYR,Matyr,Matyr,58,2087,0,495,557,1,144,170,63,5,48,20,21,17,43,10,10,12,1,2,27,0x3095,150,432,432,360,0,0,0,0,0,0,0,0,2618,10,528,5000,919,5500,537,400,757,100,514,200,0,0,0,0,0,0,4097,1 +1147,MAYA,Maya,Maya,55,380000,0,178560,133920,1,555,820,183,50,88,72,76,102,92,76,10,12,2,4,82,0x37B5,100,864,1000,480,89280,10000,730,2000,603,3000,617,2000,10006,500,2615,200,2234,200,639,500,7020,10,985,3500,2005,100,0,0,0,0,4146,1 +1148,MEDUSA,Medusa,Medusa,102,10045,0,1737,1302,1,477,590,87,66,99,68,65,79,69,15,10,12,1,6,40,0x3795,180,1720,1320,360,0,0,0,0,0,0,0,0,1048,5335,1965,250,702,200,1973,20,722,250,967,3500,1007,3,0,0,0,0,4124,1 +1149,MINOROUS,Minorous,Minorous,58,1893,0,544,602,1,235,271,100,10,65,42,36,43,55,25,10,12,2,2,43,0x3095,200,1360,960,432,0,0,0,0,0,0,0,0,941,5335,756,196,1361,2,1005,10,516,1500,1301,200,568,300,0,0,0,0,4126,1 +1150,MOONLIGHT,Moonlight Flower,Moonlight Flower,79,324000,0,334080,271440,1,2029,3280,154,81,86,102,93,82,131,120,10,12,1,6,63,0x37B5,150,1276,576,288,167040,10000,1022,5000,504,1500,728,500,1477,500,1234,100,1525,150,10008,500,638,650,985,2600,1648,100,0,0,0,0,4131,1 +1151,MYST,Myst,Myst,49,1223,0,396,446,1,96,116,61,10,35,37,20,10,41,10,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,0,5005,2,1019,800,10005,10,756,65,757,97,605,20,514,35,0,0,0,0,4108,1 +1152,ORC_SKELETON,Orc Skeleton,Orc Skeleton,53,2077,0,459,524,1,115,140,82,10,52,16,24,5,22,5,10,12,1,1,29,0x3885,200,2420,720,648,0,0,0,0,0,0,0,0,922,5500,932,3500,757,80,2299,2,1358,10,511,50,0,0,0,0,0,0,4085,1 +1153,ORC_ZOMBIE,Orc Zombie,Orc Zombie,51,1908,0,430,498,1,109,124,71,5,45,17,32,5,52,5,10,12,1,1,29,0x3885,400,2852,1152,840,0,0,0,0,0,0,0,0,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,1 +1154,PASANA,Pasana,Pasana,79,3510,0,972,1194,1,398,438,93,35,76,36,33,20,67,5,10,12,1,7,43,0x3095,165,976,576,288,0,0,0,0,0,0,0,0,7110,4365,7121,2500,757,20,1105,500,1217,150,2522,100,0,0,0,0,0,0,4099,1 +1155,PETIT,Petite,Petite,86,5799,0,1170,1317,1,292,358,99,49,55,32,38,37,54,20,10,12,1,9,22,0x3095,250,1624,620,384,0,0,0,0,0,0,0,0,1035,5335,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1 +1156,PETIT_,Petite,Petite,79,3556,0,900,1013,1,280,316,86,42,63,39,31,55,72,85,10,12,1,9,24,0x3095,200,1420,1080,528,0,0,0,0,0,0,0,0,1036,5335,1037,300,985,61,509,1000,13006,5,912,1500,606,15,0,0,0,0,4120,1 +1157,PHARAOH,Pharaoh,Pharaoh,85,500000,0,417600,334080,1,1476,3258,124,269,98,102,96,142,144,102,10,12,2,7,67,0x37B5,125,868,768,288,208800,10000,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1 +1158,PHEN,Phen,Phen,52,1963,0,446,503,1,97,127,44,11,54,15,35,15,25,15,10,12,1,5,41,0x91,150,2544,1344,1152,0,0,0,0,0,0,0,0,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1 +1159,PHREEONI,Phreeoni,Phreeoni,71,300000,0,116000,180000,1,630,1597,269,98,88,70,112,87,102,71,10,12,2,2,60,0x37B5,200,1020,1020,288,58000,10000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1 +1160,PIERE,Piere,Piere,32,696,0,216,243,1,47,67,57,16,19,19,36,8,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1 +1161,PLANKTON,Plankton,Plankton,40,1232,0,334,375,1,75,111,28,28,23,53,25,55,35,14,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,0,1052,9000,910,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1 +1162,RAFFLESIA,Rafflesia,Rafflesia,86,5819,0,1170,1317,3,295,336,86,2,47,41,44,29,65,31,10,12,0,3,22,0x3885,150,512,528,240,0,0,0,0,0,0,0,0,1033,5500,911,1600,706,2,708,10,703,10,711,550,509,30,0,0,0,0,4083,1 +1163,RAYDRIC,Raydric,Raydric,115,18408,0,2770,2076,1,572,668,89,15,129,87,55,32,76,27,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,0,985,106,2266,1,2315,2,1158,2,1116,100,1004,10,7054,4850,0,0,0,0,4133,1 +1164,REQUIEM,Requiem,Requiem,71,3089,0,738,831,1,316,364,88,20,58,34,35,12,42,10,10,12,1,7,27,0x3885,400,1516,816,432,0,0,0,0,0,0,0,0,603,35,714,1,912,2500,958,3500,934,1500,2308,10,7477,1,0,0,0,0,4104,1 +1165,SAND_MAN,Sandman,Sandman,61,2887,0,626,705,1,156,212,126,24,44,8,55,15,31,25,10,12,1,0,62,0x3885,250,1672,720,288,0,0,0,0,0,0,0,0,997,35,1056,5335,757,118,7043,350,1001,200,1257,1,1622,5,0,0,0,0,4101,1 +1166,SAVAGE,Savage,Savage,59,2301,0,573,644,1,172,195,126,3,56,21,54,10,47,15,10,12,2,2,42,0x91,150,1960,960,384,0,0,0,0,0,0,0,0,1028,9000,514,300,702,2,2276,1,605,10,757,70,526,2,0,0,0,0,4078,1 1167,SAVAGE_BABE,Savage Babe,Savage Babe,14,180,0,90,68,1,19,25,22,0,16,8,9,5,21,18,10,12,0,2,22,0x81,400,1624,624,576,0,0,0,0,0,0,0,0,919,9000,1302,100,517,500,1750,1000,949,850,1010,80,627,40,0,0,0,0,4017,1 //1168,SCORPION_KING,Scorpion King,Scorpion King,50,6354,0,2187,1346,1,500,603,40,10,1,50,47,1,83,30,10,12,2,7,23,0x1B1,200,1700,1000,500,0,0,0,0,0,0,0,0,994,45,1046,4850,1005,15,904,5000,943,3000,509,700,0,0,0,0,0,0,4130,1 -1169,SKEL_WORKER,Skeleton Worker,Skeleton Worker,30,2872,0,397,240,1,242,288,0,15,1,15,30,5,42,10,10,12,1,1,29,0x3885,400,2420,720,384,0,0,0,0,0,0,0,0,998,400,1041,5500,757,90,5009,2,999,100,1003,200,1002,800,0,0,0,0,4092,1 -1170,SOHEE,Sohee,Sohee,33,5628,0,739,455,1,210,251,0,10,1,33,33,10,58,15,10,12,1,6,21,0x191,250,2112,912,576,0,0,0,0,0,0,0,0,1020,9000,1049,50,2277,1,2504,5,1217,5,507,1000,662,350,0,0,0,0,4100,1 +1169,SKEL_WORKER,Skeleton Worker,Skeleton Worker,44,1240,0,333,374,1,92,104,45,5,30,13,22,10,37,25,10,12,1,1,29,0x3885,400,2420,720,384,0,0,0,0,0,0,0,0,998,400,1041,5500,757,90,5009,2,999,100,1003,200,1002,800,0,0,0,0,4092,1 +1170,SOHEE,Sohee,Sohee,64,2875,0,594,669,1,169,199,61,21,61,24,29,20,37,25,10,12,1,6,21,0x191,250,2112,912,576,0,0,0,0,0,0,0,0,1020,9000,1049,50,2277,1,2504,5,1217,5,507,1000,662,350,0,0,0,0,4100,1 //1171,SOLDIER_ANDRE,Soldier Andre,Soldier Andre,22,1245,0,219,138,1,105,127,20,0,1,22,44,20,40,10,10,12,0,4,42,0x3095,200,1001,1,1,0,0,0,0,0,0,0,0,1014,2700,911,800,757,10,1111,15,1001,30,943,150,0,0,0,0,0,0,4059,1 //1172,SOLDIER_DENIRO,Soldier Deniro,Soldier Deniro,29,2047,0,450,274,1,162,193,20,0,1,29,58,20,54,10,10,12,0,4,42,0x3095,200,2000,1000,500,0,0,0,0,0,0,0,0,1014,5500,911,2000,757,15,1111,20,943,270,1001,50,0,0,0,0,0,0,4059,1 //1173,SOLDIER_PIERE,Soldier Piere,Soldier Piere,23,1217,0,240,149,1,109,131,25,0,1,23,46,20,38,10,10,12,0,4,42,0x3095,200,1001,1,1,0,0,0,0,0,0,0,0,1014,3100,911,800,911,10,1114,15,1001,35,943,200,0,0,0,0,0,0,4059,1 -1174,STAINER,Stainer,Stainer,21,365,0,126,143,1,65,74,65,74,10,10,24,5,39,15,10,12,0,4,24,0x191,200,1688,1188,612,0,0,0,0,0,0,0,0,992,70,1011,30,1013,9000,910,2100,757,25,943,10,1002,300,0,0,0,0,4039,1 -1175,TAROU,Tarou,Tarou,11,284,0,57,28,1,34,45,0,0,1,20,11,10,24,5,10,12,0,2,27,0x91,150,1744,1044,684,0,0,0,0,0,0,0,0,1016,9000,919,3000,949,800,528,1000,701,2,0,0,0,0,0,0,0,0,4028,1 -1176,VITATA,Vitata,Vitata,20,894,0,163,101,1,69,80,15,20,1,20,25,65,40,70,10,12,0,4,22,0x191,300,1768,768,384,0,0,0,0,0,0,0,0,993,90,955,5000,911,200,518,350,518,350,526,200,756,26,0,0,0,0,4053,1 -1177,ZENORC,Zenorc,Zenorc,31,2585,0,967,407,1,188,223,0,15,1,77,15,0,76,10,10,12,1,7,27,0x83,150,1180,480,360,0,0,0,0,0,0,0,0,1044,5500,756,70,938,2500,1006,5,508,100,640,20,0,0,0,0,0,0,4096,1 -1178,ZEROM,Zerom,Zerom,23,1109,0,240,149,1,127,155,0,10,1,23,23,5,42,0,10,12,1,7,23,0x3885,200,1780,1080,432,0,0,0,0,0,0,0,0,1011,55,998,190,2339,200,2265,3,2408,10,1002,300,1002,300,0,0,0,0,4064,1 -1179,WHISPER,Whisper,Whisper,34,1796,0,591,599,1,180,221,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,960,504,0,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4102,1 -1180,NINE_TAIL,Nine Tail,Nine Tail,51,7766,0,2812,825,1,610,734,10,25,1,80,46,1,74,85,10,12,1,2,63,0x3695,150,840,540,480,0,0,0,0,0,0,0,0,1022,4656,746,200,603,100,604,100,526,250,525,350,756,100,0,0,0,0,4159,1 +1174,STAINER,Stainer,Stainer,21,365,0,126,143,1,65,74,22,25,10,10,24,0,39,15,10,12,0,4,24,0x191,200,1688,1188,612,0,0,0,0,0,0,0,0,992,70,1011,30,1013,9000,910,2100,757,25,943,10,1002,300,0,0,0,0,4039,1 +1175,TAROU,Tarou,Tarou,22,420,0,135,152,1,72,78,23,5,21,6,12,0,10,1,10,12,0,2,27,0x91,150,1744,1044,684,0,0,0,0,0,0,0,0,1016,9000,919,3000,949,800,528,1000,701,2,0,0,0,0,0,0,0,0,4028,1 +1176,VITATA,Vitata,Vitata,35,756,0,234,264,1,68,86,44,12,20,11,24,20,21,5,10,12,0,4,22,0x191,300,1768,768,384,0,0,0,0,0,0,0,0,993,90,955,5000,911,200,518,350,518,350,526,200,756,26,0,0,0,0,4053,1 +1177,ZENORC,Zenorc,Zenorc,54,1816,0,450,507,1,130,154,69,5,50,18,20,5,25,5,10,12,1,7,27,0x83,150,1180,480,360,0,0,0,0,0,0,0,0,1044,5500,756,70,938,2500,1006,5,508,100,640,20,0,0,0,0,0,0,4096,1 +1178,ZEROM,Zerom,Zerom,70,2687,0,720,960,1,312,350,93,15,57,49,30,15,56,20,10,12,1,7,23,0x3885,200,1780,1080,432,0,0,0,0,0,0,0,0,1011,55,998,190,2339,200,2265,3,2408,10,1002,300,1002,300,0,0,0,0,4064,1 +1179,WHISPER,Whisper,Whisper,46,1109,0,242,513,1,65,120,20,40,32,48,20,35,52,20,10,12,0,6,68,0x3195,150,1960,960,504,0,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4102,1 +1180,NINE_TAIL,Nine Tail,Nine Tail,72,2783,0,887,998,1,446,496,95,40,61,38,30,20,88,50,10,12,1,2,63,0x3695,150,840,540,480,0,0,0,0,0,0,0,0,1022,4656,746,200,603,100,604,100,526,250,525,350,756,100,0,0,0,0,4159,1 //1181,ZOMBIE_DRAGON,Zombie Dragon,Zombie Dragon,1,1000,0,49500,1650,3,7900,9140,0,0,120,145,145,145,130,120,10,12,2,9,89,0x37B5,400,2700,1000,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1182,THIEF_MUSHROOM,Thief Mushroom,Thief Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,1069,1500,1070,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1183,CHONCHON_,Chonchon,Chonchon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,0x3985,200,1076,576,480,0,0,0,0,0,0,0,0,998,50,935,5500,909,1500,1205,55,601,100,742,5,0,0,0,0,0,0,4009,1 1184,FABRE_,Fabre,Fabre,1,30,0,1,0,1,4,7,0,0,1,2,1,1,4,5,10,12,0,4,22,0x3985,400,1672,672,480,0,0,0,0,0,0,0,0,914,2000,949,250,1502,80,721,2,511,350,705,500,1501,200,0,0,0,0,0,0 -1185,WHISPER_,Whisper,Whisper,34,1796,0,537,545,1,198,239,0,45,1,51,14,0,60,0,10,12,0,1,28,0x0,150,1960,960,504,0,0,0,0,0,0,0,0,1001,10,1059,100,0,0,2333,1,0,0,0,0,0,0,0,0,0,0,0,0 -1186,WHISPER_BOSS,Giant Whisper,Giant Whisper,34,5040,0,537,545,1,198,239,0,45,1,51,14,0,60,0,10,12,0,6,48,0x3795,250,2536,1536,672,0,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4303,1 +1185,WHISPER_,Whisper,Whisper,34,1796,0,483,737,1,198,239,0,45,1,51,14,0,60,0,10,12,0,1,28,0x0,150,1960,960,504,0,0,0,0,0,0,0,0,1001,10,1059,100,0,0,2333,1,0,0,0,0,0,0,0,0,0,0,0,0 +1186,WHISPER_BOSS,Giant Whisper,Giant Whisper,66,2570,0,630,710,1,282,341,94,45,40,79,44,51,67,31,10,12,0,6,48,0x3795,250,2536,1536,672,0,0,0,0,0,0,0,0,1001,150,1059,5335,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4303,1 1187,SWITCH,Switch,Switch,1,2,0,1,1,1,1,2,0,0,1,1,1,0,1,0,1,12,1,0,20,0x0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1188,BON_GUN,Bongun,Bongun,32,3520,0,424,242,1,220,260,0,0,45,15,36,10,48,15,10,12,1,1,29,0x3095,200,1720,500,420,0,0,0,0,0,0,0,0,1094,5500,7014,40,618,60,5046,1,609,15,508,1000,508,1250,0,0,0,0,4212,1 -1189,ORC_ARCHER,Orc Archer,Orc Archer,49,7440,0,1729,1787,9,310,390,10,5,1,44,25,20,125,20,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,0,1063,4656,1753,1000,1756,2500,1755,2500,1734,2,507,1400,509,900,0,0,0,0,4256,1 +1188,BON_GUN,Bongun,Bongun,59,2510,0,531,597,1,189,218,88,5,55,24,24,5,34,10,10,12,1,1,29,0x3095,200,1720,500,420,0,0,0,0,0,0,0,0,1094,5500,7014,40,618,60,5046,1,609,15,508,1000,508,1250,0,0,0,0,4212,1 +1189,ORC_ARCHER,Orc Archer,Orc Archer,78,4835,0,922,1161,9,260,303,67,31,55,32,24,30,99,15,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,0,1063,4656,1753,1000,1756,2500,1755,2500,1734,2,507,1400,509,900,0,0,0,0,4256,1 1190,ORC_LORD,Orc Lord,Orc Lord,55,552000,0,156240,122760,1,780,1428,256,92,95,95,103,96,155,85,10,12,2,7,82,0x37B5,100,1248,500,360,31102,10000,968,5500,617,2000,0,0,1363,200,2601,500,5007,150,1371,400,617,1000,985,4268,16000,3100,0,0,0,0,4135,1 -1191,MIMIC,Mimic,Mimic,51,6120,182,165,165,1,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,0x3095,100,972,500,288,0,0,0,0,0,0,0,0,617,5,603,45,1065,1200,611,3000,714,3,2626,1,757,270,0,0,0,0,4205,1 -1192,WRAITH,Wraith,Wraith,53,10999,0,2199,1099,1,580,760,5,30,1,95,30,65,95,35,10,12,2,1,89,0x3695,300,1816,576,240,0,0,0,0,0,0,0,0,1059,5820,2206,10,2506,2,716,650,602,1300,2505,10,731,5,0,0,0,0,4190,1 -1193,ALARM,Alarm,Alarm,58,10647,0,3987,2300,1,480,600,15,15,1,62,72,10,85,45,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,0,1095,5335,2607,1,7005,1500,611,1300,984,105,7026,20,912,1500,0,0,0,0,4244,1 -1194,ARCLOUSE,Arclouse,Arclouze,59,6075,0,860,1000,1,570,640,10,15,1,75,5,5,75,50,10,12,1,4,42,0x3195,100,960,500,480,0,0,0,0,0,0,0,0,1096,3500,938,3000,943,800,912,450,716,300,997,20,912,2500,0,0,0,0,4240,1 -1195,RIDEWORD,Rideword,Rideword,59,11638,0,2007,3106,1,584,804,5,35,48,75,10,20,120,45,10,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,0,1097,4850,1553,4,1554,4,1555,2,1556,2,7015,300,1006,20,0,0,0,0,4185,1 -1196,SKEL_PRISONER,Skeleton Prisoner,Skeleton Prisoner,52,8691,0,2466,1562,1,660,890,10,20,55,20,36,0,76,25,10,12,1,1,69,0x308D,350,1848,500,576,0,0,0,0,0,0,0,0,1098,3500,7016,100,2320,1,716,600,930,3500,2408,35,934,1500,0,0,0,0,4222,1 -1197,ZOMBIE_PRISONER,Zombie Prisoner,Zombie Prisoner,53,11280,0,2635,1724,1,780,930,10,20,1,24,39,0,72,25,10,12,1,1,69,0x308D,350,1768,500,192,0,0,0,0,0,0,0,0,1099,3500,7016,105,2266,1,716,600,930,3500,2408,39,985,112,0,0,0,0,4275,1 -1198,DARK_PRIEST,Dark Priest,Dark Priest,79,101992,0,12192,5152,2,1238,2037,56,70,5,91,41,101,103,42,10,12,1,6,89,0x31AD,200,864,1252,476,0,0,0,0,0,0,0,0,1557,5,2608,30,505,100,716,450,1009,50,2319,5,1241,1,0,0,0,0,4171,1 -1199,PUNK,Punk,Punk,43,3620,0,1699,1033,1,292,365,0,45,1,105,5,45,65,20,10,12,0,3,24,0x3095,300,1500,500,1000,0,0,0,0,0,0,0,0,7001,5335,715,800,10004,100,1061,1000,1057,3000,601,1100,2502,15,0,0,0,0,4313,1 -1200,ZHERLTHSH,Zherlthsh,Zealotus,63,18300,0,3608,2304,1,700,850,10,15,70,85,40,30,125,60,10,12,1,7,60,0x308D,200,800,2112,768,0,0,0,0,0,0,0,0,7017,5,509,1800,7293,1500,2331,8,2622,1,1970,100,2291,3,0,0,0,0,4277,1 -1201,RYBIO,Rybio,Rybio,71,9572,0,6317,3520,1,686,912,45,37,1,97,75,74,77,90,10,12,2,6,40,0x318D,200,1790,1440,540,0,0,0,0,0,0,0,0,1015,3880,7017,3,509,1800,731,30,1008,10,984,100,709,30,0,0,0,0,4194,1 -1202,PHENDARK,Phendark,Phendark,73,22729,0,6826,3443,2,794,1056,52,36,1,62,120,65,76,66,10,12,2,7,40,0x308D,175,1744,1344,600,0,0,0,0,0,0,0,0,1015,3880,7017,4,509,1800,0,0,984,150,1971,100,0,0,0,0,0,0,4329,1 -1203,MYSTELTAINN,Mysteltainn,Mysteltainn,76,33350,0,6457,5159,2,1160,1440,30,30,77,139,80,35,159,65,10,12,2,0,87,0x37B5,250,1152,500,240,0,0,0,0,0,0,0,0,7019,1,7297,1500,1152,70,1155,40,1163,2,999,120,984,243,0,0,0,0,4207,1 -1204,TIRFING,Tirfing,Ogretooth,71,29900,0,5412,4235,1,950,1146,30,35,58,87,55,35,132,65,10,12,1,0,67,0x37B5,100,816,500,240,0,0,0,0,0,0,0,0,7022,1,638,50,7292,1500,1214,70,1217,40,999,120,984,189,0,0,0,0,4254,1 -1205,EXECUTIONER,Executioner,Executioner,65,28980,0,4730,3536,2,570,950,35,35,64,85,40,25,88,60,10,12,2,0,47,0x37B5,200,768,500,384,0,0,0,0,0,0,0,0,7024,5,7290,1500,1111,80,1114,60,1125,40,999,120,984,145,0,0,0,0,4250,1 -1206,ANOLIAN,Anolian,Anolian,61,18960,0,5900,3700,1,640,980,15,15,1,43,58,25,80,65,10,12,1,5,41,0x3695,190,900,500,864,0,0,0,0,0,0,0,0,7003,4850,1754,2000,526,5,10019,10,943,5335,2625,1,984,134,0,0,0,0,4234,1 -1207,STING,Sting,Sting,61,9500,0,4081,2970,1,850,1032,5,30,57,45,55,5,120,85,10,12,1,0,62,0x3695,300,528,500,240,0,0,0,0,0,0,0,0,7004,4850,1756,1500,2624,1,1003,130,997,25,10007,10,719,3,0,0,0,0,4226,1 -1208,WANDER_MAN,Wander Man,Wanderer,74,8170,0,5786,4730,2,450,1170,5,5,1,192,38,45,127,85,10,12,1,6,24,0x3795,100,672,500,192,0,0,0,0,0,0,0,0,7005,4850,616,1,13015,5,2270,5,610,650,984,217,1164,1,0,0,0,0,4210,1 -1209,CRAMP,Cramp,Cramp,56,4720,0,2300,1513,1,395,465,0,5,1,85,35,5,65,60,10,12,0,2,45,0x3095,100,1000,500,1000,0,0,0,0,0,0,0,0,7007,4656,528,1000,726,80,746,110,568,250,510,70,984,95,0,0,0,0,4296,1 +1191,MIMIC,Mimic,Mimic,56,1939,182,486,548,1,221,243,63,15,49,120,20,15,99,0,10,12,1,0,60,0x3095,100,972,500,288,0,0,0,0,0,0,0,0,617,5,603,45,1065,1200,611,3000,714,3,2626,1,757,270,0,0,0,0,4205,1 +1192,WRAITH,Wraith,Wraith,77,5168,0,1190,1191,1,335,396,80,40,62,26,30,55,76,5,10,12,2,1,89,0x3695,300,1816,576,240,0,0,0,0,0,0,0,0,1059,5820,2206,10,2506,2,716,650,602,1300,2505,10,731,5,0,0,0,0,4190,1 +1193,ALARM,Alarm,Alarm,88,5562,0,1242,1398,1,290,338,106,53,70,72,40,25,55,25,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,0,1095,5335,2607,1,7005,1500,611,1300,984,105,7026,20,912,1500,0,0,0,0,4244,1 +1194,ARCLOUSE,Arclouse,Arclouze,107,10020,0,1844,2607,1,269,309,101,36,60,73,45,35,140,15,10,12,1,4,42,0x3195,100,960,500,480,0,0,0,0,0,0,0,0,1096,3500,938,3000,943,800,912,450,716,300,997,20,912,2500,0,0,0,0,4240,1 +1195,RIDEWORD,Rideword,Rideword,74,3222,0,810,1212,1,352,374,61,38,67,53,32,44,104,5,10,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,0,1097,4850,1553,4,1554,4,1555,2,1556,2,7015,300,1006,20,0,0,0,0,4185,1 +1196,SKEL_PRISONER,Skeleton Prisoner,Skeleton Prisoner,91,9194,0,1566,1763,1,466,521,95,41,84,35,60,20,71,15,10,12,1,1,69,0x308D,350,1848,500,576,0,0,0,0,0,0,0,0,1098,3500,7016,100,2320,1,716,600,930,3500,2408,35,934,1500,0,0,0,0,4222,1 +1197,ZOMBIE_PRISONER,Zombie Prisoner,Zombie Prisoner,89,8045,0,1458,1647,1,356,416,89,28,87,39,58,5,68,10,10,12,1,1,69,0x308D,350,1768,500,192,0,0,0,0,0,0,0,0,1099,3500,7016,105,2266,1,716,600,930,3500,2408,39,985,112,0,0,0,0,4275,1 +1198,DARK_PRIEST,Dark Priest,Dark Priest,98,12090,0,2430,1667,2,355,554,56,30,5,60,41,89,78,42,10,12,1,6,89,0x31AD,200,864,1252,476,0,0,0,0,0,0,0,0,1557,5,2608,30,505,100,716,450,1009,50,2319,5,1241,1,0,0,0,0,4171,1 +1199,PUNK,Punk,Punk,82,3869,0,972,1094,1,266,320,68,55,67,39,30,35,79,45,10,12,0,3,24,0x3095,300,1500,500,1000,0,0,0,0,0,0,0,0,7001,5335,715,800,10004,100,1061,1000,1057,3000,601,1100,2502,15,0,0,0,0,4313,1 +1200,ZHERLTHSH,Zherlthsh,Zealotus,105,61350,0,6944,6458,1,610,790,91,99,88,61,51,62,113,60,10,12,1,7,60,0x308D,200,800,2112,768,0,0,0,0,0,0,0,0,7017,5,509,1800,7293,1500,2331,8,2622,1,1970,100,2291,3,0,0,0,0,4277,1 +1201,RYBIO,Rybio,Rybio,98,8700,0,1575,1442,1,477,553,109,30,96,52,61,30,73,10,10,12,2,6,40,0x318D,200,1790,1440,540,0,0,0,0,0,0,0,0,1015,3880,7017,3,509,1800,731,30,1008,10,984,100,709,30,0,0,0,0,4194,1 +1202,PHENDARK,Phendark,Phendark,102,11000,0,1990,1302,2,539,614,307,50,111,65,71,20,91,30,10,12,2,7,40,0x308D,175,1744,1344,600,0,0,0,0,0,0,0,0,1015,3880,7017,4,509,1800,0,0,984,150,1971,100,0,0,0,0,0,0,4329,1 +1203,MYSTELTAINN,Mysteltainn,Mysteltainn,130,70000,0,7919,4987,2,771,1338,73,61,102,139,62,65,130,65,10,12,2,0,87,0x37B5,250,1152,500,240,0,0,0,0,0,0,0,0,7019,1,7297,1500,1152,70,1155,40,1163,2,999,120,984,243,0,0,0,0,4207,1 +1204,TIRFING,Tirfing,Ogretooth,114,59000,0,5345,5009,1,677,1088,87,69,105,105,75,73,108,65,10,12,1,0,67,0x37B5,100,816,500,240,0,0,0,0,0,0,0,0,7022,1,638,50,7292,1500,1214,70,1217,40,999,120,984,189,0,0,0,0,4254,1 +1205,EXECUTIONER,Executioner,Executioner,101,40200,0,4860,3645,2,515,874,97,188,99,96,77,78,79,60,10,12,2,0,47,0x37B5,200,768,500,384,0,0,0,0,0,0,0,0,7024,5,7290,1500,1111,80,1114,60,1125,40,999,120,984,145,0,0,0,0,4250,1 +1206,ANOLIAN,Anolian,Anolian,109,15547,0,2930,2223,1,500,610,61,11,130,63,55,66,58,48,10,12,1,5,41,0x3695,190,900,500,864,0,0,0,0,0,0,0,0,7003,4850,1754,2000,526,5,10019,10,943,5335,2625,1,984,134,0,0,0,0,4234,1 +1207,STING,Sting,Sting,104,10143,0,2172,1629,1,611,678,146,34,108,49,68,34,99,24,10,12,1,0,62,0x3695,300,528,500,240,0,0,0,0,0,0,0,0,7004,4850,1756,1500,2624,1,1003,130,997,25,10007,10,719,3,0,0,0,0,4226,1 +1208,WANDER_MAN,Wander Man,Wanderer,120,19307,0,3389,2466,2,711,816,64,5,118,92,36,15,107,33,10,12,1,6,24,0x3795,100,672,500,192,0,0,0,0,0,0,0,0,7005,4850,616,1,13015,5,2270,5,610,650,984,217,1164,1,0,0,0,0,4210,1 +1209,CRAMP,Cramp,Cramp,82,3898,0,972,1094,1,395,443,88,42,65,43,35,25,68,30,10,12,0,2,45,0x3095,100,1000,500,1000,0,0,0,0,0,0,0,0,7007,4656,528,1000,726,80,746,110,568,250,510,70,984,95,0,0,0,0,4296,1 //1210,FILAMENTOUS,Filamentous,Filamentous,51,6088,0,1926,1353,1,425,525,35,10,1,35,30,5,83,40,10,12,1,4,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7008,4850,947,8000,943,3880,993,200,1451,40,757,18,509,1600,0,0,0,0,4045,1 -1211,BRILIGHT,Brilight,Brilight,46,5562,0,1826,1331,1,298,383,30,5,1,90,15,10,50,35,10,12,0,4,23,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7009,5335,992,200,912,1200,602,1000,757,220,610,250,509,2600,0,0,0,0,4213,1 -1212,IRON_FIST,Iron Fist,Iron Fist,47,4221,0,1435,1520,1,430,590,40,5,1,25,15,10,81,20,10,12,1,4,60,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7010,5335,757,229,757,22,1002,750,999,180,998,300,0,0,0,0,0,0,4239,1 -1213,HIGH_ORC,High Orc,High Orc,52,6890,0,3618,1639,1,428,533,15,5,55,46,55,35,82,40,10,12,2,7,43,0x3695,150,1500,500,1000,0,0,0,0,0,0,0,0,7002,2500,1304,10,999,90,931,7500,912,1300,756,196,508,900,0,0,0,0,4322,1 -1214,CHOCO,Choco,Choco,48,1080,0,369,414,1,120,167,70,30,40,45,32,19,42,20,10,12,0,2,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1 -1215,STEM_WORM,Stem Worm,Stem Worm,40,6136,0,1452,939,2,290,375,5,10,1,30,26,15,79,35,10,12,1,3,24,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,1454,20,608,45,0,0,0,0,4224,1 -1216,PENOMENA,Penomena,Penomena,57,7256,0,2870,2200,7,415,565,5,50,1,5,35,15,136,30,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1 -1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,79,36140,0,8469,6268,1,1600,2150,55,50,66,68,64,25,135,50,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,1162,1,985,369,984,259,0,0,0,0,4140,1 +1211,BRILIGHT,Brilight,Brilight,71,2772,0,738,831,1,306,339,93,25,51,19,38,32,56,30,10,12,0,4,23,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7009,5335,992,200,912,1200,602,1000,757,220,610,250,509,2600,0,0,0,0,4213,1 +1212,IRON_FIST,Iron Fist,Iron Fist,47,4221,0,1292,1368,1,430,590,40,5,1,17,15,10,73,20,10,12,1,4,60,0x3195,200,1500,500,1000,0,0,0,0,0,0,0,0,7010,5335,757,229,757,22,1002,750,999,180,998,300,0,0,0,0,0,0,4239,1 +1213,HIGH_ORC,High Orc,High Orc,81,4193,0,1099,1158,1,389,439,101,45,75,16,40,31,69,20,10,12,2,7,43,0x3695,150,1500,500,1000,0,0,0,0,0,0,0,0,7002,2500,1304,10,999,90,931,7500,912,1300,756,196,508,900,0,0,0,0,4322,1 +1214,CHOCO,Choco,Choco,48,1080,0,369,414,1,120,167,70,30,40,45,32,19,42,20,10,12,0,2,23,0x3095,150,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1 +1215,STEM_WORM,Stem Worm,Stem Worm,84,4530,0,1080,1215,1,266,307,73,50,55,37,25,47,70,30,10,12,1,3,24,0x3095,300,1500,500,1000,0,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,1454,20,608,45,0,0,0,0,4224,1 +1216,PENOMENA,Penomena,Penomena,85,4589,0,1116,1556,7,292,333,85,32,76,38,35,35,89,10,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1 +1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,122,23297,0,4779,4013,1,810,1002,102,50,121,55,68,70,97,37,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,1162,1,985,369,984,259,0,0,0,0,4140,1 1220,M_DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,388,242,1,169,208,0,10,1,27,45,15,56,10,10,12,1,2,23,0x3695,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,0,0,0,0,0,0,4082,1 1221,M_SAVAGE,Savage,Savage,26,2092,0,357,226,1,146,177,10,5,1,26,54,10,37,10,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,1028,6000,514,150,702,3,2276,2,605,15,757,70,0,0,0,0,0,0,4078,1 //1222,L_HIGH_ORC,High Orc,High Orc,52,6890,0,2128,1490,1,428,533,15,5,1,46,55,35,82,40,10,12,2,7,43,0x3695,200,1500,500,1000,0,0,0,0,0,0,0,0,7002,2500,1304,10,999,120,931,8000,912,1600,756,196,508,1100,0,0,0,0,4066,1 @@ -243,88 +243,88 @@ 1239,META_DENIRO,Deniro,Deniro,19,760,0,135,85,1,68,79,15,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,0,955,6000,910,3000,938,1200,990,45,1001,8,1002,450,757,34,0,0,0,0,4043,1 1240,META_PICKY,Picky,Picky,3,80,0,4,3,1,9,12,0,0,1,3,3,0,10,30,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,6500,949,850,2302,150,507,650,519,350,715,60,0,0,0,0,0,0,4008,1 1241,META_PICKY_,Picky,Picky,4,83,0,5,4,1,8,11,20,0,1,3,3,0,11,20,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,0,916,6500,949,850,5015,7,507,750,519,350,715,60,0,0,0,0,0,0,4011,1 -1242,MARIN,Marin,Marin,15,742,0,66,44,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1 -1243,SASQUATCH,Sasquatch,Sasquatch,30,3163,0,529,319,1,250,280,5,0,75,25,60,10,34,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,0,912,750,509,800,949,1000,5030,1,948,5000,727,30,757,90,0,0,0,0,4216,1 +1242,MARIN,Marin,Marin,37,987,0,282,317,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1 +1243,SASQUATCH,Sasquatch,Sasquatch,72,3163,0,765,860,1,266,296,101,28,70,35,60,10,59,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,0,912,750,509,800,949,1000,5030,1,948,5000,727,30,757,90,0,0,0,0,4216,1 1244,JAKK_XMAS,Christmas Jakk,Christmas Jakk,38,3581,0,1113,688,1,315,382,5,30,1,38,38,43,75,45,10,12,1,0,43,0x81,200,1180,480,648,0,0,0,0,0,0,0,0,1062,5335,912,900,985,31,2331,5,644,20,7175,1200,7174,1200,0,0,0,0,4109,1 1245,GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,0,282,171,1,118,140,10,5,1,53,25,20,38,45,10,12,1,7,24,0x81,100,1120,620,240,0,0,0,0,0,0,0,0,7174,550,7175,550,756,43,644,10,1211,10,2104,5,2236,10,0,0,0,0,4060,1 -1246,COOKIE_XMAS,Christmas Cookie,Christmas Cookie,28,2090,0,461,284,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,0x91,400,1248,1248,240,0,0,0,0,0,0,0,0,538,1500,722,45,912,200,2502,25,644,5,688,100,507,1700,0,0,0,0,4235,1 +1246,COOKIE_XMAS,Christmas Cookie,Christmas Cookie,37,733,0,282,317,1,70,105,48,36,21,16,30,20,25,5,10,12,0,7,46,0x91,400,1248,1248,240,0,0,0,0,0,0,0,0,538,1500,722,45,912,200,2502,25,644,5,688,100,507,1700,0,0,0,0,4235,1 1247,ANTONIO,Antonio,Antonio,10,10,0,3,2,1,13,20,100,0,1,1,1,50,100,100,10,12,1,3,66,0xC1,100,720,720,432,0,0,0,0,0,0,0,0,7034,10000,644,200,538,1500,539,1000,529,5500,530,5500,2236,250,0,0,0,0,4243,1 -1248,CRUISER,Cruiser,Cruiser,35,2820,0,1100,450,7,175,215,5,5,1,40,10,10,90,25,10,12,1,0,60,0x2085,400,1296,1296,432,0,0,0,0,0,0,0,0,1098,900,2251,2,998,320,996,5,911,3500,13150,5,756,87,0,0,0,0,4297,1 -1249,MYSTCASE,Myst Case,Myst Case,38,3450,0,1113,688,1,160,360,5,10,65,50,25,5,48,75,10,12,1,0,60,0x91,400,1248,1248,432,0,0,0,0,0,0,0,0,530,90,912,1500,603,20,539,800,722,150,731,5,529,340,0,0,0,0,4206,1 -1250,CHEPET,Chepet,Chepet,42,4950,0,1518,946,1,380,440,0,25,1,72,35,71,65,85,10,12,1,7,23,0x3695,400,672,672,288,0,0,0,0,0,0,0,0,7035,2500,912,750,512,5500,619,40,10019,5,508,1300,2508,5,0,0,0,0,4284,1 -1251,KNIGHT_OF_WINDSTORM,Knight of Windstorm,Stormy Knight,77,240000,0,64350,21450,2,1425,1585,35,60,75,185,83,55,130,79,10,12,2,0,84,0x37B5,200,468,468,288,32175,10000,720,4500,2406,500,995,3000,1468,150,603,3000,617,4000,2621,200,2506,500,985,4559,5007,1,0,0,0,0,4318,1 -1252,GARM,Garm,Garm,73,197000,0,50050,20020,3,1700,1900,40,45,85,126,82,65,95,60,10,12,2,2,81,0x37B5,400,608,408,336,25025,10000,7036,1000,603,3000,995,3000,7036,5500,1131,150,1256,500,1815,500,0,0,985,3977,984,2900,0,0,0,0,4324,1 -1253,GARGOYLE,Gargoyle,Gargoyle,48,3950,0,1650,1650,9,290,360,10,10,15,61,20,20,126,40,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,912,3880,1039,500,0,0,0,0,2619,1,1769,2000,757,238,0,0,0,0,4149,1 -1254,RAGGLER,Raggler,Raggler,21,1020,0,218,140,1,102,113,0,5,18,10,32,20,39,35,10,12,0,2,24,0x3695,200,1000,900,384,0,0,0,0,0,0,0,0,7053,3000,916,5000,645,200,514,200,992,90,2225,7,756,32,0,0,0,0,4186,1 -1255,NERAID,Neraid,Nereid,40,4120,0,1126,684,1,325,360,0,10,1,45,50,5,64,5,10,12,0,2,22,0x3695,200,776,576,288,0,0,0,0,0,0,0,0,1055,5100,7053,1000,510,230,1966,10,514,250,757,180,985,37,0,0,0,0,4167,1 -1256,PEST,Pest,Pest,40,3240,0,1238,752,1,375,450,0,5,1,60,22,5,80,5,10,12,0,2,47,0x3695,165,700,648,480,0,0,0,0,0,0,0,0,1055,5500,7054,200,702,10,605,100,716,250,0,0,756,115,0,0,0,0,4315,1 -1257,INJUSTICE,Injustice,Injustice,51,7600,0,2118,1488,1,480,600,0,0,84,42,39,0,71,35,10,12,1,1,47,0x3695,400,770,720,336,0,0,0,0,0,0,0,0,999,300,7054,5335,7053,3500,2313,5,2316,2,660,2,1255,2,0,0,0,0,4268,1 -1258,GOBLIN_ARCHER,Goblin Archer,Goblin Archer,55,1575,0,450,507,9,95,119,69,0,50,34,20,15,48,20,10,12,0,7,25,0x2085,200,1172,672,420,0,0,0,0,0,0,0,0,2297,3,998,250,911,1000,1765,3000,507,600,1705,25,514,300,0,0,0,0,4157,1 -1259,GRYPHON,Gryphon,Gryphon,72,27800,0,5896,4400,1,880,1260,35,35,68,95,78,65,115,75,10,12,2,2,84,0x37B5,100,704,504,432,0,0,0,0,0,0,0,0,7048,2500,7054,5335,7063,120,1452,1500,1417,1,984,185,996,150,0,0,0,0,4163,1 -1260,DARK_FRAME,Dark Frame,Dark Frame,59,7500,0,3652,3271,1,960,1210,10,45,1,72,42,45,85,25,10,12,1,6,67,0x3795,200,920,720,200,0,0,0,0,0,0,0,0,7054,4656,734,1000,2505,30,0,0,0,0,1000,80,747,3,0,0,0,0,4170,1 -1261,WILD_ROSE,Wild Rose,Wild Rose,38,2980,0,1113,688,1,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,0x83,100,964,864,288,0,0,0,0,0,0,0,0,7053,5335,748,50,5037,120,1767,3000,624,35,528,600,2244,2,0,0,0,0,4257,1 -1262,MUTANT_DRAGON,Mutant Dragon,Mutant Dragonoid,65,62600,0,4730,3536,4,2400,3400,15,20,75,47,30,68,45,35,10,12,2,9,43,0x37B5,250,1280,1080,240,0,0,0,0,0,0,0,0,7054,4850,1035,500,1036,500,930,500,1559,400,7296,1500,2527,50,0,0,0,0,4203,1 -1263,WIND_GHOST,Wind Ghost,Wind Ghost,51,4820,0,2424,1488,2,489,639,0,45,1,89,15,90,85,25,10,12,1,6,64,0x3795,150,1056,1056,336,0,0,0,0,0,0,0,0,912,4559,932,6000,7005,500,693,100,1611,8,996,100,1615,1,0,0,0,0,4264,1 -1264,MERMAN,Merman,Merman,53,14690,0,4500,3000,2,482,964,10,35,72,45,46,35,60,55,10,12,1,7,61,0x3695,220,916,816,336,0,0,0,0,0,0,0,0,1054,1300,523,300,568,400,720,40,995,35,1460,3,756,203,0,0,0,0,4199,1 -1265,COOKIE,Cookie,Cookie,25,950,0,310,188,1,130,145,0,25,1,35,20,53,37,90,10,12,0,7,60,0x1089,200,1036,936,240,0,0,0,0,0,0,0,0,538,1000,530,150,979,1,11002,50,2402,30,12001,100,529,320,0,0,0,0,4293,1 -1266,ASTER,Aster,Aster,18,1372,0,122,78,1,56,64,0,10,1,19,15,0,34,5,10,12,0,5,22,0x91,400,1264,864,216,0,0,0,0,0,0,0,0,938,500,7013,40,1052,1200,508,200,912,60,512,100,0,0,0,0,0,0,4247,1 -1267,CARAT,Carat,Carat,51,5200,0,1926,1353,1,330,417,0,25,1,41,45,5,85,155,10,12,1,6,44,0x3795,200,1078,768,384,0,0,0,0,0,0,0,0,7054,3200,536,1000,2409,5,5003,1,0,0,0,0,509,1450,0,0,0,0,4288,1 -1268,BLOODY_KNIGHT,Bloody Knight,Bloody Knight,82,57870,0,10120,6820,3,2150,3030,60,50,88,75,70,77,125,55,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,7054,4850,2229,45,2317,5,2125,62,1170,1,1417,2,985,433,0,0,0,0,4320,1 -1269,CLOCK,Clock,Clock,60,11050,0,3410,2904,1,720,909,15,10,1,70,50,25,90,50,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,0,1095,5335,1019,800,509,1900,568,320,7026,30,7027,30,985,163,0,0,0,0,4299,1 -1270,C_TOWER_MANAGER,Clock Tower Manager,Clock Tower Manager,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,0,1095,5335,7054,5335,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1 -1271,ALLIGATOR,Alligator,Alligator,42,6962,0,1379,866,1,315,360,2,5,1,45,50,10,69,65,10,12,1,2,21,0x91,200,1100,900,480,0,0,0,0,0,0,0,0,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1 -1272,DARK_LORD,Dark Lord,Dark Lord,80,720000,0,65780,45045,2,2800,3320,30,70,1,120,30,118,99,60,10,12,2,6,89,0x37B5,100,868,768,480,32890,10000,7005,6000,5093,500,617,2000,1615,800,2004,100,1237,300,2334,300,2507,100,985,5141,984,3977,0,0,0,0,4168,1 -1273,ORC_LADY,Orc Lady,Orc Lady,45,1520,0,380,435,1,77,110,83,17,36,11,28,57,10,5,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,7053,4656,998,300,2602,1,2206,1,12127,10,7477,3,2338,1,0,0,0,0,4255,1 -1274,MEGALITH,Megalith,Megalith,45,5300,0,1758,1075,9,264,314,50,25,1,45,60,5,95,5,10,12,2,0,80,0x84,200,1332,1332,672,0,0,0,0,0,0,0,0,912,100,7049,1000,617,1,0,0,0,0,985,61,757,207,0,0,0,0,4200,1 -1275,ALICE,Alice,Alice,62,10000,221,3583,2400,1,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,0x91,200,502,2304,480,0,0,0,0,0,0,0,0,7047,2500,637,40,2407,3,739,30,5085,1,12128,10,12002,100,0,0,0,0,4253,1 -1276,RAYDRIC_ARCHER,Raydric Archer,Raydric Archer,52,5250,0,3025,2125,9,415,500,35,5,15,25,22,5,145,35,10,12,1,6,47,0x2185,200,1152,1152,480,0,0,0,0,0,0,0,0,7054,4656,0,0,2315,2,1701,150,1764,2000,1715,3,985,106,0,0,0,0,4187,1 -1277,GREATEST_GENERAL,Greatest General,Greatest General,40,3632,0,1238,752,3,350,400,15,15,1,20,60,55,82,140,10,12,1,0,43,0x84,200,1152,1152,384,0,0,0,0,0,0,0,0,7054,2000,1019,2000,1501,100,662,300,2272,1,508,250,686,100,0,0,0,0,4283,1 -1278,STALACTIC_GOLEM,Stalactic Golem,Stalactic Golem,60,18700,0,5808,2695,1,950,1260,50,5,73,45,85,5,90,25,10,12,2,0,80,0x91,200,1264,864,288,0,0,0,0,0,0,0,0,7004,2000,7054,4850,1000,250,997,30,757,250,0,0,985,163,0,0,0,0,4223,1 -1279,TRI_JOINT,Tri Joint,Tri Joint,32,2300,0,386,220,1,178,206,20,5,1,48,24,10,67,20,10,12,0,4,22,0x3795,200,860,660,624,0,0,0,0,0,0,0,0,7053,100,943,380,606,200,993,160,1001,140,0,0,757,106,0,0,0,0,4308,1 +1248,CRUISER,Cruiser,Cruiser,41,919,0,288,324,7,55,75,20,18,17,10,23,15,34,10,10,12,1,0,60,0x2085,400,1296,1296,432,0,0,0,0,0,0,0,0,1098,900,2251,2,998,320,996,5,911,3500,13150,5,756,87,0,0,0,0,4297,1 +1249,MYSTCASE,Myst Case,Myst Case,39,879,0,288,324,1,68,89,50,11,26,19,40,35,31,25,10,12,1,0,60,0x91,400,1248,1248,432,0,0,0,0,0,0,0,0,530,90,912,1500,603,20,539,800,722,150,731,5,529,340,0,0,0,0,4206,1 +1250,CHEPET,Chepet,Chepet,42,4950,0,1315,1854,1,79,112,55,25,32,35,35,21,32,23,10,12,1,7,23,0x3695,400,672,672,288,0,0,0,0,0,0,0,0,7035,2500,912,750,512,5500,619,40,10019,5,508,1300,2508,5,0,0,0,0,4284,1 +1251,KNIGHT_OF_WINDSTORM,Knight of Windstorm,Stormy Knight,92,630500,0,413800,302200,2,2677,4110,306,166,126,165,132,104,171,79,10,12,2,0,84,0x37B5,200,468,468,288,206900,10000,720,4500,2406,500,995,3000,1468,150,603,3000,617,4000,2621,200,2506,500,985,4559,5007,1,0,0,0,0,4318,1 +1252,GARM,Garm,Hatii,98,1275500,0,758880,613800,3,1862,3595,173,103,122,153,135,116,146,72,10,12,2,2,81,0x37B5,400,608,408,336,379440,10000,7036,1000,603,3000,995,3000,7036,5500,1131,150,1256,500,1815,500,0,0,985,3977,984,2900,0,0,0,0,4324,1 +1253,GARGOYLE,Gargoyle,Gargoyle,100,8772,0,1900,1425,9,383,472,98,43,100,61,60,57,100,70,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,912,3880,1039,500,0,0,0,0,2619,1,1769,2000,757,238,0,0,0,0,4149,1 +1254,RAGGLER,Raggler,Raggler,48,1148,0,369,414,1,72,111,56,10,30,42,38,15,54,27,10,12,0,2,24,0x3695,200,1000,900,384,0,0,0,0,0,0,0,0,7053,3000,916,5000,645,200,514,200,992,90,2225,7,756,32,0,0,0,0,4186,1 +1255,NERAID,Neraid,Nereid,98,9550,0,1575,1181,1,196,267,100,37,97,45,60,30,69,50,10,12,0,2,22,0x3695,200,776,576,288,0,0,0,0,0,0,0,0,1055,5100,7053,1000,510,230,1966,10,514,250,757,180,985,37,0,0,0,0,4167,1 +1256,PEST,Pest,Pest,89,5747,0,1341,1509,1,304,352,55,33,73,77,48,15,88,25,10,12,0,2,47,0x3695,165,700,648,480,0,0,0,0,0,0,0,0,1055,5500,7054,200,702,10,605,100,716,250,0,0,756,115,0,0,0,0,4315,1 +1257,INJUSTICE,Injustice,Injustice,95,7952,0,1574,1997,1,344,460,76,31,77,59,58,65,73,50,10,12,1,1,47,0x3695,400,770,720,336,0,0,0,0,0,0,0,0,999,300,7054,5335,7053,3500,2313,5,2316,2,660,2,1255,2,0,0,0,0,4268,1 +1258,GOBLIN_ARCHER,Goblin Archer,Goblin Archer,55,1575,0,450,507,9,95,119,69,0,40,34,20,15,48,20,10,12,0,7,25,0x2085,200,1172,672,420,0,0,0,0,0,0,0,0,2297,3,998,250,911,1000,1765,3000,507,600,1705,25,514,300,0,0,0,0,4157,1 +1259,GRYPHON,Gryphon,Gryphon,105,60720,0,9410,5808,1,717,820,113,72,101,133,66,70,137,54,10,12,2,2,84,0x37B5,100,704,504,432,0,0,0,0,0,0,0,0,7048,2500,7054,5335,7063,120,1452,1500,1417,1,984,185,996,150,0,0,0,0,4163,1 +1260,DARK_FRAME,Dark Frame,Dark Frame,76,3520,0,992,1115,1,318,348,67,27,69,37,36,10,53,5,10,12,1,6,67,0x3795,200,920,720,200,0,0,0,0,0,0,0,0,7054,4656,734,1000,2505,30,0,0,0,0,1000,80,747,3,0,0,0,0,4170,1 +1261,WILD_ROSE,Wild Rose,Wild Rose,70,2682,0,720,1110,1,140,185,75,15,44,87,31,35,63,80,10,12,0,2,24,0x83,100,964,864,288,0,0,0,0,0,0,0,0,7053,5335,748,50,5037,120,1767,3000,624,35,528,600,2244,2,0,0,0,0,4257,1 +1262,MUTANT_DRAGON,Mutant Dragon,Mutant Dragonoid,65,50706,0,3644,12830,4,1120,1654,130,20,75,35,30,68,98,35,10,12,2,9,43,0x37B5,250,1280,1080,240,0,0,0,0,0,0,0,0,7054,4850,1035,500,1036,500,930,500,1559,400,7296,1500,2527,50,0,0,0,0,4203,1 +1263,WIND_GHOST,Wind Ghost,Wind Ghost,80,4008,0,918,1334,2,165,260,64,51,62,27,25,55,85,20,10,12,1,6,64,0x3795,150,1056,1056,336,0,0,0,0,0,0,0,0,912,4559,932,6000,7005,500,693,100,1611,8,996,100,1615,1,0,0,0,0,4264,1 +1264,MERMAN,Merman,Merman,60,2940,0,616,692,1,125,157,62,8,45,29,30,19,50,10,10,12,1,7,61,0x3695,220,916,816,336,0,0,0,0,0,0,0,0,1054,1300,523,300,568,400,720,40,995,35,1460,3,756,203,0,0,0,0,4199,1 +1265,COOKIE,Cookie,Cookie,35,666,0,234,264,1,59,84,56,28,15,23,35,12,31,15,10,12,0,7,60,0x1089,200,1036,936,240,0,0,0,0,0,0,0,0,538,1000,530,150,979,1,11002,50,2402,30,12001,100,529,320,0,0,0,0,4293,1 +1266,ASTER,Aster,Aster,50,1509,0,405,455,1,85,107,70,7,41,14,15,0,28,5,10,12,0,5,22,0x91,400,1264,864,216,0,0,0,0,0,0,0,0,938,500,7013,40,1052,1200,508,200,912,60,512,100,0,0,0,0,0,0,4247,1 +1267,CARAT,Carat,Carat,103,9222,0,1944,1458,1,598,674,111,67,102,64,60,40,67,50,10,12,1,6,44,0x3795,200,1078,768,384,0,0,0,0,0,0,0,0,7054,3200,536,1000,2409,5,5003,1,0,0,0,0,509,1450,0,0,0,0,4288,1 +1268,BLOODY_KNIGHT,Bloody Knight,Bloody Knight,116,68500,0,7348,6511,3,942,1065,122,50,132,59,70,57,98,45,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,7054,4850,2229,45,2317,5,2125,62,1170,1,1417,2,985,433,0,0,0,0,4320,1 +1269,CLOCK,Clock,Clock,81,5556,0,1231,1158,1,403,456,91,43,68,24,35,41,81,15,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,0,1095,5335,1019,800,509,1900,568,320,7026,30,7027,30,985,163,0,0,0,0,4299,1 +1270,C_TOWER_MANAGER,Clock Tower Manager,Clock Tower Manager,90,6400,0,1305,1467,3,388,458,96,60,80,28,40,25,73,45,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,0,1095,5335,7054,5335,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1 +1271,ALLIGATOR,Alligator,Alligator,57,2430,0,486,548,1,150,187,62,30,47,48,24,15,36,26,10,12,1,2,21,0x91,200,1100,900,480,0,0,0,0,0,0,0,0,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1 +1272,DARK_LORD,Dark Lord,Dark Lord,96,1190900,0,714240,558000,2,3027,5112,330,168,118,136,154,142,161,66,10,12,2,6,89,0x37B5,100,868,768,480,357120,10000,7005,6000,5093,500,617,2000,1615,800,2004,100,1237,300,2334,300,2507,100,985,5141,984,3977,0,0,0,0,4168,1 +1273,ORC_LADY,Orc Lady,Orc Lady,45,1520,0,380,435,1,77,110,83,17,36,11,28,10,57,5,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,7053,4656,998,300,2602,1,2206,1,12127,10,7477,3,2338,1,0,0,0,0,4255,1 +1274,MEGALITH,Megalith,Megalith,65,2451,0,594,669,9,116,146,66,18,57,14,35,10,90,3,10,12,2,0,80,0x84,200,1332,1332,672,0,0,0,0,0,0,0,0,912,100,7049,1000,617,1,0,0,0,0,985,61,757,207,0,0,0,0,4200,1 +1275,ALICE,Alice,Alice,100,9230,221,1630,1222,1,395,493,93,73,82,53,45,70,80,80,10,12,1,7,60,0x91,200,502,2304,480,0,0,0,0,0,0,0,0,7047,2500,637,40,2407,3,739,30,5085,1,12128,10,12002,100,0,0,0,0,4253,1 +1276,RAYDRIC_ARCHER,Raydric Archer,Raydric Archer,82,4437,0,1049,1332,9,377,395,63,40,53,24,40,15,112,30,10,12,1,6,47,0x2185,200,1152,1152,480,0,0,0,0,0,0,0,0,7054,4656,0,0,2315,2,1701,150,1764,2000,1715,3,985,106,0,0,0,0,4187,1 +1277,GREATEST_GENERAL,Greatest General,Greatest General,55,1575,0,486,548,3,215,241,114,30,58,30,20,25,25,20,10,12,1,0,43,0x84,200,1152,1152,384,0,0,0,0,0,0,0,0,7054,2000,1019,2000,1501,100,662,300,2272,1,508,250,686,100,0,0,0,0,4283,1 +1278,STALACTIC_GOLEM,Stalactic Golem,Stalactic Golem,68,2590,0,675,759,1,341,362,230,5,67,47,48,1,63,5,10,12,2,0,80,0x91,200,1264,864,288,0,0,0,0,0,0,0,0,7004,2000,7054,4850,1000,250,997,30,757,250,0,0,985,163,0,0,0,0,4223,1 +1279,TRI_JOINT,Tri Joint,Tri Joint,66,2530,0,347,297,1,278,306,22,5,1,33,24,10,55,20,10,12,0,4,22,0x3795,200,860,660,624,0,0,0,0,0,0,0,0,7053,100,943,380,606,200,993,160,1001,140,0,0,757,106,0,0,0,0,4308,1 1280,STEAM_GOBLIN,Steam Goblin,Goblin Steamrider,66,2241,0,680,765,1,280,315,85,5,52,61,32,15,82,25,10,12,1,7,44,0x91,200,1008,1008,528,0,0,0,0,0,0,0,0,911,2500,7053,3880,998,300,999,55,1003,320,13104,5,757,124,0,0,0,0,4156,1 -1281,SAGEWORM,Sage Worm,Sage Worm,43,3850,0,1155,1320,1,120,280,0,50,1,52,24,88,79,55,10,12,0,2,60,0x91,200,936,936,288,0,0,0,0,0,0,0,0,2716,5,1097,1000,1055,3000,691,100,505,40,689,100,5012,1,0,0,0,0,4219,1 -1282,KOBOLD_ARCHER,Kobold Archer,Kobold Archer,33,2560,0,739,455,9,155,185,10,5,10,20,15,30,100,25,10,12,0,7,23,0x2085,200,1008,1008,384,0,0,0,0,0,0,0,0,912,250,999,60,1034,4850,5118,50,1763,2000,1711,5,756,79,0,0,0,0,4292,1 -1283,CHIMERA,Chimera,Chimera,70,32600,0,4950,3000,1,1200,1320,30,10,1,72,110,88,75,85,10,12,2,2,63,0x37B5,200,772,672,360,0,0,0,0,0,0,0,0,7054,5335,1048,2500,568,1000,1306,1,7295,1500,1364,1,984,160,0,0,0,0,4300,1 +1281,SAGEWORM,Sage Worm,Sage Worm,70,2872,0,720,810,1,158,279,109,45,39,29,28,71,44,30,10,12,0,2,60,0x91,200,936,936,288,0,0,0,0,0,0,0,0,2716,5,1097,1000,1055,3000,691,100,505,40,689,100,5012,1,0,0,0,0,4219,1 +1282,KOBOLD_ARCHER,Kobold Archer,Kobold Archer,108,11053,0,2160,2620,9,586,619,84,5,99,39,48,30,103,25,10,12,0,7,23,0x2085,200,1008,1008,384,0,0,0,0,0,0,0,0,912,250,999,60,1034,4850,5118,50,1763,2000,1711,5,756,79,0,0,0,0,4292,1 +1283,CHIMERA,Chimera,Chimera,70,26406,0,5168,4698,1,980,1128,159,10,1,38,110,88,83,85,10,12,2,2,63,0x37B5,200,772,672,360,0,0,0,0,0,0,0,0,7054,5335,1048,2500,568,1000,1306,1,7295,1500,1364,1,984,160,0,0,0,0,4300,1 //1284,HUGELING,Hugeling,Hugeling,1,5000,0,2,1,4,7,10,0,0,1,1,1,1,6,1,10,12,2,3,21,0x91,200,1872,672,480,0,0,0,0,0,0,0,0,512,100,512,100,512,100,512,100,512,100,512,100,512,100,512,100,0,0,0,0 1285,ARCHER_GUARDIAN,Archer Guardian,Archer Guardian,74,28634,0,1,1,12,1120,1600,35,60,95,80,80,90,165,55,14,16,2,7,80,0x1FA5,265,1200,1200,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1286,KNIGHT_GUARDIAN,Knight Guardian,Knight Guardian,86,30214,0,1,1,2,1280,1560,55,30,110,40,140,65,125,65,14,16,2,7,80,0x1FA5,275,1200,1200,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1287,SOLDIER_GUARDIAN,Soldier Guardian,Soldier Guardian,56,15670,0,1,1,1,873,1036,35,0,85,56,100,45,103,43,10,12,0,4,22,0x21A5,265,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1288,EMPELIUM,Emperium,Emperium,90,68430,0,0,0,1,60,71,40,50,1,17,80,50,26,20,10,12,0,8,26,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1289,MAYA_PUPLE,Maya Purple,Maya Purple,81,55479,0,10496,3893,2,1447,2000,68,48,95,90,80,95,90,119,10,12,2,4,82,0x37B5,100,1024,1000,480,0,0,0,0,0,0,0,0,7053,4413,757,250,756,300,969,100,984,150,10006,1,7481,2,0,0,0,0,4198,1 -1290,SKELETON_GENERAL,Skeleton General,Skeleton General,73,17402,0,8170,3370,1,910,1089,25,25,90,25,40,20,77,25,10,12,1,1,29,0x3695,150,2276,576,432,0,0,0,0,0,0,0,0,7068,2550,756,160,508,800,1220,35,1219,80,13035,15,2274,1,0,0,0,0,4221,1 -1291,WRAITH_DEAD,Wraith Dead,Wraith Dead,74,43021,0,10341,3618,2,1366,1626,25,30,5,99,55,75,115,45,10,12,2,1,89,0x3695,175,1816,576,240,0,0,0,0,0,0,0,0,1059,4413,2206,10,2506,8,716,700,732,5,603,100,568,300,0,0,0,0,4189,1 -1292,MINI_DEMON,Mini Demon,Mini Demon,68,32538,0,8396,3722,1,1073,1414,30,25,5,75,40,55,89,42,10,12,0,6,27,0x3795,150,1000,600,384,0,0,0,0,0,0,0,0,1038,4413,1039,450,2255,3,757,160,912,2500,1009,10,1478,5,0,0,0,0,4204,1 -1293,CREMY_FEAR,Creamy Fear,Creamy Fear,62,13387,0,7365,2691,2,666,829,45,30,5,40,16,15,68,55,10,12,0,4,24,0x3795,155,1136,720,840,0,0,0,0,0,0,0,0,924,4550,2333,10,518,550,602,200,1550,8,2726,5,522,50,0,0,0,0,4298,1 -1294,KILLER_MANTIS,Killer Mantis,Killer Mantis,56,13183,0,6509,2366,1,764,927,35,20,5,26,24,5,75,40,10,12,1,4,22,0x3795,175,1528,660,432,0,0,0,0,0,0,0,0,1031,4550,943,2500,721,10,509,15,514,25,1262,1,2108,1,0,0,0,0,4301,1 -1295,OWL_BARON,Owl Baron,Owl Baron,75,60746,0,10967,4811,2,1252,1610,65,25,25,25,80,95,95,55,10,12,2,6,60,0x37B5,175,1345,824,440,0,0,0,0,0,0,0,0,7071,3500,7063,2500,1716,2,1472,1,1629,2,693,100,5045,5,0,0,0,0,4238,1 -1296,KOBOLD_LEADER,Kobold Leader,Kobold Leader,65,18313,0,7432,2713,1,649,958,37,37,5,90,36,30,77,59,10,12,1,7,44,0x3695,150,1028,528,360,0,0,0,0,0,0,0,0,999,450,1034,6305,912,1200,1511,6,1613,2,525,150,526,100,0,0,0,0,4291,1 -1297,ANCIENT_MUMMY,Ancient Mummy,Ancient Mummy,64,40599,0,8040,3499,1,836,1129,27,27,28,19,32,5,83,35,10,12,1,1,49,0x3695,175,1772,120,384,0,0,0,0,0,0,0,0,930,4413,934,1800,2624,1,2611,150,508,650,756,150,757,100,0,0,0,0,4248,1 -1298,ZOMBIE_MASTER,Zombie Master,Zombie Master,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1 +1289,MAYA_PUPLE,Maya Purple,Maya Purple,81,77670,0,11714,6516,2,1447,2000,139,40,95,52,80,95,73,119,10,12,2,4,82,0x37B5,100,1024,1000,480,0,0,0,0,0,0,0,0,7053,4413,757,250,756,300,969,100,984,150,10006,1,7481,2,0,0,0,0,4198,1 +1290,SKELETON_GENERAL,Skeleton General,Skeleton General,88,6720,0,1368,1553,1,540,579,100,35,72,34,52,31,84,25,10,12,1,1,29,0x3695,150,2276,576,432,0,0,0,0,0,0,0,0,7068,2550,756,160,508,800,1220,35,1219,80,13035,15,2274,1,0,0,0,0,4221,1 +1291,WRAITH_DEAD,Wraith Dead,Wraith Dead,86,10035,0,2518,1824,2,402,462,88,56,63,69,55,45,88,45,10,12,2,1,89,0x3695,175,1816,576,240,0,0,0,0,0,0,0,0,1059,4413,2206,10,2506,8,716,700,732,5,603,100,568,300,0,0,0,0,4189,1 +1292,MINI_DEMON,Mini Demon,Mini Demon,117,19402,0,2700,2025,1,670,784,80,25,130,69,55,56,79,40,10,12,0,6,27,0x3795,150,1000,600,384,0,0,0,0,0,0,0,0,1038,4413,1039,450,2255,3,757,160,912,2500,1009,10,1478,5,0,0,0,0,4204,1 +1293,CREMY_FEAR,Creamy Fear,Creamy Fear,77,3420,0,945,1067,2,272,335,76,37,65,36,33,49,66,30,10,12,0,4,24,0x3795,155,1136,720,840,0,0,0,0,0,0,0,0,924,4550,2333,10,518,550,602,200,1550,8,2726,5,522,50,0,0,0,0,4298,1 +1294,KILLER_MANTIS,Killer Mantis,Killer Mantis,91,7650,0,1485,1674,1,500,550,107,45,82,56,58,45,69,40,10,12,1,4,22,0x3795,175,1528,660,432,0,0,0,0,0,0,0,0,1031,4550,943,2500,721,10,509,15,514,25,1262,1,2108,1,0,0,0,0,4301,1 +1295,OWL_BARON,Owl Baron,Owl Baron,120,21000,0,3042,2282,2,449,650,88,25,72,65,55,102,77,72,10,12,2,6,60,0x37B5,175,1345,824,440,0,0,0,0,0,0,0,0,7071,3500,7063,2500,1716,2,1472,1,1629,2,693,100,5045,5,0,0,0,0,4238,1 +1296,KOBOLD_LEADER,Kobold Leader,Kobold Leader,112,13520,0,2643,2383,1,711,807,90,62,135,34,68,56,83,47,10,12,1,7,44,0x3695,150,1028,528,360,0,0,0,0,0,0,0,0,999,450,1034,6305,912,1200,1511,6,1613,2,525,150,526,100,0,0,0,0,4291,1 +1297,ANCIENT_MUMMY,Ancient Mummy,Ancient Mummy,114,27157,0,4104,3199,1,701,901,93,51,126,57,55,69,112,15,10,12,1,1,49,0x3695,175,1772,120,384,0,0,0,0,0,0,0,0,930,4413,934,1800,2624,1,2611,150,508,650,756,150,757,100,0,0,0,0,4248,1 +1298,ZOMBIE_MASTER,Zombie Master,Zombie Master,92,8780,0,1710,1857,1,499,629,78,46,55,60,48,49,72,48,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1 1299,GOBLIN_LEADER,Goblin Leader,Goblin Leader,55,21692,0,4450,5007,1,165,214,72,30,60,67,45,18,66,23,10,12,1,7,24,0x3695,120,1120,620,240,0,0,0,0,0,0,0,0,7054,1500,999,800,756,120,5090,50,2106,2,508,650,5113,10,0,0,0,0,4155,1 -1300,CATERPILLAR,Caterpillar,Caterpillar,64,14439,0,6272,3107,1,894,1447,47,29,35,25,85,15,69,45,10,12,0,4,22,0x3795,300,1672,672,480,0,0,0,0,0,0,0,0,949,3000,7054,5335,13034,20,1000,100,997,50,505,12,508,500,0,0,0,0,4289,1 -1301,AM_MUT,Am Mut,Am Mut,61,12099,0,7709,2690,1,1040,1121,50,10,50,65,40,35,83,45,10,12,0,6,27,0x3795,200,1156,456,384,0,0,0,0,0,0,0,0,1021,4550,757,250,1517,3,969,5,2282,1,616,1,746,250,0,0,0,0,4245,1 -1302,DARK_ILLUSION,Dark Illusion,Dark Illusion,77,103631,0,11163,4181,2,1300,1983,64,70,5,100,40,100,97,40,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,1615,3,5017,2,2508,3,7054,5335,522,120,509,1550,1162,2,0,0,0,0,4169,1 -1303,GIANT_HONET,Giant Hornet,Giant Hornet,56,13105,0,5785,2006,1,650,852,38,43,35,38,32,10,71,64,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,526,550,518,1200,522,12,610,15,1608,3,722,20,1736,15,0,0,0,0,4271,1 -1304,GIANT_SPIDER,Giant Spider,Giant Spider,55,11874,0,6211,2146,1,624,801,41,28,5,36,43,5,73,69,10,12,2,4,25,0x3795,165,1468,468,768,0,0,0,0,0,0,0,0,1025,4550,1042,1200,757,140,525,450,943,1200,1096,680,7053,800,0,0,0,0,4270,1 -1305,ANCIENT_WORM,Ancient Worm,Ancient Worm,67,22598,0,8174,3782,1,948,1115,35,30,5,35,56,55,81,72,10,12,2,4,25,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,1042,4413,912,2500,2406,9,2727,5,1096,680,938,3500,7054,2500,0,0,0,0,4249,1 -1306,LEIB_OLMAI,Leib Olmai,Leib Olmai,58,24233,0,6011,2171,1,740,1390,27,31,5,35,95,5,64,85,10,12,2,2,22,0x3695,175,1260,230,192,0,0,0,0,0,0,0,0,948,4550,2289,8,740,120,518,500,2717,5,969,5,7053,800,0,0,0,0,4188,1 -1307,CAT_O_NINE_TAIL,Cat o' Nine Tails,Cat o' Nine Tails,76,64512,0,10869,4283,1,1112,1275,61,55,55,75,55,82,86,120,10,12,1,6,63,0x37B5,155,1276,576,288,0,0,0,0,0,0,0,0,5008,1,638,150,10008,5,985,600,984,800,969,6,617,1,0,0,0,0,4290,1 -1308,PANZER_GOBLIN,Panzer Goblin,Panzer Goblin,52,1471,0,446,504,1,122,180,60,25,62,60,35,35,68,31,10,12,1,7,44,0x3695,200,960,1008,840,0,0,0,0,0,0,0,0,7053,4413,7054,3500,999,180,998,360,1003,580,13158,5,994,160,0,0,0,0,4310,1 -1309,GAJOMART,Gajomart,Gajomart,63,13669,0,6625,2900,1,917,950,85,50,5,34,10,5,75,140,10,12,0,0,83,0x3695,300,1000,1152,828,0,0,0,0,0,0,0,0,953,6500,912,2300,508,870,2279,8,1752,10000,2131,20,994,180,0,0,0,0,4151,1 -1310,MAJORUROS,Majoruros,Majoruros,66,57991,0,8525,3799,1,780,1300,10,25,65,50,75,50,85,48,10,12,2,2,43,0x3695,250,1100,960,780,0,0,0,0,0,0,0,0,941,4413,1361,4,568,300,984,16,509,1850,2611,160,1000,250,0,0,0,0,4201,1 -1311,GULLINBURSTI,Gullinbursti,Gullinbursti,62,21331,0,5814,2376,1,699,1431,10,15,55,25,60,5,70,45,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,1028,3500,514,290,702,6,2276,1,605,15,2627,1,912,160,0,0,0,0,4164,1 -1312,TURTLE_GENERAL,Turtle General,Turtle General,97,320700,0,18202,9800,2,2438,3478,50,54,100,45,55,65,105,164,10,12,2,2,42,0x37B5,200,900,1000,500,9101,10000,967,5500,607,1500,617,2000,1529,8,1306,5,7480,200,1417,9,7070,5335,1141,80,658,1,0,0,0,0,4305,1 -1313,MOBSTER,Mobster,Mobster,61,7991,0,4424,1688,1,910,1128,41,37,76,46,20,35,76,55,10,12,1,7,20,0x3695,250,1100,560,580,0,0,0,0,0,0,0,0,1239,3,726,4559,2621,1,716,600,912,2500,525,450,505,60,0,0,0,0,4317,1 -1314,PERMETER,Permeter,Permeter,63,8228,0,3756,1955,2,943,1211,46,45,69,59,60,5,69,100,10,12,1,2,40,0x91,250,1100,483,528,0,0,0,0,0,0,0,0,967,4413,7070,45,1019,1240,507,2450,912,1240,522,25,605,1,0,0,0,0,4311,1 -1315,ASSULTER,Assaulter,Assaulter,71,11170,0,4854,2654,2,764,1499,35,28,85,74,10,35,100,100,10,12,1,7,44,0x3695,155,1000,900,432,0,0,0,0,0,0,0,0,967,4413,7069,1200,7072,840,508,1280,912,1240,13300,5,603,1,0,0,0,0,4246,1 -1316,SOLIDER,Solider,Solider,70,12099,0,4458,1951,2,797,979,57,43,69,35,85,5,74,100,10,12,1,2,42,0x91,250,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,64,7067,850,508,2100,912,1240,518,850,1519,1,0,0,0,0,4220,1 -1317,FUR_SEAL,Fur Seal,Seal,63,9114,0,3765,1824,1,845,1203,25,33,5,28,22,15,69,84,10,12,1,2,21,0x3885,200,1612,622,583,0,0,0,0,0,0,0,0,912,4365,510,250,2310,5,7053,1200,1452,1,525,200,746,120,0,0,0,0,4312,1 -1318,HEATER,Heater,Heater,68,11020,0,3766,2359,2,683,1008,40,42,69,47,25,5,71,100,10,12,1,2,43,0x3695,250,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,750,697,100,912,1640,526,140,7054,600,7068,1250,0,0,0,0,4331,1 -1319,FREEZER,Freezer,Freezer,72,8636,0,3665,2197,2,671,983,55,43,69,41,59,5,67,100,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,850,7066,1250,912,1800,526,160,7053,600,689,100,0,0,0,0,4319,1 -1320,OWL_DUKE,Owl Duke,Owl Duke,75,26623,0,7217,3474,1,715,910,27,49,15,45,40,75,79,88,10,12,2,6,60,0x37B5,195,1345,824,440,0,0,0,0,0,0,0,0,7071,4413,7063,1500,693,100,747,1,1451,3,1513,2,5045,1,0,0,0,0,4237,1 -1321,DRAGON_TAIL,Dragon Tail,Dragon Tail,61,8368,0,3587,1453,1,520,715,25,19,10,68,15,5,67,67,10,12,1,4,44,0x3795,175,862,534,312,0,0,0,0,0,0,0,0,7064,4413,1096,400,943,800,2207,8,2226,2,601,300,602,150,0,0,0,0,4178,1 -1322,SPRING_RABBIT,Spring Rabbit,Spring Rabbit,58,9045,0,3982,1766,1,585,813,29,21,45,61,5,15,77,90,10,12,1,2,42,0x83,160,1120,552,511,0,0,0,0,0,0,0,0,7054,3500,7053,2500,949,2500,511,4500,508,800,510,200,509,800,0,0,0,0,4227,1 -1323,SEE_OTTER,Sea Otter,Sea Otter,59,9999,0,3048,1642,1,650,813,33,35,5,36,40,25,82,65,10,12,1,2,61,0x3885,190,1132,583,532,0,0,0,0,0,0,0,0,722,150,965,5500,7065,4365,725,50,726,50,746,650,7053,1200,0,0,0,0,4326,1 +1300,CATERPILLAR,Caterpillar,Caterpillar,84,5555,0,1312,1487,1,270,313,100,42,58,37,51,50,45,45,10,12,0,4,22,0x3795,300,1672,672,480,0,0,0,0,0,0,0,0,949,3000,7054,5335,13034,20,1000,100,997,50,505,12,508,500,0,0,0,0,4289,1 +1301,AM_MUT,Am Mut,Am Mut,76,3530,0,945,1067,1,342,391,90,42,58,44,40,35,67,45,10,12,0,6,27,0x3795,200,1156,456,384,0,0,0,0,0,0,0,0,1021,4550,757,250,1517,3,969,5,2282,1,616,1,746,250,0,0,0,0,4245,1 +1302,DARK_ILLUSION,Dark Illusion,Dark Illusion,96,29255,0,4091,4099,2,666,726,145,60,82,36,55,100,102,88,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,1615,3,5017,2,2508,3,7054,5335,522,120,509,1550,1162,2,0,0,0,0,4169,1 +1303,GIANT_HONET,Giant Hornet,Giant Hornet,82,3960,0,1080,1215,1,275,328,80,43,70,45,47,32,62,34,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,526,550,518,1200,522,12,610,15,1608,3,722,20,1736,15,0,0,0,0,4271,1 +1304,GIANT_SPIDER,Giant Spider,Giant Spider,85,4680,0,1242,1418,1,298,350,86,38,71,58,43,38,61,41,10,12,2,4,25,0x3795,165,1468,468,768,0,0,0,0,0,0,0,0,1025,4550,1042,1200,757,140,525,450,943,1200,1096,680,7053,800,0,0,0,0,4270,1 +1305,ANCIENT_WORM,Ancient Worm,Ancient Worm,83,4140,0,1139,1283,1,299,334,90,41,70,56,56,55,70,42,10,12,2,4,25,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,1042,4413,912,2500,2406,9,2727,5,1096,680,938,3500,7054,2500,0,0,0,0,4249,1 +1306,LEIB_OLMAI,Leib Olmai,Leib Olmai,87,6050,0,1314,1485,1,299,363,127,31,72,35,80,35,64,27,10,12,2,2,22,0x3695,175,1260,230,192,0,0,0,0,0,0,0,0,948,4550,2289,8,740,120,518,500,2717,5,969,5,7053,800,0,0,0,0,4188,1 +1307,CAT_O_NINE_TAIL,Cat o' Nine Tails,Cat o' Nine Tails,79,23600,0,4148,5792,1,467,547,100,50,72,75,40,50,79,48,10,12,1,6,63,0x37B5,155,1276,576,288,0,0,0,0,0,0,0,0,5008,1,638,150,10008,5,985,600,984,800,969,6,617,1,0,0,0,0,4290,1 +1308,PANZER_GOBLIN,Panzer Goblin,Panzer Goblin,52,1471,0,446,504,1,122,180,60,25,52,60,35,35,68,31,10,12,1,7,44,0x3695,200,960,1008,840,0,0,0,0,0,0,0,0,7053,4413,7054,3500,999,180,998,360,1003,580,13158,5,994,160,0,0,0,0,4310,1 +1309,GAJOMART,Gajomart,Gajomart,81,3825,0,1317,1490,1,355,412,98,50,77,47,39,33,78,40,10,12,0,0,83,0x3695,300,1000,1152,828,0,0,0,0,0,0,0,0,953,6500,912,2300,508,870,2279,8,1752,10000,2131,20,994,180,0,0,0,0,4151,1 +1310,MAJORUROS,Majoruros,Majoruros,107,11801,0,3090,2200,1,654,1086,111,25,112,58,65,55,72,49,10,12,2,2,43,0x3695,250,1100,960,780,0,0,0,0,0,0,0,0,941,4413,1361,4,568,300,984,16,509,1850,2611,160,1000,250,0,0,0,0,4201,1 +1311,GULLINBURSTI,Gullinbursti,Gullinbursti,89,7080,0,1478,1677,1,371,419,108,43,88,54,82,35,63,15,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,1028,3500,514,290,702,6,2276,1,605,15,2627,1,912,160,0,0,0,0,4164,1 +1312,TURTLE_GENERAL,Turtle General,Turtle General,110,1442000,0,933120,748440,2,2438,4504,394,123,116,123,154,99,181,98,10,12,2,2,42,0x37B5,200,900,1000,500,466560,10000,967,5500,607,1500,617,2000,1529,8,1306,5,7480,200,1417,9,7070,5335,1141,80,658,1,0,0,0,0,4305,1 +1313,MOBSTER,Mobster,Mobster,58,2253,0,495,557,1,149,172,87,18,72,36,33,21,41,5,10,12,1,7,20,0x3695,250,1100,560,580,0,0,0,0,0,0,0,0,1239,3,726,4559,2621,1,716,600,912,2500,525,450,505,60,0,0,0,0,4317,1 +1314,PERMETER,Permeter,Permeter,90,6575,0,1305,1467,2,265,321,144,50,68,28,55,40,42,25,10,12,1,2,40,0x91,250,1100,483,528,0,0,0,0,0,0,0,0,967,4413,7070,45,1019,1240,507,2450,912,1240,522,25,605,1,0,0,0,0,4311,1 +1315,ASSULTER,Assaulter,Assaulter,100,8977,0,1992,1779,2,405,472,169,49,100,92,30,20,103,15,10,12,1,7,44,0x3695,200,1000,900,432,0,0,0,0,0,0,0,0,967,4413,7069,1200,7072,840,508,1280,912,1240,13300,5,603,1,0,0,0,0,4246,1 +1316,SOLIDER,Solider,Solider,92,8768,0,1487,1671,2,282,322,206,58,65,44,60,15,47,20,10,12,1,2,42,0x91,250,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,64,7067,850,508,2100,912,1240,518,850,1519,1,0,0,0,0,4220,1 +1317,FUR_SEAL,Fur Seal,Seal,47,1371,0,360,405,1,87,127,42,16,37,40,30,39,35,19,10,12,1,2,21,0x3885,200,1612,622,583,0,0,0,0,0,0,0,0,912,4365,510,250,2310,5,7053,1200,1452,1,525,200,746,120,0,0,0,0,4312,1 +1318,HEATER,Heater,Heater,98,8180,0,1893,1611,2,511,590,199,50,89,49,50,30,88,35,10,12,1,2,43,0x3695,250,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,750,697,100,912,1640,526,140,7054,600,7068,1250,0,0,0,0,4331,1 +1319,FREEZER,Freezer,Freezer,94,9990,0,1555,1749,2,388,438,127,38,68,47,50,45,55,25,10,12,1,2,41,0x3695,170,1452,483,528,0,0,0,0,0,0,0,0,967,4413,7070,850,7066,1250,912,1800,526,160,7053,600,689,100,0,0,0,0,4319,1 +1320,OWL_DUKE,Owl Duke,Owl Duke,92,7381,0,1377,1953,1,480,680,80,45,54,51,45,88,88,50,10,12,2,6,60,0x37B5,195,1345,824,440,0,0,0,0,0,0,0,0,7071,4413,7063,1500,693,100,747,1,1451,3,1513,2,5045,1,0,0,0,0,4237,1 +1321,DRAGON_TAIL,Dragon Tail,Dragon Tail,86,4680,0,1264,1422,1,182,217,63,25,61,65,35,40,52,20,10,12,1,4,44,0x3795,175,862,534,312,0,0,0,0,0,0,0,0,7064,4413,1096,400,943,800,2207,8,2226,2,601,300,602,150,0,0,0,0,4178,1 +1322,SPRING_RABBIT,Spring Rabbit,Spring Rabbit,88,6684,0,1341,1509,1,288,328,108,42,68,66,35,30,48,5,10,12,1,2,42,0x83,160,1120,552,511,0,0,0,0,0,0,0,0,7054,3500,7053,2500,949,2500,511,4500,508,800,510,200,509,800,0,0,0,0,4227,1 +1323,SEE_OTTER,Sea Otter,Sea Otter,48,1820,0,428,480,1,83,125,31,18,32,26,33,26,41,28,10,12,1,2,61,0x3885,190,1132,583,532,0,0,0,0,0,0,0,0,722,150,965,5500,7065,4365,725,50,726,50,746,650,7053,1200,0,0,0,0,4326,1 1324,TREASURE_BOX1,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0 1325,TREASURE_BOX2,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7073,80,658,500,604,10000,984,4850,985,7275,1239,1500,5027,75,1165,8,0,0,0,0 1326,TREASURE_BOX3,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0 @@ -366,33 +366,33 @@ 1362,TREASURE_BOX39,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0 1363,TREASURE_BOX40,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7092,80,658,500,604,10000,984,4850,985,7275,2506,43,2254,43,1529,38,0,0,0,0 1364,G_ASSULTER,Assaulter,Assaulter,59,12853,0,0,0,2,152,177,35,36,85,55,10,35,145,100,10,12,1,6,44,0x3795,155,1000,900,432,0,0,0,0,0,0,0,0,1019,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1365,APOCALIPS,Apocalypse,Apocalypse,66,22880,0,6540,4935,2,1030,1370,62,49,1,48,120,48,66,85,10,12,2,0,60,0x91,400,1840,1440,384,0,0,0,0,0,0,0,0,7095,5335,7094,2400,7093,2200,985,5,13161,1,2506,20,999,2500,0,0,0,0,4242,1 -1366,LAVA_GOLEM,Lava Golem,Lava Golem,77,24324,0,6470,3879,1,1541,2049,65,50,1,57,115,70,76,68,10,12,2,0,83,0x3095,400,2190,2040,336,0,0,0,0,0,0,0,0,7096,4559,7097,3686,2317,1,2316,2,509,2500,1818,20,0,0,0,0,0,0,4184,1 -1367,BLAZZER,Blazer,Blazer,43,8252,0,3173,1871,2,533,709,50,40,1,52,50,39,69,40,10,12,1,6,43,0x3395,180,1732,1332,540,0,0,0,0,0,0,0,0,7097,4850,7098,3400,509,3000,0,0,0,0,0,0,0,0,0,0,0,0,4215,1 -1368,GEOGRAPHER,Geographer,Geographer,56,8071,0,2715,2000,3,467,621,28,26,1,66,47,60,68,44,10,12,1,3,62,0x84,2000,1308,1008,480,0,0,0,0,0,0,0,0,1032,6200,1033,5500,2253,30,2207,50,12002,100,0,0,0,0,0,0,0,0,4280,1 -1369,GRAND_PECO,Grand Peco,Grand Peco,58,8054,0,2387,1361,2,444,565,37,30,1,66,66,50,71,51,10,12,2,2,43,0x1089,165,1460,960,432,0,0,0,0,0,0,0,0,7101,4850,522,300,992,1000,969,1,0,0,0,0,582,500,0,0,0,0,4161,1 -1370,SUCCUBUS,Succubus,Succubus,85,16955,0,5357,4322,2,1268,1686,54,48,1,97,95,103,89,87,10,12,1,6,67,0x3795,155,1306,1056,288,0,0,0,0,0,0,0,0,522,1500,2407,3,12373,1,2613,250,5066,1,1472,1,505,1000,0,0,0,0,4218,1 -1371,FAKE_ANGEL,Fake Angel,False Angel,65,16845,0,3371,1949,2,513,682,50,35,1,64,57,70,61,88,10,12,0,8,66,0x3885,160,920,720,336,0,0,0,0,0,0,0,0,0,0,0,0,717,1000,715,1000,716,1000,12020,1000,1974,20,0,0,0,0,4316,1 -1372,GOAT,Goat,Goat,69,11077,0,3357,2015,1,457,608,44,25,1,58,66,62,67,43,10,12,1,2,63,0x1089,165,1380,1080,336,0,0,0,0,0,0,0,0,7106,4559,7107,2500,713,5000,507,500,510,1000,508,2500,511,5500,0,0,0,0,4150,1 -1373,LORD_OF_DEATH,Lord of Death,Lord of the Dead,94,603383,0,131343,43345,3,3430,4232,77,73,1,99,30,109,100,106,10,12,2,6,67,0x37B5,180,1446,1296,360,65671,10000,607,5500,732,5000,617,5000,7108,5335,1417,5,1230,10,2621,2,7109,10,1306,1,1529,2,0,0,0,0,4276,1 -1374,INCUBUS,Incubus,Incubus,75,17281,0,5254,4212,2,1408,1873,58,46,1,97,95,103,89,87,10,12,1,6,67,0x3795,165,850,600,336,0,0,0,0,0,0,0,0,522,1500,509,5500,5072,1,2621,1,2610,500,2613,150,509,2200,0,0,0,0,4269,1 -1375,THE_PAPER,The Paper,The Paper,56,18557,0,2849,1998,1,845,1124,25,24,1,66,52,76,71,79,10,12,1,0,60,0x3885,170,1160,960,336,0,0,0,0,0,0,0,0,7111,4947,7112,3200,508,1800,511,2000,13009,5,0,0,0,0,0,0,0,0,4172,1 -1376,HARPY,Harpy,Harpy,70,16599,0,3562,2133,1,926,1231,42,44,1,112,72,67,74,76,10,12,1,6,64,0x3985,155,972,672,470,0,0,0,0,0,0,0,0,7115,4850,7116,2500,508,1500,508,800,709,20,1820,20,0,0,0,0,0,0,4325,1 -1377,ELDER,Elder,Elder,64,21592,0,5650,3408,3,421,560,45,68,1,76,68,108,72,86,10,12,2,7,80,0x3885,165,1552,1152,336,0,0,0,0,0,0,0,0,7099,4000,7117,1500,7118,1500,1564,10,1473,1,616,1,7027,3000,0,0,0,0,4251,1 -1378,DEMON_PUNGUS,Demon Pungus,Demon Pungus,56,7259,0,3148,1817,1,360,479,48,31,1,83,55,59,63,34,10,12,0,6,65,0x3985,170,1260,960,672,0,0,0,0,0,0,0,0,7119,4074,7001,4559,715,3880,1061,5000,0,0,0,0,0,0,0,0,0,0,4173,1 -1379,NIGHTMARE_TERROR,Nightmare Terror,Nightmare Terror,78,22605,0,6683,4359,1,757,1007,37,37,1,76,55,60,76,54,10,12,2,6,67,0x3985,165,1216,816,432,0,0,0,0,0,0,0,0,7120,4947,2626,1,2608,30,505,50,510,150,695,100,1261,1,0,0,0,0,4166,1 -1380,DRILLER,Driller,Driller,52,7452,0,3215,1860,1,666,886,48,31,1,66,58,50,60,47,10,12,1,2,22,0x3885,165,1300,900,336,0,0,0,0,0,0,0,0,1012,7500,715,3880,716,3500,0,0,0,0,0,0,0,0,0,0,0,0,4180,1 -1381,GRIZZLY,Grizzly,Grizzly,68,11733,0,3341,2012,1,809,1076,44,32,1,55,68,58,70,61,10,12,2,2,63,0x3885,165,1492,1092,192,0,0,0,0,0,0,0,0,948,5000,919,5000,549,2500,0,0,0,0,0,0,0,0,0,0,0,0,4162,1 -1382,DIABOLIC,Diabolic,Diabolic,67,9642,0,3662,2223,1,796,1059,64,36,1,84,53,67,71,69,10,12,0,6,47,0x3985,150,1080,780,180,0,0,0,0,0,0,0,0,1038,5820,1039,4850,2605,3,984,20,1263,10,0,0,0,0,0,0,0,0,4182,1 -1383,EXPLOSION,Explosion,Explosion,46,8054,0,2404,1642,1,336,447,35,27,1,61,56,50,66,38,10,12,0,2,63,0x3885,165,1260,960,336,0,0,0,0,0,0,0,0,7006,5500,7097,2200,7122,3200,756,800,522,400,0,0,0,0,0,0,0,0,4267,1 -1384,DELETER,Deleter,Deleter,66,17292,0,3403,2066,1,446,593,45,53,1,104,40,65,72,54,10,12,1,9,43,0x308D,175,1020,720,384,0,0,0,0,0,0,0,0,7123,4074,1035,5335,1037,3880,1036,3589,0,0,0,0,0,0,0,0,0,0,4158,1 -1385,DELETER_,Deleter,Deleter,65,15168,0,3403,2066,1,446,593,52,53,1,66,40,65,72,68,10,12,1,9,43,0x308D,175,1024,624,336,0,0,0,0,0,0,0,0,7123,4074,1035,5335,1037,3880,1036,3589,0,0,0,0,0,0,0,0,0,0,4279,1 -1386,SLEEPER,Sleeper,Sleeper,67,8237,0,3603,2144,1,593,789,49,35,1,48,100,57,75,28,10,12,1,0,42,0x3885,195,1350,1200,432,0,0,0,0,0,0,0,0,7124,4947,1056,5335,997,2500,756,300,1226,5,1622,5,7043,1200,0,0,0,0,4228,1 -1387,GIG,Gig,Gig,60,8409,0,3934,2039,1,360,479,60,28,1,61,80,53,59,46,10,12,0,2,43,0x3885,170,1264,864,576,0,0,0,0,0,0,0,0,7125,4365,904,5500,716,150,525,2500,994,850,0,0,0,0,0,0,0,0,4165,1 -1388,ARCHANGELING,Archangeling,Arc Angeling,60,79523,0,4152,2173,1,669,890,54,58,1,65,80,74,65,105,10,12,1,8,66,0x37B5,180,1072,672,480,0,0,0,0,0,0,0,0,2255,5,610,1800,608,150,7291,1500,2254,5,2317,3,7294,1500,0,0,0,0,4241,1 -1389,DRACULA,Dracula,Dracula,85,320096,0,120157,38870,3,1625,1890,45,76,1,95,90,87,85,100,10,12,2,6,87,0x37B5,145,1290,1140,576,60078,10000,607,5500,732,5000,522,5000,607,4700,1473,5,1722,5,2507,15,2621,4,1557,4,0,0,0,0,0,0,4134,1 -1390,VIOLY,Violy,Violy,75,18257,0,6353,3529,10,738,982,37,36,1,93,54,58,101,83,10,12,1,7,40,0x2085,170,1356,1056,540,0,0,0,0,0,0,0,0,1060,6305,12127,50,740,1200,1919,50,526,1400,12020,1000,1902,500,0,0,0,0,4209,1 -1391,GALAPAGO,Galapago,Galapago,61,9145,0,3204,1966,1,457,608,33,33,1,56,56,45,66,57,10,12,0,2,22,0x108B,165,1430,1080,1080,0,0,0,0,0,0,0,0,7053,5335,610,100,508,3500,606,100,605,100,5111,1,582,1000,0,0,0,0,4152,1 +1365,APOCALIPS,Apocalypse,Apocalypse,121,22090,0,3042,2282,2,752,868,136,26,130,53,76,25,89,15,10,12,2,0,60,0x91,400,1840,1440,384,0,0,0,0,0,0,0,0,7095,5335,7094,2400,7093,2200,985,5,13161,1,2506,20,999,2500,0,0,0,0,4242,1 +1366,LAVA_GOLEM,Lava Golem,Lava Golem,103,8452,0,2232,1674,1,598,651,299,27,126,42,103,28,77,15,10,12,2,0,83,0x3095,400,2190,2040,336,0,0,0,0,0,0,0,0,7096,4559,7097,3686,2317,1,2316,2,509,2500,1818,20,0,0,0,0,0,0,4184,1 +1367,BLAZZER,Blazer,Blazer,101,8121,0,1827,1371,2,461,555,116,60,99,75,55,70,60,65,10,12,1,6,43,0x3395,180,1732,1332,540,0,0,0,0,0,0,0,0,7097,4850,7098,3400,509,3000,0,0,0,0,0,0,0,0,0,0,0,0,4215,1 +1368,GEOGRAPHER,Geographer,Geographer,73,3866,0,898,1010,3,281,363,158,42,81,26,35,56,60,60,10,12,1,3,62,0x84,2000,1308,1008,480,0,0,0,0,0,0,0,0,1032,6200,1033,5500,2253,30,2207,50,12002,100,0,0,0,0,0,0,0,0,4280,1 +1369,GRAND_PECO,Grand Peco,Grand Peco,75,3150,0,887,998,2,316,372,95,30,63,45,50,23,51,25,10,12,2,2,43,0x1089,165,1460,960,432,0,0,0,0,0,0,0,0,7101,4850,522,300,992,1000,969,1,0,0,0,0,582,500,0,0,0,0,4161,1 +1370,SUCCUBUS,Succubus,Succubus,119,24960,0,3924,3489,2,670,864,76,48,100,64,45,80,82,85,10,12,1,6,67,0x3795,155,1306,1056,288,0,0,0,0,0,0,0,0,522,1500,2407,3,12373,1,2613,250,5066,1,1472,1,505,1000,0,0,0,0,4218,1 +1371,FAKE_ANGEL,Fake Angel,False Angel,105,10988,0,2100,1570,2,505,640,106,84,112,67,43,81,68,80,10,12,0,8,66,0x3885,160,920,720,336,0,0,0,0,0,0,0,0,0,0,0,0,717,1000,715,1000,716,1000,12020,1000,1974,20,0,0,0,0,4316,1 +1372,GOAT,Goat,Goat,80,3980,0,1065,1197,1,387,447,95,43,61,40,48,40,65,31,10,12,1,2,63,0x1089,165,1380,1080,336,0,0,0,0,0,0,0,0,7106,4559,7107,2500,713,5000,507,500,510,1000,508,2500,511,5500,0,0,0,0,4150,1 +1373,LORD_OF_DEATH,Lord of Death,Lord of the Dead,94,603883,0,437121,345252,3,4116,5078,336,73,140,99,30,109,100,90,10,12,2,6,67,0x37B5,180,1446,1296,360,218560,10000,607,5500,732,5000,617,5000,7108,5335,1417,5,1230,10,2621,2,7109,10,1306,1,1529,2,0,0,0,0,4276,1 +1374,INCUBUS,Incubus,Incubus,120,28000,0,3928,3646,2,683,858,72,46,120,56,52,75,99,70,10,12,1,6,67,0x3795,165,850,600,336,0,0,0,0,0,0,0,0,522,1500,509,5500,5072,1,2621,1,2610,500,2613,150,509,2200,0,0,0,0,4269,1 +1375,THE_PAPER,The Paper,The Paper,97,8500,0,1530,1148,1,280,390,32,39,77,49,30,5,61,5,10,12,1,0,60,0x3885,350,1160,960,336,0,0,0,0,0,0,0,0,7111,4947,7112,3200,508,1800,511,2000,13009,5,0,0,0,0,0,0,0,0,4172,1 +1376,HARPY,Harpy,Harpy,83,4423,0,1201,1349,1,282,323,69,44,71,39,50,31,96,12,10,12,1,6,64,0x3985,155,972,672,470,0,0,0,0,0,0,0,0,7115,4850,7116,2500,508,1500,508,800,709,20,1820,20,0,0,0,0,0,0,4325,1 +1377,ELDER,Elder,Elder,92,7341,0,1377,2898,3,276,678,72,41,67,63,35,99,88,61,10,12,2,7,80,0x3885,165,1552,1152,336,0,0,0,0,0,0,0,0,7099,4000,7117,1500,7118,1500,1564,10,1473,1,616,1,7027,3000,0,0,0,0,4251,1 +1378,DEMON_PUNGUS,Demon Pungus,Demon Pungus,91,6466,0,1350,1520,1,428,493,80,52,63,61,30,38,79,43,10,12,0,6,65,0x3985,170,1260,960,672,0,0,0,0,0,0,0,0,7119,4074,7001,4559,715,3880,1061,5000,0,0,0,0,0,0,0,0,0,0,4173,1 +1379,NIGHTMARE_TERROR,Nightmare Terror,Nightmare Terror,107,13289,0,2443,1832,1,629,755,78,37,118,53,55,63,88,43,10,12,2,6,67,0x3985,165,1216,816,432,0,0,0,0,0,0,0,0,7120,4947,2626,1,2608,30,505,50,510,150,695,100,1261,1,0,0,0,0,4166,1 +1380,DRILLER,Driller,Driller,65,2719,0,594,669,1,181,212,96,18,62,50,25,15,48,5,10,12,1,2,22,0x3885,165,1300,900,336,0,0,0,0,0,0,0,0,1012,7500,715,3880,716,3500,0,0,0,0,0,0,0,0,0,0,0,0,4180,1 +1381,GRIZZLY,Grizzly,Grizzly,66,2241,0,731,822,1,254,267,109,2,60,26,44,3,78,15,10,12,2,2,63,0x3885,165,1492,1092,192,0,0,0,0,0,0,0,0,948,5000,919,5000,549,2500,0,0,0,0,0,0,0,0,0,0,0,0,4162,1 +1382,DIABOLIC,Diabolic,Diabolic,104,10572,0,2172,1629,1,544,644,68,61,103,80,53,65,78,25,10,12,0,6,47,0x3985,150,1080,780,180,0,0,0,0,0,0,0,0,1038,5820,1039,4850,2605,3,984,20,1263,10,0,0,0,0,0,0,0,0,4182,1 +1383,EXPLOSION,Explosion,Explosion,100,7813,0,1900,1425,1,481,591,112,50,91,51,63,50,65,60,10,12,0,2,63,0x3885,165,1260,960,336,0,0,0,0,0,0,0,0,7006,5500,7097,2200,7122,3200,756,800,522,400,0,0,0,0,0,0,0,0,4267,1 +1384,DELETER,Deleter,Deleter,105,10000,0,2099,1574,1,502,581,111,53,105,55,53,68,67,73,10,12,1,9,43,0x308D,175,1020,720,384,0,0,0,0,0,0,0,0,7123,4074,1035,5335,1037,3880,1036,3589,0,0,0,0,0,0,0,0,0,0,4158,1 +1385,DELETER_,Deleter,Deleter,105,10000,0,2099,1574,1,510,621,114,53,98,65,49,72,57,73,10,12,1,9,43,0x308D,175,1024,624,336,0,0,0,0,0,0,0,0,7123,4074,1035,5335,1037,3880,1036,3589,0,0,0,0,0,0,0,0,0,0,4279,1 +1386,SLEEPER,Sleeper,Sleeper,81,5160,0,1034,1160,1,274,322,101,29,74,41,57,27,54,27,10,12,1,0,42,0x3885,195,1350,1200,432,0,0,0,0,0,0,0,0,7124,4947,1056,5335,997,2500,756,300,1226,5,1622,5,7043,1200,0,0,0,0,4228,1 +1387,GIG,Gig,Gig,100,8721,0,1769,1327,1,476,599,104,53,92,66,60,48,60,50,10,12,0,2,43,0x3885,170,1264,864,576,0,0,0,0,0,0,0,0,7125,4365,904,5500,716,150,525,2500,994,850,0,0,0,0,0,0,0,0,4165,1 +1388,ARCHANGELING,Archangeling,Arc Angeling,84,25100,0,3253,2910,1,539,639,92,81,32,48,62,99,99,105,10,12,1,8,66,0x37B5,180,1072,672,480,0,0,0,0,0,0,0,0,2255,5,610,1800,608,150,7291,1500,2254,5,2317,3,7294,1500,0,0,0,0,4241,1 +1389,DRACULA,Dracula,Dracula,75,350000,0,312480,245520,3,1322,3134,152,146,86,99,88,92,145,82,10,12,2,6,87,0x37B5,145,1290,1140,576,156240,10000,607,5500,732,5000,522,5000,607,4700,1473,5,1722,5,2507,15,2621,4,1557,4,0,0,0,0,0,0,4134,1 +1390,VIOLY,Violy,Violy,118,20557,0,2862,2147,10,548,668,74,36,90,86,38,76,90,63,10,12,1,7,40,0x2085,170,1356,1056,540,0,0,0,0,0,0,0,0,1060,6305,12127,50,740,1200,1919,50,526,1400,12020,1000,1902,500,0,0,0,0,4209,1 +1391,GALAPAGO,Galapago,Galapago,45,1221,0,342,386,1,68,103,70,16,30,28,29,18,30,16,10,12,0,2,22,0x108B,165,1430,1080,1080,0,0,0,0,0,0,0,0,7053,5335,610,100,508,3500,606,100,605,100,5111,1,582,1000,0,0,0,0,4152,1 1392,ROTAR_ZAIRO,Rotar Zairo,Rotar Zairo,48,1088,0,399,449,10,75,115,57,34,29,70,45,26,61,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,7126,500,2312,1,7053,1000,999,450,984,1,912,2500,910,5500,0,0,0,0,4192,1 1393,G_MUMMY,Mummy,Mummy,37,5176,0,0,0,1,305,360,0,10,28,19,32,0,63,20,10,12,1,1,49,0x3885,300,1772,72,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1394,G_ZOMBIE,Zombie,Zombie,15,534,0,0,0,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -401,25 +401,25 @@ 1397,CRYSTAL_3,Fire Crystal,Fire Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,999,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,5097,7000,534,6500,558,5000,604,300,0,0,0,0 1398,CRYSTAL_4,Water Crystal,Water Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,999,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,5097,7000,533,6500,558,5000,603,100,0,0,0,0 1399,EVENT_BAPHO,Baphomet,Baphomet,68,1264000,0,261750,83685,3,1847,2267,35,45,1,152,96,85,120,95,10,12,2,6,67,0x37B5,130,768,768,576,130875,10000,607,5500,526,5000,732,5000,1417,550,1306,680,1145,480,2110,640,2327,1500,2111,500,2621,1720,2256,1550,0,0,0,0 -1400,KARAKASA,Karakasa,Karakasa,30,3092,0,489,322,1,141,183,1,5,1,45,12,20,49,60,10,12,1,0,60,0x81,155,1638,2016,576,0,0,0,0,0,0,0,0,7151,5000,7150,4268,1019,3200,7111,2200,912,4074,746,30,13012,5,0,0,0,0,4286,1 -1401,SHINOBI,Shinobi,Shinobi,69,12700,0,4970,3010,2,460,1410,34,21,85,85,25,25,100,100,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,7156,5335,2337,2,7053,2200,2654,100,2336,1,7157,2000,13013,5,0,0,0,0,4230,1 -1402,POISON_TOAD,Poison Toad,Poison Toad,46,6629,0,1929,1457,3,288,408,5,10,20,34,19,14,66,55,10,12,1,2,45,0x81,160,1148,1728,864,0,0,0,0,0,0,0,0,7155,5500,7154,2400,2610,4,511,540,724,2,526,2,1246,10,0,0,0,0,4175,1 -1403,ANTIQUE_FIRELOCK,Antique Firelock,Firelock Soldier,47,3852,0,1293,1003,10,289,336,10,10,15,35,29,15,120,42,10,12,1,1,49,0x2085,170,1084,2304,576,0,0,0,0,0,0,0,0,998,5500,2285,1,7126,1400,508,40,549,350,525,250,13152,5,0,0,0,0,4160,1 -1404,MIYABI_NINGYO,Miyabi Ningyo,Miyabi Doll,33,6300,0,795,453,1,250,305,1,20,1,52,15,10,62,15,10,12,1,6,27,0x191,250,1938,2112,768,0,0,0,0,0,0,0,0,7152,5335,7153,2500,509,1550,1000,1250,12127,10,13014,5,1904,2,0,0,0,0,4208,1 -1405,TENGU,Tengu,Tengu,65,16940,0,4207,2843,2,660,980,12,82,90,42,69,45,78,80,10,12,2,6,42,0x3985,200,1439,1920,672,0,0,0,0,0,0,0,0,7159,3500,7158,5500,13301,5,522,150,13302,5,12128,20,687,100,0,0,0,0,4282,1 -1406,KAPHA,Kapha,Kapha,41,7892,0,2278,1552,3,399,719,20,38,1,51,49,22,73,45,10,12,1,5,21,0x3885,165,2012,1728,672,0,0,0,0,0,0,0,0,7149,6500,7053,3500,13304,20,521,2300,708,2,1915,10,13008,5,0,0,0,0,4287,1 +1400,KARAKASA,Karakasa,Karakasa,72,3092,0,765,860,1,156,198,93,29,66,73,33,20,53,60,10,12,1,0,60,0x81,155,1638,2016,576,0,0,0,0,0,0,0,0,7151,5000,7150,4268,1019,3200,7111,2200,912,4074,746,30,13012,5,0,0,0,0,4286,1 +1401,SHINOBI,Shinobi,Shinobi,95,8000,0,1691,1902,2,441,492,49,45,71,70,55,30,69,30,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,7156,5335,2337,2,7053,2200,2654,100,2336,1,7157,2000,13013,5,0,0,0,0,4230,1 +1402,POISON_TOAD,Poison Toad,Poison Toad,87,4876,0,1341,1509,3,212,266,80,42,66,42,40,45,58,30,10,12,1,2,45,0x81,160,1148,1728,864,0,0,0,0,0,0,0,0,7155,5500,7154,2400,2610,4,511,540,724,2,526,2,1246,10,0,0,0,0,4175,1 +1403,ANTIQUE_FIRELOCK,Antique Firelock,Firelock Soldier,88,7524,0,1352,1512,10,324,369,72,30,67,44,30,30,83,30,10,12,1,1,49,0x2085,170,1084,2304,576,0,0,0,0,0,0,0,0,998,5500,2285,1,7126,1400,508,40,549,350,525,250,13152,5,0,0,0,0,4160,1 +1404,MIYABI_NINGYO,Miyabi Ningyo,Miyabi Doll,85,5188,0,1116,1256,1,216,282,57,19,66,30,30,55,73,40,10,12,1,6,27,0x191,250,1938,2112,768,0,0,0,0,0,0,0,0,7152,5335,7153,2500,509,1550,1000,1250,12127,10,13014,5,1904,2,0,0,0,0,4208,1 +1405,TENGU,Tengu,Tengu,98,10196,0,1701,1275,2,211,294,134,46,99,38,40,30,67,60,10,12,2,6,42,0x3985,200,1439,1920,672,0,0,0,0,0,0,0,0,7159,3500,7158,5500,13301,5,522,150,13302,5,12128,20,687,100,0,0,0,0,4282,1 +1406,KAPHA,Kapha,Kapha,83,5470,0,1035,1164,1,278,310,61,38,67,59,40,31,61,24,10,12,1,5,21,0x3885,165,2012,1728,672,0,0,0,0,0,0,0,0,7149,6500,7053,3500,13304,20,521,2300,708,2,1915,10,13008,5,0,0,0,0,4287,1 //1407,DOKEBI_,Dokebi,Dokebi,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1408,BLOOD_BUTTERFLY,Bloody Butterfly,Bloody Butterfly,55,8082,0,2119,1562,3,121,342,5,23,1,59,14,55,68,15,10,12,1,4,44,0x318D,145,472,576,288,0,0,0,0,0,0,0,0,7163,4608,7168,2500,602,1200,924,5500,1802,3,1962,1,0,0,0,0,0,0,4327,1 -1409,RICE_CAKE_BOY,Rice Cake Boy,Dumpling Child,27,2098,0,231,149,1,112,134,5,12,1,22,29,5,41,10,10,12,0,7,20,0x91,160,647,768,420,0,0,0,0,0,0,0,0,7150,3200,7151,2500,2262,1,7192,5000,553,1000,7187,3000,0,0,0,0,0,0,4154,1 -1410,LIVE_PEACH_TREE,Live Peach Tree,Enchanted Peach Tree,53,8905,0,2591,1799,7,301,351,10,38,72,45,35,39,80,5,10,12,1,3,42,0x2085,410,400,672,480,0,0,0,0,0,0,0,0,7164,4365,0,0,526,1000,604,400,532,100,603,5,0,0,0,0,0,0,4217,1 +1408,BLOOD_BUTTERFLY,Bloody Butterfly,Bloody Butterfly,94,7030,0,1555,1749,3,278,345,79,50,70,68,40,55,90,30,10,12,1,4,44,0x318D,145,472,576,288,0,0,0,0,0,0,0,0,7163,4608,7168,2500,602,1200,924,5500,1802,3,1962,1,0,0,0,0,0,0,4327,1 +1409,RICE_CAKE_BOY,Rice Cake Boy,Dumpling Child,60,2098,0,531,597,1,128,150,96,12,50,43,29,5,43,10,10,12,0,7,20,0x91,160,647,768,420,0,0,0,0,0,0,0,0,7150,3200,7151,2500,2262,1,7192,5000,553,1000,7187,3000,0,0,0,0,0,0,4154,1 +1410,LIVE_PEACH_TREE,Live Peach Tree,Enchanted Peach Tree,92,8777,0,1499,1724,7,270,342,109,40,76,52,55,40,77,50,10,12,1,3,42,0x2085,410,400,672,480,0,0,0,0,0,0,0,0,7164,4365,0,0,526,1000,604,400,532,100,603,5,0,0,0,0,0,0,4217,1 //1411,PEACH_TREE_BULLET,Peach Tree Bullet,Peach Tree Bullet... (mode 129),0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1412,EVIL_CLOUD_HERMIT,Evil Cloud Hermit,Taoist Hermit,56,10392,0,3304,2198,10,311,333,25,59,1,20,18,50,136,11,10,12,2,0,40,0x2085,190,480,840,432,0,0,0,0,0,0,0,0,7162,4656,548,5600,550,4500,553,6800,1908,2,757,150,693,100,0,0,0,0,4262,1 -1413,WILD_GINSENG,Wild Ginseng,Hermit Plant,46,6900,0,1038,692,1,220,280,10,20,13,42,36,55,66,30,10,12,0,3,43,0x91,140,512,756,360,0,0,0,0,0,0,0,0,520,3500,521,3500,1033,3800,1032,4800,516,4800,1951,1,578,1000,0,0,0,0,4232,1 +1412,EVIL_CLOUD_HERMIT,Evil Cloud Hermit,Taoist Hermit,96,8266,0,1503,1127,10,470,500,66,46,63,57,45,60,99,45,10,12,2,0,40,0x2085,190,480,840,432,0,0,0,0,0,0,0,0,7162,4656,548,5600,550,4500,553,6800,1908,2,757,150,693,100,0,0,0,0,4262,1 +1413,WILD_GINSENG,Wild Ginseng,Hermit Plant,90,6052,0,1409,1586,1,523,594,56,62,76,51,60,60,76,50,10,12,0,3,43,0x91,140,512,756,360,0,0,0,0,0,0,0,0,520,3500,521,3500,1033,3800,1032,4800,516,4800,1951,1,578,1000,0,0,0,0,4232,1 //1414,GINSENG_BULLET,Ginseng Bullet,Ginseng Bullet... (mode 129),0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1415,BABY_LEOPARD,Baby Leopard,Baby Leopard,32,2590,0,352,201,2,155,207,0,5,20,44,20,4,49,10,10,12,0,2,28,0x3885,150,318,528,420,0,0,0,0,0,0,0,0,7171,5200,7172,3200,756,150,517,2000,1214,100,537,500,0,0,0,0,0,0,4233,1 -1416,WICKED_NYMPH,Wicked Nymph,Evil Nymph,63,16029,0,3945,2599,2,399,1090,12,75,1,64,12,69,100,80,10,12,1,6,67,0x3795,200,637,1008,360,0,0,0,0,0,0,0,0,7165,3977,7166,1380,984,10,1904,4,1906,1,12002,100,1918,10,0,0,0,0,4258,1 -1417,ZIPPER_BEAR,Zipper Bear,Zipper Bear,35,2901,0,370,225,1,248,289,10,5,30,25,55,15,28,25,10,12,1,2,27,0x91,155,780,1008,420,0,0,0,0,0,0,0,0,7161,4462,7167,3500,526,400,518,900,512,90,0,0,0,0,0,0,0,0,4281,1 -1418,DARK_SNAKE_LORD,Evil Snake Lord,Evil Snake Lord,73,254993,0,34288,17950,3,2433,4210,25,55,70,83,30,80,164,88,10,12,2,2,68,0x37B5,200,588,816,420,17144,10000,607,5500,608,3500,985,5500,7169,5820,10020,5100,1471,80,5012,80,1474,500,7226,900,661,2000,0,0,0,0,4330,1 +1415,BABY_LEOPARD,Baby Leopard,Baby Leopard,68,2590,0,500,1016,2,277,329,77,5,46,36,20,4,55,10,10,12,0,2,28,0x3885,150,318,528,420,0,0,0,0,0,0,0,0,7171,5200,7172,3200,756,150,517,2000,1214,100,537,500,0,0,0,0,0,0,4233,1 +1416,WICKED_NYMPH,Wicked Nymph,Evil Nymph,97,8491,0,1775,1331,2,340,468,46,45,84,46,45,70,77,60,10,12,1,6,67,0x3795,200,637,1008,360,0,0,0,0,0,0,0,0,7165,3977,7166,1380,984,10,1904,4,1906,1,12002,100,1918,10,0,0,0,0,4258,1 +1417,ZIPPER_BEAR,Zipper Bear,Zipper Bear,90,6620,0,1305,1467,1,410,467,130,40,68,51,50,35,58,20,10,12,1,2,27,0x91,155,780,1008,420,0,0,0,0,0,0,0,0,7161,4462,7167,3500,526,400,518,900,512,90,0,0,0,0,0,0,0,0,4281,1 +1418,DARK_SNAKE_LORD,Evil Snake Lord,Evil Snake Lord,105,1101000,0,720000,630000,3,2217,4203,314,185,122,172,107,135,196,88,10,12,2,2,68,0x37B5,200,588,816,420,78120,10000,607,5500,608,3500,985,5500,7169,5820,10020,5100,1471,80,5012,80,1474,500,7226,900,661,2000,0,0,0,0,4330,1 1419,G_FARMILIAR,Familiar,Familiar,8,155,0,0,0,1,20,28,0,0,1,12,8,5,28,0,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1420,G_ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,31,3040,0,0,0,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,0x3885,300,2864,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1421,G_ISIS,Isis,Isis,43,4828,0,0,0,1,423,507,10,35,38,65,43,30,72,15,10,12,2,6,27,0x3985,200,1384,768,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -495,39 +495,39 @@ 1491,G_DOKEBI,Dokebi,Dokebi,33,2697,0,0,0,1,197,249,0,10,50,50,40,35,69,40,10,12,0,6,27,0x3985,250,1156,456,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //Umbala -1492,INCANTATION_SAMURAI,Incantation Samurai,Samurai Specter,71,218652,0,33095,18214,3,2219,3169,10,51,91,85,30,85,150,60,10,12,2,7,67,0x37B5,135,874,1344,576,16547,10000,607,5500,608,3500,985,5500,1165,2,985,3500,5096,500,607,4500,999,6305,13303,7500,1235,80,0,0,0,0,4263,1 -1493,DRYAD,Dryad,Dryad,50,8791,0,2763,1493,3,499,589,15,33,1,75,55,1,78,45,10,12,1,3,82,0x3885,170,950,2520,576,0,0,0,0,0,0,0,0,7197,5335,7198,1000,7188,3000,1951,80,1964,1,2270,10,7100,3000,0,0,0,0,4177,1 -1494,KIND_OF_BEETLE,Beetle King,Beetle King,34,1874,0,679,442,1,191,243,45,12,1,34,10,0,40,0,10,12,0,4,22,0x1189,165,1247,768,576,0,0,0,0,0,0,0,0,7190,6500,7202,4500,928,1000,955,500,2102,1,0,0,0,0,0,0,0,0,4307,1 -1495,STONE_SHOOTER,Stone Shooter,Stone Shooter,42,4104,0,1238,752,10,309,350,12,45,1,40,20,79,92,20,10,12,1,3,63,0x3885,175,2413,1248,768,0,0,0,0,0,0,0,0,7203,5000,7201,5000,7188,1000,1019,2000,756,100,7049,1000,0,0,0,0,0,0,4225,1 +1492,INCANTATION_SAMURAI,Incantation Samurai,Samurai Specter,100,901000,0,751680,595080,3,2196,3132,296,140,145,161,88,66,155,60,10,12,2,7,67,0x37B5,135,874,1344,576,375840,10000,607,5500,608,3500,985,5500,1165,2,985,3500,5096,500,607,4500,999,6305,13303,7500,1235,80,0,0,0,0,4263,1 +1493,DRYAD,Dryad,Dryad,68,3640,0,837,939,3,266,301,153,8,54,14,40,35,67,10,10,12,1,3,82,0x3885,170,950,2520,576,0,0,0,0,0,0,0,0,7197,5335,7198,1000,7188,3000,1951,80,1964,1,2270,10,7100,3000,0,0,0,0,4177,1 +1494,KIND_OF_BEETLE,Beetle King,Beetle King,55,2061,0,450,507,1,110,162,79,8,53,47,10,0,45,0,10,12,0,4,22,0x1189,165,1247,768,576,0,0,0,0,0,0,0,0,7190,6500,7202,4500,928,1000,955,500,2102,1,0,0,0,0,0,0,0,0,4307,1 +1495,STONE_SHOOTER,Stone Shooter,Stone Shooter,64,2101,0,689,776,10,201,254,88,15,55,55,36,15,77,15,10,12,1,3,63,0x3885,175,2413,1248,768,0,0,0,0,0,0,0,0,7203,5000,7201,5000,7188,1000,1019,2000,756,100,7049,1000,0,0,0,0,0,0,4225,1 //1496,STONE_SHOOTER_BULLET,Stone Shooter Bullet,Stone Shooter Bullet,(mode 2181),0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1497,WOODEN_GOLEM,Wooden Golem,Wooden Golem,51,9200,0,1926,1353,1,570,657,32,36,1,41,69,5,85,155,10,12,2,3,82,0x3885,165,1543,1632,480,0,0,0,0,0,0,0,0,7189,4000,7188,4000,757,110,2270,10,604,100,7201,5000,921,1000,0,0,0,0,4259,1 -1498,WOOTAN_SHOOTER,Wootan Shooter,Wootan Shooter,39,3977,0,886,453,10,84,105,10,28,15,35,29,15,100,42,10,12,1,7,42,0x3885,200,857,1056,576,0,0,0,0,0,0,0,0,7195,4500,7200,3500,513,1000,7049,1000,512,100,7182,100,5116,10,0,0,0,0,4260,1 -1499,WOOTAN_FIGHTER,Wootan Fighter,Wootan Fighter,41,4457,0,1790,833,1,395,480,30,19,1,41,31,10,45,30,10,12,1,7,43,0x3885,200,912,1344,480,0,0,0,0,0,0,0,0,517,4500,7196,4000,1801,3,1812,1,513,1000,7198,1000,5116,5,0,0,0,0,4261,1 -1500,PARASITE,Parasite,Parasite,49,5188,0,1098,1453,8,215,430,10,19,1,40,30,30,90,50,10,12,1,3,44,0x84,400,864,864,672,0,0,0,0,0,0,0,0,7193,5500,7194,2000,7186,3880,7198,500,1957,1,1969,1,711,500,0,0,0,0,4309,1 +1497,WOODEN_GOLEM,Wooden Golem,Wooden Golem,72,3914,0,950,1079,1,292,334,249,26,69,30,45,5,49,5,10,12,2,3,82,0x3885,165,1543,1632,480,0,0,0,0,0,0,0,0,7189,4000,7188,4000,757,110,2270,10,604,100,7201,5000,921,1000,0,0,0,0,4259,1 +1498,WOOTAN_SHOOTER,Wootan Shooter,Wootan Shooter,67,3096,0,711,798,10,140,175,91,21,32,23,38,20,69,10,10,12,1,7,42,0x3885,200,857,1056,576,0,0,0,0,0,0,0,0,7195,4500,7200,3500,513,1000,7049,1000,512,100,7182,100,5116,10,0,0,0,0,4260,1 +1499,WOOTAN_FIGHTER,Wootan Fighter,Wootan Fighter,67,2327,0,709,798,1,243,279,103,8,63,14,36,5,56,15,10,12,1,7,43,0x3885,200,912,1344,480,0,0,0,0,0,0,0,0,517,4500,7196,4000,1801,3,1812,1,513,1000,7198,1000,5116,5,0,0,0,0,4261,1 +1500,PARASITE,Parasite,Parasite,76,3222,0,923,1337,8,161,206,63,30,55,78,33,50,88,40,10,12,1,3,44,0x84,400,864,864,672,0,0,0,0,0,0,0,0,7193,5500,7194,2000,7186,3880,7198,500,1957,1,1969,1,711,500,0,0,0,0,4309,1 //1501,PARASITE_BULLET,Parasite Bullet,Parasite Bullet... (mode 2181),0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1502,PORING_V,Pori Pori,Bring it on!,99,95000000,0,87250,27895,1,10000,30000,0,10,100,100,65,100,255,255,10,12,1,3,25,0x39A5,160,1672,672,480,43625,10000,10020,1000,4005,100,2286,200,5035,10000,2344,2500,2346,2500,2350,2500,2348,2500,2655,4000,7126,10000,2110,4500,0,0,0,0 //Niflheim -1503,GIBBET,Gibbet,Gibbet,58,6841,0,4011,1824,1,418,656,28,31,0,42,42,27,46,28,10,12,2,6,27,0x3985,180,917,1584,576,0,0,0,0,0,0,0,0,7212,1800,7218,5335,7222,4074,724,300,716,100,604,10,0,0,0,0,0,0,4278,1 -1504,DULLAHAN,Dullahan,Dullahan,62,12437,0,4517,2963,2,647,1065,47,38,0,30,5,45,62,22,10,12,1,1,49,0x3885,155,847,1152,480,0,0,0,0,0,0,0,0,7209,3200,7210,4850,2614,1,2505,13,2506,1,0,0,0,0,0,0,0,0,4176,1 -1505,LOLI_RURI,Loli Ruri,Loli Ruri,71,23470,0,6641,4314,2,1476,2317,39,44,0,66,54,74,81,43,10,12,2,6,87,0x3985,125,747,1632,576,0,0,0,0,0,0,0,0,7206,800,7219,3000,7214,5044,985,100,7019,1,2718,5,0,0,0,0,0,0,4191,1 -1506,DISGUISE,Disguise,Disguise,55,7543,180,2815,1919,2,279,546,18,29,0,72,45,35,48,65,10,12,1,6,82,0x3985,147,516,768,384,0,0,0,0,0,0,0,0,7216,4850,7221,3686,2502,50,518,100,2508,50,2504,2,2529,5,0,0,0,0,4181,1 -1507,BLOODY_MURDERER,Bloody Murderer,Bloody Murderer,72,27521,0,9742,3559,2,864,1081,37,41,0,30,90,15,52,12,10,12,2,7,67,0x3885,175,914,1344,384,0,0,0,0,0,0,0,0,7207,4171,7223,1000,7208,2000,2288,50,984,100,1229,3,13002,1,0,0,0,0,4214,1 -1508,QUVE,Quve,Quve,40,4559,0,414,306,1,299,469,12,12,0,61,24,19,37,24,10,12,0,1,29,0x3885,150,912,1248,576,0,0,0,0,0,0,0,0,7205,3200,7220,5723,601,1000,7154,100,756,10,0,0,0,0,0,0,0,0,4294,1 -1509,LUDE,Lude,Lude,36,3214,0,392,247,2,287,451,14,10,0,59,21,18,36,21,10,12,0,1,29,0x3885,150,890,960,480,0,0,0,0,0,0,0,0,7225,3200,7220,5723,1059,1000,2282,10,757,10,12001,100,0,0,0,0,0,0,4193,1 -1510,HYLOZOIST,Hylozoist,Heirozoist,51,7186,0,2314,1297,1,317,498,16,51,0,28,26,47,66,14,10,12,0,6,47,0x3985,155,741,1536,480,0,0,0,0,0,0,0,0,7215,4365,7217,5335,7213,2000,740,80,7220,300,757,10,5113,1,0,0,0,0,4321,1 +1503,GIBBET,Gibbet,Gibbet,105,12999,0,1944,1458,1,536,621,116,45,103,56,62,55,61,37,10,12,2,6,27,0x3985,180,917,1584,576,0,0,0,0,0,0,0,0,7212,1800,7218,5335,7222,4074,724,300,716,100,604,10,0,0,0,0,0,0,4278,1 +1504,DULLAHAN,Dullahan,Dullahan,108,18546,0,2509,1977,2,666,741,111,38,121,29,51,43,87,3,10,12,1,1,49,0x3885,155,847,1152,480,0,0,0,0,0,0,0,0,7209,3200,7210,4850,2614,1,2505,13,2506,1,0,0,0,0,0,0,0,0,4176,1 +1505,LOLI_RURI,Loli Ruri,Loli Ruri,109,15280,0,2790,2093,2,787,1017,53,44,111,50,47,79,79,79,10,12,2,6,87,0x3985,125,747,1632,576,0,0,0,0,0,0,0,0,7206,800,7219,3000,7214,5044,985,100,7019,1,2718,5,0,0,0,0,0,0,4191,1 +1506,DISGUISE,Disguise,Disguise,103,13895,180,2232,1674,2,260,342,85,58,92,53,57,75,67,45,10,12,1,6,82,0x3985,147,516,768,384,0,0,0,0,0,0,0,0,7216,4850,7221,3686,2502,50,518,100,2508,50,2504,2,2529,5,0,0,0,0,4181,1 +1507,BLOODY_MURDERER,Bloody Murderer,Bloody Murderer,110,14099,0,2724,2244,2,844,942,84,41,120,65,66,41,89,26,10,12,2,7,67,0x3885,175,914,1344,384,0,0,0,0,0,0,0,0,7207,4171,7223,1000,7208,2000,2288,50,984,100,1229,3,13002,1,0,0,0,0,4214,1 +1508,QUVE,Quve,Quve,100,11090,0,1638,1229,1,226,323,96,55,84,54,55,50,71,60,10,12,0,1,29,0x3885,150,912,1248,576,0,0,0,0,0,0,0,0,7205,3200,7220,5723,601,1000,7154,100,756,10,0,0,0,0,0,0,0,0,4294,1 +1509,LUDE,Lude,Lude,101,11574,0,1692,1269,2,218,296,90,53,97,38,55,82,69,55,10,12,0,1,29,0x3885,150,890,960,480,0,0,0,0,0,0,0,0,7225,3200,7220,5723,1059,1000,2282,10,757,10,12001,100,0,0,0,0,0,0,4193,1 +1510,HYLOZOIST,Hylozoist,Heirozoist,102,12000,0,1876,1406,1,268,349,101,68,97,67,72,88,69,60,10,12,0,6,47,0x3985,155,741,1536,480,0,0,0,0,0,0,0,0,7215,4365,7217,5335,7213,2000,740,80,7220,300,757,10,5113,1,0,0,0,0,4321,1 -1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,3,1647,2576,26,52,0,1,90,124,74,45,14,12,2,7,62,0x1A4,170,854,2016,480,43632,10000,607,5500,608,3500,732,5500,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1 +1511,AMON_RA,Amon Ra,Amon Ra,69,319000,0,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x1A4,170,854,2016,480,120060,10000,607,5500,608,3500,732,5500,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1 //Louyang -1512,HYEGUN,Hyegun,Yao Jun,56,9981,0,2199,1022,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,0x3885,180,890,1320,720,0,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1 -1513,CIVIL_SERVANT,Civil Servant,Mao Guai,62,14390,0,4023,2750,2,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,0x3885,200,1257,528,432,0,0,0,0,0,0,0,0,7262,4171,7263,2000,606,10,1023,100,693,100,0,0,0,0,0,0,0,0,4202,1 -1514,DANCING_DRAGON,Dancing Dragon,Zhu Po Long,54,9136,0,3030,769,2,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,0x83,160,600,840,504,0,0,0,0,0,0,0,0,7266,4365,7265,3000,7268,800,1036,1000,7038,3000,0,0,0,0,0,0,0,0,4272,1 -1515,GARM_BABY,Garm Baby,Garm Baby,61,20199,0,1022,2980,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,7270,1500,7269,2500,7066,4365,749,100,12000,100,0,0,0,0,0,0,0,0,4323,1 -1516,INCREASE_SOIL,Increase Soil,Mi Gao,51,8230,0,2760,2110,1,560,700,30,12,40,45,23,12,69,12,10,12,1,0,62,0x91,445,106,1056,576,0,0,0,0,0,0,0,0,7264,4365,7004,2300,997,10,969,2,0,0,0,0,0,0,0,0,0,0,4231,1 -1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,Jing Guai,48,5920,0,1643,1643,1,434,633,23,16,46,51,19,8,57,30,10,12,1,6,62,0x3985,165,1120,576,420,0,0,0,0,0,0,0,0,7267,4500,7268,400,1501,10,1523,1,0,0,0,0,0,0,0,0,0,0,4265,1 +1512,HYEGUN,Hyegun,Yao Jun,87,6996,0,1283,1445,1,246,294,84,43,69,38,40,20,68,20,10,12,1,1,49,0x3885,180,890,1320,720,0,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1 +1513,CIVIL_SERVANT,Civil Servant,Mao Guai,89,5292,0,1349,1512,2,276,337,90,56,67,76,40,65,62,30,10,12,1,2,44,0x3885,200,1257,528,432,0,0,0,0,0,0,0,0,7262,4171,7263,2000,606,10,1023,100,693,100,0,0,0,0,0,0,0,0,4202,1 +1514,DANCING_DRAGON,Dancing Dragon,Zhu Po Long,82,3943,0,972,1094,2,268,303,83,36,59,76,40,30,61,30,10,12,1,9,44,0x83,160,600,840,504,0,0,0,0,0,0,0,0,7266,4365,7265,3000,7268,800,1036,1000,7038,3000,0,0,0,0,0,0,0,0,4272,1 +1515,GARM_BABY,Garm Baby,Hatii Baby,94,10016,0,1555,1749,1,383,444,62,43,69,61,55,61,88,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,7270,1500,7269,2500,7066,4365,749,100,12000,100,0,0,0,0,0,0,0,0,4323,1 +1516,INCREASE_SOIL,Increase Soil,Mi Gao,83,5335,0,1201,1529,1,332,362,112,39,67,23,41,49,78,30,10,12,1,0,62,0x91,444,106,1056,576,0,0,0,0,0,0,0,0,7264,4365,7004,2300,997,10,969,2,0,0,0,0,0,0,0,0,0,0,4231,1 +1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,Jing Guai,80,5187,0,1065,1197,1,179,220,110,37,61,22,33,35,62,20,10,12,1,6,62,0x3985,165,1120,576,420,0,0,0,0,0,0,0,0,7267,4500,7268,400,1501,10,1523,1,0,0,0,0,0,0,0,0,0,0,4265,1 1518,BACSOJIN,Bacsojin,White Lady,72,56380,0,5590,1659,2,560,1446,10,15,38,65,34,80,102,35,10,12,2,7,41,0x3695,160,576,960,480,0,0,0,0,0,0,0,0,1020,5500,603,2,617,2,7165,3000,7166,1000,747,500,0,0,2234,1,0,0,0,0 -1519,CHUNG_E,Chung E,Green Maiden,49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,12395,20,5024,50,0,0,5042,2,0,0,0,0 +1519,CHUNG_E,Chung E,Green Maiden,49,23900,0,2156,894,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,12395,20,5024,50,0,0,5042,2,0,0,0,0 1520,BOILED_RICE,Boiled Rice,Boiled Rice,15,400,0,84,45,1,49,82,0,10,1,14,14,0,19,15,10,12,1,3,21,0x81,170,1152,672,672,0,0,0,0,0,0,0,0,564,5500,7272,3000,7194,1000,7198,1000,0,0,0,0,0,0,0,0,0,0,0,0 1521,G_ALICE,Alice,Alice,62,10000,0,0,0,1,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,0x91,200,520,2304,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1522,G_ANCIENT_MUMMY,Ancient Mummy,Ancient Mummy,64,40599,0,0,0,1,836,1129,27,27,28,19,32,5,83,35,10,12,1,1,49,0x3695,175,1772,120,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -590,14 +590,14 @@ 1579,G_HYDRA,Hydra,Hydra,14,660,0,0,0,7,22,28,0,40,1,14,14,0,40,2,10,12,0,3,41,0x84,1000,800,432,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1580,G_INCUBUS,Incubus,Incubus,75,17281,0,0,0,2,1408,1873,58,46,1,97,95,103,89,87,10,12,1,6,67,0x3795,165,850,600,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1581,G_VOCAL,Vocal,Vocal,18,3016,0,0,0,1,71,82,10,30,77,28,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1582,DEVILING,Deviling,Deviling,31,64500,0,211,412,1,135,270,5,70,30,50,20,75,77,200,10,12,1,6,87,0x37B5,200,1072,1056,384,0,0,0,0,0,0,0,0,1039,3000,912,4850,2255,100,512,5000,7023,1,983,100,694,100,0,0,0,0,4174,1 -1583,TAO_GUNKA,Tao Gunka,Tao Gunka,70,193000,0,59175,10445,2,1450,1770,20,20,1,85,78,35,140,60,10,12,2,6,60,0x37B5,150,1020,288,144,29587,10000,984,6000,617,3000,505,6000,7300,4850,7067,4850,728,1000,2296,400,504,3000,1002,1000,2231,5,0,0,0,0,4302,1 +1582,DEVILING,Deviling,Deviling,66,16890,0,2281,2379,1,298,481,67,70,48,50,33,75,77,200,10,12,1,6,87,0x37B5,200,1072,1056,384,0,0,0,0,0,0,0,0,1039,3000,912,4850,2255,100,512,5000,7023,1,983,100,694,100,0,0,0,0,4174,1 +1583,TAO_GUNKA,Tao Gunka,Tao Gunka,110,1252000,0,900000,720000,2,2890,4150,404,143,135,175,98,110,199,66,10,12,2,6,60,0x37B5,150,1020,288,144,450000,10000,984,6000,617,3000,505,6000,7300,4850,7067,4850,728,1000,2296,400,504,3000,1002,1000,2231,5,0,0,0,0,4302,1 //Ayothaya -1584,TAMRUAN,Tamruan,Tamruan,52,10234,0,3812,55,1,489,534,15,35,80,62,38,75,72,15,10,12,2,6,67,0x318D,140,512,1152,672,0,0,0,0,0,0,0,0,7301,4850,7069,3000,1117,40,1155,8,2315,3,0,0,0,0,0,0,0,0,4304,1 +1584,TAMRUAN,Tamruan,Tamruan,73,3195,0,898,1010,1,305,342,63,30,60,38,40,20,61,20,10,12,2,6,67,0x318D,140,512,1152,672,0,0,0,0,0,0,0,0,7301,4850,7069,3000,1117,40,1155,8,2315,3,0,0,0,0,0,0,0,0,4304,1 1585,MIME_MONKEY,Mime Monkey,Mime Monkey,40,6000,0,200,22,3,300,350,40,40,1,40,40,40,40,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,0,0 -1586,LEAF_CAT,Leaf Cat,Leaf Cat,38,2396,0,165,1212,1,266,307,5,19,25,67,12,45,60,29,10,12,0,2,22,0x83,150,960,864,720,0,0,0,0,0,0,0,0,7198,4365,520,300,608,5,1023,1100,568,250,567,500,7298,5335,0,0,0,0,4195,1 -1587,KRABEN,Kraben,Kraben,50,5880,0,206,1322,1,125,765,5,42,50,125,1,66,75,50,10,12,1,0,48,0x3095,100,1152,1536,576,0,0,0,0,0,0,0,0,912,3500,519,3000,521,1000,2102,1,7299,4850,7286,1000,603,10,0,0,0,0,4295,1 +1586,LEAF_CAT,Leaf Cat,Leaf Cat,64,2635,0,594,669,1,140,181,88,16,46,16,12,45,33,29,10,12,0,2,22,0x83,150,960,864,720,0,0,0,0,0,0,0,0,7198,4365,520,300,608,5,1023,1100,568,250,567,500,7298,5335,0,0,0,0,4195,1 +1587,KRABEN,Kraben,Kraben,70,2901,0,510,1095,1,266,311,108,20,54,33,35,15,62,20,10,12,1,0,48,0x3095,100,1152,1536,576,0,0,0,0,0,0,0,0,912,3500,519,3000,521,1000,2102,1,7299,4850,7286,1000,603,10,0,0,0,0,4295,1 //Some more G_Mobs and Xmas_Orc 1588,ORC_XMAS,Christmas Orc,Christmas Orc,24,1400,0,261,160,1,104,126,10,5,1,24,48,25,34,10,10,12,1,7,22,0x81,200,1864,864,288,0,0,0,0,0,0,0,0,998,210,931,5500,756,40,7175,1600,1352,10,644,15,7174,1600,0,0,0,0,4066,1 @@ -627,17 +627,17 @@ 1612,A_HYEGUN,Hyegun,Yao Jun,56,9981,0,0,0,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,89,0x39A5,180,890,1320,720,0,0,0,0,0,0,0,0,502,2000,0,0,0,0,0,0,0,0,0,0,12017,100,12016,100,0,0,0,0 //Einbroch -1613,METALING,Metaling,Metaling,26,889,0,492,249,1,135,270,5,3,30,15,10,18,35,2,10,12,0,0,20,0x83,300,384,672,480,0,0,0,0,0,0,0,0,7325,4000,1002,1000,998,500,7126,1000,7317,200,13103,5,7312,5000,0,0,0,0,4341,1 -1614,MINERAL,Mineral,Mineral,56,7950,0,3563,1768,1,723,812,29,35,60,52,35,21,67,32,10,12,0,0,40,0x91,250,648,480,360,0,0,0,0,0,0,0,0,7321,3000,728,500,714,2,984,80,1011,800,715,100,969,2,0,0,0,0,4339,1 -1615,OBSIDIAN,Obsidian,Obsidian,50,8812,0,2799,1802,1,841,980,35,5,62,32,42,24,61,55,10,12,0,0,42,0x3885,350,720,864,504,0,0,0,0,0,0,0,0,7315,3000,730,500,1003,500,985,50,999,500,1263,10,0,0,0,0,0,0,4338,1 -1616,PITMAN,Pitman,Pitman,43,5015,0,1799,1083,1,290,486,22,26,0,15,5,5,52,36,10,12,2,1,42,0x91,180,960,336,300,0,0,0,0,0,0,0,0,7318,3000,7319,500,998,800,999,500,1003,100,1041,1000,7327,80,0,0,0,0,4335,1 -1617,WASTE_STOVE,Waste Stove,Old Stove,68,15895,0,4412,1135,1,692,1081,23,10,20,69,55,5,59,77,10,12,2,0,20,0x3885,300,1152,528,360,0,0,0,0,0,0,0,0,7323,1000,7068,1000,998,500,625,50,1002,1000,604,50,7319,3800,0,0,0,0,4332,1 -1618,UNGOLIANT,Ungoliant,Ungoliant,69,29140,0,8211,142,1,1290,2280,25,25,33,52,57,25,119,43,10,12,2,4,45,0x3795,350,420,576,420,0,0,0,0,0,0,0,0,7316,4500,1014,3500,1013,1000,7289,1500,7326,2500,718,1500,2406,500,0,0,0,0,4336,1 -1619,PORCELLIO,Porcellio,Porcellio,28,1654,0,512,346,1,82,247,0,8,0,31,21,50,54,85,10,12,0,4,62,0x183,150,720,360,360,0,0,0,0,0,0,0,0,7312,5000,1208,25,928,1000,1052,3000,630,2,7326,30,0,0,0,0,0,0,4337,1 -1620,NOXIOUS,Noxious,Noxious,35,2038,0,698,698,1,299,400,0,60,12,41,10,30,44,2,10,12,1,0,68,0x3885,350,768,1440,672,0,0,0,0,0,0,0,0,7322,1000,7001,3000,605,50,7320,3000,0,0,0,0,603,1,0,0,0,0,4334,1 -1621,VENOMOUS,Venomous,Venomous,42,4653,0,1780,1280,1,422,844,0,49,12,60,17,19,60,1,10,12,1,0,25,0x3885,350,768,1440,672,0,0,0,0,0,0,0,0,7320,5000,7119,3000,7154,1000,7322,2000,0,0,0,0,603,1,0,0,0,0,4333,1 -1622,TEDDY_BEAR,Teddy Bear,Teddy Bear,71,8109,0,5891,3455,1,621,1432,19,32,5,155,32,41,121,26,10,12,0,0,60,0x3295,200,512,780,504,0,0,0,0,0,0,0,0,7317,3800,518,1000,615,300,13106,5,5113,50,2652,10,985,100,0,0,0,0,4340,1 -1623,RSX_0806,RSX 0806,RSX-0806,86,560733,0,31010,32011,1,2740,5620,39,41,85,51,30,25,93,84,10,12,2,0,60,0x37B5,220,128,1104,240,15505,10000,607,5500,5104,3500,732,5500,7093,6000,1230,10,13017,1,617,1000,7327,5000,1242,50,1531,20,0,0,0,0,4342,1 +1613,METALING,Metaling,Metaling,81,4300,0,954,1074,1,171,210,69,28,58,30,49,17,50,5,10,12,0,0,20,0x83,300,384,672,480,0,0,0,0,0,0,0,0,7325,4000,1002,1000,998,500,7126,1000,7317,200,13103,5,7312,5000,0,0,0,0,4341,1 +1614,MINERAL,Mineral,Mineral,96,8300,0,1503,1127,1,578,635,127,23,70,61,40,50,62,50,10,12,0,0,40,0x91,250,648,480,360,0,0,0,0,0,0,0,0,7321,3000,728,500,714,2,984,80,1011,800,715,100,969,2,0,0,0,0,4339,1 +1615,OBSIDIAN,Obsidian,Obsidian,97,10088,0,1652,1239,1,590,670,129,37,84,38,40,60,53,50,10,12,0,0,42,0x3885,350,720,864,504,0,0,0,0,0,0,0,0,7315,3000,730,500,1003,500,985,50,999,500,1263,10,0,0,0,0,0,0,4338,1 +1616,PITMAN,Pitman,Pitman,90,7208,0,1409,1586,1,182,242,104,48,78,56,45,35,50,30,10,12,2,1,42,0x91,180,960,336,300,0,0,0,0,0,0,0,0,7318,3000,7319,500,998,800,999,500,1003,100,1041,1000,7327,80,0,0,0,0,4335,1 +1617,WASTE_STOVE,Waste Stove,Old Stove,92,7400,0,1377,1548,1,408,468,100,47,76,61,50,30,56,15,10,12,2,0,20,0x3885,300,1152,528,360,0,0,0,0,0,0,0,0,7323,1000,7068,1000,998,500,625,50,1002,1000,604,50,7319,3800,0,0,0,0,4332,1 +1618,UNGOLIANT,Ungoliant,Ungoliant,94,17070,0,3501,1913,1,689,733,108,28,71,70,58,43,92,38,10,12,2,4,45,0x3795,350,420,576,420,0,0,0,0,0,0,0,0,7316,4500,1014,3500,1013,1000,7289,1500,7326,2500,718,1500,2406,500,0,0,0,0,4336,1 +1619,PORCELLIO,Porcellio,Porcellio,85,5544,0,1294,1455,1,266,319,79,37,67,48,28,40,62,30,10,12,0,4,62,0x183,150,720,360,360,0,0,0,0,0,0,0,0,7312,5000,1208,25,928,1000,1052,3000,630,2,7326,30,0,0,0,0,0,0,4337,1 +1620,NOXIOUS,Noxious,Noxious,87,5430,0,888,1785,1,255,326,117,66,58,45,60,55,57,50,10,12,1,0,68,0x3885,350,768,1440,672,0,0,0,0,0,0,0,0,7322,1000,7001,3000,605,50,7320,3000,0,0,0,0,603,1,0,0,0,0,4334,1 +1621,VENOMOUS,Venomous,Venomous,87,4770,0,1188,1337,1,287,337,104,65,61,28,60,55,45,50,10,12,1,0,25,0x3885,350,768,1440,672,0,0,0,0,0,0,0,0,7320,5000,7119,3000,7154,1000,7322,2000,0,0,0,0,603,1,0,0,0,0,4333,1 +1622,TEDDY_BEAR,Teddy Bear,Teddy Bear,91,7238,0,1350,1799,1,371,433,106,39,57,81,66,20,68,44,10,12,0,0,60,0x3295,200,512,780,504,0,0,0,0,0,0,0,0,7317,3800,518,1000,615,300,13106,5,5113,50,2652,10,985,100,0,0,0,0,4340,1 +1623,RSX_0806,RSX 0806,RSX-0806,100,1001000,0,720000,576000,1,2315,3291,317,96,153,143,110,128,165,84,10,12,2,0,60,0x37B5,220,128,1104,240,360000,10000,607,5500,5104,3500,732,5500,7093,6000,1230,10,13017,1,617,1000,7327,5000,1242,50,1531,20,0,0,0,0,4342,1 1624,G_WASTE_STOVE,Waste Stove,Old Stove,68,15895,0,0,0,1,500,889,23,10,20,69,55,5,79,77,10,12,2,0,20,0x3885,220,1152,528,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1625,G_PORCELLIO,Porcellio,Porcellio,43,5523,0,1024,693,1,164,494,0,8,0,31,21,50,64,85,10,12,0,4,62,0x3985,150,720,360,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -645,43 +645,43 @@ 1626,G_DARK_PRIEST,Hellion Revenant,Hellion Revenant,88,286900,0,1,1,2,50,3150,25,50,1,80,50,99,130,99,10,12,1,6,69,0x37B5,150,432,384,192,0,0,0,0,0,0,0,0,7337,8000,7337,5000,7337,3000,7337,1000,7337,500,7337,100,0,0,0,0,0,0,0,0 //Lighthalzen -1627,ANOPHELES,Anopheles,Anopheles,23,100,0,99,55,1,48,63,0,90,1,200,4,5,120,5,10,12,0,4,64,0x3985,200,140,864,430,0,0,0,0,0,0,0,0,601,1000,7119,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4344,1 -1628,MOLE,Mole,Holden,36,2209,0,268,172,9,52,63,0,5,24,18,23,30,45,5,10,12,0,2,42,0x1089,300,140,960,504,0,0,0,0,0,0,0,0,1017,5000,1018,5000,5119,50,13101,5,0,0,0,0,0,0,0,0,0,0,4343,1 -1629,HILL_WIND,Hill Wind,Hill Wind,43,3189,0,1800,1100,3,290,480,10,15,21,42,31,50,41,23,10,12,1,2,64,0x3885,200,336,540,432,0,0,0,0,0,0,0,0,517,1000,528,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4345,1 -1630,BACSOJIN_,Bacsojin,White Lady,85,253221,0,45250,16445,3,1868,6124,20,55,52,65,44,112,152,35,10,12,2,7,64,0x39A5,130,576,960,480,22625,10000,607,5500,2513,2000,617,5000,1020,5500,603,5000,12395,50,7165,3000,7166,1000,2700,100,2234,10,0,0,0,0,4372,1 -1631,CHUNG_E_,Chung E,Green Maiden,59,23900,0,4256,920,2,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,44,0x3885,150,1728,816,1188,0,0,0,0,0,0,0,0,7053,4200,740,100,1806,10,518,500,12395,10,0,0,5042,50,0,0,0,0,4373,1 -1632,GREMLIN,Gremlin,Gremlin,53,9280,0,4355,1768,1,329,762,29,25,80,41,59,75,62,15,10,12,2,6,47,0x191,140,432,540,432,0,0,0,0,0,0,0,0,7340,3000,938,3000,719,100,2406,1,1265,1,0,0,603,2,0,0,0,0,4355,1 -1633,BEHOLDER,Beholder,Beholder,56,7950,0,4821,3822,6,723,812,17,30,60,62,25,59,85,32,10,12,0,0,44,0x91,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,0,0,0,0,603,2,0,0,0,0,4356,1 +1627,ANOPHELES,Anopheles,Anopheles,95,7238,0,1691,1902,1,242,260,7,10,64,60,42,58,88,42,10,12,0,4,64,0x3985,170,140,864,430,0,0,0,0,0,0,0,0,601,1000,7119,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4344,1 +1628,MOLE,Mole,Holden,85,6228,0,1206,1358,9,260,309,82,16,53,65,31,30,48,31,10,12,0,2,42,0x1089,300,140,960,504,0,0,0,0,0,0,0,0,1017,5000,1018,5000,5119,50,13101,5,0,0,0,0,0,0,0,0,0,0,4343,1 +1629,HILL_WIND,Hill Wind,Hill Wind,43,2870,0,340,340,3,290,480,9,15,21,50,31,50,59,23,10,12,1,2,64,0x3885,200,336,540,432,0,0,0,0,0,0,0,0,517,1000,528,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4345,1 +1630,BACSOJIN_,Bacsojin,White Lady,97,720500,0,668160,542880,3,1088,3124,210,178,118,244,98,126,205,102,10,12,2,7,64,0x39A5,130,576,960,480,334080,10000,607,5500,2513,2000,617,5000,1020,5500,603,5000,12395,50,7165,3000,7166,1000,2700,100,2234,10,0,0,0,0,4372,1 +1631,CHUNG_E_,Chung E,Green Maiden,82,3901,0,1049,1481,2,247,310,69,15,66,79,36,48,66,43,10,12,1,7,44,0x3885,150,1728,816,1188,0,0,0,0,0,0,0,0,7053,4200,740,100,1806,10,518,500,12395,10,0,0,5042,50,0,0,0,0,4373,1 +1632,GREMLIN,Gremlin,Gremlin,118,20313,0,3091,2318,1,606,744,76,25,141,75,48,61,90,37,10,12,2,6,47,0x191,140,432,540,432,0,0,0,0,0,0,0,0,7340,3000,938,3000,719,100,2406,1,1265,1,0,0,603,2,0,0,0,0,4355,1 +1633,BEHOLDER,Beholder,Beholder,120,19280,0,3285,2463,6,588,718,50,30,96,82,65,107,94,82,10,12,0,0,44,0x91,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,0,0,0,0,603,2,0,0,0,0,4356,1 //Normal advanced class mobs -1634,SEYREN,Seyren,Seyren Windsor,91,88402,0,100000,116460,1,2100,2530,63,12,90,89,72,20,99,25,10,12,1,6,63,0x3195,170,76,384,288,0,0,0,0,0,0,0,0,7345,3000,13001,2,1163,200,603,30,2229,12,2317,1,13421,1,0,0,0,0,4358,1 -1635,EREMES,Eremes,Eremes Guile,87,60199,0,100000,99800,1,2020,2320,23,12,45,138,31,19,99,30,10,12,1,6,85,0x3195,180,76,384,288,0,0,0,0,0,0,0,0,7347,2000,1284,1,2514,1,1262,3,1264,30,678,110,2336,2,0,0,0,0,4360,1 -1636,HARWORD,Harword,Howard Alt-Eisen,83,78690,0,100000,112540,1,1890,2390,59,10,90,62,99,35,98,66,10,12,1,7,81,0x3095,180,76,384,288,0,0,0,0,0,0,0,0,7345,3000,2514,1,1311,1,1361,110,2104,10,2318,1,603,50,0,0,0,0,4362,1 -1637,MAGALETA,Magaleta,Margaretha Sorin,90,61282,0,100000,117800,1,1300,2053,35,60,1,9,97,145,88,40,10,12,1,7,66,0x3295,180,1152,384,288,0,0,0,0,0,0,0,0,7347,2000,1647,2,1602,200,1561,10,2327,1,603,50,2504,10,0,0,0,0,4364,1 -1638,SHECIL,Shecil,Cecil Damon,82,58900,0,100000,118260,14,1226,1854,25,15,1,145,27,32,134,80,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,0,7345,3000,12014,110,2331,10,1711,100,12007,150,603,50,1745,1,0,0,0,0,4368,1 -1639,KATRINN,Katrinn,Kathryne Keyron,92,47280,0,100000,116470,1,497,1697,10,74,1,5,77,180,110,39,10,12,1,7,68,0x3295,150,1152,384,288,0,0,0,0,0,0,0,0,7345,3000,603,50,1646,1,1620,5,2102,30,5085,1,2404,20,0,0,0,0,4366,1 +1634,SEYREN,Seyren,Seyren Windsor,142,194962,0,10386,7790,1,1670,1987,166,12,142,69,86,49,132,55,10,12,1,6,63,0x3195,170,76,384,288,0,0,0,0,0,0,0,0,7345,3000,13001,2,1163,200,603,30,2229,12,2317,1,13421,1,0,0,0,0,4358,1 +1635,EREMES,Eremes,Eremes Guile,140,190525,0,10329,6846,1,1503,1674,122,12,145,87,59,67,127,76,10,12,1,6,85,0x3195,180,76,384,288,0,0,0,0,0,0,0,0,7347,2000,1284,1,2514,1,1262,3,1264,30,678,110,2336,2,0,0,0,0,4360,1 +1636,HARWORD,Harword,Howard Alt-Eisen,142,348100,0,10854,7241,1,1308,1590,131,10,138,79,62,53,82,48,10,12,1,7,81,0x3095,180,76,384,288,0,0,0,0,0,0,0,0,7345,3000,2514,1,1311,1,1361,110,2104,10,2318,1,603,50,0,0,0,0,4362,1 +1637,MAGALETA,Magaleta,Margaretha Sorin,140,220800,0,9895,7421,1,851,1405,108,93,126,74,71,123,99,65,10,12,1,7,66,0x3295,180,1152,384,288,0,0,0,0,0,0,0,0,7347,2000,1647,2,1602,200,1561,10,2327,1,603,50,2504,10,0,0,0,0,4364,1 +1638,SHECIL,Shecil,Cecil Damon,141,190255,0,10103,7577,14,1158,1406,76,15,121,126,67,80,165,42,10,12,1,7,64,0x3095,180,76,384,288,0,0,0,0,0,0,0,0,7345,3000,12014,110,2331,10,1711,100,12007,150,603,50,1745,1,0,0,0,0,4368,1 +1639,KATRINN,Katrinn,Kathryne Keyron,141,219780,0,9207,6905,1,726,1449,77,74,108,78,55,144,139,49,10,12,1,7,68,0x3295,150,1152,384,288,0,0,0,0,0,0,0,0,7345,3000,603,50,1646,1,1620,5,2102,30,5085,1,2404,20,0,0,0,0,4366,1 //MVP Slaves -1640,G_SEYREN,Lord Knight Seyren,Lord Knight Seyren,99,347590,0,18000,10000,1,4238,5040,72,37,120,110,81,65,130,52,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 -1641,G_EREMES,Assassin Cross Eremes,Assassin Cross Eremes,99,211230,0,18000,10000,1,3189,5289,27,39,90,181,62,37,122,60,10,12,1,7,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 -1642,G_HARWORD,Whitesmith Harword,Whitesmith Howard,99,310000,0,18000,10000,1,4822,5033,66,36,100,73,112,35,136,60,10,12,1,7,81,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 -1643,G_MAGALETA,High Priest Magaleta,High Priest Margaretha,99,182910,0,18000,10000,1,1688,2580,35,78,1,84,64,182,92,100,10,12,1,7,86,0x37B5,125,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 -1644,G_SHECIL,Sniper Shecil,Sniper Cecil,99,209000,0,18000,10000,14,1892,5113,22,35,1,180,39,67,193,130,10,12,1,7,84,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 -1645,G_KATRINN,High Wizard Katrinn,High Wizard Kathryne,99,189920,0,18000,10000,1,497,2094,10,88,1,89,42,223,128,93,10,12,1,7,68,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1640,G_SEYREN,Lord Knight Seyren,Lord Knight Seyren,160,2680000,0,0,0,1,4290,6632,567,155,303,165,181,110,178,66,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1641,G_EREMES,Assassin Cross Eremes,Assassin Cross Eremes,160,1230000,0,0,0,1,4055,5433,445,98,211,181,114,83,225,60,10,12,1,7,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1642,G_HARWORD,Whitesmith Harword,Whitesmith Howard,160,3750000,0,0,0,1,3500,4965,301,106,275,148,156,72,177,60,10,12,1,7,82,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1643,G_MAGALETA,High Priest Magaleta,High Priest Margaretha,160,2800000,0,0,0,1,1666,5062,231,349,172,150,164,203,155,88,10,12,1,7,86,0x37B5,125,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1644,G_SHECIL,Sniper Shecil,Sniper Cecil,160,4140000,0,0,0,14,2770,4320,178,135,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 +1645,G_KATRINN,High Wizard Katrinn,High Wizard Kathryne,160,4500000,0,0,0,1,1398,6652,215,456,165,190,142,236,199,93,10,12,1,7,68,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,617,10,0,0,0,0 //MVP Monsters -1646,B_SEYREN,Lord Knight Seyren,Lord Knight Seyren,99,1647590,0,4835600,1569970,1,7238,11040,72,37,120,110,81,65,130,52,10,12,1,7,83,0x37B5,100,76,384,288,2417800,10000,617,5500,603,5000,732,2000,1132,2500,2342,3500,2412,9000,1470,3500,1469,3000,1166,2500,1415,1500,0,0,0,0,4357,1 -1647,B_EREMES,Assassin Cross Eremes,Assassin Cross Eremes,99,1411230,0,4083400,1592380,1,4189,8289,37,39,90,181,62,37,122,60,10,12,1,7,85,0x37B5,100,76,384,288,2041700,10000,617,5500,603,5000,732,2000,1234,1500,1230,1500,2319,9000,1233,3500,1232,3500,1265,3500,13002,3500,0,0,0,0,4359,1 -1648,B_HARWORD,Whitesmith Harword,Whitesmith Howard,99,1460000,0,4002340,1421000,1,7822,8251,66,36,100,73,112,35,136,60,10,12,1,7,82,0x37B5,100,76,384,288,2001170,10000,617,5500,603,5000,732,2000,1138,3500,1140,2500,2318,9000,1365,3500,1364,3500,1369,2500,1368,3500,0,0,0,0,4361,1 -1649,B_MAGALETA,High Priest Magaleta,High Priest Margaretha,99,1092910,0,4257000,1318800,1,4688,5580,35,78,1,84,64,182,92,100,10,12,1,7,86,0x37B5,125,1152,384,288,2128500,10000,617,5500,603,5000,732,2000,1814,3500,2615,2500,2513,9000,1557,3500,1527,3500,1528,2500,1560,3500,0,0,0,0,4363,1 -1650,B_SHECIL,Sniper Shecil,Sniper Cecil,99,1349000,0,4093000,1526000,14,4892,9113,22,35,1,180,39,67,193,130,10,12,1,7,84,0x37B5,100,76,384,288,2046500,10000,617,5500,603,5000,1723,2000,1228,3500,1236,3500,617,9000,1234,1500,1237,3500,1720,1500,1724,2500,0,0,0,0,4367,1 -1651,B_KATRINN,High Wizard Katrinn,High Wizard Kathryne,99,1069920,0,4008200,1636700,1,1197,4394,10,88,1,89,42,223,128,93,10,12,1,7,68,0x37B5,150,1152,384,288,2004100,10000,617,5500,603,5000,732,2000,1241,3500,1242,3500,2616,9000,2343,2500,2513,2500,1618,3000,2319,3500,0,0,0,0,4365,1 +1646,B_SEYREN,Lord Knight Seyren,Lord Knight Seyren,160,4680000,0,4642560,3481920,1,4290,6632,567,155,303,165,181,110,178,66,10,12,1,7,83,0x37B5,100,76,384,288,2321280,10000,617,5500,603,5000,732,2000,1132,2500,2342,3500,2412,9000,1470,3500,1469,3000,1166,2500,1415,1500,0,0,0,0,4357,1 +1647,B_EREMES,Assassin Cross Eremes,Assassin Cross Eremes,160,4230000,0,4185000,3147120,1,4055,5433,445,98,211,181,114,83,225,60,10,12,1,7,85,0x37B5,100,76,384,288,2092500,10000,617,5500,603,5000,732,2000,1234,1500,1230,1500,2319,9000,1233,3500,1232,3500,1265,3500,13002,3500,0,0,0,0,4359,1 +1648,B_HARWORD,Whitesmith Harword,Whitesmith Howard,160,6750000,0,3555000,2664000,1,3500,4965,301,106,275,148,156,72,177,60,10,12,1,7,82,0x37B5,100,76,384,288,1777500,10000,617,5500,603,5000,732,2000,1138,3500,1140,2500,2318,9000,1365,3500,1364,3500,1369,2500,1368,3500,0,0,0,0,4361,1 +1649,B_MAGALETA,High Priest Magaleta,High Priest Margaretha,160,4800000,0,3465000,2520000,1,1666,5062,231,349,172,150,164,203,155,88,10,12,1,7,86,0x37B5,125,1152,384,288,1732500,10000,617,5500,603,5000,732,2000,1814,3500,2615,2500,2513,9000,1557,3500,1527,3500,1528,2500,1560,3500,0,0,0,0,4363,1 +1650,B_SHECIL,Sniper Shecil,Sniper Cecil,160,4140000,0,4106880,3080160,14,2770,4320,178,135,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2053440,10000,617,5500,603,5000,1723,2000,1228,3500,1236,3500,617,9000,1234,1500,1237,3500,1720,1500,1724,2500,0,0,0,0,4367,1 +1651,B_KATRINN,High Wizard Katrinn,High Wizard Kathryne,160,4500000,0,3240000,2430000,1,1398,6652,215,456,165,190,142,236,199,93,10,12,1,7,68,0x37B5,150,1152,384,288,1620000,10000,617,5500,603,5000,732,2000,1241,3500,1242,3500,2616,9000,2343,2500,2513,2500,1618,3000,2319,3500,0,0,0,0,4365,1 //1'st Class Mobs -1652,YGNIZEM,Ygnizem,Egnigem Cenia,58,11200,0,4870,98,1,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,0x3885,145,576,432,288,0,0,0,0,0,0,0,0,7347,1000,1170,1,1158,20,1127,20,2313,10,1152,80,2317,1,0,0,0,0,4346,1 -1653,WHIKEBAIN,Whikebain,Wickebine Tres,62,7320,0,4204,21,1,693,889,9,8,1,102,34,20,83,30,10,12,1,7,65,0x3885,120,576,432,288,0,0,0,0,0,0,0,0,7345,2000,1223,1,2306,40,1220,10,2315,2,2620,2,13004,10,0,0,0,0,4348,1 -1654,ARMAIA,Armaia,Armeyer Dinze,66,7110,0,4008,35,1,750,913,42,6,5,36,50,15,89,60,10,12,1,7,62,0x3885,120,576,432,288,0,0,0,0,0,0,0,0,7345,1000,2504,1,1358,50,1352,40,2311,10,1302,80,1307,10,0,0,0,0,4347,1 -1655,EREND,Erend,Errende Ebecee,59,6980,0,4501,67,1,896,1159,14,30,1,31,41,93,67,30,10,12,1,7,46,0x3885,130,576,432,288,0,0,0,0,0,0,0,0,7345,500,2217,5,1514,50,1517,20,2326,5,2324,10,1523,1,0,0,0,0,4349,1 -1656,KAVAC,Kavac,Kavach Icarus,60,7899,0,4090,86,9,684,904,12,5,48,100,10,15,118,40,10,12,1,7,44,0x3885,150,576,432,288,0,0,0,0,0,0,0,0,7347,2000,1716,1,12006,100,1708,10,2308,5,2402,30,2404,2,0,0,0,0,4351,1 -1657,RAWREL,Rawrel,Laurell Weinder,61,6168,0,4620,30,1,430,517,8,48,1,41,5,120,45,10,10,12,1,7,48,0x3885,150,576,432,288,0,0,0,0,0,0,0,0,934,1000,1616,1,2102,5,1608,50,2322,10,2333,30,2607,1,0,0,0,0,4350,1 +1652,YGNIZEM,Ygnizem,Egnigem Cenia,136,44327,0,5229,4461,1,790,1018,124,8,144,92,86,69,99,68,10,12,1,7,43,0x3885,145,576,432,288,0,0,0,0,0,0,0,0,7347,1000,1170,1,1158,20,1127,20,2313,10,1152,80,2317,1,0,0,0,0,4346,1 +1653,WHIKEBAIN,Whikebain,Wickebine Tres,132,43191,0,5094,4721,1,876,1020,114,66,114,91,69,42,85,55,10,12,1,7,65,0x3885,120,576,432,288,0,0,0,0,0,0,0,0,7345,2000,1223,1,2306,40,1220,10,2315,2,2620,2,13004,10,0,0,0,0,4348,1 +1654,ARMAIA,Armaia,Armeyer Dinze,134,46878,0,4895,4909,1,793,948,119,4,123,59,85,65,96,62,10,12,1,7,62,0x3885,120,576,432,288,0,0,0,0,0,0,0,0,7345,1000,2504,1,1358,50,1352,40,2311,10,1302,80,1307,10,0,0,0,0,4347,1 +1655,EREND,Erend,Errende Ebecee,133,42764,0,4860,4545,1,558,880,106,99,77,66,90,105,87,62,10,12,1,7,46,0x3885,130,576,432,288,0,0,0,0,0,0,0,0,7345,500,2217,5,1514,50,1517,20,2326,5,2324,10,1523,1,0,0,0,0,4349,1 +1656,KAVAC,Kavac,Kavach Icarus,135,43079,0,5103,4276,9,663,792,86,48,103,109,62,50,149,48,10,12,1,7,44,0x3885,150,576,432,288,0,0,0,0,0,0,0,0,7347,2000,1716,1,12006,100,1708,10,2308,5,2402,30,2404,2,0,0,0,0,4351,1 +1657,RAWREL,Rawrel,Laurell Weinder,133,40282,0,4500,4477,1,445,877,76,88,67,79,65,122,112,57,10,12,1,7,48,0x3885,150,576,432,288,0,0,0,0,0,0,0,0,934,1000,1616,1,2102,5,1608,50,2322,10,2333,30,2607,1,0,0,0,0,4350,1 //1'st Class MvP (Ygnizem/Egnigem Cenia) and her mobs. -1658,B_YGNIZEM,Ygnizem,Egnigem Cenia,79,214200,0,258760,86000,1,3890,5690,48,25,82,60,45,31,110,40,10,12,1,7,43,0x37B5,100,1008,864,288,129380,10000,617,5500,603,5000,732,2000,1162,1000,644,5000,603,5000,1167,1000,2320,1000,2406,1000,1130,1000,0,0,0,0,4352,1 +1658,B_YGNIZEM,Ygnizem,Egnigem Cenia,141,2910088,0,1054400,1860000,1,3057,5408,373,175,188,177,165,142,185,105,10,12,1,7,43,0x37B5,100,1008,864,288,527200,10000,617,5500,603,5000,732,2000,1162,1000,644,5000,603,5000,1167,1000,2320,1000,2406,1000,1130,1000,0,0,0,0,4352,1 1659,G_WHIKEBAIN,Whikebain,Wickebine Tres,62,7320,0,0,0,1,593,789,9,12,1,102,34,23,74,30,10,12,1,7,65,0x3885,120,1008,864,288,0,0,0,0,0,0,0,0,0,0,644,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1660,G_ARMAIA,Armaia,Armeyer Dinze,66,7110,0,0,0,1,650,813,42,6,5,36,40,15,80,60,10,12,1,7,62,0x3885,120,1008,864,288,0,0,0,0,0,0,0,0,0,0,644,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1661,G_EREND,Erend,Errende Ebecee,59,6980,0,0,0,1,796,1059,14,30,1,31,41,93,60,30,10,12,1,7,46,0x3885,130,1008,864,288,0,0,0,0,0,0,0,0,0,0,644,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -693,62 +693,62 @@ 1665,POTON_CANON_1,Photon Cannon,Photon Cannon,67,7500,0,4300,2000,9,700,800,15,30,1,40,30,40,86,80,10,12,1,0,40,0x84,300,1536,960,480,0,0,0,0,0,0,0,0,7126,5000,726,1000,938,1000,13160,5,0,0,0,0,0,0,0,0,0,0,0,0 1666,POTON_CANON_2,Photon Cannon,Photon Cannon,64,7100,0,3100,2700,9,800,900,8,30,1,40,21,29,80,91,10,12,1,0,40,0x84,300,1536,960,480,0,0,0,0,0,0,0,0,7126,5000,721,1000,938,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1667,POTON_CANON_3,Photon Cannon,Photon Cannon,65,7800,0,3800,2300,9,700,800,15,30,1,40,23,30,90,99,10,12,1,0,40,0x84,300,1536,960,480,0,0,0,0,0,0,0,0,7126,5000,728,1000,938,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1668,ARCHDAM,Archdam,Archdam,79,25000,0,8000,5000,3,1000,2000,15,15,65,65,35,75,75,15,10,12,2,7,60,0x3695,180,580,288,360,0,0,0,0,0,0,0,0,7317,5000,999,500,984,200,985,200,13156,5,13167,5,0,0,0,0,0,0,4371,1 -1669,DIMIK,Dimik,Dimik,77,10000,0,0,0,5,1040,1880,45,28,15,35,40,15,120,42,10,12,1,0,40,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4370,1 -1670,DIMIK_1,Dimik,Dimik,79,16000,0,6400,3500,7,1140,1980,45,28,15,88,20,20,120,40,10,12,1,0,44,0x3885,150,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7352,50,999,300,7094,300,13153,5,984,10,12128,50,0,0,0,0,4370,1 -1671,DIMIK_2,Dimik,Dimik,89,29000,0,8000,5000,5,1440,2280,45,28,15,40,30,30,150,70,10,12,1,0,41,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7353,50,999,300,7094,300,13169,10,984,10,12128,50,0,0,0,0,4370,1 -1672,DIMIK_3,Dimik,Dimik,80,19000,0,5900,2800,5,1240,2080,68,28,15,30,78,20,120,30,10,12,1,0,42,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7354,50,999,300,7094,300,2656,10,984,10,12128,50,0,0,0,0,4370,1 -1673,DIMIK_4,Dimik,Dimik,82,13900,0,5800,4500,5,1840,2840,45,28,15,20,20,10,120,30,10,12,1,0,43,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7355,50,999,300,7094,300,2656,10,984,10,12128,50,0,0,0,0,4370,1 -1674,MONEMUS,Monemus,Monemus,88,80000,0,0,0,5,2000,3000,54,25,0,1,90,24,144,45,14,12,2,0,63,0x1A4,400,1368,1344,432,0,0,0,0,0,0,0,0,7049,2000,953,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1675,VENATU,Venatu,Venatu,77,8000,0,0,0,2,1200,1800,35,20,5,26,24,5,75,40,10,12,1,0,43,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4369,1 -1676,VENATU_1,Venatu,Venatu,72,8900,0,4000,2000,2,800,1400,30,20,5,26,24,5,82,30,10,12,1,0,40,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7356,350,999,300,7094,300,13157,5,985,10,12127,100,0,0,0,0,4369,1 -1677,VENATU_2,Venatu,Venatu,80,9000,0,4000,2000,2,900,1500,30,20,5,82,32,5,105,30,10,12,1,0,44,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7357,500,999,300,7094,300,13164,10,985,10,12127,100,0,0,0,0,4369,1 -1678,VENATU_3,Venatu,Venatu,78,9500,0,4500,2000,2,800,1400,30,20,5,26,68,5,95,30,10,12,1,0,42,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7358,400,999,300,7094,300,2656,10,985,10,12127,100,0,0,0,0,4369,1 -1679,VENATU_4,Venatu,Venatu,75,12300,0,4000,2000,2,800,1400,30,20,5,26,24,5,100,30,10,12,1,0,41,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7359,300,999,300,7094,300,2656,10,985,10,12127,100,0,0,0,0,4369,1 -1680,HILL_WIND_1,Hill Wind,Hill Wind,45,4233,0,2132,1722,3,320,510,10,15,21,42,31,50,67,23,10,12,1,2,64,0x3885,170,504,480,360,0,0,0,0,0,0,0,0,7115,4000,7116,3000,528,1000,510,10,0,0,0,0,0,0,0,0,0,0,4345,1 -1681,GEMINI,Gemini-S58,Gemini-S58,72,57870,0,22024,9442,3,2150,3030,60,45,88,75,70,77,105,55,10,12,1,0,21,0x39A5,200,1872,360,864,0,0,0,0,0,0,0,0,7005,3000,603,1000,13159,5,546,500,547,400,7479,6,12040,300,0,0,0,0,4354,1 -1682,REMOVAL,Removal,Remover,55,10289,0,3831,1278,1,558,797,5,20,1,20,56,35,57,20,10,12,1,1,49,0x3885,250,1536,1056,1152,0,0,0,0,0,0,0,0,713,5000,7319,5000,5005,10,549,500,971,50,972,100,5120,6,0,0,0,0,4353,1 +1668,ARCHDAM,Archdam,Archdam,119,20700,0,2862,2147,3,603,722,98,15,118,64,70,65,66,25,10,12,2,7,60,0x3695,180,580,288,360,0,0,0,0,0,0,0,0,7317,5000,999,500,984,200,985,200,13156,5,13167,5,0,0,0,0,0,0,4371,1 +1669,DIMIK,Dimik,Dimik,77,10000,0,0,0,5,1040,1880,45,28,15,69,40,15,63,42,10,12,1,0,40,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4370,1 +1670,DIMIK_1,Dimik,Dimik,116,17552,0,2916,2187,7,656,763,93,28,114,90,66,52,122,41,10,12,1,0,44,0x3885,150,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7352,50,999,300,7094,300,13153,5,984,10,12128,50,0,0,0,0,4370,1 +1671,DIMIK_2,Dimik,Dimik,116,23840,0,2916,2187,5,630,733,76,21,118,72,62,55,88,38,10,12,1,0,41,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7353,50,999,300,7094,300,13169,10,984,10,12128,50,0,0,0,0,4370,1 +1672,DIMIK_3,Dimik,Dimik,116,21920,0,2916,2187,5,610,705,114,24,115,64,68,50,82,35,10,12,1,0,42,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7354,50,999,300,7094,300,2656,10,984,10,12128,50,0,0,0,0,4370,1 +1673,DIMIK_4,Dimik,Dimik,116,16940,0,2916,2187,5,699,823,98,28,112,79,72,53,86,47,10,12,1,0,43,0x3885,200,576,720,432,0,0,0,0,0,0,0,0,7319,2000,7355,50,999,300,7094,300,2656,10,984,10,12128,50,0,0,0,0,4370,1 +1674,MONEMUS,Monemus,Monemus,88,80000,0,0,0,5,2400,3400,87,25,0,1,90,24,144,45,14,12,2,0,63,0x1A4,400,1368,1344,432,0,0,0,0,0,0,0,0,7049,2000,953,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1675,VENATU,Venatu,Venatu,77,12717,0,0,0,2,652,779,96,20,99,56,58,62,48,30,10,12,1,0,43,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4369,1 +1676,VENATU_1,Venatu,Venatu,113,15900,0,2448,1836,2,687,772,95,20,109,54,60,50,60,30,10,12,1,0,40,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7356,350,999,300,7094,300,13157,5,985,10,12127,100,0,0,0,0,4369,1 +1677,VENATU_2,Venatu,Venatu,113,14717,0,2637,1980,2,655,762,86,20,99,73,58,62,98,30,10,12,1,0,44,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7357,500,999,300,7094,300,13164,10,985,10,12127,100,0,0,0,0,4369,1 +1678,VENATU_3,Venatu,Venatu,113,21040,0,2643,1983,2,698,798,104,16,103,50,62,57,69,30,10,12,1,0,42,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7358,400,999,300,7094,300,2656,10,985,10,12127,100,0,0,0,0,4369,1 +1679,VENATU_4,Venatu,Venatu,113,21810,0,2643,1983,2,656,745,74,15,106,69,61,55,72,30,10,12,1,0,41,0x3885,150,504,1020,360,0,0,0,0,0,0,0,0,7317,2000,7359,300,999,300,7094,300,2656,10,985,10,12127,100,0,0,0,0,4369,1 +1680,HILL_WIND_1,Hill Wind,Hill Wind,101,9100,0,1900,1425,3,308,375,90,37,105,69,59,35,80,25,10,12,1,2,64,0x3885,170,504,480,360,0,0,0,0,0,0,0,0,7115,4000,7116,3000,528,1000,510,10,0,0,0,0,0,0,0,0,0,0,4345,1 +1681,GEMINI,Gemini-S58,Gemini-S58,135,108999,0,4725,3543,3,785,1107,89,45,115,92,81,92,94,66,10,12,1,0,21,0x39A5,200,1872,360,864,0,0,0,0,0,0,0,0,7005,3000,603,1000,13159,5,546,500,547,400,7479,6,12040,300,0,0,0,0,4354,1 +1682,REMOVAL,Removal,Remover,121,32235,0,3772,2829,1,713,833,110,47,127,50,82,35,89,50,10,12,1,1,49,0x3885,250,1536,1056,1152,0,0,0,0,0,0,0,0,713,5000,7319,5000,5005,10,549,500,971,50,972,100,5120,6,0,0,0,0,4353,1 1683,G_POTON_CANON,Photon Cannon,Photon Cannon,46,7000,0,0,0,9,560,570,5,10,1,36,36,20,56,30,10,12,1,0,43,0x3885,300,1536,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1684,G_ARCHDAM,Archdam,Archdam,57,11000,0,0,0,3,600,700,15,15,65,65,35,75,75,15,10,12,2,8,60,0x3885,180,1080,288,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1685,APOCALIPS_H,Vesper,Vesper,97,640700,0,200000,100000,3,4000,10000,50,54,100,50,30,70,160,150,10,12,2,2,46,0x37B5,180,504,912,432,100000,10000,617,5500,603,5000,732,2000,7095,5000,7094,3000,617,1000,2659,100,2660,100,2661,100,2662,100,0,0,0,0,4374,1 -1686,ORC_BABY,Orc Baby,Orc Baby,21,912,0,220,220,1,135,270,10,10,30,15,10,18,35,2,10,12,0,7,22,0x3885,200,672,864,288,0,0,0,0,0,0,0,0,7126,1000,10004,100,2299,1,519,5000,7270,200,7269,100,0,0,0,0,0,0,4375,1 -1687,GREEN_IGUANA,Green Iguana,Grove,54,6444,0,2400,2050,1,550,650,0,10,1,52,64,5,98,14,10,12,1,2,42,0x83,200,720,528,432,0,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,511,1,0,0,0,0,4377,1 -1688,LADY_TANEE,Lady Tanee,Lady Tanee,89,493000,0,64995,43222,14,450,2170,20,44,1,125,48,78,210,38,10,12,2,3,64,0x1A4,100,576,432,360,32497,10000,617,5500,12095,5000,732,2000,12090,5000,634,4000,12129,1000,5116,1000,985,5000,617,2000,1716,6000,0,0,0,0,4376,1 +1685,APOCALIPS_H,Vesper,Vesper,128,3802000,0,2700000,2250000,3,2620,7276,402,109,177,195,165,130,182,102,10,12,2,2,46,0x37B5,180,504,912,1350000,100000,10000,617,5500,603,5000,732,2000,7095,5000,7094,3000,617,1000,2659,100,2660,100,2661,100,2662,100,0,0,0,0,4374,1 +1686,ORC_BABY,Orc Baby,Orc Baby,43,1122,0,315,354,1,64,75,49,3,25,1,32,20,31,35,10,12,0,7,22,0x3885,200,672,864,288,0,0,0,0,0,0,0,0,7126,1000,10004,100,2299,1,519,5000,7270,200,7269,100,0,0,0,0,0,0,4375,1 +1687,GREEN_IGUANA,Green Iguana,Grove,55,2090,0,486,548,9,139,174,96,18,58,42,22,5,45,17,10,12,1,2,42,0x83,200,720,528,432,0,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,511,1,0,0,0,0,4377,1 +1688,LADY_TANEE,Lady Tanee,Lady Tanee,80,360000,0,334080,261000,14,1760,2685,141,104,86,108,88,121,200,71,10,12,2,3,64,0x1A4,100,576,432,360,167040,10000,617,5500,12095,5000,732,2000,12090,5000,634,4000,12129,1000,5116,1000,985,5000,617,2000,1716,6000,0,0,0,0,4376,1 1689,G_BACSOJIN,Bacsojin,White Lady,85,253221,0,45250,16445,3,1868,6124,20,55,52,65,44,112,152,35,10,12,2,7,64,0x37B5,130,576,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1690,G_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,12,15,0,0,0,1,0,0,100,99,1,1,1,1,1,1,10,12,1,2,42,0xC3,160,1120,552,511,0,0,0,0,0,0,0,0,12194,100,12706,300,12708,300,7888,5000,0,0,0,0,0,0,0,0,0,0,0,0 1691,G_KRABEN,Kraben,Kraben,70,10880,0,0,0,1,125,765,5,42,50,155,1,66,112,60,10,12,1,0,48,0x3885,100,1152,1536,576,0,0,0,0,0,0,0,0,521,1,521,1,521,1,521,1,521,1,521,1,521,1,0,0,0,0,0,0 // Thanatos Tower & Abyss -1692,BREEZE,Breeze,Breeze,56,5099,0,2390,1340,2,94,215,7,32,1,96,6,38,91,45,10,12,1,0,64,0x3885,100,140,384,504,0,0,0,0,0,0,0,0,945,500,706,10,2270,10,1733,10,604,10,2269,10,996,10,0,0,0,0,4390,1 -1693,PLASMA_Y,Plasma,Plasma,56,8400,0,2200,2100,3,400,900,0,40,1,30,10,83,105,45,10,12,0,0,88,0x3885,100,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,715,100,969,1,0,0,0,0,0,0,0,0,4389,1 -1694,PLASMA_R,Plasma,Plasma,43,5700,0,2000,1000,3,300,700,0,30,1,30,5,56,90,30,10,12,0,0,83,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,716,100,990,45,0,0,0,0,0,0,0,0,4389,1 -1695,PLASMA_G,Plasma,Plasma,47,7600,0,2000,1000,3,300,700,0,30,1,30,5,61,90,30,10,12,0,0,82,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,717,100,993,40,0,0,0,0,0,0,0,0,4389,1 -1696,PLASMA_P,Plasma,Plasma,49,5900,0,2000,1000,3,300,700,0,30,1,30,5,54,90,30,10,12,0,0,87,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,716,100,724,100,0,0,0,0,0,0,0,0,4389,1 -1697,PLASMA_B,Plasma,Plasma,44,8200,0,2000,1000,3,300,700,0,30,1,30,5,73,90,30,10,12,0,0,81,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,717,100,991,35,0,0,0,0,0,0,0,0,4389,1 -1698,DEATHWORD,Deathword,Death Word,65,18990,0,2986,4912,1,622,1102,10,40,50,75,10,20,140,45,10,12,1,0,60,0x3695,150,176,912,300,0,0,0,0,0,0,0,0,1097,4000,7015,300,11003,50,7449,500,2418,10,7479,2,7480,1,0,0,0,0,4388,1 -1699,ANCIENT_MIMIC,Ancient Mimic,Ancient Mimic,60,8080,0,2950,2650,1,530,1697,20,40,50,100,30,40,150,110,10,12,2,0,60,0x3885,100,168,480,360,0,0,0,0,0,0,0,0,603,30,617,1,644,50,2404,5,2506,1,2417,10,2610,100,0,0,0,0,4387,1 -1700,OBSERVATION,Observation,Dame of Sentinel,81,65111,0,39872,33120,2,1666,2609,55,55,30,74,56,126,145,114,10,12,1,8,80,0x33B5,100,432,480,360,0,0,0,0,0,0,0,0,7441,500,2621,1,7442,100,728,1000,12040,100,2210,10,7435,100,0,0,0,0,4392,1 -1701,SHELTER,Shelter,Mistress of Shelter,80,38000,0,29010,25110,2,1871,1971,22,63,12,67,34,167,157,120,10,12,1,8,66,0x33B5,160,432,420,360,0,0,0,0,0,0,0,0,7440,200,7442,1,12040,50,722,1000,7005,1000,7442,50,0,0,0,0,0,0,4393,1 -1702,RETRIBUTION,Retribution,Baroness of Retribution,79,46666,0,28332,33120,2,2022,2288,35,35,30,142,66,72,133,39,10,12,1,8,67,0x33B5,120,360,480,360,0,0,0,0,0,0,0,0,7440,400,2621,1,12040,50,723,1000,2506,5,1158,10,7442,50,0,0,0,0,4391,1 -1703,SOLACE,Solace,Lady Solace,77,25252,0,21000,25110,2,1392,1462,21,67,12,76,29,145,99,100,10,12,1,8,66,0x33B5,180,576,420,360,0,0,0,0,0,0,0,0,7441,200,2621,1,12040,50,718,1000,1910,50,1909,100,7442,50,0,0,0,0,4394,1 -1704,THA_ODIUM,Thanatos Odium,Odium of Thanatos,92,72389,0,88420,63880,9,2100,2800,68,30,100,52,165,62,185,90,10,12,2,1,88,0x37B5,100,432,288,420,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7438,10000,616,10,2520,1000,0,0,0,0,0,0,4396,1 -1705,THA_DESPERO,Thanatos Despero,Despero of Thanatos,88,86666,0,62001,51220,2,2182,3082,38,39,100,167,79,92,151,120,10,12,2,1,88,0x37B5,150,160,528,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7439,10000,616,10,2419,1000,0,0,0,0,0,0,4397,1 -1706,THA_MAERO,Thanatos Maero,Maero of Thanatos,83,62000,0,56699,63880,2,2022,2288,29,72,100,176,30,200,122,29,10,12,1,1,88,0x37B5,150,160,480,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7437,10000,616,10,2354,1000,0,0,0,0,0,0,4395,1 -1707,THA_DOLOR,Thanatos Dolor,Dolor of Thanatos,83,59922,0,43200,51220,2,1392,2092,21,80,100,76,29,206,139,44,10,12,0,1,88,0x37B5,150,160,672,480,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7436,10000,616,10,5128,1000,0,0,0,0,0,0,4398,1 -1708,THANATOS,Thanatos,Memory of Thanatos,99,445660,0,3666000,2145060,3,3812,7483,35,35,100,108,30,86,147,32,10,12,2,6,88,0x37B5,120,115,816,504,1833000,10000,617,5500,603,5000,732,2000,7444,1000,2519,1000,7450,5000,2342,5000,2412,5000,2515,1000,2655,500,0,0,0,0,4399,1 +1692,BREEZE,Breeze,Breeze,92,6755,0,1598,1797,2,379,431,83,32,75,101,46,35,66,55,10,12,1,0,64,0x3885,100,140,384,504,0,0,0,0,0,0,0,0,945,500,706,10,2270,10,1733,10,604,10,2269,10,996,10,0,0,0,0,4390,1 +1693,PLASMA_Y,Plasma,Plasma,119,20600,0,2111,2882,1,615,750,130,45,141,94,75,91,103,50,10,12,0,0,88,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,715,100,969,1,0,0,0,0,0,0,0,0,4389,1 +1694,PLASMA_R,Plasma,Plasma,118,16789,0,3549,2661,1,835,935,111,12,147,77,66,65,95,50,10,12,0,0,83,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,716,100,990,45,0,0,0,0,0,0,0,0,4389,1 +1695,PLASMA_G,Plasma,Plasma,116,24975,0,3348,2511,1,608,720,120,3,121,60,58,62,73,50,10,12,0,0,82,0x3885,100,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,717,100,993,40,0,0,0,0,0,0,0,0,4389,1 +1696,PLASMA_P,Plasma,Plasma,117,18955,0,3348,2511,1,623,762,78,49,130,71,72,70,87,50,10,12,0,0,87,0x3885,350,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,716,100,724,100,0,0,0,0,0,0,0,0,4389,1 +1697,PLASMA_B,Plasma,Plasma,115,24651,0,3181,2384,1,428,498,51,18,124,74,60,55,66,50,10,12,0,0,81,0x3885,150,608,1440,576,0,0,0,0,0,0,0,0,911,100,644,10,731,2,717,100,991,35,0,0,0,0,0,0,0,0,4389,1 +1698,DEATHWORD,Deathword,Death Word,114,16390,0,2565,1923,1,596,721,68,40,91,64,53,88,99,54,10,12,1,0,60,0x3695,150,176,912,300,0,0,0,0,0,0,0,0,1097,4000,7015,300,11003,50,7449,500,2418,10,7479,2,7480,1,0,0,0,0,4388,1 +1699,ANCIENT_MIMIC,Ancient Mimic,Ancient Mimic,112,14700,0,2448,2069,1,685,769,100,40,121,70,63,43,101,67,10,12,2,0,60,0x3885,100,168,480,360,0,0,0,0,0,0,0,0,603,30,617,1,644,50,2404,5,2506,1,2417,10,2610,100,0,0,0,0,4387,1 +1700,OBSERVATION,Observation,Dame of Sentinel,127,34538,0,3735,2801,2,643,795,98,55,99,75,52,55,106,80,10,12,1,8,80,0x33B5,100,432,480,360,0,0,0,0,0,0,0,0,7441,500,2621,1,7442,100,728,1000,12040,100,2210,10,7435,100,0,0,0,0,4392,1 +1701,SHELTER,Shelter,Mistress of Shelter,125,27000,0,4010,3051,2,691,935,80,89,99,66,41,103,95,89,10,12,1,8,66,0x33B5,160,432,420,360,0,0,0,0,0,0,0,0,7440,200,7442,1,12040,50,722,1000,7005,1000,7442,50,0,0,0,0,0,0,4393,1 +1702,RETRIBUTION,Retribution,Baroness of Retribution,121,22152,0,3528,2463,2,798,1102,61,35,112,60,45,77,78,70,10,12,1,8,67,0x33B5,120,360,480,360,0,0,0,0,0,0,0,0,7440,400,2621,1,12040,50,723,1000,2506,5,1158,10,7442,50,0,0,0,0,4391,1 +1703,SOLACE,Solace,Lady Solace,123,24729,0,3758,2819,2,667,832,96,96,106,65,61,42,82,72,10,12,1,8,66,0x33B5,180,576,420,360,0,0,0,0,0,0,0,0,7441,200,2621,1,12040,50,718,1000,1910,50,1909,100,7442,50,0,0,0,0,4394,1 +1704,THA_ODIUM,Thanatos Odium,Odium of Thanatos,129,40200,0,3960,3666,9,758,902,120,30,106,78,71,54,129,31,10,12,2,1,88,0x37B5,100,432,288,420,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7438,10000,616,10,2520,1000,0,0,0,0,0,0,4396,1 +1705,THA_DESPERO,Thanatos Despero,Despero of Thanatos,129,41111,0,3960,3666,2,737,908,95,69,111,96,66,65,91,52,10,12,2,1,88,0x37B5,150,160,528,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7439,10000,616,10,2419,1000,0,0,0,0,0,0,4397,1 +1706,THA_MAERO,Thanatos Maero,Maero of Thanatos,129,42599,0,3960,3666,2,756,1001,96,90,97,111,70,133,82,67,10,12,1,1,88,0x37B5,150,160,480,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7437,10000,616,10,2354,1000,0,0,0,0,0,0,4395,1 +1707,THA_DOLOR,Thanatos Dolor,Dolor of Thanatos,129,45000,0,3960,3666,2,700,901,71,80,91,72,59,96,78,79,10,12,0,1,88,0x37B5,150,160,672,480,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,7436,10000,616,10,5128,1000,0,0,0,0,0,0,4398,1 +1708,THANATOS,Thanatos,Thanatos Phantom,99,1445660,0,1299400,1930554,3,3812,5483,364,35,100,129,30,86,206,32,10,12,2,6,88,0x37B5,120,115,816,504,649700,10000,617,5500,603,5000,732,2000,7444,1000,2519,1000,7450,5000,2342,5000,2412,5000,2515,1000,2655,500,0,0,0,0,4399,1 1709,G_THA_ODIUM,Thanatos Odium,Odium of Thanatos,92,72389,0,10000,5000,9,2100,2800,68,30,100,52,165,62,185,90,10,12,2,1,88,0x33B5,100,115,288,420,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1710,G_THA_DESPERO,Thanatos Despero,Despero of Thanatos,88,86666,0,10000,5000,2,2182,3082,38,39,100,167,79,92,151,120,10,12,2,1,88,0x33B5,150,160,528,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1711,G_THA_MAERO,Thanatos Maero,Maero of Thanatos,83,62000,0,10000,5000,2,2022,2288,29,72,100,176,30,200,122,29,10,12,1,1,88,0x33B5,150,160,480,360,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1712,G_THA_DOLOR,Thanatos Dolor,Dolor of Thanatos,83,59922,0,10000,5000,2,1392,2092,21,80,100,76,29,206,139,44,10,12,0,1,88,0x33B5,150,160,672,480,0,0,0,0,0,0,0,0,7054,1000,731,500,732,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1713,ACIDUS,Acidus,Acidus,80,51112,0,28043,8023,2,1289,2109,29,69,1,71,55,135,103,69,10,12,2,9,46,0x3095,170,168,1008,300,0,0,0,0,0,0,0,0,582,5100,1035,4000,7444,5,1036,3589,7448,800,1269,10,2114,50,0,0,0,0,4378,1 -1714,FERUS,Ferus,Ferus,70,29218,0,8093,3952,2,1056,1496,14,45,1,78,45,72,81,73,10,12,2,9,43,0x3095,100,108,576,432,0,0,0,0,0,0,0,0,578,2200,1035,1000,7123,1000,1036,2000,7447,800,994,20,5122,50,0,0,0,0,4380,1 -1715,NOVUS,Novus,Novus,42,5430,0,1320,1002,1,284,384,20,28,1,56,43,45,124,43,10,12,0,9,20,0x3885,110,151,288,360,0,0,0,0,0,0,0,0,511,3000,7053,1035,0,0,1036,589,0,0,0,0,0,0,0,0,0,0,4383,1 -1716,ACIDUS_,Acidus,Acidus,76,39111,0,14392,4203,2,1180,2000,21,47,1,78,31,93,88,52,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,0,505,150,1035,4000,510,150,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1 -1717,FERUS_,Ferus,Ferus,69,21182,0,6750,2230,2,930,1170,14,38,1,66,77,60,79,35,10,12,2,9,42,0x3095,120,108,576,432,0,0,0,0,0,0,0,0,579,5100,1035,1000,0,0,1036,3589,7445,800,997,20,7445,100,0,0,0,0,4381,1 -1718,NOVUS_,Novus,Novus,43,5830,0,1411,1100,1,314,414,24,28,1,60,43,39,119,43,10,12,0,9,20,0x3885,100,252,816,480,0,0,0,0,0,0,0,0,508,2000,7053,1035,0,0,1036,589,0,0,0,0,0,0,0,0,0,0,4382,1 -1719,DETALE,Detale,Detardeurus,90,960000,0,291850,123304,3,4560,5548,66,59,100,90,30,136,140,56,10,12,2,9,67,0x37B5,250,432,936,360,145925,10000,617,5500,603,5000,732,2000,2649,1000,2648,1000,7444,5000,7451,3589,12080,1000,1417,100,5002,500,0,0,0,0,4386,1 -1720,HYDRO,Hydro,Hydrolancer,89,308230,0,83450,2480,3,2554,3910,52,62,1,96,110,86,94,32,10,12,2,9,47,0x37B5,160,140,672,432,0,0,0,0,0,0,0,0,7123,4000,1035,4000,7443,3880,5126,500,5127,500,12085,300,5124,500,0,0,0,0,4384,1 -1721,DRAGON_EGG,Dragon Egg,Dragon Egg,43,18322,0,6740,0,0,1,2,78,60,1,1,56,67,1,63,10,12,1,9,40,0x0,1000,24,0,0,0,0,0,0,0,0,0,0,985,5,7032,100,731,10,732,5,718,10,720,10,728,10,0,0,0,0,4385,1 +1713,ACIDUS,Acidus,Acidus,130,48430,0,4520,3389,2,622,1017,101,90,109,78,50,55,77,55,10,12,2,9,46,0x3095,170,168,1008,300,0,0,0,0,0,0,0,0,582,5100,1035,4000,7444,5,1036,3589,7448,800,1269,10,2114,50,0,0,0,0,4378,1 +1714,FERUS,Ferus,Ferus,126,25668,0,3985,2989,2,692,807,96,45,94,80,55,60,78,50,10,12,2,9,43,0x3095,100,108,576,432,0,0,0,0,0,0,0,0,578,2200,1035,1000,7123,1000,1036,2000,7447,800,994,20,5122,50,0,0,0,0,4380,1 +1715,NOVUS,Novus,Novus,90,6670,0,1305,1505,1,388,445,95,48,74,56,57,25,90,45,10,12,0,9,20,0x3885,110,151,288,360,0,0,0,0,0,0,0,0,511,3000,7053,1035,0,0,1036,589,0,0,0,0,0,0,0,0,0,0,4383,1 +1716,ACIDUS_,Acidus,Acidus,130,40718,0,4520,3389,2,703,861,98,47,106,110,61,53,95,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,0,505,150,1035,4000,510,150,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1 +1717,FERUS_,Ferus,Ferus,126,39054,0,4185,2989,2,647,769,111,33,91,57,57,61,62,51,10,12,2,9,42,0x3095,120,108,576,432,0,0,0,0,0,0,0,0,579,5100,1035,1000,0,0,1036,3589,7445,800,997,20,7445,100,0,0,0,0,4381,1 +1718,NOVUS_,Novus,Novus,84,5028,0,1080,1215,1,266,314,88,28,53,43,43,55,90,58,10,12,0,9,20,0x3885,100,252,816,480,0,0,0,0,0,0,0,0,508,2000,7053,1035,0,0,1036,589,0,0,0,0,0,0,0,0,0,0,4382,1 +1719,DETALE,Detale,Detardeurus,135,6005000,0,4320000,3420000,3,4072,6734,364,166,165,153,171,136,185,72,10,12,2,9,67,0x37B5,250,432,936,360,2160000,10000,617,5500,603,5000,732,2000,2649,1000,2648,1000,7444,5000,7451,3589,12080,1000,1417,100,5002,500,0,0,0,0,4386,1 +1720,HYDRO,Hydro,Hydrolancer,121,41500,0,6285,4463,3,760,910,92,58,120,72,67,66,88,58,10,12,2,9,47,0x37B5,160,140,672,432,0,0,0,0,0,0,0,0,7123,4000,1035,4000,7443,3880,5126,500,5127,500,12085,300,5124,500,0,0,0,0,4384,1 +1721,DRAGON_EGG,Dragon Egg,Dragon Egg,119,20990,0,2862,2147,0,503,653,172,85,84,59,85,40,118,65,10,12,1,9,40,0x0,1000,24,0,0,0,0,0,0,0,0,0,0,985,5,7032,100,731,10,732,5,718,10,720,10,728,10,0,0,0,0,4385,1 1722,EVENT_JAKK,Jakk,Jakk,99,10310,0,103,100,1,115,182,5,11,1,28,18,13,35,45,10,12,1,0,43,0x81,240,1180,480,648,0,0,0,0,0,0,0,0,7225,1000,1062,1000,535,1000,0,0,0,0,0,0,0,0,0,0,0,0,5134,10000 1723,A_SHECIL,Shecil Damon,Cecil Damon,82,30000,0,0,0,14,600,900,25,15,1,145,27,32,134,80,10,12,1,7,64,0x3695,180,1008,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1724,A_POTON_CANON,Photon Cannon,Photon Cannon,66,8000,0,0,0,9,1000,1300,10,30,1,40,25,20,80,80,10,12,1,0,40,0x84,300,1536,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -763,11 +763,11 @@ // Kiel Dungeon monsters 1733,KIEL,Kiel,Kiehl,90,523000,0,36500,23405,3,1682,3311,28,32,100,112,76,89,156,102,10,12,1,0,47,0x37B5,140,1152,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1734,KIEL_,Kiel D-01,Kiel D-01,90,1523000,0,2356200,512602,3,3280,6560,28,32,100,130,30,160,199,180,10,12,1,0,47,0x37B5,130,1152,576,432,1178100,10000,617,5500,603,5000,616,2000,7513,3000,617,3000,2651,1000,2319,1000,1618,500,1242,500,2650,1000,0,0,0,0,4403,1 -1735,ALICEL,Alicel,Alicel,75,37520,0,8890,5420,2,1800,2770,30,30,50,58,50,51,92,40,10,12,1,6,60,0x318D,250,1080,480,504,0,0,0,0,0,0,0,0,7512,2000,7507,3000,999,200,7317,500,1270,5,985,10,2517,20,0,0,0,0,4401,1 -1736,ALIOT,Aliot,Aliot,75,48290,0,13020,4006,2,950,2470,35,15,50,32,87,12,68,19,10,12,1,6,60,0x318D,200,1296,432,360,0,0,0,0,0,0,0,0,7512,2000,7507,3000,2516,10,7317,500,1810,10,985,10,13405,15,0,0,0,0,4402,1 -1737,ALIZA,Aliza,Aliza,69,19000,0,6583,3400,1,750,1100,8,5,74,74,52,35,110,140,10,12,1,7,60,0x91,220,1440,576,600,0,0,0,0,0,0,0,0,7054,4000,2518,10,2626,10,7047,5,12128,50,661,1,2123,5,0,0,0,0,4400,1 -1738,CONSTANT,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,50,28,26,47,66,14,10,12,0,0,67,0x3885,150,720,360,360,0,0,0,0,0,0,0,0,7512,100,7507,1500,7325,10,999,10,757,10,0,0,0,0,0,0,0,0,0,0 +1734,KIEL_,Kiel D-01,Kiel D-01,125,2502000,0,1800000,1440000,3,2937,6517,314,232,166,187,155,141,199,180,10,12,1,0,47,0x37B5,130,1152,576,432,900000,10000,617,5500,603,5000,616,2000,7513,3000,617,3000,2651,1000,2319,1000,1618,500,1242,500,2650,1000,0,0,0,0,4403,1 +1735,ALICEL,Alicel,Alicel,115,18000,0,2565,1923,2,537,635,109,30,121,53,59,63,73,60,10,12,1,6,60,0x318D,250,1080,480,504,0,0,0,0,0,0,0,0,7512,2000,7507,3000,999,200,7317,500,1270,5,985,10,2517,20,0,0,0,0,4401,1 +1736,ALIOT,Aliot,Aliot,112,15669,0,2448,1836,2,608,697,106,15,111,56,55,42,62,75,10,12,1,6,60,0x318D,200,1296,432,360,0,0,0,0,0,0,0,0,7512,2000,7507,3000,2516,10,7317,500,1810,10,985,10,13405,15,0,0,0,0,4402,1 +1737,ALIZA,Aliza,Aliza,112,14450,0,2448,1836,1,600,697,98,5,115,50,51,62,70,54,10,12,1,7,60,0x91,220,1440,576,600,0,0,0,0,0,0,0,0,7054,4000,2518,10,2626,10,7047,5,12128,50,661,1,2123,5,0,0,0,0,4400,1 +1738,CONSTANT,Constant,Constant,108,12050,0,2506,1879,1,660,804,92,82,126,98,62,57,91,34,10,12,0,0,67,0x3885,150,720,360,360,0,0,0,0,0,0,0,0,7512,100,7507,1500,7325,10,999,10,757,10,0,0,0,0,0,0,0,0,0,0 1739,G_ALICEL,Alicel,Alicel,75,37520,0,0,0,2,1600,2570,30,30,50,60,50,51,92,40,10,12,1,6,60,0x318D,150,1080,480,504,0,0,0,0,0,0,0,0,7507,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1740,G_ALIOT,Aliot,Aliot,75,43290,0,0,0,2,950,2070,35,15,50,32,87,12,68,19,10,12,1,6,60,0x318D,150,1296,432,360,0,0,0,0,0,0,0,0,7507,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1741,G_COOKIE_XMAS,Christmas Cookie,Christmas Cookie,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,0x3885,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -782,11 +782,11 @@ 1750,G_RED_PLANT,Red Plant,Red Plant,1,100,0,0,0,1,100,200,100,99,0,0,0,0,0,100,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Odin monsters -1751,RANDGRIS,Valkyrie Randgris,Valkyrie Randgris,99,3567200,0,2854900,3114520,3,5560,9980,25,42,100,120,30,120,220,210,10,12,2,8,86,0x37B5,100,576,576,480,1427450,10000,617,5500,603,5000,616,2000,7510,5000,2357,800,2524,1500,2421,1500,2229,2500,7024,2500,0,0,0,0,0,0,4407,1 -1752,SKOGUL,Skogul,Skogul,70,87544,0,27620,10,2,1110,1930,20,15,1,69,70,50,67,52,10,12,1,6,67,0x3395,190,720,384,480,0,0,0,0,0,0,0,0,7511,3500,7054,1000,716,1000,739,500,2609,100,757,500,1271,5,0,0,0,0,4404,1 -1753,FRUS,Frus,Frus,69,83422,0,20620,10,2,1110,1780,20,15,1,69,60,50,76,52,10,12,1,6,67,0x3395,150,480,576,432,0,0,0,0,0,0,0,0,7511,3500,7054,1000,716,1000,2622,3,2308,10,757,500,0,0,0,0,0,0,4405,1 -1754,SKEGGIOLD,Skeggiold,Skeggiold,81,295200,0,91100,10,1,1400,2020,12,24,80,100,50,72,90,50,10,12,0,8,46,0x37B5,250,672,780,480,0,0,0,0,0,0,0,0,7511,6000,2254,1,7063,1000,2001,25,7511,1000,2322,100,2353,100,0,0,0,0,4406,1 -1755,SKEGGIOLD_,Skeggiold,Skeggiold,83,315200,0,99200,10,1,1600,2050,15,24,80,120,60,85,98,80,10,12,0,8,46,0x37B5,250,672,780,480,0,0,0,0,0,0,0,0,7511,6000,2254,1,7063,1000,2001,25,7511,1000,2322,100,2353,100,0,0,0,0,4406,1 +1751,RANDGRIS,Valkyrie Randgris,Valkyrie Randgris,141,2205000,0,2000000,2200000,3,2895,9307,588,506,196,131,125,276,267,156,10,12,2,8,86,0x37B5,100,576,576,480,1000000,10000,617,5500,603,5000,616,2000,7510,5000,2357,800,2524,1500,2421,1500,2229,2500,7024,2500,0,0,0,0,0,0,4407,1 +1752,SKOGUL,Skogul,Skogul,126,34240,0,4280,3210,2,791,947,72,15,100,71,63,85,82,37,10,12,1,6,67,0x3395,190,720,384,480,0,0,0,0,0,0,0,0,7511,3500,7054,1000,716,1000,739,500,2609,100,757,500,1271,5,0,0,0,0,4404,1 +1753,FRUS,Frus,Frus,128,39520,0,4562,3421,2,710,879,65,35,114,77,66,51,79,27,10,12,1,6,67,0x3395,150,480,576,432,0,0,0,0,0,0,0,0,7511,3500,7054,1000,716,1000,2622,3,2308,10,757,500,0,0,0,0,0,0,4405,1 +1754,SKEGGIOLD,Skeggiold,Skeggiold,131,53290,0,5552,4419,1,733,1058,85,92,91,89,65,118,98,75,10,12,0,8,46,0x37B5,250,672,780,480,0,0,0,0,0,0,0,0,7511,6000,2254,1,7063,1000,2001,25,7511,1000,2322,100,2353,100,0,0,0,0,4406,1 +1755,SKEGGIOLD_,Skeggiold,Skeggiold,131,52280,0,5549,4411,1,767,985,80,86,91,86,67,116,102,71,10,12,0,8,46,0x37B5,250,672,780,480,0,0,0,0,0,0,0,0,7511,6000,2254,1,7063,1000,2001,25,7511,1000,2322,100,2353,100,0,0,0,0,4406,1 1756,G_HYDRO,Hydro,Hydrolancer,89,308230,0,0,0,3,2554,3910,52,62,1,96,110,86,94,32,10,12,2,9,47,0x39A5,160,140,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1757,G_ACIDUS,Acidus,Acidus,80,51112,0,0,0,2,1289,2109,39,69,1,71,55,135,103,69,10,12,2,9,46,0x3885,170,168,1008,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1758,G_FERUS,Ferus,Ferus,70,29218,0,0,0,2,1056,1496,34,45,1,78,45,72,81,73,10,12,2,9,43,0x3885,100,108,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -796,49 +796,49 @@ 1762,G_FRUS,Frus,Frus,69,53422,0,0,0,2,1110,1780,20,15,1,69,60,50,76,52,10,12,1,6,67,0x3985,130,480,576,432,0,0,0,0,0,0,0,0,7511,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1763,G_SKEGGIOLD,Skeggiold,Skeggiold,81,100200,0,0,0,1,1400,3410,12,24,80,100,50,72,90,50,10,12,0,8,46,0x39A5,200,672,780,480,0,0,0,0,0,0,0,0,7511,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1764,G_SKEGGIOLD_,Skeggiold,Skeggiold,83,103000,0,0,0,1,1600,4110,15,24,80,120,60,85,98,80,10,12,0,8,46,0x39A5,200,672,780,480,0,0,0,0,0,0,0,0,7511,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1765,G_RANDGRIS,Valkyrie,Valkyrie,99,1567200,0,10000,10000,3,5560,9980,25,42,100,120,80,120,220,210,10,12,2,8,86,0x37B5,100,576,576,480,0,0,0,0,0,0,0,0,7510,500,617,100,2115,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1765,G_RANDGRIS,Valkyrie,Valkyrie,141,1005000,0,10000,10000,3,2895,6101,588,506,196,131,125,276,267,156,10,12,2,8,86,0x37B5,100,576,576,480,0,0,0,0,0,0,0,0,7510,500,617,100,2115,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1766,EM_ANGELING,Angeling,Angeling,99,128430,0,0,0,1,60,71,40,50,1,17,80,80,126,20,10,12,0,8,66,0x4B5,300,1288,288,384,0,0,909,5000,909,5000,741,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1767,EM_DEVILING,Deviling,Deviling,99,128430,0,0,0,1,60,71,40,50,1,17,80,80,126,20,10,12,0,8,66,0x4B5,300,1288,288,384,0,0,909,5000,909,5000,741,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Rachel / Ice Dungeon monsters -1768,GLOOMUNDERNIGHT,Gloom Under Night,Gloom Under Night,89,2298000,0,962175,276445,3,5880,9516,10,20,100,115,98,78,111,50,10,12,2,0,68,0x37B5,200,1344,2880,576,481087,10000,607,5500,617,5000,617,5000,7566,7000,7023,4000,7022,2000,616,5000,2513,1000,1377,100,0,0,0,0,0,0,4408,1 -1769,AGAV,Agav,Agav,73,29620,0,9780,6622,1,103,1109,15,35,1,32,27,132,69,15,10,12,1,7,80,0x3295,300,768,360,360,0,0,0,0,0,0,0,0,7567,2500,2422,2,7563,4000,2109,1,12183,50,7563,100,0,0,0,0,0,0,4409,1 -1770,ECHIO,Echio,Echio,69,34900,0,13560,4300,1,750,1800,33,11,74,74,52,35,59,56,10,12,1,7,80,0x3295,250,768,360,360,0,0,0,0,0,0,0,0,7567,2500,608,10,7563,4000,5172,500,12183,20,7563,100,2366,20,0,0,0,0,4410,1 -1771,VANBERK,Vanberk,Vanberk,59,9988,0,4203,901,1,230,660,24,6,69,66,39,29,51,41,10,12,1,7,80,0x3885,250,768,360,360,0,0,0,0,0,0,0,0,7568,2500,526,10,7563,1000,5172,10,13027,5,7563,100,0,0,0,0,0,0,4411,1 -1772,ISILLA,Isilla,Isilla,62,8297,0,3001,3001,1,89,733,11,19,1,28,12,97,57,12,10,12,1,7,80,0x3885,300,768,360,432,0,0,0,0,0,0,0,0,7568,2500,2422,1,7563,1000,2610,10,2601,1,7563,100,0,0,0,0,0,0,4412,1 -1773,HODREMLIN,Hodremlin,Hodremlin,61,12180,0,6782,2022,1,845,1678,29,25,80,41,81,56,62,11,10,12,1,6,67,0x3985,140,960,528,432,0,0,0,0,0,0,0,0,587,1000,7340,1000,2406,2,938,1000,7563,1000,1061,2000,2426,10,0,0,0,0,4413,1 -1774,SEEKER,Seeker,Seeker,65,10090,0,5671,4278,6,723,852,17,30,60,52,34,143,107,27,10,12,0,0,64,0x3295,190,576,432,300,0,0,0,0,0,0,0,0,587,1000,7340,1000,985,20,1061,4000,7563,1000,1375,20,0,0,0,0,0,0,4414,1 -1775,SNOWIER,Snowier,Snowier,60,19230,0,5882,2699,2,770,1347,22,12,73,46,72,15,52,25,10,12,2,0,41,0x3885,220,936,1020,420,0,0,0,0,0,0,0,0,7561,3000,7066,1000,757,100,510,50,509,500,1819,3,991,100,0,0,0,0,4415,1 -1776,SIROMA,Siroma,Siroma,42,6800,0,2230,1005,1,220,440,12,8,33,23,52,11,40,19,10,12,0,0,61,0x83,180,432,648,240,0,0,0,0,0,0,0,0,7561,1000,7066,500,510,10,0,0,0,0,0,0,991,20,0,0,0,0,4416,1 -1777,ICE_TITAN,Ice Titan,Ice Titan,60,38200,0,13872,7928,1,1090,1570,71,15,99,34,88,10,79,29,10,12,2,0,61,0x3885,250,861,660,144,0,0,0,0,0,0,0,0,7561,5000,7066,3000,749,100,984,10,985,30,0,0,995,100,0,0,0,0,4417,1 -1778,GAZETI,Gazeti,Gazeti,55,12300,0,5758,2075,10,512,612,65,25,1,12,20,60,101,5,10,12,1,6,21,0x3395,190,576,370,270,0,0,0,0,0,0,0,0,7561,3000,7066,3000,985,20,1731,1,0,0,0,0,0,0,0,0,0,0,4418,1 -1779,KTULLANUX,Ktullanux,Ktullanux,98,4417000,0,2720050,1120020,3,1680,10360,40,42,85,126,30,125,177,112,10,12,2,2,81,0x37B5,400,432,840,216,1360025,10000,607,5500,617,5000,617,5000,7562,9000,616,3000,2509,3000,2111,5000,617,5000,607,5000,0,0,0,0,0,0,4419,1 -1780,MUSCIPULAR,Muscipular,Muscipular,57,4332,0,1706,1706,3,521,726,12,12,1,53,39,25,92,51,10,12,1,3,22,0x84,2000,672,648,360,0,0,0,0,0,0,0,0,7565,3000,1032,3000,629,2,1033,2000,905,1000,631,3,0,0,0,0,0,0,4420,1 -1781,DROSERA,Drosera,Drosera,46,7221,0,2612,1022,7,389,589,10,13,1,30,27,17,76,41,10,12,1,3,22,0x84,2000,864,576,336,0,0,0,0,0,0,0,0,7565,3000,938,3000,1032,2000,1033,2000,621,3,905,1000,0,0,0,0,0,0,4421,1 -1782,ROWEEN,Roween,Roween,31,5716,0,1669,1266,1,298,377,0,7,51,39,48,18,67,19,10,12,1,2,24,0x108B,200,412,840,300,0,0,0,0,0,0,0,0,7564,3000,919,3000,992,50,1822,2,0,0,0,0,0,0,0,0,0,0,4422,1 -1783,GALION,Galion,Galion,44,32240,0,10020,3368,1,336,441,11,12,51,52,59,25,72,32,10,12,1,2,44,0x11AB,150,864,624,360,0,0,0,0,0,0,0,0,7564,3000,919,3000,996,10,2531,5,0,0,0,0,0,0,0,0,0,0,4423,1 -1784,STAPO,Stapo,Stapo,23,666,0,332,221,1,135,370,90,5,12,11,15,12,23,1,10,12,0,0,42,0x83,300,936,792,432,0,0,0,0,0,0,0,0,909,1000,7312,1000,512,1000,7126,100,993,10,1821,3,0,0,0,0,0,0,4424,1 -1785,ATROCE,Atroce,Atroce,82,1008420,0,295550,118895,2,2526,3646,25,25,100,87,30,49,89,72,10,12,2,2,67,0x37B5,150,576,600,240,147775,10000,607,5500,617,5000,617,5000,7563,7000,608,1000,2621,1000,617,5000,607,5000,5123,100,1175,100,0,0,0,0,4425,1 +1768,GLOOMUNDERNIGHT,Gloom Under Night,Gloom Under Night,139,3005000,0,2160000,1800000,3,3061,5846,479,262,191,223,187,155,241,163,10,12,2,0,68,0x37B5,200,1344,2880,576,1080000,10000,607,5500,617,5000,617,5000,7566,7000,7023,4000,7022,2000,616,5000,2513,1000,1377,100,0,0,0,0,0,0,4408,1 +1769,AGAV,Agav,Agav,128,40000,0,3933,2949,1,637,818,77,82,85,66,55,113,86,61,10,12,1,7,80,0x3295,300,768,360,360,0,0,0,0,0,0,0,0,7567,2500,2422,2,7563,4000,2109,1,12183,50,7563,100,0,0,0,0,0,0,4409,1 +1770,ECHIO,Echio,Echio,126,31620,0,3690,2768,1,606,765,66,11,111,63,51,37,94,45,10,12,1,7,80,0x3295,250,768,360,360,0,0,0,0,0,0,0,0,7567,2500,608,10,7563,4000,5172,500,12183,20,7563,100,2366,20,0,0,0,0,4410,1 +1771,VANBERK,Vanberk,Vanberk,123,24605,0,3240,2430,1,656,797,100,6,109,70,55,60,87,54,10,12,1,7,80,0x3885,250,768,360,360,0,0,0,0,0,0,0,0,7568,2500,526,10,7563,1000,5172,10,13027,5,7563,100,0,0,0,0,0,0,4411,1 +1772,ISILLA,Isilla,Isilla,124,26324,0,3456,2592,1,606,774,69,19,90,65,43,82,91,75,10,12,1,7,80,0x3885,300,768,360,432,0,0,0,0,0,0,0,0,7568,2500,2422,1,7563,1000,2610,10,2601,1,7563,100,0,0,0,0,0,0,4412,1 +1773,HODREMLIN,Hodremlin,Hodremlin,122,23182,0,3758,2819,1,682,836,75,25,106,70,77,60,59,40,10,12,1,6,67,0x3985,140,960,528,432,0,0,0,0,0,0,0,0,587,1000,7340,1000,2406,2,938,1000,7563,1000,1061,2000,2426,10,0,0,0,0,4413,1 +1774,SEEKER,Seeker,Seeker,124,24500,0,4009,3006,6,611,731,64,30,91,90,35,75,126,31,10,12,0,0,64,0x3295,190,576,432,300,0,0,0,0,0,0,0,0,587,1000,7340,1000,985,20,1061,4000,7563,1000,1375,20,0,0,0,0,0,0,4414,1 +1775,SNOWIER,Snowier,Snowier,103,13934,0,1944,1458,2,510,592,121,47,91,61,67,45,61,55,10,12,2,0,41,0x3885,220,936,1020,420,0,0,0,0,0,0,0,0,7561,3000,7066,1000,757,100,510,50,509,500,1819,3,991,100,0,0,0,0,4415,1 +1776,SIROMA,Siroma,Siroma,98,11910,0,1827,1369,1,389,489,64,38,83,43,50,70,80,60,10,12,0,0,61,0x83,180,432,648,240,0,0,0,0,0,0,0,0,7561,1000,7066,500,510,10,0,0,0,0,0,0,991,20,0,0,0,0,4416,1 +1777,ICE_TITAN,Ice Titan,Ice Titan,110,20820,0,2724,2644,1,837,935,344,11,133,54,78,33,78,26,10,12,2,0,61,0x3885,250,861,660,144,0,0,0,0,0,0,0,0,7561,5000,7066,3000,749,100,984,10,985,30,0,0,995,100,0,0,0,0,4417,1 +1778,GAZETI,Gazeti,Gazeti,106,14000,0,2025,1518,10,596,664,71,21,105,37,42,38,97,38,10,12,1,6,21,0x3395,190,576,370,270,0,0,0,0,0,0,0,0,7561,3000,7066,3000,985,20,1731,1,0,0,0,0,0,0,0,0,0,0,4418,1 +1779,KTULLANUX,Ktullanux,Ktullanux,98,2626000,0,1035576,949942,3,2888,5568,129,78,85,126,30,125,177,112,10,12,2,2,81,0x37B5,400,432,840,216,517788,10000,607,5500,617,5000,617,5000,7562,9000,616,3000,2509,3000,2111,5000,617,5000,607,5000,0,0,0,0,0,0,4419,1 +1780,MUSCIPULAR,Muscipular,Muscipular,105,12550,0,1944,1458,1,401,477,114,43,100,60,58,37,60,47,10,12,1,3,22,0x84,2000,672,648,360,0,0,0,0,0,0,0,0,7565,3000,1032,3000,629,2,1033,2000,905,1000,631,3,0,0,0,0,0,0,4420,1 +1781,DROSERA,Drosera,Drosera,101,10878,0,1350,1013,7,168,222,86,52,79,32,64,38,78,14,10,12,1,3,22,0x84,2000,864,576,336,0,0,0,0,0,0,0,0,7565,3000,938,3000,1032,2000,1033,2000,621,3,905,1000,0,0,0,0,0,0,4421,1 +1782,ROWEEN,Roween,Roween,95,7385,0,1691,1902,1,375,410,73,33,70,82,55,45,73,25,10,12,1,2,24,0x108B,200,412,840,300,0,0,0,0,0,0,0,0,7564,3000,919,3000,992,50,1822,2,0,0,0,0,0,0,0,0,0,0,4422,1 +1783,GALION,Galion,Galion,100,8821,0,1769,1327,1,405,482,100,62,106,79,62,45,90,36,10,12,1,2,44,0x11AB,150,864,624,360,0,0,0,0,0,0,0,0,7564,3000,919,3000,996,10,2531,5,0,0,0,0,0,0,0,0,0,0,4423,1 +1784,STAPO,Stapo,Stapo,95,8805,0,1574,1772,1,364,415,129,36,20,46,25,35,53,30,10,12,0,0,42,0x83,300,936,792,432,0,0,0,0,0,0,0,0,909,1000,7312,1000,512,1000,7126,100,993,10,1821,3,0,0,0,0,0,0,4424,1 +1785,ATROCE,Atroce,Atroce,113,1502000,0,1080000,855000,2,2031,3534,316,176,121,165,135,99,152,113,10,12,2,2,67,0x37B5,150,576,600,240,540000,10000,607,5500,617,5000,617,5000,7563,7000,608,1000,2621,1000,617,5000,607,5000,5123,100,1175,100,0,0,0,0,4425,1 1786,G_AGAV,Agav,Agav,73,25620,0,0,0,1,103,909,15,35,1,32,27,132,69,15,10,12,1,7,40,0x3295,300,768,360,360,0,0,0,0,0,0,0,0,7567,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1787,G_ECHIO,Echio,Echio,69,36900,0,0,0,1,750,1500,33,11,74,74,52,35,59,56,10,12,1,7,40,0x3295,250,768,360,360,0,0,0,0,0,0,0,0,7567,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1788,G_ICE_TITAN,Ice Titan,Ice Titan,60,32900,0,0,0,1,1090,1570,71,15,99,34,88,10,79,29,10,12,2,0,61,0x3295,250,861,660,144,0,0,0,0,0,0,0,0,7561,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1789,ICEICLE,Iceicle,Iceicle,38,10,0,5,5,3,241,1082,0,10,1,10,10,10,172,5,10,12,0,0,41,0x84,2000,1344,0,0,0,0,0,0,0,0,0,0,7066,1000,7066,1000,7066,1000,7066,500,7066,500,7066,500,7066,500,0,0,0,0,7066,500 +1789,ICEICLE,Iceicle,Iceicle,100,1012,0,164,122,3,425,426,2,15,99,1,1,1,95,1,10,12,0,0,41,0x84,2000,1344,0,0,0,0,0,0,0,0,0,0,7066,1000,7066,1000,7066,1000,7066,500,7066,500,7066,500,7066,500,0,0,0,0,7066,500 1790,G_RAFFLESIA,Rafflesia,Rafflesia,17,1333,0,0,0,3,105,127,0,2,1,18,24,11,37,10,10,12,0,3,22,0x3885,150,512,528,240,0,0,0,0,0,0,0,0,7577,3000,7575,4000,7576,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1791,G_GALION,Galion,Galion,44,32240,0,0,0,1,336,441,11,12,51,52,59,25,72,32,10,12,1,2,44,0x11AB,150,864,624,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1792,SOCCER_BALL,Soccer Ball,Soccer Ball,1,1000,0,0,0,0,0,0,128,99,0,0,0,0,0,0,0,0,0,0,20,0x40,2000,96,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1793,G_MEGALITH,Megalith,Megalith,45,5300,0,0,0,9,264,314,50,25,1,45,60,5,95,5,10,12,2,0,80,0x3695,200,1332,1332,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1794,G_ROWEEN,Roween,Roween,31,5716,0,0,0,1,298,377,0,7,51,39,48,18,67,19,10,12,1,2,24,0x3295,200,412,840,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1795,BLOODY_KNIGHT_,Bloody Knight,Bloody Knight,82,800000,0,0,0,3,10000,30000,60,60,88,121,100,100,125,55,10,12,2,8,28,0x37B5,250,828,528,192,0,0,0,0,0,0,0,0,1417,100,2412,100,2514,200,2342,300,2513,200,1620,200,617,7000,7578,10000,0,0,0,0 -1796,AUNOE,Aunoe,Aunoe,62,21297,0,7102,5102,1,1500,2144,11,19,1,28,12,91,57,12,10,12,1,7,80,0x3295,250,768,432,360,0,0,0,0,0,0,0,0,7568,2500,2422,1,7563,1000,2109,1,12183,50,7563,100,2545,1,0,0,0,0,0,0 -1797,FANAT,Fanat,Fanat,62,21297,0,7102,5102,1,1500,2144,11,19,1,28,12,91,57,12,10,12,1,7,80,0x3885,250,768,432,360,0,0,0,0,0,0,0,0,2388,1,2422,1,7563,1000,2109,1,12183,10,7568,2500,0,0,0,0,0,0,0,0 +1796,AUNOE,Aunoe,Aunoe,110,13050,0,1935,1454,1,646,727,107,42,118,63,62,77,70,35,10,12,1,7,80,0x3295,250,768,432,360,0,0,0,0,0,0,0,0,7568,2500,2422,1,7563,1000,2109,1,12183,50,7563,100,2545,1,0,0,0,0,0,0 +1797,FANAT,Fanat,Fanat,120,21000,0,3042,2282,1,599,705,81,64,102,66,70,47,79,57,10,12,1,7,80,0x3885,250,768,432,360,0,0,0,0,0,0,0,0,2388,1,2422,1,7563,1000,2109,1,12183,10,7568,2500,0,0,0,0,0,0,0,0 1798,TREASURE_BOX_,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x40,0,0,0,0,0,0,0,0,0,0,0,0,7582,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1799,G_SEYREN_,Lord Knight Seyren,Lord Knight Seyren,99,347590,0,18000,10000,1,4238,5040,72,37,120,110,81,65,130,52,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1800,G_EREMES_,Assassin Cross Eremes,Assassin Cross Eremes,99,211230,0,18000,10000,1,3189,5289,27,39,90,181,62,37,122,60,10,12,1,7,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1801,G_HARWORD_,Whitesmith Harword,Mastersmith Howard,99,310000,0,18000,10000,1,4822,5033,66,36,100,73,112,35,136,60,10,12,1,7,81,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1802,G_MAGALETA_,High Priest Magaleta,High Priest Margaretha,99,182910,0,18000,10000,1,1688,2580,35,78,1,84,64,182,92,100,10,12,1,7,86,0x37B5,125,1152,384,288,9000,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1803,G_SHECIL_,Sniper Shecil,Sniper Cecil,99,209000,0,18000,10000,14,1892,5113,22,35,1,180,39,67,193,130,10,12,1,7,84,0x33B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1804,G_KATRINN_,High Wizard Katrinn,High Wizard Kathryne,99,189920,0,18000,10000,1,497,2094,10,88,1,89,42,223,128,93,10,12,1,7,68,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1799,G_SEYREN_,Lord Knight Seyren,Lord Knight Seyren,99,1647590,0,4352040,1412973,1,7238,11040,72,37,120,110,81,65,130,52,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1800,G_EREMES_,Assassin Cross Eremes,Assassin Cross Eremes,99,1411230,0,3675060,1433142,1,4189,8289,37,39,90,181,62,37,122,60,10,12,1,7,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1801,G_HARWORD_,Whitesmith Harword,Mastersmith Howard,99,1460000,0,3602106,1278900,1,7822,8251,66,36,100,73,112,35,136,60,10,12,1,7,82,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1802,G_MAGALETA_,High Priest Magaleta,High Priest Margaretha,99,1092910,0,3831300,1186920,1,4688,5580,35,78,1,84,64,182,92,100,10,12,1,7,86,0x37B5,125,1152,384,288,9000,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1803,G_SHECIL_,Sniper Shecil,Sniper Cecil,99,1349000,0,3683700,1373400,14,4892,9113,22,35,1,180,39,67,193,130,10,12,1,7,84,0x33B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1804,G_KATRINN_,High Wizard Katrinn,High Wizard Kathryne,99,1069920,0,3607380,1473030,1,1197,4394,10,88,1,89,42,223,128,93,10,12,1,7,68,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,0,7583,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1805,B_SEYREN_,Lord Knight Seyren,Lord Knight Seyren,99,1647590,0,4835600,1569970,1,7238,11040,72,37,120,110,81,65,130,52,10,12,1,7,83,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1806,B_EREMES_,Assassin Cross Eremes,Assassin Cross Eremes,99,1411230,0,4083400,1592380,1,4189,8289,37,39,90,181,62,37,122,60,10,12,1,7,85,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1807,B_HARWORD_,Whitesmith Harword,Mastersmith Howard,99,1460000,0,4002340,1421000,1,7822,8251,66,36,100,73,112,35,136,60,10,12,1,7,82,0x37B5,100,76,384,288,0,0,0,0,0,0,0,0,7583,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -863,17 +863,17 @@ 1826,EVENT_MYST,Myst,Myst,38,3745,0,0,0,1,365,445,0,40,1,38,18,0,53,10,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1827,EVENT_SASQUATCH,Sasquatch,Sasquatch,30,3163,0,0,0,1,250,280,5,0,75,25,60,10,34,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1828,EVENT_GULLINBURSTI,Gullinbrusti,Gullinbrusti,20,20,0,0,0,1,59,72,100,99,1,14,14,0,19,15,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,7303,6000,570,9000,571,8000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1829,SWORD_GUARDIAN,Sword Guardian,Sword Master,86,152533,0,155013,122604,2,7590,9140,60,33,110,40,54,65,125,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,1,2122,10,1176,50,0,0,0,0,0,0,4427,1 -1830,BOW_GUARDIAN,Bow Guardian,Bow Master,80,80404,0,50149,23006,12,1840,2520,40,62,95,80,33,90,165,55,14,16,2,7,80,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,1701,50,2367,20,2701,4,0,0,0,0,0,0,0,0,4428,1 -1831,SALAMANDER,Salamander,Salamander,91,97934,0,72000,55000,2,7590,10860,65,50,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,7097,3000,994,30,716,100,2680,1,1920,50,2621,1,2364,20,0,0,0,0,4429,1 -1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,40,50,120,180,25,190,199,50,10,12,2,0,83,0x37B5,130,212,384,360,1577160,10000,603,5500,617,5000,616,2000,994,10000,2677,3000,2678,200,2679,200,1471,2000,1133,2000,2345,100,0,0,0,0,4430,1 -1833,KASA,Kasa,Kasa,85,80375,0,49000,38000,2,3030,3500,23,70,45,110,31,200,140,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2500,994,30,2680,1,2344,10,1730,10,1626,10,0,0,0,0,4431,1 +1829,SWORD_GUARDIAN,Sword Guardian,Sword Guardian,133,70000,0,4500,3375,2,751,880,122,62,122,87,54,65,103,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,1,2122,10,1176,50,0,0,0,0,0,0,4427,1 +1830,BOW_GUARDIAN,Bow Guardian,Bow Guardian,132,63000,0,4392,3294,12,766,886,127,62,109,80,65,52,122,55,14,16,2,7,80,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,1701,50,2367,20,2701,4,0,0,0,0,0,0,0,0,4428,1 +1831,SALAMANDER,Salamander,Salamander,138,80390,0,5919,7139,2,1399,1799,141,68,189,105,72,85,132,72,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,7097,3000,994,30,716,100,2680,1,1920,50,2621,1,2364,20,0,0,0,0,4429,1 +1832,IFRIT,Ifrit,Ifrit,146,6935000,0,6696000,4860000,3,5375,8764,436,218,180,201,156,190,199,77,10,12,2,0,83,0x37B5,130,212,384,360,3348000,10000,603,5500,617,5000,616,2000,994,10000,2677,3000,2678,200,2679,200,1471,2000,1133,2000,2345,100,0,0,0,0,4430,1 +1833,KASA,Kasa,Kasa,135,70128,0,5599,7709,2,1004,1309,104,70,111,74,65,78,108,55,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2500,994,30,2680,1,2344,10,1730,10,1626,10,0,0,0,0,4431,1 1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,9590,12860,65,60,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1835,G_KASA,Kasa,Kasa,85,80375,0,0,0,2,3030,3500,23,70,45,158,31,250,160,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1836,MAGMARING,Magmaring,Magmaring,40,5300,0,2110,1910,1,550,700,25,24,40,60,30,10,60,17,10,12,0,0,43,0x83,300,1472,384,288,0,0,0,0,0,0,0,0,7097,3000,757,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4432,1 -1837,IMP,Imp,Fire Imp,76,46430,0,25200,11077,1,1059,1509,27,50,37,76,30,150,99,10,10,12,0,6,63,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7122,3000,13303,3,7098,2500,1376,10,1972,25,12374,20,0,0,0,0,0,0,4433,1 -1838,KNOCKER,Knocker,Knocker,50,7755,0,2202,4023,1,889,990,28,50,25,44,50,62,65,60,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2208,10,2124,3,1732,5,0,0,0,0,4434,1 -1839,BYORGUE,Byorgue,Byorgue,86,38133,0,19000,9500,2,1340,2590,20,13,25,80,12,30,70,10,14,16,1,7,20,0x37B5,170,800,600,360,0,0,0,0,0,0,0,0,1270,50,5096,3,13027,150,12087,500,603,40,2530,1,7110,4365,0,0,0,0,4426,1 +1836,MAGMARING,Magmaring,Magmaring,110,13079,0,2536,1903,1,678,722,100,45,107,33,35,47,61,20,10,12,0,0,43,0x83,300,1472,384,288,0,0,0,0,0,0,0,0,7097,3000,757,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4432,1 +1837,IMP,Imp,Imp,129,36830,0,4594,3445,1,885,1091,56,75,66,83,65,88,72,27,10,12,0,6,63,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7122,3000,13303,3,7098,2500,1376,10,1972,25,12374,20,0,0,0,0,0,0,4433,1 +1838,KNOCKER,Knocker,Knocker,126,43900,0,3690,3768,1,633,736,126,62,93,62,58,56,99,70,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2208,10,2124,3,1732,5,0,0,0,0,4434,1 +1839,BYORGUE,Byorgue,Byrogue,135,92544,0,7725,5543,2,793,934,120,13,114,86,70,65,81,70,14,16,1,7,20,0x37B5,170,800,600,360,0,0,0,0,0,0,0,0,1270,50,5096,3,13027,150,12087,500,603,40,2530,1,7110,4365,0,0,0,0,4426,1 1840,GOLDEN_SAVAGE,Golden Savage,Golden Savage,99,500,0,1,1,1,500,700,100,99,0,1,1,50,120,1,10,12,2,2,42,0xF1,150,1960,480,384,0,0,0,0,0,0,0,0,610,3000,7444,100,616,5,969,500,714,100,5159,1,12238,3000,12239,3000,0,0,0,0 1841,G_SNAKE_,Snake Lord's Minion,Snake Lord's Minion,15,10,0,1,1,1,46,55,100,99,1,15,15,10,35,5,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,0,7720,2000,12245,200,7721,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1842,G_ANACONDAQ_,Snake Lord's Minion,Snake Lord's Minion,23,15,0,1,1,1,124,157,100,99,1,23,28,10,36,5,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,0,7720,3500,12245,400,7721,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -900,30 +900,30 @@ 1863,E_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,25,4500,0,0,0,1,292,406,14,10,20,15,15,5,15,5,10,12,1,2,42,0x83,160,1120,552,511,0,0,0,0,0,0,0,0,7860,5000,7861,5000,7862,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Cursed Abbey -1864,ZOMBIE_SLAUGHTER,Zombie Slaughter,Zombie Slaughter,77,43000,0,12000,8500,1,1055,1655,35,45,1,30,50,1,75,35,10,12,1,1,69,0x3695,200,676,648,432,0,0,0,0,0,0,0,0,7752,3000,13404,10,934,1500,7753,3000,938,3000,0,0,0,0,0,0,0,0,4435,1 -1865,RAGGED_ZOMBIE,Ragged Zombie,Ragged Zombie,75,25000,0,8500,5500,9,1200,1500,25,35,1,77,25,10,101,50,10,12,1,1,69,0x3695,150,1960,576,420,0,0,0,0,0,0,0,0,7752,3000,2424,15,934,1500,932,4500,2703,2,13107,10,0,0,0,0,0,0,4436,1 -1866,HELL_POODLE,Hell Poodle,Hell Poodle,71,9000,0,4000,3000,1,400,600,35,20,5,26,14,5,39,10,10,12,0,6,27,0x3795,140,824,432,360,0,0,0,0,0,0,0,0,528,5000,13028,10,1268,10,932,4500,628,20,919,5500,537,400,0,0,0,0,4437,1 -1867,BANSHEE,Banshee,Banshee,81,35111,0,17000,12000,1,1666,2609,30,55,30,74,1,120,75,1,10,12,1,6,47,0x3795,150,576,504,504,0,0,0,0,0,0,0,0,7751,3000,2365,10,13027,10,2528,10,934,1500,7054,5335,0,0,0,0,0,0,4438,1 +1864,ZOMBIE_SLAUGHTER,Zombie Slaughter,Zombie Slaughter,124,40440,0,3938,2702,1,707,824,100,45,117,58,82,13,97,21,10,12,1,1,69,0x3695,200,676,648,432,0,0,0,0,0,0,0,0,7752,3000,13404,10,934,1500,7753,3000,938,3000,0,0,0,0,0,0,0,0,4435,1 +1865,RAGGED_ZOMBIE,Ragged Zombie,Ragged Zombie,123,38574,0,3515,3087,9,810,940,85,35,81,50,64,56,127,23,10,12,1,1,69,0x3695,150,1960,576,420,0,0,0,0,0,0,0,0,7752,3000,2424,15,934,1500,932,4500,2703,2,13107,10,0,0,0,0,0,0,4436,1 +1866,HELL_POODLE,Hell Poodle,Hellhound,115,17168,0,2565,1923,1,642,787,86,20,114,56,59,82,77,54,10,12,0,6,27,0x3795,140,824,432,360,0,0,0,0,0,0,0,0,528,5000,13028,10,1268,10,932,4500,628,20,919,5500,537,400,0,0,0,0,4437,1 +1867,BANSHEE,Banshee,Banshee,130,48666,0,4520,3500,1,724,1127,73,96,97,71,55,123,98,72,10,12,1,6,47,0x3795,150,576,504,504,0,0,0,0,0,0,0,0,7751,3000,2365,10,13027,10,2528,10,934,1500,7054,5335,0,0,0,0,0,0,4438,1 1868,G_BANSHEE,Banshee,Banshee,81,35111,0,0,0,1,1666,2609,30,55,30,74,1,120,120,1,10,12,1,6,47,0x3795,150,576,504,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1869,FLAME_SKULL,Flame Skull,Flame Skull,60,10080,0,3000,2600,1,100,1200,20,40,50,100,30,40,140,110,10,12,0,6,68,0x3195,150,972,648,432,0,0,0,0,0,0,0,0,7005,5000,2425,20,13170,20,958,6000,0,0,0,0,0,0,0,0,0,0,4439,1 -1870,NECROMANCER,Necromancer,Necromancer,88,98000,0,45000,35000,1,3500,4000,0,40,1,50,1,190,166,10,10,12,1,1,89,0x37B5,150,1816,1320,420,0,0,0,0,0,0,0,0,7752,3000,1624,20,932,4500,2532,10,717,100,609,100,7117,1500,0,0,0,0,4440,1 -1871,FALLINGBISHOP,Fallen Bishop,Fallen Bishop Hibram,80,3333333,0,1111111,1111111,1,3220,5040,50,0,1,80,15,126,120,20,10,12,1,6,47,0x37B5,150,432,1152,360,555555,10000,607,5500,617,5000,617,5000,523,10000,1420,1000,2677,500,1422,1000,985,5432,1614,2000,0,0,0,0,0,0,4441,1 -1872,BEELZEBUB_FLY,Hell Fly,Hell Fly,66,500000,0,0,0,1,1200,2000,25,15,33,105,60,15,72,30,10,12,0,4,84,0x37B5,100,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1873,BEELZEBUB,Beelzebub,Beelzebub,98,6666666,0,0,0,1,4100,4960,40,35,6,110,200,250,120,66,10,12,0,6,88,0x37B5,100,100,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1874,BEELZEBUB_,Beelzebub,Beelzebub,98,6666666,0,6666666,6666666,2,10000,13410,40,40,6,110,200,250,166,66,10,12,2,6,88,0x37B5,100,212,504,432,3333333,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1 -1875,TRISTAN_3RD,Tristan III,Dead King,80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1869,FLAME_SKULL,Flame Skull,Flame Skull,121,21276,0,2332,2890,1,767,902,93,40,111,90,60,70,99,65,10,12,0,6,68,0x3195,150,972,648,432,0,0,0,0,0,0,0,0,7005,5000,2425,20,13170,20,958,6000,0,0,0,0,0,0,0,0,0,0,4439,1 +1870,NECROMANCER,Necromancer,Necromancer,133,91304,0,5580,4185,1,706,1112,84,73,108,54,77,116,91,30,10,12,1,1,89,0x37B5,150,1816,1320,420,0,0,0,0,0,0,0,0,7752,3000,1624,20,932,4500,2532,10,717,100,609,100,7117,1500,0,0,0,0,4440,1 +1871,FALLINGBISHOP,Fallen Bishop,Falling Bishop,138,5655000,0,2700000,1890000,1,2860,4496,274,182,186,165,95,226,182,86,10,12,1,6,47,0x37B5,150,432,1152,360,1350000,10000,607,5500,617,5000,617,5000,523,10000,1420,1000,2677,500,1422,1000,985,5432,1614,2000,0,0,0,0,0,0,4441,1 +1872,BEELZEBUB_FLY,Hell Fly,Hell Fly,127,502000,0,0,0,1,643,795,98,55,99,90,52,55,89,80,10,12,0,4,84,0x37B5,100,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1873,BEELZEBUB,Beelzebub,Beelzebub,147,6805000,0,0,0,1,3500,5600,288,265,155,235,200,225,204,66,10,12,0,6,88,0x37B5,100,100,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1874,BEELZEBUB_,Beelzebub,Beelzebub,147,4805000,0,7050000,7050000,2,4200,8150,418,265,178,236,200,250,218,66,10,12,2,6,88,0x37B5,100,212,504,432,3525000,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1 +1875,TRISTAN_3RD,Tristan III,Tristan III,80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1876,E_LORD_OF_DEATH,Lord of the Dead,Lord of the Dead,99,99000000,0,131343,43345,3,3430,4232,75,73,120,120,120,169,150,106,10,12,2,6,67,0x37B5,180,1446,1296,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1877,CRYSTAL_5,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,999,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,7863,10,644,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1878,E_SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,2,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,7864,3000,906,1500,511,500,507,2000,508,1500,914,500,0,0,0,0,0,0,0,0 1879,ECLIPSE_P,Eclipse Pet,Eclipse,6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Moscovia monsters -1880,WOOD_GOBLIN,Wood Goblin,Wood Goblin,42,6982,0,2201,1552,1,600,620,32,3,1,5,45,45,55,155,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0 -1881,LES,Les,Les,39,3080,0,1521,912,1,102,113,0,17,1,33,12,32,52,38,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0 -1882,VAVAYAGA,Baba Yaga,Baba Yaga,49,7444,0,2583,2583,2,255,387,4,29,1,76,24,88,55,18,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0 -1883,UZHAS,Uzhas,Uzhas,61,13707,0,4002,3003,1,293,960,11,34,1,33,19,72,75,77,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0 -1884,MAVKA,Mavka,Mavka,63,19200,0,8301,6353,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0 -1885,GOPINICH,Gopinich,Gopinich,85,299321,0,45250,16445,3,1868,6124,20,42,50,65,55,103,152,35,10,12,2,2,62,0x37B5,150,1536,864,432,22625,10000,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,0,0 +1880,WOOD_GOBLIN,Wood Goblin,Wood Goblin,81,5499,0,1106,1245,1,193,208,144,12,73,19,56,15,56,25,10,12,1,3,62,0x81,319,2304,840,360,0,0,0,0,0,0,0,0,2719,5,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0 +1881,LES,Les,Les,82,6216,0,1205,1356,1,270,300,123,30,63,20,35,25,52,30,10,12,1,3,82,0x1089,230,1728,720,576,0,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0 +1882,VAVAYAGA,Baba Yaga,Baba-Yaga,87,6498,0,1188,1337,2,282,353,63,60,69,45,30,60,51,35,10,12,1,7,21,0x3885,270,1536,600,420,0,0,0,0,0,0,0,0,7099,1000,7762,5000,1630,10,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0 +1883,UZHAS,Uzhas,Uzhas,85,7140,0,1294,1455,1,271,306,49,8,69,14,41,30,55,20,10,12,1,7,61,0x3885,200,576,672,384,0,0,0,0,0,0,0,0,520,900,1573,5,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0 +1884,MAVKA,Mavka,Mavka,84,5421,0,1253,1530,7,263,323,98,58,65,31,50,35,81,30,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,0,1572,5,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0 +1885,GOPINICH,Gopinich,Gopinich,97,1120500,0,714240,580320,3,1988,3849,355,121,127,102,143,102,152,76,10,12,2,2,62,0x37B5,150,1536,864,432,357120,10000,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,1737,100,1417,5,7444,5000,5007,1,0,0,0,0,0,0 1886,G_MAVKA,Mavka,Mavka,63,19200,0,0,0,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3885,170,1536,504,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Additional Monsters @@ -960,12 +960,12 @@ 1915,OBJ_B2,Pink Crystal,Pink Crystal,90,250,0,0,0,0,1,2,100,99,1,1,1,1,1,1,0,0,2,0,20,0x160,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Satan Morroc -1916,MOROCC,Satan Morroc,Satan Morroc,99,8388607,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1917,MOROCC_,Wounded Morroc,Wounded Morroc,99,8388607,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,576,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 -1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,61000,140000,1,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 -1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 -1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,143000,0,50000,80000,2,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 -1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 +1916,MOROCC,Satan Morroc,Satan Morroc,151,7000000,0,0,0,2,3560,6200,400,65,165,182,180,225,180,89,10,12,2,6,87,0x37B5,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1917,MOROCC_,Wounded Morroc,Wounded Morroc,151,5000000,0,4050000,3042000,2,3020,5900,425,65,165,185,200,245,180,89,10,12,2,6,87,0x37B5,100,576,540,432,2025000,5000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0 +1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,132,63900,0,4392,3294,1,1267,1412,199,35,126,91,63,61,76,37,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0 +1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,132,64922,0,5094,3821,1,1083,1242,92,5,121,86,71,65,75,44,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0 +1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,133,94800,0,5220,3780,2,812,1175,111,37,102,59,55,82,98,54,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0 +1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,134,77389,0,4608,4056,1,823,1422,109,54,114,88,62,97,109,43,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0 1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,35,150,152,30,180,186,70,10,12,2,8,27,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1923,G_MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1924,G_MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,1200000,0,0,0,2,16000,16001,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -974,11 +974,11 @@ 1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,10,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,0,1062,3000,1062,3000,0,0,535,3000,535,3000,535,3000,0,0,0,0,0,0,0,0 1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,10,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,960,504,0,0,0,0,0,0,0,0,1059,5000,1059,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1928,DEVIRUCHI_H,Deviruchi,Deviruchi,46,500,0,0,0,1,5,10,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,0,1038,3000,1039,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1929,BAPHOMET_I,Great Demon Baphomet,Great Demon Baphomet,98,4520000,0,4520000,2520000,2,16000,16001,35,45,1,152,5,85,200,95,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,6004,500,2514,7000,1181,5000,2655,100,2513,7000,2327,7000,1466,9000,0,0,0,0,4147,1 -1930,PIAMETTE,Piamette,Piamette,90,3000000,0,0,0,2,15000,20000,35,35,1,66,5,99,120,15,10,12,0,7,20,0x37B5,100,432,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1931,WISH_MAIDEN,Wish Maiden,Wish Maiden,98,3567200,0,0,0,3,32000,32001,25,42,100,120,30,120,220,210,10,12,2,8,28,0x37B5,100,576,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1932,GARDEN_KEEPER,Garden Keeper,Garden Keeper,80,100,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,0,0,42,0xE1,100,768,768,576,0,0,0,0,0,0,0,0,7839,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1933,GARDEN_WATCHER,Garden Watcher,Garden Watcher,81,300000,0,0,0,1,1666,2609,55,55,30,74,56,126,145,114,10,12,1,8,80,0x37B5,100,432,480,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1929,BAPHOMET_I,Great Demon Baphomet,Unsealed Baphomet,98,4520500,0,4068000,2268000,2,4200,6500,190,45,140,152,5,85,200,95,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,6004,500,2514,7000,1181,5000,2655,100,2513,7000,2327,7000,1466,9000,0,0,0,0,4147,1 +1930,PIAMETTE,Piamette,Piamette,90,3000500,0,0,0,2,1500,2700,56,35,1,66,5,99,120,15,10,12,0,7,20,0x37B5,100,432,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1931,WISH_MAIDEN,Wish Maiden,Wish Maiden,98,3567700,0,0,0,3,6500,9800,40,42,100,120,30,120,220,210,10,12,2,8,28,0x37B5,100,576,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1932,GARDEN_KEEPER,Garden Keeper,Garden Keeper,80,100,0,0,0,1,1,2,0,0,1,1,1,1,1,1,10,12,0,0,42,0xE1,100,768,768,576,0,0,0,0,0,0,0,0,7839,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1933,GARDEN_WATCHER,Garden Watcher,Garden Watcher,81,300000,0,0,0,1,1666,2609,88,55,30,57,56,126,128,114,10,12,1,8,80,0x37B5,100,432,480,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1934,BLUE_FLOWER,Blue Flower,Blue Flower,98,10000,0,0,0,0,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x60,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1935,RED_FLOWER,Red Flower,Red Flower,98,10000,0,0,0,0,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x60,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1936,YELL_FLOWER,Yellow Flower,Yellow Flower,98,10000,0,0,0,0,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x60,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -992,7 +992,7 @@ 1944,TREASURE_BOX47,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7836,80,658,500,12999,10000,984,4850,985,7275,1478,150,1732,150,2531,50,0,0,0,0 1945,TREASURE_BOX48,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7837,80,658,500,12999,10000,984,4850,985,7275,1624,150,1733,150,1821,150,0,0,0,0 1946,TREASURE_BOX49,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7838,80,658,500,12999,10000,984,4850,985,7275,1626,150,1270,150,2532,50,0,0,0,0 -1947,PIAMETTE_,Piamette,Piamette,90,500000,0,0,0,2,5000,6000,35,35,1,66,5,99,120,15,10,12,0,7,20,0x37B5,100,432,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1947,PIAMETTE_,Piamette,Piamette,90,500500,0,0,0,2,1500,2700,56,35,1,66,5,99,120,15,10,12,0,7,20,0x37B5,100,432,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1948,G_YGNIZEM,Ygnizem,Egnigem Cenia,58,11200,0,0,0,1,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,0x3885,145,576,432,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1949,B_S_GUARDIAN,Camp Guardian,Camp Guardian,86,457599,0,0,0,2,7590,9140,60,33,110,40,5,65,125,65,14,16,2,7,80,0x20A5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1950,B_B_GUARDIAN,Camp Guardian,Camp Guardian,80,241212,0,0,0,12,1840,2520,40,62,95,80,5,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1004,8 +1004,8 @@ // ? 1955,TREASURE_BOX_I,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,999,0,0,0,0,0,20,0x83,0,0,0,0,0,0,0,0,0,0,0,0,12281,3000,7849,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Endless Tower -1956,NAGHT_SIEGER,Naght Sieger,Naght Sieger,99,8000000,0,4000000,2000000,2,32000,64000,60,40,1,50,80,220,220,30,10,12,2,6,88,0x37B5,100,76,432,504,0,0,0,0,0,0,0,0,13412,9000,13413,9000,2542,9000,5017,9000,616,9000,2514,9000,7294,9000,0,0,0,0,0,0 -1957,ENTWEIHEN,Entweihen Crothen,Entweihen Crothen,90,5400000,0,2700000,1350000,12,32000,40000,44,66,1,70,40,250,220,30,14,16,1,6,87,0x1A4,0,140,540,576,0,0,0,0,0,0,0,0,1636,9000,1631,9000,2513,9000,1624,9000,616,9000,1618,9000,7291,9000,0,0,0,0,4451,1 +1956,NAGHT_SIEGER,Naght Sieger,Naght Sieger,99,5000000,0,3600000,1800000,2,5400,8600,410,40,190,60,80,220,264,30,10,12,2,6,88,0x37B5,100,76,432,504,0,0,0,0,0,0,0,0,13412,9000,13413,9000,2542,9000,5017,9000,616,9000,2514,9000,7294,9000,0,0,0,0,0,0 +1957,ENTWEIHEN,Entweihen Crothen,Entweihen Crothen,90,2400500,0,1430000,1215000,12,4400,8000,171,66,90,70,40,160,190,30,14,16,1,6,87,0x1A4,0,140,540,576,0,0,0,0,0,0,0,0,1636,9000,1631,9000,2513,9000,1624,9000,616,9000,1618,9000,7291,9000,0,0,0,0,4451,1 1958,G_ENTWEIHEN_R,Thorny Skeleton,Thorny Skeleton,89,5400000,0,0,0,12,4040,4720,44,66,1,35,33,180,125,30,14,16,0,6,87,0x1A4,0,432,288,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1959,G_ENTWEIHEN_H,Thorn of Recovery,Thorn of Recovery,89,350000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,14,16,0,6,88,0x1A4,0,2864,288,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1960,G_ENTWEIHEN_M,Thorn of Magic,Thorn of Magic,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,14,16,0,6,87,0x1A4,0,1024,288,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1024,13 +1024,13 @@ 1972,E_MARINA,Marina,Marina,21,2087,0,436,280,1,84,106,0,5,1,21,21,0,36,10,10,12,0,3,41,0x120,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,90,995,4,717,200,631,40,0,0,0,0,0,0,4055,1 1973,E_PORING,Poring,Poring,1,50,0,2,1,1,7,10,0,5,1,1,1,0,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,938,400,512,1000,713,1500,12303,3000,0,0,0,0,0,0,0,0,0,0 // WoE SE Guild Dungeon -1974,BANSHEE_MASTER,Banshee Master,Banshee Master,84,47222,0,30000,24000,2,2666,3609,20,40,30,74,1,180,105,1,10,12,1,6,47,0x3795,150,676,504,504,0,0,0,0,0,0,0,0,7054,5335,7751,3000,2365,10,2748,2,2528,10,934,1500,2135,20,0,0,0,0,4450,1 -1975,BEHOLDER_MASTER,Beholder Master,Beholder master,70,24150,0,9000,11400,6,1723,2300,17,30,60,62,25,89,85,32,10,12,1,0,44,0x3885,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,2386,10,603,2,2749,2,0,0,0,0,0,0 -1976,COBALT_MINERAL,Cobalt Mineral,Cobalt Mineral,72,29665,0,12332,10379,1,1446,2979,40,30,60,77,35,57,77,32,10,12,1,0,40,0x3885,200,648,480,360,0,0,0,0,0,0,0,0,7321,3000,728,500,13414,5,984,80,1011,800,715,100,969,2,0,0,0,0,714,2 -1977,HEAVY_METALING,Heavy Metaling,Heavy Metaling,73,28433,0,9320,8831,1,1350,1700,40,30,30,65,28,40,77,2,10,12,0,0,20,0x3885,200,384,672,480,0,0,0,0,0,0,0,0,7325,4000,1002,1000,998,500,7126,1000,7317,200,13038,5,7312,5000,0,0,0,0,0,0 -1978,HELL_APOCALIPS,Hell Apocalips,Hell Apocalypse,86,65433,0,46666,32000,2,5733,6073,62,23,1,48,30,98,110,85,10,12,2,0,60,0x3885,250,1840,1440,384,0,0,0,0,0,0,0,0,7095,5335,999,2500,7094,2400,7093,2200,2506,20,985,5,2391,1,0,0,0,0,1484,1 -1979,ZAKUDAM,Zukadam,Zakudam,82,43699,0,27213,16300,3,2000,3227,30,30,65,65,35,75,80,15,10,12,2,7,60,0x3885,180,580,288,360,0,0,0,0,0,0,0,0,7317,5000,999,500,984,200,985,200,13156,5,13167,5,2390,10,0,0,0,0,0,0 -1980,KUBLIN,Kubkin,Kublin,85,1176000,0,100000,100000,1,1180,1400,20,10,1,106,25,40,72,20,10,12,1,7,22,0x37B5,100,964,648,300,100000,5000,6010,10000,0,0,0,0,998,270,911,9000,756,43,2297,3,0,0,0,0,507,1800,0,0,0,0,0,0 +1974,BANSHEE_MASTER,Banshee Master,Banshee Master,118,20320,0,3402,2556,2,599,897,87,94,121,58,48,122,60,44,10,12,1,6,47,0x3795,150,676,504,504,0,0,0,0,0,0,0,0,7054,5335,7751,3000,2365,10,2748,2,2528,10,934,1500,2135,20,0,0,0,0,4450,1 +1975,BEHOLDER_MASTER,Beholder Master,Beholder Master,106,10135,0,2430,1845,6,471,559,73,62,103,67,42,69,69,32,10,12,1,0,44,0x3885,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,2386,10,603,2,2749,2,0,0,0,0,0,0 +1976,COBALT_MINERAL,Cobalt Mineral,Cobalt Mineral,113,15800,0,2700,2070,1,645,737,113,44,110,55,65,57,95,41,10,12,1,0,40,0x3885,200,648,480,360,0,0,0,0,0,0,0,0,7321,3000,728,500,13414,5,984,80,1011,800,715,100,969,2,0,0,0,0,714,2 +1977,HEAVY_METALING,Heavy Metaling,Heavy Metaling,107,11500,0,2610,1980,1,672,784,134,65,105,63,86,58,56,38,10,12,0,0,20,0x3885,200,384,672,480,0,0,0,0,0,0,0,0,7325,4000,1002,1000,998,500,7126,1000,7317,200,13038,5,7312,5000,0,0,0,0,0,0 +1978,HELL_APOCALIPS,Hell Apocalips,Hell Vesper,121,22100,0,3348,3020,2,780,902,155,43,135,62,80,48,89,37,10,12,2,0,60,0x3885,250,1840,1440,384,0,0,0,0,0,0,0,0,7095,5335,999,2500,7094,2400,7093,2200,2506,20,985,5,2391,1,0,0,0,0,1484,1 +1979,ZAKUDAM,Zukadam,Zakudam,115,17200,0,2880,2160,3,650,780,106,92,122,66,70,61,66,55,10,12,2,7,60,0x3885,180,580,288,360,0,0,0,0,0,0,0,0,7317,5000,999,500,984,200,985,200,13156,5,13167,5,2390,10,0,0,0,0,0,0 +1980,KUBLIN,Kubkin,Kublin,85,633600,0,90000,90000,1,1180,1400,22,10,85,81,25,40,55,20,10,12,1,7,22,0x37B5,100,964,648,900,45000,5000,6010,10000,0,0,0,0,998,270,911,9000,756,43,2297,3,0,0,0,0,507,1800,0,0,0,0,0,0 // Orc Dungeon Instance 1981,I_HIGH_ORC,Safeguard Chief,Safeguard Chief,88,111111,0,3618,1639,1,428,533,15,5,55,46,55,35,82,40,10,12,2,7,43,0x3695,150,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1982,I_ORC_ARCHER,Orc Sniper,Orc Sniper,85,62000,0,1729,1787,9,1310,1390,10,5,1,44,25,20,125,20,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1038,20 +1038,20 @@ 1984,I_ORC_LADY,Shaman Cargalache,Shaman Cargalache,58,50058,0,4870,98,1,823,1212,35,10,60,35,52,18,79,20,10,12,1,7,42,0x3695,145,1050,900,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Another World (13.1) 1985,DANDELION,Dandelion Member,Dandelion Member,37,5176,0,0,0,1,305,360,0,10,28,19,32,0,63,20,10,12,1,7,47,0x3695,250,1772,72,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1986,TATACHO,Tatacho,Tatacho,106,39500,0,23700,13825,2,10000,11000,20,17,106,40,30,25,115,6,10,12,1,2,22,0x108B,150,1000,768,360,0,0,0,0,0,0,0,0,1544,20,1925,10,6020,4000,6021,3000,579,3100,516,3000,0,0,0,0,0,0,0,0 -1987,CENTIPEDE,Centipede,Centipede,110,45662,0,27397,15982,2,15000,16000,40,25,112,43,30,5,131,12,10,12,1,4,45,0x3795,150,1000,792,336,0,0,0,0,0,0,0,0,2746,2,2747,2,1741,10,1042,5335,912,5000,955,9000,943,2500,0,0,0,0,4447,1 -1988,NEPENTHES,Nepenthes,Nepenthes,75,10350,0,5175,2587,7,415,565,25,10,75,20,30,5,65,5,10,12,1,3,45,0x84,1000,500,576,504,0,0,0,0,0,0,0,0,5399,1,1979,1,1926,1,1740,1,6041,3000,993,50,905,9000,0,0,0,0,0,0 -1989,HILLSRION,Hillslion,Hillslion,105,34600,0,20760,12110,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x308D,100,400,780,576,0,0,0,0,0,0,0,0,2440,10,1825,20,6032,3000,6020,2000,1268,10,7063,120,7054,4850,0,0,0,0,4453,1 -1990,HARDROCK_MOMMOTH,Hardrock Mammoth,Hardrock Mammoth,115,4137000,0,827400,413700,2,30000,36000,50,60,115,35,1,30,150,15,10,12,2,2,62,0x37B5,150,1000,660,588,0,0,0,0,0,0,0,0,5398,100,2133,200,1483,500,13039,400,6022,9000,2257,20,985,9000,0,0,0,0,0,0 -1991,TENDRILRION,Tendrillion,Tendrilion,113,3657330,0,731466,365733,2,20000,24000,33,30,113,60,1,45,147,13,10,12,1,2,42,0x37B5,100,500,960,360,0,0,0,0,0,0,0,0,2544,500,1186,100,1637,100,6033,9000,6020,4000,7197,5335,7008,4850,0,0,0,0,0,0 -1992,CORNUS,Cornus,Cornus,108,41220,0,30854,4427,2,12000,13000,35,80,110,45,80,200,105,10,10,12,1,2,66,0x1089,120,1000,624,300,0,0,0,0,0,0,0,0,2387,10,2743,1,6023,4000,7063,3000,944,6000,2257,2,1420,1,0,0,0,0,4448,1 -1993,NAGA,Naga,Naga,111,46708,0,30360,16348,3,8000,8800,38,15,113,42,30,108,122,13,10,12,2,2,42,0x3695,150,400,864,432,0,0,0,0,0,0,0,0,2389,10,2134,10,1485,10,926,5000,936,3500,954,2000,1408,20,0,0,0,0,0,0 -1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,32600,0,16300,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,2744,2,955,9000,939,9000,518,300,992,160,526,200,943,3000,0,0,0,0,4445,1 -1995,PINGUICULA,Pinguicula,Pinguicula,80,13680,0,6840,3420,1,600,720,25,5,102,23,30,10,86,2,10,12,1,3,62,0x308D,150,700,600,360,0,0,0,0,0,0,0,0,2745,1,1980,10,2270,10,7100,5000,7198,2000,7188,3000,712,1000,0,0,0,0,0,0 +1986,TATACHO,Tatacho,Tatacho,128,33336,0,3762,3092,2,727,799,151,14,119,33,70,56,78,33,10,12,1,2,22,0x108B,200,1000,768,360,0,0,0,0,0,0,0,0,1544,20,1925,10,6020,4000,6021,3000,579,3100,516,3000,0,0,0,0,0,0,0,0 +1987,CENTIPEDE,Centipede,Centipede,125,24992,0,3201,2711,2,601,713,143,25,133,71,69,39,86,49,10,12,1,4,45,0x3795,150,1000,792,336,0,0,0,0,0,0,0,0,2746,2,2747,2,1741,10,1042,5335,912,5000,955,9000,943,2500,0,0,0,0,4447,1 +1988,NEPENTHES,Nepenthes,Nepenthes,114,15099,0,2599,1793,7,602,727,25,5,94,32,41,39,150,59,10,12,1,3,45,0x84,1000,500,576,504,0,0,0,0,0,0,0,0,5399,1,1979,1,1926,1,1740,1,6041,3000,993,50,905,9000,0,0,0,0,0,0 +1989,HILLSRION,Hillslion,Hillthrion,123,21422,0,2909,1698,1,450,552,83,11,110,69,72,41,102,12,10,12,0,2,22,0x308D,130,400,780,576,0,0,0,0,0,0,0,0,2440,10,1825,20,6032,3000,6020,2000,1268,10,7063,120,7054,4850,0,0,0,0,4453,1 +1990,HARDROCK_MOMMOTH,Hardrock Mammoth,Hardrock Mammoth,137,1900944,0,142293,81178,2,1552,2326,449,43,191,66,102,49,131,51,10,12,2,2,62,0x37B5,150,1000,660,588,0,0,0,0,0,0,0,0,5398,100,2133,200,1483,500,13039,400,6022,9000,2257,20,985,9000,0,0,0,0,0,0 +1991,TENDRILRION,Tendrillion,Tendrillion,126,1397451,0,100772,75299,2,1002,2322,132,123,144,66,77,181,145,132,10,12,1,2,42,0x37B5,100,500,960,360,0,0,0,0,0,0,0,0,2544,500,1186,100,1637,100,6033,9000,6020,4000,7197,5335,7008,4850,0,0,0,0,0,0 +1992,CORNUS,Cornus,Cornus,120,20722,0,6240,4004,2,288,810,66,95,51,47,59,99,93,77,10,12,1,2,66,0x1089,120,1000,624,300,0,0,0,0,0,0,0,0,2387,10,2743,1,6023,4000,7063,3000,944,6000,2257,2,1420,1,0,0,0,0,4448,1 +1993,NAGA,Naga,Naga,117,21099,0,2944,2212,3,489,591,72,5,112,65,71,32,71,33,10,12,2,2,42,0x3695,150,400,864,432,0,0,0,0,0,0,0,0,2389,10,2134,10,1485,10,926,5000,936,3500,954,2000,1408,20,0,0,0,0,0,0 +1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,109,12466,0,1622,1806,1,299,410,59,55,88,89,55,32,119,59,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,2744,2,955,9000,939,9000,518,300,992,160,526,200,943,3000,0,0,0,0,4445,1 +1995,PINGUICULA,Pinguicula,Pinguicula,105,13058,0,2221,1662,1,189,511,46,77,67,60,64,107,64,34,10,12,1,3,62,0x308D,200,700,600,360,0,0,0,0,0,0,0,0,2745,1,1980,10,2270,10,7100,5000,7198,2000,7188,3000,712,1000,0,0,0,0,0,0 1996,BACSOJIN_T,Bacsojin,White Lady,85,253221,0,45250,16445,3,1868,6124,20,55,52,65,44,112,152,35,10,12,2,7,64,0x37B5,130,576,960,480,0,0,0,0,0,0,0,0,//5411,500,2638,80,2639,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1997,G_TATACHO,Tatacho,Tatacho,106,39500,0,0,0,2,10000,11000,20,17,106,40,30,25,115,6,10,12,1,2,22,0x108B,150,1000,768,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1998,G_HILLSRION,Hillslion,Hillslion,105,34600,0,0,0,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x308D,100,400,780,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1999,CENTIPEDE_LARVA,Centipede Larva,Centipede Larva,80,12000,0,3600,4800,2,948,1115,20,20,80,33,15,3,75,10,10,12,0,4,25,0x3795,150,1000,792,336,0,0,0,0,0,0,0,0,2406,9,732,50,0,0,1042,5335,912,5000,955,9000,943,2500,0,0,0,0,4452,1 +1999,CENTIPEDE_LARVA,Centipede Larva,Centipede Larva,118,20667,0,2930,2003,2,521,609,98,17,103,62,66,27,77,44,10,12,0,4,25,0x3795,150,1000,792,336,0,0,0,0,0,0,0,0,2406,9,732,50,0,0,1042,5335,912,5000,955,9000,943,2500,0,0,0,0,4452,1 //2000,M_GAMEMASTER,Male Game Master,Game Master,50,7000,250,0,0,1,25,25,10,10,44,121,1,60,75,110,10,12,1,7,20,0x120,200,300,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2001,F_GAMEMASTER,Female Game Master,Game Master,50,7000,250,0,0,1,25,25,10,10,44,121,1,60,75,110,10,12,1,7,20,0x120,200,300,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2002,T_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,50,8000,0,3982,1766,1,585,813,29,21,45,61,5,15,77,90,10,12,1,2,42,0x120,160,1120,552,511,0,0,0,0,0,0,0,0,12190,1000,6061,500,6068,1500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1066,18 +1066,18 @@ //2011,E_GHOUL,Ghoul,Ghoul,40,99999,0,1088,622,1,2100,2500,100,20,1,20,29,0,180,20,10,12,1,1,49,0x120,100,2456,912,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2012,E_ZOMBIE,Zombie,Zombie,15,99999,0,50,33,1,335,395,100,10,1,8,7,0,60,0,10,12,1,1,29,0x120,150,2612,912,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // Another World (13.2) -2013,DRACO,Draco,Draco,82,18300,0,6100,4100,1,410,710,10,5,1,23,30,34,62,2,10,12,1,9,22,0x1089,250,576,960,504,0,0,0,0,0,0,0,0,6073,3000,7123,100,1035,100,1037,1000,1036,1000,518,500,0,0,0,0,0,0,4444,1 -2014,DRACO_EGG,Draco Egg,Draco Egg,67,9822,0,1200,1600,0,1,2,56,40,1,1,56,34,1,63,10,12,1,9,82,0x0,1000,24,0,0,0,0,0,0,0,0,0,0,7032,5000,5015,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2015,PINGUICULA_D,Dark Pinguicula,Dark Pinguicula,83,8780,0,7740,5200,1,600,1450,15,5,1,23,22,12,89,2,10,12,1,3,45,0x308D,290,1426,600,360,0,0,0,0,0,0,0,0,7100,5000,7198,2000,7188,3000,972,10,6086,1000,0,0,0,0,0,0,0,0,0,0 -2016,AQUA_ELEMENTAL,Aqua Elemental,Aqua Elemental,83,33220,0,5430,15300,1,400,1600,8,12,1,23,19,87,77,2,10,12,2,0,81,0x3095,230,504,960,576,0,0,0,0,0,0,0,0,6075,1000,7326,5000,12353,100,0,0,0,0,0,0,0,0,0,0,0,0,4443,1 -2017,RATA,Rata,Rata,107,216600,0,70012,34000,1,8000,15000,32,52,1,51,22,132,99,15,10,12,1,7,62,0x3295,150,792,540,420,0,0,0,0,0,0,0,0,12346,5000,1026,5000,6089,500,1548,100,0,0,0,0,0,0,0,0,0,0,0,0 -2018,DUNEYRR,Duneyrr,Duneyrr,107,265100,0,83030,52000,1,16000,19000,39,35,1,60,45,89,105,15,10,12,1,7,62,0x3295,200,672,420,360,0,0,0,0,0,0,0,0,515,5000,6020,4000,6089,500,2783,1,1188,10,1384,100,0,0,0,0,0,0,0,0 -2019,ANCIENT_TREE,Ancient Tree,Ancient Tree,102,30030,0,11020,8900,1,13200,17400,39,43,1,30,73,58,45,30,10,12,2,3,62,0x308D,290,504,960,576,0,0,0,0,0,0,0,0,7197,1000,7198,1000,7201,5000,1643,10,2450,30,0,0,0,0,0,0,0,0,0,0 -2020,RHYNCHO,Rhyncho,Rhyncho,85,18900,0,2040,6000,1,350,2300,5,19,1,56,12,35,89,10,10,12,1,0,61,0x308D,240,576,660,420,0,0,0,0,0,0,0,0,7326,5000,972,5,6087,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2021,PHYLLA,Phylla,Phylla,85,23880,0,3040,6600,10,350,2550,8,22,1,59,15,25,99,10,10,12,1,0,61,0x2085,240,360,780,432,0,0,0,0,0,0,0,0,7326,5000,971,5,6088,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2022,S_NYDHOG,Nidhoggr's Shadow,Nidhoggr's Shadow,117,3450000,0,4800000,3900000,2,17000,49000,60,75,1,34,62,236,188,34,10,12,2,9,87,0x37B5,150,1596,1620,864,2400000,1000,0,0,0,0,0,0,6091,5000,7444,5000,2610,5000,1484,500,1170,500,1417,500,2554,2000,0,0,0,0,0,0 -2023,DARK_SHADOW,Dark Shadow,Dark Shadow,114,42900,0,21000,14000,1,10000,15000,35,44,1,23,12,145,102,60,10,12,0,0,47,0x3195,220,768,1776,648,0,0,0,0,0,0,0,0,7205,5000,2609,1000,13038,5,6089,1000,2783,5,1385,10,0,0,0,0,0,0,0,0 -2024,BRADIUM_GOLEM,Bradium Golem,Bradium Golem,101,45200,0,14000,18920,1,12000,13000,78,22,0,10,82,25,60,12,10,12,2,0,42,0x3295,300,1008,1200,540,0,0,0,0,0,0,0,0,7067,3000,953,5000,6090,500,2138,10,0,0,0,0,0,0,0,0,0,0,0,0 +2013,DRACO,Draco,Draco,114,20099,0,1995,1205,1,556,666,56,3,21,58,47,34,71,66,10,12,0,9,22,0x1089,250,576,960,504,0,0,0,0,0,0,0,0,6073,3000,7123,100,1035,100,1037,1000,1036,1000,518,500,0,0,0,0,0,0,4444,1 +2014,DRACO_EGG,Draco Egg,Draco Egg,101,100000,0,2000,1500,0,1,2,384,30,1,1,135,92,1,98,10,12,0,9,82,0x0,1000,24,0,0,0,0,0,0,0,0,0,0,7032,5000,5015,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2015,PINGUICULA_D,Dark Pinguicula,Dark Pinguicula,113,17002,0,2101,2419,1,251,640,59,35,89,55,55,95,66,12,10,12,1,3,45,0x308D,290,1426,600,360,0,0,0,0,0,0,0,0,7100,5000,7198,2000,7188,3000,972,10,6086,1000,0,0,0,0,0,0,0,0,0,0 +2016,AQUA_ELEMENTAL,Aqua Elemental,Aqua Elemental,121,33209,0,4155,4155,1,616,1066,23,8,95,61,25,25,86,40,10,12,2,0,81,0x3095,230,504,960,576,0,0,0,0,0,0,0,0,6075,1000,7326,5000,12353,100,0,0,0,0,0,0,0,0,0,0,0,0,4443,1 +2017,RATA,Rata,Rata,131,58299,0,7787,6119,1,720,931,81,46,101,74,71,51,98,56,10,12,1,7,62,0x3295,150,792,540,420,0,0,0,0,0,0,0,0,12346,5000,1026,5000,6089,500,1548,100,0,0,0,0,0,0,0,0,0,0,0,0 +2018,DUNEYRR,Duneyrr,Duneyrr,135,63342,0,8601,7298,1,833,1134,144,28,133,69,72,55,110,44,10,12,1,7,62,0x3295,200,672,420,360,0,0,0,0,0,0,0,0,515,5000,6020,4000,6089,500,2783,1,1188,10,1384,100,0,0,0,0,0,0,0,0 +2019,ANCIENT_TREE,Ancient Tree,Ancient Tree,144,388933,0,7308,5481,1,788,864,226,37,148,72,93,58,99,30,10,12,2,3,62,0x308D,290,504,960,576,0,0,0,0,0,0,0,0,7197,1000,7198,1000,7201,5000,1643,10,2450,30,0,0,0,0,0,0,0,0,0,0 +2020,RHYNCHO,Rhyncho,Rhyncho,139,337220,0,6107,4579,1,575,776,68,12,119,98,62,48,79,46,10,12,1,0,61,0x308D,240,576,660,420,0,0,0,0,0,0,0,0,7326,5000,972,5,6087,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2021,PHYLLA,Phylla,Phylla,139,345560,0,6107,4579,10,550,726,61,14,107,85,60,58,101,42,10,12,1,0,61,0x2085,240,360,780,432,0,0,0,0,0,0,0,0,7326,5000,971,5,6088,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2022,S_NYDHOG,Nidhoggr's Shadow,Nidhoggur's Shadow,117,3452000,0,4320000,3510000,2,4040,7880,60,75,1,34,62,236,188,34,10,12,2,9,87,0x37B5,150,1596,1620,864,2160000,10000,0,0,0,0,0,0,6091,5000,7444,5000,2610,5000,1484,500,1170,500,1417,500,2554,2000,0,0,0,0,0,0 +2023,DARK_SHADOW,Dark Shadow,Dark Shadow,147,434300,0,7630,5721,1,902,1059,140,44,155,126,89,108,142,76,10,12,0,0,47,0x3195,220,768,1776,648,0,0,0,0,0,0,0,0,7205,5000,2609,1000,13038,5,6089,1000,2783,5,1385,10,0,0,0,0,0,0,0,0 +2024,BRADIUM_GOLEM,Bradium Golem,Bradium Golem,133,45739,0,6553,3595,1,871,974,359,12,189,25,125,45,69,33,10,12,2,0,42,0x3295,300,1008,1200,540,0,0,0,0,0,0,0,0,7067,3000,953,5000,6090,500,2138,10,0,0,0,0,0,0,0,0,0,0,0,0 //2025,MYSTCASE_EVENT,Mystcase,Mystcase,10,15,0,0,0,1,160,360,99,99,65,50,25,5,48,75,10,12,1,0,20,0x120,400,1248,1248,432,0,0,0,0,0,0,0,0,14550,5000,14546,5000,12355,50,6092,2000,7175,2000,7174,2000,529,3000,0,0,0,0,530,3000 2026,DANDELION_,Runaway Dandelion Member,Runaway Dandelion Member,90,552000,0,50000,25000,1,3050,4300,25,35,1,66,66,45,88,66,10,12,1,7,27,0x3695,230,1772,72,384,0,0,0,0,0,0,0,0,7031,5000,579,500,7016,2000,581,3000,12125,500,511,5000,7032,3000,0,0,0,0,902,2000 2027,G_DARK_SHADOW,Dark Shadow,Dark Shadow,114,42900,0,0,0,1,10000,15000,35,44,1,23,12,145,102,60,10,12,0,0,47,0x3795,220,768,1776,648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1121,13 +1121,13 @@ //2065,E_METALING,Metaling,Metaling,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2066,E_ANOPHELES,Anopheles,Anopheles,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2067,E_ANOPHELES_,Anopheles,Anopheles,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2068,BOITATA,Boitata,Boitata,93,1283990,0,74288,77950,2,1060,2022,32,66,140,99,30,109,100,90,10,12,2,0,63,0x37B5,200,1150,1150,288,37144,10000,0,0,0,0,0,0,7444,5000,985,1000,984,1000,607,500,1377,100,1422,100,1471,100,0,0,0,0,0,0 +2068,BOITATA,Boitata,Boitata,93,1283990,0,74288,77950,2,1060,2022,32,66,140,99,30,109,100,90,10,12,2,2,63,0x37B5,200,1150,1150,288,37144,10000,0,0,0,0,0,0,7444,5000,985,1000,984,1000,607,500,1377,100,1422,100,1471,100,0,0,0,0,0,0 2069,IARA,Iara,Iara,79,5890,0,1070,890,1,171,270,0,76,69,14,41,60,69,20,10,12,1,5,61,0x91,200,672,380,288,0,0,0,0,0,0,0,0,950,9000,951,500,747,100,748,50,710,10,995,5,2334,1,0,0,0,0,0,0 -2070,PIRANHA,Piranha,Piranha,75,4522,0,899,1023,1,182,223,7,12,69,45,30,30,66,35,10,12,1,5,61,0x3885,200,768,768,384,0,0,0,0,0,0,0,0,963,9000,956,600,1053,500,1054,500,995,5,1249,5,13027,1,0,0,0,0,0,0 +2070,PIRANHA,Piranha,Piranha,75,4522,0,899,1023,1,182,223,7,12,69,45,30,30,66,35,10,12,2,5,61,0x3885,200,768,768,384,0,0,0,0,0,0,0,0,963,9000,956,600,1053,500,1054,500,995,5,1249,5,13027,1,0,0,0,0,0,0 2071,HEADLESS_MULE,Headless Mule,Headless Mule,80,6620,0,1011,1120,1,210,267,33,44,68,51,50,35,67,20,10,12,2,6,63,0x3985,165,1216,816,432,0,0,0,0,0,0,0,0,7120,4000,7097,1000,7122,1000,2317,5,1255,2,1269,1,2317,1,0,0,0,0,0,0 2072,JAGUAR,Jaguar,Jaguar,71,3914,0,720,512,1,192,234,44,15,69,30,45,5,59,5,10,12,1,2,42,0x3885,150,1250,580,360,0,0,0,0,0,0,0,0,7171,3000,7172,2000,919,1000,756,40,1810,1,0,0,0,0,0,0,0,0,0,0 -2073,TOUCAN,Toucan,Toucan,70,3640,0,659,544,1,166,201,12,12,54,14,40,35,44,10,10,12,0,2,44,0x3885,155,1450,960,480,0,0,0,0,0,0,0,0,917,3000,7053,1000,2612,200,508,100,510,50,0,0,0,0,0,0,0,0,0,0 -2074,CURUPIRA,Curupira,Curupira,68,3096,0,622,450,1,140,175,42,12,32,23,38,20,45,10,10,12,1,6,22,0x118B,250,530,530,384,0,0,0,0,0,0,0,0,517,3000,7267,500,757,250,1505,100,1011,10,0,0,0,0,0,0,0,0,0,0 +2073,TOUCAN,Toucan,Toucan,70,3640,0,659,544,1,166,201,12,12,54,14,40,35,44,10,10,12,1,2,44,0x3885,155,1450,960,480,0,0,0,0,0,0,0,0,917,3000,7053,1000,2612,200,508,100,510,50,0,0,0,0,0,0,0,0,0,0 +2074,CURUPIRA,Curupira,Curupira,68,3096,0,622,450,1,140,175,42,12,32,23,38,20,45,10,10,12,1,7,22,0x118B,250,530,530,384,0,0,0,0,0,0,0,0,517,3000,7267,500,757,250,1505,100,1011,10,0,0,0,0,0,0,0,0,0,0 //2075,E_VADON_X,Vadon,Vadon,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2076,S_WIND_GHOST,Wind Ghost,Wind Ghost,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2077,S_SKOGUL,Skogul,Skogul,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/mob_penalty_db.txt b/db/mob_penalty_db.txt new file mode 100644 index 0000000000..775902a5dc --- /dev/null +++ b/db/mob_penalty_db.txt @@ -0,0 +1,40 @@ +// This database is currently unused, and is not read by the server. +// It is here only to illistrate design, with known information. +// With the recommended formatting to handle the level penelty system. +// +// Mob Level Penalty Database +// +// Structure of Database : +// Type or MOD ID,Level Difference:Percentage{,Level Difference:Percentage{,...}} +// +// 01: +// 0 Normal Mob EXP penalty. penalty or bonus to EXP from normal monsters relative to level. +// 1 Boss Mob EXP penalty. penalty or bonus to EXP from boss monsters relative to level. +// 2 Normal Mob Damage Penlty. penalty or bonus to damage done to normal monsters relative to level. +// 3 Boss Mob Damage Penlty. penalty or bonus to damage done to boss monsters relative to level. +// 4 Normal Mob Drop penalty. penalty or bonus to drops from normal monsters relative to level. +// 5 Boss Mob Drop penalty. penalty or bonus to drops from boss monsters relative to level. +// +// 02: +// Level Difference:Percentage Adustment. +// All levels below the highest or lowest value given will carry that adjustment to reamining levels. +// For example: +// If only 0:100 is given, all levels will receieve the 100% rate. +// Another example would be: +// If 0,13:0,12:25,11:50,10:100 is given, then a level difference of 13 levels and higher recievce 0 exp. +// While a 12 level difference will give 25% of hte exp the monster wold give normally. +// with a level difference of 11, 50%...and if you are 10 levels lower, 100%. +// + +// Normal Mob EXP penalty. +0,13:40,12:50,11:60,10:140,9:135,8:130,7:125,6:120,5:115,4:110,3:105,0:100,-1:100,-6:95,-11:90,-16:85,-21:60,-26:35,-31:10 +// Boss Mob EXP penalty. +1,0:100 +// Normal Mob Damage Penlty. +2,0:100 +// Boss Mob Damage Penlty. +3,0:100 +// Normal Mob Drop penalty. +4,71:50,61:60,51:70,41:80,31:90,0:100,-31:90,-41:80,-51:70,-61:60,-71:50 +// Boss Mob Drop penalty. +5,0:100 From 7926aea29762b0956949965d612bfefd2bdea29f Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 4 Nov 2010 23:17:12 +0000 Subject: [PATCH 031/129] This one's for you RedMageJoe! God speed! Fixing some typos in the comments in the unused database I just added :3 git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14446 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 5 +++++ db/mob_penalty_db.txt | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index a2b1ddd68b..81658086f0 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,11 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/04 + * Rev. 14445 Updated monster database. Most spawning monsters stats are now updated. [L0ne_W0lf] + - 'Ghost' mobs, and event monsters are not updated at this time. + - Information collected from RODE by Gepard. + * Added demonstrative mob_penalty_db. (unused.) 2010/11/02 * Fixed incorrect status change constants being used in cash food scripts. (bugreport:4477) [Paradox924X] 2010/10/23 diff --git a/db/mob_penalty_db.txt b/db/mob_penalty_db.txt index 775902a5dc..6e1ef849c2 100644 --- a/db/mob_penalty_db.txt +++ b/db/mob_penalty_db.txt @@ -1,6 +1,6 @@ // This database is currently unused, and is not read by the server. // It is here only to illistrate design, with known information. -// With the recommended formatting to handle the level penelty system. +// Recommended formatting to handle the level penalty system. // // Mob Level Penalty Database // @@ -22,7 +22,7 @@ // If only 0:100 is given, all levels will receieve the 100% rate. // Another example would be: // If 0,13:0,12:25,11:50,10:100 is given, then a level difference of 13 levels and higher recievce 0 exp. -// While a 12 level difference will give 25% of hte exp the monster wold give normally. +// While a 12 level difference will give 25% of the exp the monster would give normally. // with a level difference of 11, 50%...and if you are 10 levels lower, 100%. // From 6e8f281f4c448cbb179644a10fbaa6cd19768f7a Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 4 Nov 2010 23:45:33 +0000 Subject: [PATCH 032/129] Adding back a / that got removed in nowarpto.txt. THIS IS FOR YOU REDMAGEJOE. GOD SPEED. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14447 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/nowarpto.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index c99acc8ff7..ca81f6d358 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -1,4 +1,4 @@ -/===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= Map flags that disable warpto //===== By: ================================================== //= eAthena Dev Team From 3a3e2cde66a80dcf66d0f6c210b1a02531b68b50 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 5 Nov 2010 02:02:53 +0000 Subject: [PATCH 033/129] * Just a couple Bug fixes. :P - Added a missing close in quests_13_2.txt. (bugreport:4520) - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/nobranch.txt | 53 ++++++++++++++++++++++++++++++++-- conf/mapflag/nopvp.txt | 25 ++++++++++++++++ npc/Changelog.txt | 4 +++ npc/quests/quests_13_2.txt | 4 ++- npc/quests/quests_prontera.txt | 5 ++-- 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 8013e26356..3e91263da2 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -94,7 +94,7 @@ ra_temsky mapflag nobranch ve_in mapflag nobranch ve_in02 mapflag nobranch thor_camp mapflag nobranch -cave mapflag nobanch +cave mapflag nobranch // Job Quests ================== job_sword1 mapflag nobranch @@ -276,6 +276,27 @@ que_qaru03 mapflag nobranch que_qaru04 mapflag nobranch que_qaru05 mapflag nobranch +1@cata mapflag nobranch +2@cata mapflag nobranch +e_tower mapflag nobranch +1@tower mapflag nobranch +2@tower mapflag nobranch +3@tower mapflag nobranch +4@tower mapflag nobranch +5@tower mapflag nobranch +6@tower mapflag nobranch + +mid_camp mapflag nobranch +mid_campin mapflag nobranch +man_fild01 mapflag nobranch +moc_fild22b mapflag nobranch +que_dan01 mapflag nobranch +que_dan02 mapflag nobranch +schg_que01 mapflag nobranch +arug_que01 mapflag nobranch +1@orcs mapflag nobranch +2@orcs mapflag nobranch + // Battle Grounds ============== bat_c01 mapflag nobranch bat_c02 mapflag nobranch @@ -286,4 +307,32 @@ bat_b02 mapflag nobranch bat_a01 mapflag nobranch bat_a02 mapflag nobranch -//evt_zombie mapflag nobranch +1@nyd mapflag nobranch +2@nyd mapflag nobranch +manuk mapflag nobranch +man_fild02 mapflag nobranch +man_in01 mapflag nobranch +splendide mapflag nobranch +spl_in01 mapflag nobranch +spl_in02 mapflag nobranch + +moc_para01 mapflag nobranch +job3_arch01 mapflag nobranch +job3_arch02 mapflag nobranch +job3_arch03 mapflag nobranch +job3_guil01 mapflag nobranch +job3_guil02 mapflag nobranch +job3_guil03 mapflag nobranch +job3_rang01 mapflag nobranch +job3_rang02 mapflag nobranch +job3_rune01 mapflag nobranch +job3_rune02 mapflag nobranch +job3_rune03 mapflag nobranch +job3_war01 mapflag nobranch +job3_war02 mapflag nobranch +jupe_core2 mapflag nobranch + +brasilis mapflag nobranch +bra_in01 mapflag nobranch + +//evt_zombie mapflag nobranch \ No newline at end of file diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt index f982a1285f..70c29e6a1d 100644 --- a/conf/mapflag/nopvp.txt +++ b/conf/mapflag/nopvp.txt @@ -108,4 +108,29 @@ veins mapflag pvp off ve_in mapflag pvp off ve_in02 mapflag pvp off cave mapflag pvp off + +e_tower mapflag pvp off + +mid_camp mapflag pvp off +mid_campin mapflag pvp off +man_fild01 mapflag pvp off +moc_fild22b mapflag pvp off +que_dan01 mapflag pvp off +que_dan02 mapflag pvp off +schg_que01 mapflag pvp off +arug_que01 mapflag pvp off + +bat_room mapflag pvp off + +manuk mapflag pvp off +man_in01 mapflag pvp off +splendide mapflag pvp off +spl_in01 mapflag pvp off +spl_in02 mapflag pvp off + +moc_para01 mapflag pvp off + +brasilis mapflag pvp off +bra_in01 mapflag pvp off + //evt_zombie mapflag pvp off diff --git a/npc/Changelog.txt b/npc/Changelog.txt index cb351350f9..d37f991d8b 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,9 @@ Date Added ====== +2010/11/04 + * Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf] + - Added a missing close in quests_13_2.txt. (bugreport:4520) + - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) 2010/10/23 * Rev. 14435 Updated spawns for Geffen fields to Rewnewal. [L0ne_W0lf] 2010/10/20 diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index a3f3d8f4e8..3d2e10f66a 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.1 +//= 2.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -38,6 +38,7 @@ //= floor 2 puzzle. Fixed a typo. Commented out untranslated //= line. [Gepard] //= 2.1 Fixed Myterious Rock 31, and Cart Hand Agents. +//= 2.2 Added a missing close. (bugreport:4520) [L0ne_W0lf] //============================================================ // Cat Hand Addition. @@ -5018,6 +5019,7 @@ manuk,252,116,3 script Manuk Galtun#ep13_2day 450,{ mes "EW pisdn psa?"; mes "We psis?"; } + close; } // Daily Quests diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 77365cae53..cbd25ee360 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 2.6 +//= 2.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -46,6 +46,7 @@ //= 2.5 Fixed requirements for PH D. Hat. [L0ne_W0lf] //= 2.5a Fixed requirements for PH D. Hat agian lol. [L0ne_W0lf] //= 2.6 Replaced effect numerics with constants. [L0ne_W0lf] +//= 2.7 Corrected 'IProntera' typo. (bugreport:4522) [L0ne_W0lf] //============================================================ // Prontera Culvert @@ -1316,7 +1317,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ mes "Rodafrian can offer you"; mes "any more information. For"; mes "now, it would be best to"; - mes "go to ^3355FFIProntera Church.^000000"; + mes "go to ^3355FFProntera Church.^000000"; close; } else { From 35feae1e5c97b949df0241a585c371fe5fed18fb Mon Sep 17 00:00:00 2001 From: Gepard Date: Sun, 7 Nov 2010 10:44:16 +0000 Subject: [PATCH 034/129] Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14449 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/clif.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 649ea12d5b..c5f2cc0697 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/07 + * Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard] 2010/11/02 * Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X] * Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index a13811913e..a6865d833e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2146,6 +2146,12 @@ void clif_equiplist(struct map_session_data *sd) #if PACKETVER >= 20071002 WBUFL(buf,n*cmd+24)=sd->status.inventory[i].expire_time; WBUFW(buf,n*cmd+28)=0; //Unknown +#endif +#if PACKETVER >= 20100629 + if (sd->inventory_data[i]->equip&EQP_HELM) + WBUFW(buf,n*cmd+30)= sd->inventory_data[i]->look; + else + WBUFW(buf,n*cmd+30)=0; #endif n++; } From a5762f27ff848b193817028509de195cc4a9d713 Mon Sep 17 00:00:00 2001 From: Gepard Date: Sun, 7 Nov 2010 11:08:06 +0000 Subject: [PATCH 035/129] 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14450 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/pc.c | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index c5f2cc0697..1625985407 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/07 + * 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard] * Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard] 2010/11/02 * Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X] diff --git a/src/map/pc.c b/src/map/pc.c index 72fc4da90c..834a7f8714 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4899,18 +4899,17 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int clif_updatestatus(sd,SP_JOBEXP); } - if(sd->state.showexp){ #if PACKETVER >= 20091027 - if(base_exp) - clif_displayexp(sd, base_exp, 1, quest); - if(job_exp) - clif_displayexp(sd, job_exp, 2, quest); -#else + if(base_exp) + clif_displayexp(sd, base_exp, 1, quest); + if(job_exp) + clif_displayexp(sd, job_exp, 2, quest); +#endif + if(sd->state.showexp) { char output[256]; sprintf(output, "Experience Gained Base:%u (%.2f%%) Job:%u (%.2f%%)",base_exp,nextbp*(float)100,job_exp,nextjp*(float)100); clif_disp_onlyself(sd,output,strlen(output)); -#endif } return 1; From 975ab5e504e8440e35106ede108a9651f5b967b5 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 8 Nov 2010 22:21:03 +0000 Subject: [PATCH 036/129] Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14451 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/clif.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 1625985407..089a0af917 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/08 + * Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings. [Paradox924X] 2010/11/07 * 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard] * Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard] diff --git a/src/map/clif.c b/src/map/clif.c index a6865d833e..013b413766 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3458,7 +3458,7 @@ void clif_traderequest(struct map_session_data* sd, const char* name) WFIFOW(fd,0) = 0x1f4; safestrncpy((char*)WFIFOP(fd,2), name, NAME_LENGTH); WFIFOL(fd,26) = tsd->status.char_id; - WFIFOW(fd,30) = clif_setlevel(tsd->status.base_level); + WFIFOW(fd,30) = tsd->status.base_level; WFIFOSET(fd,packet_len(0x1f4)); #endif } @@ -3491,7 +3491,7 @@ void clif_tradestart(struct map_session_data* sd, uint8 type) WFIFOW(fd,0) = 0x1f5; WFIFOB(fd,2) = type; WFIFOL(fd,3) = tsd->status.char_id; - WFIFOW(fd,7) = clif_setlevel(tsd->status.base_level); + WFIFOW(fd,7) = tsd->status.base_level; WFIFOSET(fd,packet_len(0x1f5)); #endif } From 187aa99cbf204175b49b1919add1712d84cdbae9 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Mon, 8 Nov 2010 23:28:11 +0000 Subject: [PATCH 037/129] Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14452 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/trade.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 089a0af917..37467bd7a2 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/08 + * Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. [Paradox924X] * Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings. [Paradox924X] 2010/11/07 * 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard] diff --git a/src/map/trade.c b/src/map/trade.c index 392acb33fc..32c84b508c 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -455,8 +455,12 @@ void trade_tradecancel(struct map_session_data *sd) if(!sd->state.trading) { // Not trade acepted - if( target_sd ) target_sd->trade_partner = 0; + if( target_sd ) { + target_sd->trade_partner = 0; + clif_tradecancelled(target_sd); + } sd->trade_partner = 0; + clif_tradecancelled(sd); return; } From 9730bc0139a2d6ec6bc412a0e63bfb814eacf036 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 9 Nov 2010 20:17:56 +0000 Subject: [PATCH 038/129] Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14453 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/char_sql/char.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 37467bd7a2..43e4fce547 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/09 + * Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429) [Paradox924X] 2010/11/08 * Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. [Paradox924X] * Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings. [Paradox924X] diff --git a/src/char_sql/char.c b/src/char_sql/char.c index f27395a80d..be94c920fe 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -824,6 +824,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) SqlStmt* stmt; struct mmo_charstatus p; int j = 0, i; + char last_map[MAP_NAME_LENGTH_EXT]; stmt = SqlStmt_Malloc(sql_handle); if( stmt == NULL ) @@ -838,7 +839,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) "`char_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`," "`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`," "`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`," - "`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`rename`" + "`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`" " FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS) || SQL_ERROR == SqlStmt_Execute(stmt) || SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT, &p.char_id, 0, NULL, NULL) @@ -873,7 +874,8 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) || SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_SHORT, &p.head_top, 0, NULL, NULL) || SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT, &p.head_mid, 0, NULL, NULL) || SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT, &p.head_bottom, 0, NULL, NULL) - || SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_SHORT, &p.rename, 0, NULL, NULL) + || SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL) + || SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT, &p.rename, 0, NULL, NULL) ) { SqlStmt_ShowDebug(stmt); @@ -882,6 +884,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) } for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++ ) { + p.last_point.map = mapindex_name2id(last_map); sd->found_char[i] = p.char_id; j += mmo_char_tobuf(WBUFP(buf, j), &p); } From 9ab7bdfc12cc7e8e6b26dc7644cd5f6e60036553 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 10 Nov 2010 03:55:52 +0000 Subject: [PATCH 039/129] Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14454 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/clif.c | 29 +++++++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 43e4fce547..116b45980b 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/09 + * Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544) [Paradox924X] * Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429) [Paradox924X] 2010/11/08 * Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index 013b413766..94c19287ac 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3477,23 +3477,20 @@ void clif_traderequest(struct map_session_data* sd, const char* name) void clif_tradestart(struct map_session_data* sd, uint8 type) { int fd = sd->fd; - -#if PACKETVER < 6 - WFIFOHEAD(fd,packet_len(0xe7)); - WFIFOW(fd,0) = 0xe7; - WFIFOB(fd,2) = type; - WFIFOSET(fd,packet_len(0xe7)); -#else struct map_session_data* tsd = map_id2sd(sd->trade_partner); - if( !tsd ) return; - - WFIFOHEAD(fd,packet_len(0x1f5)); - WFIFOW(fd,0) = 0x1f5; - WFIFOB(fd,2) = type; - WFIFOL(fd,3) = tsd->status.char_id; - WFIFOW(fd,7) = tsd->status.base_level; - WFIFOSET(fd,packet_len(0x1f5)); -#endif + if( PACKETVER < 6 || !tsd ) { + WFIFOHEAD(fd,packet_len(0xe7)); + WFIFOW(fd,0) = 0xe7; + WFIFOB(fd,2) = type; + WFIFOSET(fd,packet_len(0xe7)); + } else { + WFIFOHEAD(fd,packet_len(0x1f5)); + WFIFOW(fd,0) = 0x1f5; + WFIFOB(fd,2) = type; + WFIFOL(fd,3) = tsd->status.char_id; + WFIFOW(fd,7) = tsd->status.base_level; + WFIFOSET(fd,packet_len(0x1f5)); + } } /*========================================== From 840f04f41fd3fb0f76d05cc4c06e3c029cbcbd86 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 10 Nov 2010 18:57:14 +0000 Subject: [PATCH 040/129] Added an item_delay database usable for item-specific use delays. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14455 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ db/item_delay.txt | 6 ++++++ src/map/itemdb.c | 47 ++++++++++++++++++++++++++++++++++++++++++- src/map/itemdb.h | 4 ++++ src/map/pc.c | 23 +++++++++++++++++++-- src/map/pc.h | 6 +++++- 6 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 db/item_delay.txt diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 116b45980b..706ac02f2b 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/10 + * Added an item_delay database usable for item-specific use delays. [Paradox924X] 2010/11/09 * Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544) [Paradox924X] * Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429) [Paradox924X] diff --git a/db/item_delay.txt b/db/item_delay.txt new file mode 100644 index 0000000000..8faef09067 --- /dev/null +++ b/db/item_delay.txt @@ -0,0 +1,6 @@ +// Item Delay Database +// Max number of entries is defined in itemdb.h as MAX_ITEMDELAYS +// WARNING: Adding/removing/modifying entries here and then using @reloaditemdb will cause problems/inconsistencies! +// +// Structure: +// Item ID,Delay in Milliseconds diff --git a/src/map/itemdb.c b/src/map/itemdb.c index fb7cbe86fa..2096ddf9e8 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -27,7 +27,7 @@ static struct item_group itemgroup_db[MAX_ITEMGROUP]; struct item_data dummy_item; //This is the default dummy item used for non-existant items. [Skotlex] - +int item_delays = 0; /*========================================== * OŌp @@ -661,6 +661,50 @@ static int itemdb_read_itemtrade(void) return 0; } +/*========================================== + * Reads item delay amounts [Paradox924X] + *------------------------------------------*/ +static int itemdb_read_itemdelay(void) +{ + FILE *fp; + int nameid, j; + char line[1024], *str[10], *p; + struct item_data *id; + + sprintf(line, "%s/item_delay.txt", db_path); + if ((fp = fopen(line,"r")) == NULL) { + ShowError("can't read %s\n", line); + return -1; + } + + while(fgets(line, sizeof(line), fp)) + { + if (item_delays == MAX_ITEMDELAYS) { + ShowError("itemdb_read_itemdelay: Too many entries specified in %s/item_delay.txt!\n", db_path); + break; + } + if (line[0] == '/' && line[1] == '/') + continue; + memset(str, 0, sizeof(str)); + for (j = 0, p = line; j < 2 && p; j++) { + str[j] = p; + p = strchr(p, ','); + if(p) *p++ = 0; + } + + if (j < 2 || str[0] == NULL || + (nameid = atoi(str[0])) < 0 || !(id = itemdb_exists(nameid))) + continue; + + id->delay = atoi(str[1]); + item_delays++; + } + fclose(fp); + ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", item_delays, "item_delay.txt"); + + return 0; +} + /*====================================== * Applies gender restrictions according to settings. [Skotlex] *======================================*/ @@ -971,6 +1015,7 @@ static void itemdb_read(void) itemdb_read_itemavail(); itemdb_read_noequip(); itemdb_read_itemtrade(); + itemdb_read_itemdelay(); } /*========================================== diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 62bbb2c5af..5b07b5c1b6 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -8,6 +8,9 @@ #define MAX_RANDITEM 11000 +// The maximum number of item delays +#define MAX_ITEMDELAYS 10 + #define MAX_SEARCH 5 //Designed for search functions, species max number of matches to display. #define ITEMID_YELLOW_GEMSTONE 715 @@ -54,6 +57,7 @@ struct item_data { int elv; int wlv; int view_id; + int delay; //Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command // some script commands should be revised as well... unsigned int class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2) diff --git a/src/map/pc.c b/src/map/pc.c index 834a7f8714..433b67b462 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -67,6 +67,8 @@ char motd_text[MOTD_LINE_SIZE][256]; // Message of the day buffer [Valaris] struct duel duel_list[MAX_DUEL]; int duel_count = 0; +extern int item_delays; // [Paradox924X] + //Links related info to the sd->hate_mob[]/sd->feel_map[] entries const struct sg_data sg_info[3] = { { SG_SUN_ANGER, SG_SUN_BLESS, SG_SUN_COMFORT, "PC_FEEL_SUN", "PC_HATE_MOB_SUN", is_day_of_sun }, @@ -531,6 +533,11 @@ int pc_setinventorydata(struct map_session_data *sd) for(i=0;istatus.inventory[i].nameid; sd->inventory_data[i] = id?itemdb_search(id):NULL; + if(sd->inventory_data[i] && sd->inventory_data[i]->delay > 0) { // Load delays + sd->item_delay[item_delays].nameid = sd->inventory_data[i]->nameid; + sd->item_delay[item_delays].tick = 0; + ++item_delays; + } } return 0; } @@ -3654,8 +3661,8 @@ int pc_isUseitem(struct map_session_data *sd,int n) *------------------------------------------*/ int pc_useitem(struct map_session_data *sd,int n) { - unsigned int tick = gettick(); - int amount; + unsigned int delay, tick = gettick(); + int amount, i, nameid; struct script_code *script; nullpo_ret(sd); @@ -3681,6 +3688,16 @@ int pc_useitem(struct map_session_data *sd,int n) )) return 0; + // Store information for later use before it is lost (via pc_delitem) [Paradox924X] + nameid = sd->inventory_data[n]->nameid; + delay = sd->inventory_data[n]->delay; + + if( sd->inventory_data[n]->delay > 0 ) { // Check if there is a delay on this item [Paradox924X] + ARR_FIND(0, item_delays, i, sd->item_delay[i].nameid == nameid); + if( i < item_delays && DIFF_TICK(sd->item_delay[i].tick, tick) > 0 ) + return 0; // Delay has not expired yet + } + //Since most delay-consume items involve using a "skill-type" target cursor, //perform a skill-use check before going through. [Skotlex] //resurrection was picked as testing skill, as a non-offensive, generic skill, it will do. @@ -3725,6 +3742,8 @@ int pc_useitem(struct map_session_data *sd,int n) sd->canuseitem_tick = tick + battle_config.item_use_interval; if( itemdb_iscashfood(sd->status.inventory[n].nameid) ) sd->canusecashfood_tick = tick + battle_config.cashfood_use_interval; + if( delay > 0 && i < item_delays ) + sd->item_delay[i].tick = tick + delay; run_script(script,0,sd->bl.id,fake_nd->bl.id); potion_flag = 0; diff --git a/src/map/pc.h b/src/map/pc.h index da666f9a7e..0c3cb89eb3 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -204,6 +204,11 @@ struct map_session_data { unsigned int cantalk_tick; unsigned int cansendmail_tick; // [Mail System Flood Protection] unsigned int ks_floodprotect_tick; // [Kill Steal Protection] + + struct { + int nameid; + unsigned int tick; + } item_delay[MAX_ITEMDELAYS]; // [Paradox924X] short weapontype1,weapontype2; short disguise; // [Valaris] @@ -404,7 +409,6 @@ struct map_session_data { const char* debug_func; }; - //Update this max as necessary. 54 is the value needed for Super Baby currently #define MAX_SKILL_TREE 54 //Total number of classes (for data storage) From 45826cbbc594e41e23bc24e33cc2f5e8582f0331 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 10 Nov 2010 20:32:31 +0000 Subject: [PATCH 041/129] Made bAtkRate add the rate rather than setting it. (bugreport:4499) Warning: This will break backwards compatibility for item scripts which rely on the previous effect for this (although most people assumed it added, as described in the bonus doc). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14456 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/battle.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 706ac02f2b..488fb69e5c 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/10 + * Made bAtkRate add the rate rather than setting it. (bugreport:4499) [Paradox924X] * Added an item_delay database usable for item-specific use delays. [Paradox924X] 2010/11/09 * Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544) [Paradox924X] diff --git a/src/map/battle.c b/src/map/battle.c index fde6402a34..19bea10360 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1396,7 +1396,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(sd) { if (sd->atk_rate != 100) - ATK_RATE(sd->atk_rate); + ATK_ADDRATE(sd->atk_rate); if(flag.cri && sd->crit_atk_rate) ATK_ADDRATE(sd->crit_atk_rate); From a9c0bc7924a706c4ca5571c9dd0fd724302f3e00 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 10 Nov 2010 20:46:18 +0000 Subject: [PATCH 042/129] Changed the check prior to adding to the attack rate so it ensures the value is non-zero instead of not 100. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14457 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/battle.c b/src/map/battle.c index 19bea10360..b520b1d97b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1395,7 +1395,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo //Add any bonuses that modify the base baseatk+watk (pre-skills) if(sd) { - if (sd->atk_rate != 100) + if (sd->atk_rate) ATK_ADDRATE(sd->atk_rate); if(flag.cri && sd->crit_atk_rate) From 0644a4e4919ee6e6688be603b50c79f772f48b96 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Wed, 10 Nov 2010 21:07:04 +0000 Subject: [PATCH 043/129] * Added some items with enforced delays to the item_delay_db! git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14458 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/item_delay.txt | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/db/Changelog.txt b/db/Changelog.txt index 81658086f0..8efe0d35ed 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/10 + * Rev. 14458 Added some items with enforced delays to the item_delay_db! [L0ne_W0lf] 2010/11/04 * Rev. 14445 Updated monster database. Most spawning monsters stats are now updated. [L0ne_W0lf] - 'Ghost' mobs, and event monsters are not updated at this time. diff --git a/db/item_delay.txt b/db/item_delay.txt index 8faef09067..716d60ebc0 100644 --- a/db/item_delay.txt +++ b/db/item_delay.txt @@ -4,3 +4,14 @@ // // Structure: // Item ID,Delay in Milliseconds + +//12202,60000 //Str_Dish10_ +//12203,60000 //Agi_Dish10_ +//12204,60000 //Int_Dish10_ +//12205,60000 //Dex_Dish10_ +//12206,60000 //Luk_Dish10_ +//12207,60000 //Vit_Dish10_ +12208,60000 //Battle_Manual +12210,60000 //Bubble_Gum +14538,300000 //Glass_Of_Illusion +14586,180000 //Spark_Candy From fc4c5902e94a8bc28a0d49d34ce68440bc0ae6a5 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 11 Nov 2010 19:23:54 +0000 Subject: [PATCH 044/129] Updated known EXP values, and deleted exp2.txt. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14459 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/exp.txt | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index 8efe0d35ed..3cec5e1bb6 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/11 + * Rev. 14459 Updated known EXP values, and deleted exp2.txt. [L0ne_W0lf] 2010/11/10 * Rev. 14458 Added some items with enforced delays to the item_delay_db! [L0ne_W0lf] 2010/11/04 diff --git a/db/exp.txt b/db/exp.txt index 58310fe247..1c983923d0 100644 --- a/db/exp.txt +++ b/db/exp.txt @@ -1,24 +1,28 @@ //Experience tables format: //Max Level,Class list,Type (0 - Base Exp; 1 - Job Exp),Exp for Lv 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98 //Base - Normal and Baby Jobs -99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:26:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049,0,9,16,25,36,77,112,153,200,253,320,385,490,585,700,830,970,1120,1260,1420,1620,1860,1990,2240,2504,2950,3426,3934,4474,6889,7995,9174,10425,11748,13967,15775,17678,19677,21773,30543,34212,38065,42102,46323,53026,58419,64041,69892,75973,102468,115254,128692,142784,157528,178184,196300,215198,234879,255341,330188,365914,403224,442116,482590,536948,585191,635278,687211,740988,925400,1473746,1594058,1718928,1848355,1982340,2230113,2386162,2547417,2713878,3206160,3681024,4022472,4377024,4744680,5125440,5767272,6204000,6655464,7121664,7602600,9738720,11649960,13643520,18339300,23836800,35658000,48687000,58135000,99999999 +99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:26:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,57000,59000,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000 //Base - Adv Jobs -99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304200,18516326,19766760,29216160,34949880,40930560,55017900,71510400,106974000,146061000,174405000,343210000 +99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,4620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,96800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000 +//Base - 3rd Jobs +//130,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12930000,13150000,14030000,14420000,15420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000 //Job - Novice 10,0:4023,1,10,18,28,40,91,151,205,268,340 //Job - 1st Classes -50,1:2:3:4:5:6:26:4024:4025:4026:4027:4028:4029:4046,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,386371,409795,482092,509596 +50,1:2:3:4:5:6:26:4024:4025:4026:4027:4028:4029:4046,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5330,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180 //Job - 2nd Classes -50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,644736,793535,921810,1106758,1260955,1487304,1557657,1990632,2083386 -//Job - Super Novice +50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049,1,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,23000,33300,35100,40500,44100,46300,48500,50700,56000,59400,63500,68100,75000,85700,90500,96600,102600,108600,119700,126000,132300,138600,146100,157500,170600,180400,190300,196800,214900,225200,232000,245700,255900,279300,294000,308700,327000,345400 +//Job - Super Novice - Needs to be updated. 99,23:4045,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,386371,409795,482092,509596,982092,992092,1002092,1012092,1022092,1032092,1042092,1052092,1062092,1072092,1082092,1092092,1102092,1112092,1122092,1132092,1142092,1152092,1162092,1172092,1182092,1192092,1202092,1212092,1222092,1232092,1242092,1252092,1262092,1272092,1282092,1292092,1302092,1312092,1322092,1332092,1342092,1352092,1362092,1372092,1382092,1392092,1402092,1412092,1422092,1432092,1442092,1452092,1462092 //Job - Novice High -10,4001,1,11,20,31,44,100,166,226,295,374 +10,4001,1,12,22,35,50,113,188,256,335,425 //Job - Adv First Classes -50,4002:4003:4004:4005:4006:4007,1,60,86,116,152,232,360,440,544,672,1040,1208,1398,1604,1896,2250,3336,3874,4452,6080,7976,11128,12544,14042,18228,28683,38225,42228,46425,58073,70898,91195,99290,107720,131043,156238,195408,210430,226010,269028,314788,384853,479453,510878,620880,715530,965928,1024488,1205230,1273990 +50,4002:4003:4004:4005:4006:4007,1,340,550,760,990,1250,1600,1980,2340,2740,3140,3950,4510,5210,5950,7000,8150,9130,10220,11480,12780,14090,15560,16980,18620,20280,21780,24510,27000,29000,31000,36000,39000,41000,45000,49000,51900,55000,59450,64630,70030,74940,79800,84630,89610,95170,100420,107250,112070,118120 //Job - Adv Second Classes -70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,288,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1773024,2182221,2534978,3043585,3782865,4461912,4672971,5971896,6250158,6875174,7562691,8318960,9150856,10065942,11877812,14015818,16538655,19515624,23028437,28094693,34275525,41816141,51015692,62239144,79666104,101972614,130524946,167071930,213852071 -//Job - Star Gladiator +70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,949300,988100,1026800,1065600,1104300,1334800,1371400,1425300,1470600,1515800,2003800,2032800,2119900,2236100,2323200,3025300,3433300,3776600,4436900,6758400 +//Job - Star Gladiator - Needs to be updated. 50,4047:4048,1,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,54868,70216,77154,84412,105416,133942,165376,179088,193338,235642,289842,348402,373354,399168,477234,572732,674294,716870,760752,895370,1053978,1220492,1289472,1587070,1843620,2213516,2521910,2974608,3115314,3981264,4166772 //Job - Ninja/Gunslinger -70,24:25,1,72,92,142,174,301,443,548,799,1270,1838,2145,2473,3339,4746,6385,7172,8002,10321,13717,17554,19288,21103,26354,33485,41344,44772,48334,58910,72460,87100,93338,99792,119308,143183,231068,257377,274363,314246,371105,431038,476309,588548,665256,801731,916689,1130023,1188623,1477408,1551289,1746582,1845236,1954741,2124555,2345698,2548763,2759555,3021488,3254111,3489547,3695474,4012251,4181112,4302211,4496584,4578951,4869523,5022114,5123654,5395117 +70,24:25,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000 +//Job - 3rd Classes +//50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,1,112000,355000,15000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77646000,83624000,91113000,98548000,107630000,119077000 From f04fb1ccfc65364aa7af8701ebbcdcb717bc74f3 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 11 Nov 2010 19:25:06 +0000 Subject: [PATCH 045/129] Whoops. Actually deleted exp2.txt this time. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14460 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/exp2.txt | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 db/exp2.txt diff --git a/db/exp2.txt b/db/exp2.txt deleted file mode 100644 index 733b13a924..0000000000 --- a/db/exp2.txt +++ /dev/null @@ -1,35 +0,0 @@ -//This is a custom Experience table with support for up to level 1000. -//To use it, replace exp.txt with this file and edit the max level -//accordingly. -//Experience tables format: -//Max Level,Class list,Type (0 - Base Exp / 1 - Job Exp),Exp 1,2,3,... -//Base - Normal Jobs -99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:26:4046:4047:4048:4049,0,9,16,25,36,77,112,153,200,253,320,385,490,585,700,830,970,1120,1260,1420,1620,1860,1990,2240,2504,2950,3426,3934,4474,6889,7995,9174,10425,11748,13967,15775,17678,19677,21773,30543,34212,38065,42102,46323,53026,58419,64041,69892,75973,102468,115254,128692,142784,157528,178184,196300,215198,234879,255341,330188,365914,403224,442116,482590,536948,585191,635278,687211,740988,925400,1473746,1594058,1718928,1848355,1982340,2230113,2386162,2547417,2713878,3206160,3681024,4022472,4377024,4744680,5125440,5767272,6204000,6655464,7121664,7602600,8109652,8643822,9206127,9797599,10419283,11072238,11757533,12476249,13229476,14018313,14843866,15707247,16609574,17551968,18535552,19561452,20630792,21744696,22904284,24110674,25364977,26668297,28021732,29426368,30883282,32393539,33958189,35578269,37254799,38988782,40781202,42633023,44545189,46518620,48554214,50652844,52815357,55042573,57335285,59694256,62120220,64613880,67175907,69806941,72507587,75278418,78119970,81032746,84017211,87073795,90202891,93404853,96680000,100028610,103450924,106947144,110517434,114161918,117880680,121673767,125541185,129482901,133498844,137588903,141752928,145990732,150302088,154686733,159144364,163674642,168277191,172951600,177697420,182514167,187401324,192358338,197384623,202479560,207642499,212872757,218169621,223532347,228960163,234452268,240007834,245626005,251305900,257046613,262847212,268706744,274624232,280598679,286629065,292714352,298853483,305045382,311288957,317583099,323926685,330318577,336757623,343242660,349772512,356345994,362961909,369619053,376316214,383052171,389825698,396635564,403480532,410359362,417270811,424213634,431186584,438188413,445217874,452273720,459354706,466459588,473587127,480736086,487905232,495093338,502299181,509521545,516759221,524011006,531275705,538552132,545839109,553135467,560440047,567751700,575069288,582391684,589717771,597046446,604376616,611707202,619037136,626365365,633690848,641012559,648329484,655640625,662944998,670241632,677529573,684807881,692075631,699331913,706575834,713806514,721023091,728224718,735410563,742579811,749731663,756865335,763980061,771075089,778149684,785203127,792234715,799243761,806229595,813191563,820129025,827041359,833927958,840788232,847621604,854427516,861205423,867954796,874675123,881365905,888026659,894656917,901256227,907824150,914360262,920864154,927335431,933773713,940178632,946549836,952886985,959189754,965457830,971690914,977888720,984050975,990177418,996267800,1002321886,1008339452,1014320285,1020264186,1026170966,1032040448,1037872466,1043666865,1049423500,1055142238,1060822955,1066465539,1072069886,1077635904,1083163509,1088652627,1094103193,1099515152,1104888457,1110223070,1115518962,1120776112,1125994507,1131174143,1136315022,1141417155,1146480560,1151505263,1156491296,1161438699,1166347518,1171217806,1176049622,1180843032,1185598108,1190314928,1194993575,1199634138,1204236712,1208801396,1213328296,1217817522,1222269189,1226683417,1231060330,1235400057,1239702732,1243968491,1248197476,1252389832,1256545708,1260665257,1264748635,1268796001,1272807518,1276783353,1280723674,1284628654,1288498467,1292333290,1296133304,1299898691,1303629636,1307326326,1310988950,1314617700,1318212769,1321774352,1325302646,1328797850,1332260164,1335689790,1339086931,1342451791,1345784576,1349085494,1352354752,1355592559,1358799125,1361974661,1365119379,1368233491,1371317210,1374370750,1377394325,1380388150,1383352439,1386287408,1389193273,1392070249,1394918553,1397738400,1400530007,1403293591,1406029367,1408737552,1411418361,1414072010,1416698715,1419298692,1421872155,1424419319,1426940398,1429435606,1431905157,1434349263,1436768137,1439161990,1441531034,1443875479,1446195535,1448491412,1450763318,1453011460,1455236046,1457437282,1459615373,1461770523,1463902937,1466012816,1468100363,1470165779,1472209264,1474231016,1476231234,1478210114,1480167853,1482104645,1484020685,1485916165,1487791277,1489646211,1491481157,1493296304,1495091838,1496867946,1498624813,1500362623,1502081558,1503781800,1505463529,1507126924,1508772163,1510399423,1512008880,1513600707,1515175078,1516732165,1518272138,1519795167,1521301420,1522791064,1524264265,1525721187,1527161994,1528586847,1529995908,1531389336,1532767289,1534129924,1535477397,1536809863,1538127475,1539430385,1540718744,1541992701,1543252405,1544498003,1545729641,1546947464,1548151616,1549342238,1550519472,1551683458,1552834334,1553972238,1555097306,1556209673,1557309473,1558396839,1559471902,1560534793,1561585640,1562624572,1563651716,1564667197,1565671140,1566663668,1567644904,1568614969,1569573982,1570522063,1571459329,1572385897,1573301883,1574207401,1575102565,1575987487,1576862278,1577727048,1578581907,1579426962,1580262321,1581088090,1581904373,1582711275,1583508898,1584297344,1585076715,1585847110,1586608628,1587361366,1588105422,1588840892,1589567871,1590286453,1590996731,1591698797,1592392743,1593078658,1593756633,1594426755,1595089112,1595743791,1596390878,1597030458,1597662614,1598287430,1598904988,1599515370,1600118656,1600714926,1601304259,1601886733,1602462426,1603031414,1603593772,1604149576,1604698899,1605241815,1605778396,1606308715,1606832842,1607350847,1607862800,1608368770,1608868825,1609363032,1609851457,1610334167,1610811226,1611282699,1611748650,1612209142,1612664237,1613113997,1613558483,1613997756,1614431875,1614860899,1615284887,1615703896,1616117984,1616527207,1616931621,1617331282,1617726244,1618116561,1618502287,1618883474,1619260175,1619632442,1620000326,1620363877,1620723146,1621078182,1621429033,1621775749,1622118377,1622456965,1622791559,1623122206,1623448951,1623771840,1624090917,1624406227,1624717813,1625025719,1625329987,1625630660,1625927779,1626221386,1626511522,1626798227,1627081541,1627361504,1627638155,1627911532,1628181674,1628448618,1628712402,1628973062,1629230635,1629485157,1629736664,1629985191,1630230773,1630473445,1630713240,1630950192,1631184334,1631415700,1631644322,1631870232,1632093461,1632314042,1632532005,1632747381,1632960200,1633170493,1633378289,1633583617,1633786507,1633986987,1634185085,1634380829,1634574248,1634765368,1634954216,1635140820,1635325205,1635507398,1635687425,1635865311,1636041081,1636214761,1636386375,1636555947,1636723501,1636889061,1637052651,1637214294,1637374013,1637531831,1637687770,1637841852,1637994099,1638144533,1638293176,1638440048,1638585171,1638728565,1638870250,1639010247,1639148576,1639285256,1639420307,1639553749,1639685600,1639815879,1639944605,1640071796,1640197471,1640321647,1640444342,1640565574,1640685360,1640803717,1640920662,1641036212,1641150383,1641263192,1641374655,1641484788,1641593607,1641701127,1641807363,1641912331,1642016046,1642118523,1642219777,1642319822,1642418672,1642516342,1642612846,1642708197,1642802409,1642895496,1642987471,1643078348,1643168139,1643256857,1643344515,1643431126,1643516702,1643601256,1643684799,1643767344,1643848902,1643929486,1644009107,1644087776,1644165505,1644242304,1644318185,1644393159,1644467237,1644540429,1644612746,1644684198,1644754796,1644824550,1644893470,1644961565,1645028846,1645095322,1645161003,1645225899,1645290018,1645353370,1645415965,1645477811,1645538917,1645599292,1645658945,1645717884,1645776118,1645833655,1645890503,1645946671,1646002167,1646056999,1646111175,1646164702,1646217589,1646269843,1646321471,1646372481,1646422881,1646472677,1646521877,1646570488,1646618517,1646665972,1646712858,1646759183,1646804953,1646850175,1646894856,1646939002,1646982619,1647025714,1647068293,1647110362,1647151927,1647192995,1647233571,1647273661,1647313271,1647352406,1647391073,1647429277,1647467023,1647504317,1647541164,1647577570,1647613540,1647649079,1647684192,1647718884,1647753161,1647787027,1647820488,1647853548,1647886212,1647918484,1647950370,1647981874,1648013000,1648043753,1648074138,1648104159,1648133820,1648163126,1648192080,1648220687,1648248952,1648276878,1648304469,1648331730,1648358664,1648385275,1648411567,1648437544,1648463210,1648488568,1648513622,1648538376,1648562833,1648586997,1648610872,1648634460,1648657766,1648680792,1648703542,1648726020,1648748228,1648770170,1648791849,1648813268,1648834430,1648855339,1648875997,1648896407,1648916573,1648936497,1648956182,1648975631,1648994847,1649013832,1649032590,1649051123,1649069434,1649087525,1649105399,1649123059,1649140507,1649157746,1649174778,1649191606,1649208232,1649224659,1649240889,1649256924,1649272767,1649288420,1649303885,1649319165,1649334262,1649349178,1649363915,1649378475,1649392861,1649407074,1649421117,1649434991,1649448699,1649462242,1649475623,1649488844,1649501906,1649514811,1649527562,1649540160,1649552607,1649564904,1649577054,1649589058,1649600918,1649612636,1649624213,1649635652,1649646953,1649658119,1649669151,1649680051,1649690820,1649701460,1649711972,1649722358,1649732619,1649742757,1649752774,1649762671,1649772449,1649782110,1649791655,1649801085,1649810402,1649819607,1649828702,1649837688,1649846566,1649855338,1649864004,1649872566,1649881026,1649889384,1649897642,1649905801,1649913862,1649921826,1649929695,1649937469,1649945150,1649952739,1649960237,1649967645,1649974964,1649982195,1649989340,1649996399,1650003373,1650010263,1650017071,1650023797,1650030442,1650037008,1650043495,1650049904,1650056236,1650062492,1650068673,1650074780,1650080814,1650086775,1650092665,1650098484,1650104233,1650109913,1650115525,1650121070,1650126548,1650131961,1650137309,1650142593,1650147813,1650152971,1650158067,1650163102,1650168076,1650172990,1650177845,1650182642,1650187382,1650192065,1650196692,1650201263,1650205779,1650210241,1650214650,1650219006,1650223309,1650227561,1650231762,1650235912,1650240012,1650244063,1650248066,1650252021,1650255928,1650259788,1650263602,1650267370,1650271093,1650274771,1650278405,1650281996,1650285544,1650289049,1650292512,1650295933,1650299313,1650302653,1650305953,1650309213,1650312434,1650315616,1650318760,1650321866,1650324935,1650327967,1650330963,1650333923,1650336847,1650339736,1650342591,1650345411,1650348198,1650350951,1650353671,1650356358,1650359013,1650361636,1650364228,1650366789,1650369319,1650371819,1650374289,1650376729,1650379140,1650381522,1650383875,1650386200,1650388497,1650390766,1650393008,1650395223,1650397412,1650399574,1650401711,1650403822,1650405908,1650407969,1650410005,1650412016,1650414003,1650415966,1650417906,1650419823,1650421717,1650423588,1650425436,1650427262,1650429066 -//Base - Adv Jobs -99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304200,18516326,19766760,21085096,22473939,23935933,25473761,27090141,28787825,30569594,32438257,34396650,36447628,38594068,40838862,43184915,45635142,48192464,50859807,53640095,56536248,59551182,62687799,65948990,69337627,72856561,76508620,80296602,84223275,88291372,92503586,96862571,101370933,106031232,110845975,115817614,120948544,126241098,131697545,137320088,143110859,149071919,155205253,161512770,167996297,174657580,181498280,188519973,195724146,203112195,210685425,218445048,226392181,234527844,242852961,251368358,260074760,268972793,278062983,287345754,296821429,306490229,316352273,326407578,336656059,347097530,357731703,368558190,379576502,390786051,402186149,413776012,425554759,437521412,449674899,462014055,474537623,487244256,500132518,513200886,526447751,539871420,553470119,567241993,581185110,595297462,609576966,624021468,638628745,653396504,668322389,683403980,698638797,714024301,729557897,745236936,761058717,777020492,793119465,809352795,825717601,842210961,858829917,875571475,892432609,909410264,926501355,943702774,961011389,978424047,995937576,1013548788,1031254481,1049051440,1066936441,1084906252,1102957634,1121087346,1139292145,1157568786,1175914029,1194324635,1212797373,1231329018,1249916355,1268556179,1287245299,1305980536,1324758729,1343576732,1362431419,1381319683,1400238439,1419184625,1438155202,1457147157,1476157502,1495183278,1514221554,1533269429,1552324031,1571382520,1590442090,1609499966,1628553409,1647599713,1666636209,1685660263,1704669278,1723660695,1742631992,1761580687,1780504336,1799400534,1818266916,1837101157,1855900974,1874664122,1893388399,1912071644,1930711737,1949306600,1967854196,1986352530,2004799649,2023193642,2041532640,2059814816,2078038384,2096201600,2114302763,2132340212,2150312328,2168217533,2186054291,2203821106,2221516523,2239139127,2256687544,2274160439,2291556517,2308874523,2326113241,2343271492,2360348137,2377342074,2394252239,2411077605,2427817182,2444470016,2461035190,2477511822,2493899065,2510196107,2526402170,2542516509,2558538414,2574467207,2590302243,2606042908,2621688620,2637238829,2652693014,2668050684,2683311379,2698474666,2713540143,2728507434,2743376192,2758146097,2772816855,2787388198,2801859883,2816231694,2830503439,2844674950,2858746082,2872716714,2886586747,2900356105,2914024733,2927592598,2941059688,2954426010,2967691593,2980856483,2993920747,3006884469,3019747752,3032510717,3045173501,3057736259,3070199161,3082562393,3094826158,3106990673,3119056170,3131022894,3142891106,3154661079,3166333099,3177907466,3189384491,3200764497,3212047820,3223234805,3234325809,3245321200,3256221356,3267026664,3277737521,3288354333,3298877514,3309307489,3319644689,3329889553,3340042528,3350104069,3360074637,3369954700,3379744733,3389445216,3399056636,3408579485,3418014261,3427361466,3436621608,3445795199,3454882755,3463884797,3472801849,3481634440,3490383101,3499048368,3507630778,3516130872,3524549194,3532886290,3541142708,3549318998,3557415713,3565433406,3573372633,3581233950,3589017916,3596725090,3604356032,3611911302,3619391462,3626797073,3634128697,3641386897,3648572235,3655685273,3662726573,3669696697,3676596205,3683425658,3690185617,3696876640,3703499285,3710054109,3716541669,3722962519,3729317213,3735606303,3741830339,3747989871,3754085446,3760117610,3766086907,3771993879,3777839066,3783623006,3789346235,3795009287,3800612694,3806156985,3811642688,3817070327,3822440424,3827753500,3833010071,3838210653,3843355757,3848445893,3853481568,3858463286,3863391548,3868266853,3873089696,3877860570,3882579965,3887248368,3891866263,3896434130,3900952448,3905421692,3909842333,3914214841,3918539681,3922817316,3927048205,3931232805,3935371569,3939464947,3943513385,3947517328,3951477216,3955393486,3959266573,3963096907,3966884916,3970631025,3974335655,3977999224,3981622147,3985204835,3988747697,3992251137,3995715558,3999141358,4002528933,4005878676,4009190975,4012466216,4015704782,4018907052,4022073402,4025204206,4028299834,4031360652,4034387025,4037379312,4040337871,4043263057,4046155220,4049014709,4051841869,4054637042,4057400566,4060132778,4062834010,4065504592,4068144851,4070755111,4073335693,4075886914,4078409090,4080902532,4083367550,4085804450,4088213536,4090595108,4092949463,4095276897,4097577701,4099852165,4102100575,4104323215,4106520366,4108692307,4110839312,4112961655,4115059606,4117133433,4119183400,4121209770,4123212802,4125192754,4127149880,4129084433,4130996662,4132886814,4134755133,4136601862,4138427240,4140231505,4142014891,4143777631,4145519954,4147242089,4148944261,4150626693,4152289606,4153933218,4155557746,4157163403,4158750402,4160318952,4161869260,4163401532,4164915971,4166412777,4167892150,4169354286,4170799380,4172227625,4173639211,4175034327,4176413160,4177775894,4179122712,4180453795,4181769321,4183069467,4184354408,4185624318,4186879367,4188119725,4189345560,4190557037,4191754321,4192937573,4194106954,4195262623,4196404736,4197533449,4198648916,4199751289,4200840717,4201917350,4202981334,4204032815,4205071936,4206098840,4207113668,4208116558,4209107648,4210087074,4211054971,4212011472,4212956708,4213890810,4214813906,4215726123,4216627588,4217518424,4218398755,4219268703,4220128387,4220977927,4221817441,4222647044,4223466852,4224276979,4225077537,4225868637,4226650390,4227422904,4228186286,4228940643,4229686080,4230422700,4231150607,4231869902,4232580686,4233283058,4233977116,4234662957,4235340677,4236010370,4236672131,4237326053,4237972227,4238610743,4239241692,4239865161,4240481239,4241090012,4241691565,4242285983,4242873350,4243453749,4244027261,4244593967,4245153947,4245707279,4246254042,4246794313,4247328169,4247855684,4248376933,4248891990,4249400928,4249903818,4250400732,4250891740,4251376912,4251856316,4252330020,4252798092,4253260597,4253717602,4254169171,4254615368,4255056257,4255491900,4255922359,4256347695,4256767969,4257183240,4257593568,4257999011,4258399627,4258795472,4259186603,4259573076,4259954946,4260332267,4260705093,4261073477,4261437472,4261797129,4262152500,4262503636,4262850586,4263193401,4263532129,4263866819,4264197518,4264524274,4264847134,4265166143,4265481348,4265792793,4266100523,4266404582,4266705014,4267001861,4267295166,4267584971,4267871318,4268154248,4268433801,4268710017,4268982936,4269252597,4269519039,4269782300,4270042418,4270299430,4270553373,4270804284,4271052198,4271297151,4271539179,4271778316,4272014596,4272248054,4272478723,4272706636,4272931826,4273154325,4273374166,4273591380,4273805998,4274018051,4274227570,4274434585,4274639125,4274841221,4275040901,4275238194,4275433128,4275625732,4275816033,4276004059,4276189837,4276373393,4276554754,4276733946,4276910995,4277085927,4277258767,4277429540,4277598270,4277764982,4277929700,4278092447,4278253247,4278412124,4278569100,4278724198,4278877440,4279028849,4279178446,4279326253,4279472291,4279616582,4279759146,4279900004,4280039176,4280176683,4280312544,4280446779,4280579407,4280710448,4280839920,4280967842,4281094233,4281219111,4281342494,4281464400,4281584846,4281703850,4281821429,4281937601,4282052382,4282165788,4282277836,4282388543,4282497924,4282605995,4282712772,4282818270,4282922505,4283025492,4283127245,4283227779,4283327109,4283425250,4283522215,4283618019,4283712675,4283806197,4283898599,4283989894,4284080096,4284169217,4284257270,4284344268,4284430224,4284515150,4284599059,4284681963,4284763873,4284844802,4284924761,4285003762,4285081817,4285158936,4285235131,4285310413,4285384793,4285458282,4285530890,4285602628,4285673507,4285743536,4285812726,4285881087,4285948628,4286015360,4286081292,4286146434,4286210795,4286274385,4286337213,4286399288,4286460619,4286521215,4286581084,4286640236,4286698679,4286756421,4286813471,4286869837,4286925527,4286980550,4287034913,4287088625,4287141693,4287194125,4287245928,4287297110,4287347678,4287397640,4287447003,4287495774,4287543961,4287591570,4287638608,4287685082,4287730999,4287776365,4287821187,4287865472,4287909226,4287952455,4287995166,4288037365,4288079058,4288120251,4288160950,4288201161,4288240890,4288280143,4288318925,4288357242,4288395099,4288432502,4288469457,4288505969,4288542043,4288577684,4288612898,4288647690,4288682064,4288716026,4288749581,4288782733,4288815488,4288847850,4288879824,4288911414,4288942626,4288973463,4289003930,4289034032,4289063773,4289093157,4289122189,4289150873,4289179213,4289207213,4289234877,4289262209,4289289213,4289315893,4289342253,4289368297,4289394029,4289419452,4289444570,4289469387,4289493906,4289518131,4289542066,4289565714,4289589078,4289612162,4289634969,4289657502,4289679765,4289701761,4289723493,4289744964,4289766178,4289787137,4289807845,4289828305,4289848519,4289868491,4289888223,4289907718,4289926979,4289946009,4289964811,4289983388,4290001742,4290019876,4290037792,4290055493,4290072982,4290090261,4290107333,4290124200,4290140865,4290157330,4290173597,4290189669,4290205548,4290221237,4290236737,4290252051,4290267182,4290282131,4290296901,4290311494,4290325912,4290340157,4290354231,4290368136,4290381874,4290395447,4290408857,4290422107,4290435198,4290448132,4290460910,4290473535,4290486009,4290498333,4290510509,4290522539,4290534425,4290546168,4290557770,4290569233,4290580558,4290591748,4290602803,4290613726,4290624518,4290635180,4290645714,4290656122,4290666405,4290676565,4290686603,4290696520,4290706318,4290715999,4290725564,4290735014,4290744350,4290753574,4290762688,4290771692,4290780588,4290789378,4290798062,4290806642,4290815119,4290823494,4290831769,4290839944,4290848021,4290856001,4290863886,4290871676,4290879373,4290886977,4290894490,4290901913,4290909247,4290916493,4290923652,4290930725,4290937713,4290944617,4290951438,4290958178,4290964837,4290971416,4290977916,4290984338,4290990683,4290996952,4291003145,4291009264,4291015310,4291021283,4291027184,4291033015,4291038776,4291044468,4291050091,4291055647,4291061136,4291066559,4291071917,4291077211,4291082441,4291087609,4291092715,4291097759,4291102743,4291107667,4291112532,4291117338,4291122087,4291126779 -//Base - Baby Jobs -99,4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045,0,9,16,25,36,77,112,153,200,253,320,385,490,585,700,830,970,1120,1260,1420,1620,1860,1990,2240,2504,2950,3426,3934,4474,6889,7995,9174,10425,11748,13967,15775,17678,19677,21773,30543,34212,38065,42102,46323,53026,58419,64041,69892,75973,102468,115254,128692,142784,157528,178184,196300,215198,234879,255341,330188,365914,403224,442116,482590,536948,585191,635278,687211,740988,925400,1473746,1594058,1718928,1848355,1982340,2230113,2386162,2547417,2713878,3206160,3681024,4022472,4377024,4744680,5125440,5767272,6204000,6655464,7121664,7602600,8109652,8643822,9206127,9797599,10419283,11072238,11757533,12476249,13229476,14018313,14843866,15707247,16609574,17551968,18535552,19561452,20630792,21744696,22904284,24110674,25364977,26668297,28021732,29426368,30883282,32393539,33958189,35578269,37254799,38988782,40781202,42633023,44545189,46518620,48554214,50652844,52815357,55042573,57335285,59694256,62120220,64613880,67175907,69806941,72507587,75278418,78119970,81032746,84017211,87073795,90202891,93404853,96680000,100028610,103450924,106947144,110517434,114161918,117880680,121673767,125541185,129482901,133498844,137588903,141752928,145990732,150302088,154686733,159144364,163674642,168277191,172951600,177697420,182514167,187401324,192358338,197384623,202479560,207642499,212872757,218169621,223532347,228960163,234452268,240007834,245626005,251305900,257046613,262847212,268706744,274624232,280598679,286629065,292714352,298853483,305045382,311288957,317583099,323926685,330318577,336757623,343242660,349772512,356345994,362961909,369619053,376316214,383052171,389825698,396635564,403480532,410359362,417270811,424213634,431186584,438188413,445217874,452273720,459354706,466459588,473587127,480736086,487905232,495093338,502299181,509521545,516759221,524011006,531275705,538552132,545839109,553135467,560440047,567751700,575069288,582391684,589717771,597046446,604376616,611707202,619037136,626365365,633690848,641012559,648329484,655640625,662944998,670241632,677529573,684807881,692075631,699331913,706575834,713806514,721023091,728224718,735410563,742579811,749731663,756865335,763980061,771075089,778149684,785203127,792234715,799243761,806229595,813191563,820129025,827041359,833927958,840788232,847621604,854427516,861205423,867954796,874675123,881365905,888026659,894656917,901256227,907824150,914360262,920864154,927335431,933773713,940178632,946549836,952886985,959189754,965457830,971690914,977888720,984050975,990177418,996267800,1002321886,1008339452,1014320285,1020264186,1026170966,1032040448,1037872466,1043666865,1049423500,1055142238,1060822955,1066465539,1072069886,1077635904,1083163509,1088652627,1094103193,1099515152,1104888457,1110223070,1115518962,1120776112,1125994507,1131174143,1136315022,1141417155,1146480560,1151505263,1156491296,1161438699,1166347518,1171217806,1176049622,1180843032,1185598108,1190314928,1194993575,1199634138,1204236712,1208801396,1213328296,1217817522,1222269189,1226683417,1231060330,1235400057,1239702732,1243968491,1248197476,1252389832,1256545708,1260665257,1264748635,1268796001,1272807518,1276783353,1280723674,1284628654,1288498467,1292333290,1296133304,1299898691,1303629636,1307326326,1310988950,1314617700,1318212769,1321774352,1325302646,1328797850,1332260164,1335689790,1339086931,1342451791,1345784576,1349085494,1352354752,1355592559,1358799125,1361974661,1365119379,1368233491,1371317210,1374370750,1377394325,1380388150,1383352439,1386287408,1389193273,1392070249,1394918553,1397738400,1400530007,1403293591,1406029367,1408737552,1411418361,1414072010,1416698715,1419298692,1421872155,1424419319,1426940398,1429435606,1431905157,1434349263,1436768137,1439161990,1441531034,1443875479,1446195535,1448491412,1450763318,1453011460,1455236046,1457437282,1459615373,1461770523,1463902937,1466012816,1468100363,1470165779,1472209264,1474231016,1476231234,1478210114,1480167853,1482104645,1484020685,1485916165,1487791277,1489646211,1491481157,1493296304,1495091838,1496867946,1498624813,1500362623,1502081558,1503781800,1505463529,1507126924,1508772163,1510399423,1512008880,1513600707,1515175078,1516732165,1518272138,1519795167,1521301420,1522791064,1524264265,1525721187,1527161994,1528586847,1529995908,1531389336,1532767289,1534129924,1535477397,1536809863,1538127475,1539430385,1540718744,1541992701,1543252405,1544498003,1545729641,1546947464,1548151616,1549342238,1550519472,1551683458,1552834334,1553972238,1555097306,1556209673,1557309473,1558396839,1559471902,1560534793,1561585640,1562624572,1563651716,1564667197,1565671140,1566663668,1567644904,1568614969,1569573982,1570522063,1571459329,1572385897,1573301883,1574207401,1575102565,1575987487,1576862278,1577727048,1578581907,1579426962,1580262321,1581088090,1581904373,1582711275,1583508898,1584297344,1585076715,1585847110,1586608628,1587361366,1588105422,1588840892,1589567871,1590286453,1590996731,1591698797,1592392743,1593078658,1593756633,1594426755,1595089112,1595743791,1596390878,1597030458,1597662614,1598287430,1598904988,1599515370,1600118656,1600714926,1601304259,1601886733,1602462426,1603031414,1603593772,1604149576,1604698899,1605241815,1605778396,1606308715,1606832842,1607350847,1607862800,1608368770,1608868825,1609363032,1609851457,1610334167,1610811226,1611282699,1611748650,1612209142,1612664237,1613113997,1613558483,1613997756,1614431875,1614860899,1615284887,1615703896,1616117984,1616527207,1616931621,1617331282,1617726244,1618116561,1618502287,1618883474,1619260175,1619632442,1620000326,1620363877,1620723146,1621078182,1621429033,1621775749,1622118377,1622456965,1622791559,1623122206,1623448951,1623771840,1624090917,1624406227,1624717813,1625025719,1625329987,1625630660,1625927779,1626221386,1626511522,1626798227,1627081541,1627361504,1627638155,1627911532,1628181674,1628448618,1628712402,1628973062,1629230635,1629485157,1629736664,1629985191,1630230773,1630473445,1630713240,1630950192,1631184334,1631415700,1631644322,1631870232,1632093461,1632314042,1632532005,1632747381,1632960200,1633170493,1633378289,1633583617,1633786507,1633986987,1634185085,1634380829,1634574248,1634765368,1634954216,1635140820,1635325205,1635507398,1635687425,1635865311,1636041081,1636214761,1636386375,1636555947,1636723501,1636889061,1637052651,1637214294,1637374013,1637531831,1637687770,1637841852,1637994099,1638144533,1638293176,1638440048,1638585171,1638728565,1638870250,1639010247,1639148576,1639285256,1639420307,1639553749,1639685600,1639815879,1639944605,1640071796,1640197471,1640321647,1640444342,1640565574,1640685360,1640803717,1640920662,1641036212,1641150383,1641263192,1641374655,1641484788,1641593607,1641701127,1641807363,1641912331,1642016046,1642118523,1642219777,1642319822,1642418672,1642516342,1642612846,1642708197,1642802409,1642895496,1642987471,1643078348,1643168139,1643256857,1643344515,1643431126,1643516702,1643601256,1643684799,1643767344,1643848902,1643929486,1644009107,1644087776,1644165505,1644242304,1644318185,1644393159,1644467237,1644540429,1644612746,1644684198,1644754796,1644824550,1644893470,1644961565,1645028846,1645095322,1645161003,1645225899,1645290018,1645353370,1645415965,1645477811,1645538917,1645599292,1645658945,1645717884,1645776118,1645833655,1645890503,1645946671,1646002167,1646056999,1646111175,1646164702,1646217589,1646269843,1646321471,1646372481,1646422881,1646472677,1646521877,1646570488,1646618517,1646665972,1646712858,1646759183,1646804953,1646850175,1646894856,1646939002,1646982619,1647025714,1647068293,1647110362,1647151927,1647192995,1647233571,1647273661,1647313271,1647352406,1647391073,1647429277,1647467023,1647504317,1647541164,1647577570,1647613540,1647649079,1647684192,1647718884,1647753161,1647787027,1647820488,1647853548,1647886212,1647918484,1647950370,1647981874,1648013000,1648043753,1648074138,1648104159,1648133820,1648163126,1648192080,1648220687,1648248952,1648276878,1648304469,1648331730,1648358664,1648385275,1648411567,1648437544,1648463210,1648488568,1648513622,1648538376,1648562833,1648586997,1648610872,1648634460,1648657766,1648680792,1648703542,1648726020,1648748228,1648770170,1648791849,1648813268,1648834430,1648855339,1648875997,1648896407,1648916573,1648936497,1648956182,1648975631,1648994847,1649013832,1649032590,1649051123,1649069434,1649087525,1649105399,1649123059,1649140507,1649157746,1649174778,1649191606,1649208232,1649224659,1649240889,1649256924,1649272767,1649288420,1649303885,1649319165,1649334262,1649349178,1649363915,1649378475,1649392861,1649407074,1649421117,1649434991,1649448699,1649462242,1649475623,1649488844,1649501906,1649514811,1649527562,1649540160,1649552607,1649564904,1649577054,1649589058,1649600918,1649612636,1649624213,1649635652,1649646953,1649658119,1649669151,1649680051,1649690820,1649701460,1649711972,1649722358,1649732619,1649742757,1649752774,1649762671,1649772449,1649782110,1649791655,1649801085,1649810402,1649819607,1649828702,1649837688,1649846566,1649855338,1649864004,1649872566,1649881026,1649889384,1649897642,1649905801,1649913862,1649921826,1649929695,1649937469,1649945150,1649952739,1649960237,1649967645,1649974964,1649982195,1649989340,1649996399,1650003373,1650010263,1650017071,1650023797,1650030442,1650037008,1650043495,1650049904,1650056236,1650062492,1650068673,1650074780,1650080814,1650086775,1650092665,1650098484,1650104233,1650109913,1650115525,1650121070,1650126548,1650131961,1650137309,1650142593,1650147813,1650152971,1650158067,1650163102,1650168076,1650172990,1650177845,1650182642,1650187382,1650192065,1650196692,1650201263,1650205779,1650210241,1650214650,1650219006,1650223309,1650227561,1650231762,1650235912,1650240012,1650244063,1650248066,1650252021,1650255928,1650259788,1650263602,1650267370,1650271093,1650274771,1650278405,1650281996,1650285544,1650289049,1650292512,1650295933,1650299313,1650302653,1650305953,1650309213,1650312434,1650315616,1650318760,1650321866,1650324935,1650327967,1650330963,1650333923,1650336847,1650339736,1650342591,1650345411,1650348198,1650350951,1650353671,1650356358,1650359013,1650361636,1650364228,1650366789,1650369319,1650371819,1650374289,1650376729,1650379140,1650381522,1650383875,1650386200,1650388497,1650390766,1650393008,1650395223,1650397412,1650399574,1650401711,1650403822,1650405908,1650407969,1650410005,1650412016,1650414003,1650415966,1650417906,1650419823,1650421717,1650423588,1650425436,1650427262,1650429066 -//Job - Novice -10,0,1,10,18,28,40,91,151,205,268,340,0 -//Job - 1st Classes -50,1:2:3:4:5:6:26:4046,1,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,329843,379102,434567,496856,566629,644589,731482,828096,935264,1053861,1184807,1329062,1487630,1661554,1851918,2059842,2286484,2533034,2800715,3090779,3404503,3743189,4108159,4500752,4922319,5374222,5857829,6374510,6925632,7512557,8136637,8799208,9501590,10245078,11030942,11860420,12734717,13654998,14622385,15637956,16702739,17817709,18983785,20201828,21472637,22796947,24175427,25608679,27097233,28641549,30242013,31898938,33612561,35383045,37210476,39094865,41036147,43034181,45088752,47199571,49366275,51588430,53865531,56197005,58582210,61020440,63510925,66052833,68645274,71287301,73977913,76716056,79500628,82330481,85204422,88121217,91079595,94078248,97115837,100190993,103302318,106448393,109627775,112839003,116080601,119351078,122648934,125972660,129320741,132691658,136083893,139495928,142926248,146373345,149835718,153311875,156800336,160299633,163808315,167324946,170848108,174376402,177908451,181442899,184978413,188513685,192047431,195578393,199105341,202627072,206142410,209650210,213149356,216638760,220117366,223584148,227038110,230478288,233903749,237313590,240706940,244082960,247440841,250779805,254099105,257398024,260675877,263932007,267165788,270376624,273563946,276727216,279865923,282979584,286067743,289129972,292165868,295175054,298157179,301111917,304038965,306938045,309808901,312651301,315465033,318249908,321005758,323732433,326429805,329097764,331736219,334345097,336924341,339473912,341993787,344483958,346944434,349375236,351776401,354147978,356490030,358802632,361085872,363339848,365564669,367760455,369927336,372065452,374174951,376255991,378308737,380333362,382330048,384298982,386240358,388154377,390041246,391901177,393734387,395541098,397321537,399075935,400804526,402507549,404185246,405837861,407465642,409068839,410647704,412202492,413733459,415240862,416724961,418186016,419624289,421040041,422433535,423805034,425154801,426483099,427790192,429076343,430341814,431586867,432811764,434016766,435202133,436368124,437514996,438643007,439752411,440843463,441916415,442971519,444009023,445029176,446032223,447018409,447987976,448941165,449878214,450799359,451704835,452594875,453469708,454329562,455174663,456005235,456821498,457623672,458411973,459186616,459947813,460695773,461430704,462152810,462862294,463559356,464244194,464917003,465577976,466227304,466865175,467491774,468107285,468711889,469305764,469889087,470462031,471024768,471577467,472120295,472653416,473176993,473691185,474196151,474692045,475179021,475657230,476126821,476587940,477040732,477485339,477921901,478350556,478771440,479184687,479590429,479988796,480379915,480763913,481140913,481511037,481874405,482231136,482581346,482925149,483262657,483593982,483919232,484238515,484551937,484859601,485161609,485458061,485749057,486034693,486315066,486590269,486860394,487125532,487385773,487641205,487891913,488137983,488379498,488616541,488849192,489077530,489301633,489521578,489737440,489949293,490157210,490361262,490561520,490758052,490950927,491140211,491325969,491508266,491687165,491862728,492035017,492204091,492370009,492532829,492692607,492849400,493003262,493154248,493302410,493447800,493590469,493730468,493867845,494002649,494134928,494264728,494392095,494517074,494639709,494760043,494878119,494993979,495107664,495219215,495328671,495436070,495541451,495644852,495746309,495845859,495943537,496039378,496133416,496225684,496316216,496405044,496492199,496577713,496661617,496743940,496824712,496903963,496981720,497058012,497132865,497206307,497278364,497349062,497418427,497486483,497553255,497618767,497683043,497746106,497807978,497868682,497928240,497986673,498044003,498100250,498155434,498209576,498262695,498314810,498365940,498416104,498465319,498513604,498560976,498607452,498653050,498697785,498741674,498784733,498826978,498868423,498909084,498948976,498988113,499026509,499064179,499101136,499137393,499172964,499207862,499242099,499275688,499308641,499340970,499372686,499403802,499434328,499464276,499493657,499522481,499550759,499578502,499605719,499632420,499658615,499684314,499709526,499734260,499758525,499782330,499805684,499828596,499851073,499873124,499894757,499915980,499936801,499957227,499977266,499996925,500016211,500035131,500053692,500071901,500089765,500107290,500124483,500141350,500157897,500174130,500190055,500205678,500221004,500236040,500250790,500265261,500279457,500293384,500307047,500320450,500333599,500346498,500359153,500371568,500383747,500395695,500407416,500418915,500430195,500441261,500452117,500462767,500473215,500483465,500493520,500503384,500513061,500522554,500531867,500541003,500549966,500558759,500567385,500575847,500584149,500592293,500600282,500608120,500615809,500623352,500630752,500638011,500645132,500652118,500658971,500665694,500672290,500678760,500685108,500691335,500697444,500703437,500709316,500715083,500720741,500726291,500731736,500737078,500742318,500747459,500752502,500757449,500762302,500767063,500771734,500776316,500780811,500785220,500789546,500793790,500797953,500802037,500806043,500809973,500813829,500817611,500821321,500824961,500828532,500832035,500835471,500838842,500842149,500845393,500848576,500851698,500854761,500857766,500860714,500863606,500866443,500869226,500871956,500874634,500877261,500879838,500882366,500884846,500887279,500889666,500892008,500894305,500896558,500898769,500900938,500903065,500905152,500907199,500909207,500911177,500913110,500915006,500916866,500918691,500920481,500922237,500923960,500925650,500927308,500928934,500930529,500932094,500933629,500935135,500936613,500938063,500939485,500940880,500942248,500943590,500944907,500946199,500947466,500948709,500949929,500951125,500952299,500953450,500954580,500955688,500956775,500957841,500958887,500959913,500960920,500961908,500962877,500963827,500964759,500965674,500966571,500967451,500968314,500969161,500969992,500970807,500971607,500972391,500973160,500973915,500974656,500975382,500976095,500976794,500977480,500978153,500978813,500979460,500980095,500980718,500981329,500981929,500982517,500983094,500983660,500984215,500984760,500985294,500985818,500986332,500986836,500987331,500987816,500988292,500988759,500989217,500989667,500990108,500990541,500990965,500991381,500991789,500992190,500992583,500992968,500993346,500993717,500994081,500994438,500994788,500995132,500995469,500995800,500996124,500996442,500996754,500997060,500997360,500997655,500997944,500998227,500998505,500998778,500999046,500999309,500999567,500999820,501000068,501000311,501000549,501000783,501001012,501001237,501001458,501001675,501001887,501002095,501002299,501002500,501002697,501002890,501003079,501003265,501003447,501003626,501003801,501003973,501004142,501004307,501004469,501004628,501004784,501004937,501005087,501005234,501005379,501005521,501005660,501005796,501005930,501006061,501006190,501006316,501006440,501006562,501006681,501006798,501006913,501007026,501007136,501007244,501007350,501007454,501007556,501007656,501007754,501007850,501007945,501008038,501008129,501008218,501008306,501008392,501008476,501008559,501008640,501008720,501008798,501008875,501008950,501009024,501009096,501009167,501009237,501009305,501009372,501009438,501009502,501009565,501009627,501009688,501009748,501009806,501009863,501009919,501009974,501010028,501010081,501010133,501010184,501010234,501010283,501010331,501010378,501010424,501010469,501010514,501010558,501010601,501010643,501010684,501010724,501010764,501010803,501010841,501010878,501010915,501010951,501010986,501011021,501011055,501011088,501011121,501011153,501011184,501011215,501011245,501011275,501011304,501011332,501011360,501011387,501011414,501011440,501011466,501011491,501011516,501011540,501011564,501011587,501011610,501011633,501011655,501011677,501011698,501011719,501011739,501011759,501011779,501011798,501011817,501011835,501011853,501011871,501011888,501011905,501011922,501011938,501011954,501011970,501011985,501012000,501012015,501012030,501012044,501012058,501012072,501012085,501012098,501012111,501012124,501012136,501012148,501012160,501012172,501012183,501012194,501012205,501012216,501012227,501012237,501012247,501012257,501012267,501012277,501012286,501012295,501012304,501012313,501012322,501012330,501012338,501012346,501012354,501012362,501012370,501012378,501012385,501012392,501012399,501012406,501012413,501012420,501012427,501012433,501012439,501012445,501012451,501012457,501012463,501012469,501012475,501012480,501012485,501012490,501012495,501012500,501012505,501012510,501012515,501012520,501012524,501012528,501012532,501012536,501012540,501012544,501012548,501012552,501012556,501012560,501012564,501012568,501012571,501012574,501012577,501012580,501012583,501012586,501012589,501012592,501012595,501012598,501012601,501012604,501012607,501012610,501012613,501012615,501012617,501012619,501012621,501012623,501012625,501012627,501012629,501012631,501012633,501012635,501012637,501012639,501012641,501012643,501012645,501012647,501012649,501012651,501012653,501012655,501012656,501012657,501012658,501012659,501012660,501012661,501012662,501012663,501012664,501012665,501012666,501012667,501012668,501012669,501012670,501012671,501012672,501012673,501012674,501012675,501012676,501012677,501012678,501012679,501012680,501012681,501012682,501012683,501012684,501012685,501012686,501012687,501012688,501012689,501012690,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691 -//Job - 2nd Classes -50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 -//Job - Super Novice -99,23,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 -//Job - Novice High -10,4001,1,11,20,31,44,100,166,226,295,374,0 -//Job - Adv First Classes -50,4002:4003:4004:4005:4006:4007,1,60,86,116,152,232,360,440,544,672,1040,1208,1398,1604,1896,2250,3336,3874,4452,6080,7976,11128,12544,14042,18228,28683,38225,42228,46425,58073,70898,91195,99290,107720,131043,156238,195408,210430,226010,269028,314788,384853,479453,510878,620880,715530,822388,942708,1077832,1229192,1398312,1586809,1796395,2028875,2286150,2570212,2883147,3227131,3604428,4017387,4468440,4960097,5494942,6075626,6704865,7385431,8120148,8911883,9763540,10678052,11658373,12707470,13828314,15023872,16297098,17650924,19088250,20611938,22224798,23929585,25728985,27625611,29621990,31720558,33923652,36233502,38652223,41181809,43824128,46580913,49453759,52444118,55553293,58782437,62132546,65604458,69198851,72916241,76756979,80721254,84809088,89020341,93354708,97811721,102390753,107091018,111911574,116851326,121909029,127083292,132372582,137775229,143289430,148913253,154644644,160481430,166421327,172461943,178600787,184835272,191162721,197580376,204085402,210674892,217345875,224095322,230920151,237817234,244783402,251815451,258910149,266064240,273274451,280537495,287850079,295208908,302610689,310052137,317529979,325040959,332581841,340149414,347740495,355351934,362980617,370623468,378277453,385939583,393606917,401276564,408945685,416611495,424271267,431922331,439562077,447187956,454797483,462388235,469957854,477504049,485024593,492517328,499980161,507411067,514808089,522169338,529492992,536777296,544020563,551221172,558377570,565488268,572551843,579566936,586532253,593446562,600308694,607117541,613872055,620571248,627214189,633800006,640327881,646797052,653206812,659556504,665845524,672073319,678239382,684343257,690384532,696362841,702277862,708129315,713916962,719640605,725300085,730895280,736426105,741892510,747294479,752632028,757905206,763114091,768258791,773339442,778356208,783309277,788198862,793025201,797788555,802489205,807127454,811703625,816218058,820671113,825063166,829394608,833665848,837877307,842029420,846122635,850157413,854134225,858053552,861915887,865721730,869471590,873165985,876805439,880390483,883921654,887399495,890824553,894197380,897518531,900788566,904008046,907177537,910297605,913368818,916391747,919366961,922295032,925176531,928012029,930802096,933547303,936248218,938905408,941519439,944090875,946620278,949108207,951555219,953961868,956328705,958656278,960945131,963195806,965408840,967584767,969724117,971827415,973895183,975927939,977926195,979890460,981821237,983719026,985584322,987417614,989219387,990990121,992730290,994440365,996120811,997772088,999394651,1000988949,1002555426,1004094522,1005606671,1007092302,1008551839,1009985700,1011394298,1012778042,1014137334,1015472572,1016784149,1018072452,1019337863,1020580760,1021801514,1023000493,1024178058,1025334567,1026470371,1027585817,1028681247,1029756999,1030813405,1031850792,1032869483,1033869796,1034852045,1035816538,1036763579,1037693467,1038606498,1039502962,1040383145,1041247329,1042095790,1042928803,1043746635,1044549552,1045337813,1046111675,1046871391,1047617208,1048349371,1049068120,1049773692,1050466319,1051146230,1051813650,1052468801,1053111901,1053743164,1054362800,1054971017,1055568019,1056154006,1056729176,1057293722,1057847834,1058391700,1058925505,1059449429,1059963650,1060468344,1060963682,1061449833,1061926964,1062395238,1062854815,1063305853,1063748508,1064182931,1064609273,1065027680,1065438297,1065841266,1066236727,1066624817,1067005670,1067379419,1067746194,1068106123,1068459331,1068805942,1069146076,1069479853,1069807389,1070128800,1070444198,1070753693,1071057395,1071355410,1071647844,1071934799,1072216376,1072492675,1072763794,1073029828,1073290871,1073547016,1073798354,1074044974,1074286963,1074524407,1074757391,1074985997,1075210307,1075430400,1075646355,1075858249,1076066158,1076270156,1076470315,1076666707,1076859403,1077048471,1077233979,1077415993,1077594579,1077769801,1077941721,1078110401,1078275902,1078438283,1078597603,1078753918,1078907285,1079057760,1079205396,1079350247,1079492364,1079631799,1079768602,1079902823,1080034510,1080163711,1080290472,1080414839,1080536857,1080656570,1080774021,1080889253,1081002307,1081113225,1081222046,1081328810,1081433556,1081536322,1081637145,1081736061,1081833107,1081928317,1082021726,1082113368,1082203277,1082291485,1082378024,1082462925,1082546220,1082627938,1082708110,1082786764,1082863929,1082939633,1083013904,1083086769,1083158254,1083228386,1083297189,1083364689,1083430911,1083495879,1083559616,1083622146,1083683491,1083743674,1083802717,1083860641,1083917467,1083973217,1084027910,1084081567,1084134207,1084185849,1084236512,1084286215,1084334976,1084382812,1084429742,1084475782,1084520949,1084565260,1084608731,1084651377,1084693215,1084734259,1084774525,1084814027,1084852780,1084890798,1084928095,1084964685,1085000581,1085035796,1085070343,1085104235,1085137484,1085170102,1085202101,1085233493,1085264289,1085294501,1085324140,1085353217,1085381742,1085409726,1085437179,1085464111,1085490532,1085516451,1085541878,1085566823,1085591294,1085615301,1085638852,1085661956,1085684622,1085706858,1085728672,1085750072,1085771065,1085791660,1085811864,1085831684,1085851128,1085870203,1085888916,1085907274,1085925283,1085942950,1085960282,1085977285,1085993965,1086010328,1086026381,1086042129,1086057578,1086072734,1086087602,1086102188,1086116497,1086130534,1086144304,1086157813,1086171065,1086184066,1086196820,1086209332,1086221606,1086233647,1086245459,1086257047,1086268415,1086279567,1086290507,1086301240,1086311769,1086322098,1086332231,1086342171,1086351922,1086361488,1086370872,1086380078,1086389109,1086397969,1086406661,1086415187,1086423552,1086431758,1086439808,1086447705,1086455452,1086463052,1086470507,1086477821,1086484996,1086492035,1086498940,1086505714,1086512359,1086518878,1086525273,1086531547,1086537701,1086543738,1086549661,1086555471,1086561171,1086566763,1086572248,1086577629,1086582908,1086588087,1086593167,1086598151,1086603040,1086607836,1086612541,1086617157,1086621685,1086626127,1086630485,1086634760,1086638954,1086643068,1086647104,1086651063,1086654947,1086658757,1086662495,1086666162,1086669759,1086673288,1086676750,1086680146,1086683477,1086686745,1086689951,1086693096,1086696181,1086699208,1086702177,1086705090,1086707947,1086710750,1086713500,1086716198,1086718844,1086721440,1086723987,1086726485,1086728936,1086731340,1086733699,1086736013,1086738283,1086740510,1086742694,1086744837,1086746939,1086749001,1086751024,1086753009,1086754956,1086756866,1086758740,1086760578,1086762381,1086764150,1086765885,1086767587,1086769257,1086770895,1086772502,1086774078,1086775624,1086777141,1086778629,1086780089,1086781521,1086782926,1086784304,1086785656,1086786982,1086788283,1086789559,1086790811,1086792039,1086793244,1086794426,1086795586,1086796724,1086797840,1086798935,1086800009,1086801063,1086802097,1086803111,1086804106,1086805082,1086806039,1086806978,1086807899,1086808803,1086809689,1086810559,1086811412,1086812249,1086813070,1086813875,1086814665,1086815440,1086816200,1086816946,1086817678,1086818396,1086819100,1086819791,1086820469,1086821134,1086821786,1086822426,1086823053,1086823669,1086824273,1086824865,1086825446,1086826016,1086826575,1086827124,1086827662,1086828190,1086828708,1086829216,1086829714,1086830203,1086830683,1086831153,1086831615,1086832068,1086832512,1086832948,1086833375,1086833794,1086834205,1086834608,1086835004,1086835392,1086835773,1086836147,1086836514,1086836874,1086837227,1086837573,1086837912,1086838245,1086838572,1086838892,1086839206,1086839514,1086839816,1086840113,1086840404,1086840690,1086840970,1086841245,1086841515,1086841779,1086842038,1086842292,1086842542,1086842787,1086843027,1086843263,1086843494,1086843721,1086843943,1086844161,1086844375,1086844585,1086844791,1086844993,1086845191,1086845385,1086845576,1086845763,1086845946,1086846126,1086846303,1086846476,1086846646,1086846813,1086846976,1086847136,1086847293,1086847447,1086847598,1086847746,1086847892,1086848035,1086848175,1086848312,1086848447,1086848579,1086848709,1086848836,1086848961,1086849083,1086849203,1086849321,1086849437,1086849550,1086849661,1086849770,1086849877,1086849982,1086850085,1086850186,1086850285,1086850382,1086850477,1086850571,1086850663,1086850753,1086850841,1086850928,1086851013,1086851096,1086851178,1086851258,1086851337,1086851414,1086851490,1086851564,1086851637,1086851708,1086851778,1086851847,1086851914,1086851980,1086852045,1086852109,1086852171,1086852232,1086852292,1086852351,1086852409,1086852466,1086852522,1086852576,1086852629,1086852681,1086852732,1086852782,1086852831,1086852879,1086852927,1086852974,1086853020,1086853065,1086853109,1086853152,1086853194,1086853236,1086853277,1086853317,1086853356,1086853394,1086853432,1086853469,1086853505,1086853541,1086853576,1086853610,1086853644,1086853677,1086853709,1086853741,1086853772,1086853802,1086853832,1086853861,1086853890,1086853918,1086853946,1086853973,1086854000,1086854026,1086854052,1086854077,1086854102,1086854126,1086854150,1086854173,1086854196,1086854218,1086854240,1086854261,1086854282,1086854303,1086854323,1086854343,1086854362,1086854381,1086854400,1086854418,1086854436,1086854454,1086854471,1086854488,1086854505,1086854521,1086854537,1086854553,1086854568,1086854583,1086854598,1086854612,1086854626,1086854640,1086854654,1086854667,1086854680,1086854693,1086854706,1086854718,1086854730,1086854742,1086854754,1086854765,1086854776,1086854787,1086854798,1086854808,1086854818,1086854828,1086854838,1086854848,1086854857,1086854866,1086854875,1086854884,1086854893,1086854902,1086854910,1086854918,1086854926,1086854934,1086854942,1086854950,1086854957,1086854964,1086854971,1086854978,1086854985,1086854992,1086854999,1086855005,1086855011,1086855017,1086855023,1086855029,1086855035,1086855041,1086855047,1086855052,1086855057,1086855062,1086855067,1086855072,1086855077,1086855082,1086855087,1086855092,1086855096,1086855100,1086855104,1086855108,1086855112,1086855116,1086855120,1086855124,1086855128,1086855132,1086855136,1086855140,1086855143,1086855146,1086855149,1086855152,1086855155,1086855158,1086855161,1086855164,1086855167,1086855170,1086855173,1086855176,1086855179,1086855182,1086855185,1086855187,1086855189,1086855191,1086855193,1086855195,1086855197,1086855199,1086855201,1086855203,1086855205,1086855207,1086855209,1086855211,1086855213,1086855215,1086855217,1086855219,1086855221,1086855223,1086855225,1086855227,1086855228,1086855229,1086855230,1086855231,1086855232,1086855233,1086855234,1086855235,1086855236 -//Job - Adv Second Classes -70,24:25:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1943306,2244059,2584282,2968115,3400000,3884688,4427246,5033064,5707855,6457661,7288852,8208125,9222500,10339317,11566230,12911197,14382470,15988583,17738338,19640789,21705223,23941143,26358244,28966392,31775600,34796000,38037819,41511350,45226922,49194872,53425513,57929105,62715823,67795725,73178721,78874542,84892710,91242506,97932943,104972733,112370263,120133566,128270295,136787699,145692601,154991375,164689926,174793673,185307530,196235893,207582627,219351052,231543938,244163492,257211358,270688607,284595740,298932685,313698799,328892871,344513126,360557232,377022309,393904936,411201163,428906522,447016041,465524258,484425237,503712583,523379460,543418608,563822364,584582678,605691135,627138976,648917115,671016163,693426449,716138040,739140762,762424222,785977830,809790819,833852265,858151108,882676174,907416194,932359821,957495652,982812246,1008298142,1033941875,1059731995,1085657082,1111705763,1137866726,1164128735,1190480643,1216911407,1243410098,1269965914,1296568193,1323206421,1349870242,1376549469,1403234090,1429914278,1456580397,1483223010,1509832883,1536400993,1562918530,1589376904,1615767747,1642082917,1668314501,1694454815,1720496409,1746432067,1772254807,1797957882,1823534782,1848979230,1874285184,1899446836,1924458610,1949315159,1974011367,1998542342,2022903418,2047090150,2071098310,2094923887,2118563083,2142012307,2165268175,2188327503,2211187307,2233844796,2256297369,2278542611,2300578289,2322402347,2344012903,2365408244,2386586822,2407547248,2428288289,2448808865,2469108042,2489185029,2509039173,2528669956,2548076989,2567260008,2586218871,2604953553,2623464142,2641750834,2659813929,2677653830,2695271035,2712666136,2729839813,2746792832,2763526041,2780040365,2796336805,2812416433,2828280388,2843929874,2859366157,2874590560,2889604462,2904409294,2919006536,2933397714,2947584399,2961568203,2975350775,2988933801,3002319001,3015508125,3028502953,3041305291,3053916970,3066339843,3078575783,3090626683,3102494451,3114181011,3125688300,3137018266,3148172868,3159154072,3169963851,3180604184,3191077054,3201384446,3211528348,3221510747,3231333629,3240998979,3250508779,3259865006,3269069632,3278124624,3287031942,3295793538,3304411356,3312887331,3321223387,3329421440,3337483392,3345411135,3353206549,3360871500,3368407842,3375817414,3383102041,3390263534,3397303689,3404224286,3411027090,3417713850,3424286299,3430746152,3437095109,3443334852,3449467047,3455493342,3461415367,3467234735,3472953041,3478571863,3484092761,3489517276,3494846931,3500083232,3505227667,3510281705,3515246797,3520124376,3524915857,3529622637,3534246095,3538787592,3543248471,3547630058,3551933659,3556160565,3560312047,3564389360,3568393741,3572326410,3576188570,3579981406,3583706087,3587363764,3590955573,3594482632,3597946043,3601346892,3604686248,3607965165,3611184681,3614345817,3617449581,3620496963,3623488939,3626426470,3629310502,3632141966,3634921779,3637650842,3640330044,3642960259,3645542346,3648077152,3650565509,3653008236,3655406140,3657760013,3660070635,3662338774,3664565184,3666750607,3668895774,3671001402,3673068197,3675096854,3677088055,3679042471,3680960763,3682843579,3684691557,3686505325,3688285499,3690032685,3691747478,3693430465,3695082220,3696703310,3698294290,3699855707,3701388097,3702891989,3704367901,3705816342,3707237813,3708632806,3710001804,3711345282,3712663706,3713957535,3715227220,3716473203,3717695918,3718895792,3720073245,3721228689,3722362528,3723475160,3724566975,3725638356,3726689680,3727721318,3728733632,3729726979,3730701710,3731658168,3732596692,3733517613,3734421257,3735307945,3736177990,3737031701,3737869381,3738691328,3739497833,3740289184,3741065662,3741827543,3742575099,3743308597,3744028298,3744734459,3745427333,3746107167,3746774204,3747428682,3748070836,3748700896,3749319088,3749925634,3750520750,3751104651,3751677546,3752239641,3752791138,3753332236,3753863129,3754384008,3754895060,3755396470,3755888418,3756371081,3756844634,3757309248,3757765090,3758212325,3758651114,3759081616,3759503986,3759918377,3760324939,3760723819,3761115161,3761499107,3761875797,3762245366,3762607949,3762963676,3763312677,3763655079,3763991005,3764320578,3764643917,3764961140,3765272361,3765577694,3765877250,3766171137,3766459463,3766742332,3767019847,3767292109,3767559217,3767821269,3768078359,3768330582,3768578029,3768820790,3769058954,3769292607,3769521835,3769746721,3769967347,3770183794,3770396141,3770604465,3770808842,3771009346,3771206051,3771399029,3771588350,3771774083,3771956296,3772135055,3772310426,3772482473,3772651259,3772816845,3772979292,3773138659,3773295005,3773448386,3773598859,3773746479,3773891300,3774033375,3774172755,3774309492,3774443636,3774575236,3774704340,3774830995,3774955248,3775077144,3775196728,3775314043,3775429133,3775542040,3775652805,3775761468,3775868070,3775972649,3776075244,3776175892,3776274631,3776371496,3776466523,3776559747,3776651202,3776740921,3776828938,3776915285,3776999993,3777083093,3777164616,3777244592,3777323050,3777400019,3777475527,3777549602,3777622271,3777693560,3777763496,3777832105,3777899411,3777965440,3778030215,3778093760,3778156099,3778217255,3778277250,3778336106,3778393844,3778450486,3778506053,3778560565,3778614042,3778666503,3778717968,3778768456,3778817986,3778866575,3778914242,3778961003,3779006877,3779051880,3779096028,3779139338,3779181825,3779223505,3779264394,3779304506,3779343857,3779382460,3779420330,3779457481,3779493927,3779529681,3779564756,3779599164,3779632919,3779666033,3779698518,3779730386,3779761649,3779792318,3779822405,3779851920,3779880875,3779909280,3779937145,3779964481,3779991298,3780017605,3780043413,3780068731,3780093568,3780117933,3780141835,3780165283,3780188286,3780210852,3780232989,3780254706,3780276010,3780296909,3780317412,3780337525,3780357256,3780376612,3780395601,3780414229,3780432503,3780450430,3780468016,3780485268,3780502193,3780518796,3780535084,3780551062,3780566737,3780582114,3780597199,3780611997,3780626514,3780640755,3780654726,3780668431,3780681876,3780695066,3780708005,3780720698,3780733150,3780745366,3780757349,3780769105,3780780637,3780791950,3780803048,3780813936,3780824617,3780835095,3780845374,3780855458,3780865350,3780875054,3780884574,3780893913,3780903074,3780912061,3780920878,3780929527,3780938012,3780946336,3780954501,3780962511,3780970369,3780978078,3780985640,3780993059,3781000337,3781007476,3781014480,3781021351,3781028091,3781034703,3781041189,3781047552,3781053794,3781059918,3781065925,3781071818,3781077599,3781083270,3781088834,3781094292,3781099646,3781104899,3781110052,3781115107,3781120066,3781124931,3781129703,3781134384,3781138976,3781143481,3781147901,3781152237,3781156490,3781160662,3781164755,3781168770,3781172709,3781176573,3781180364,3781184083,3781187731,3781191310,3781194821,3781198265,3781201644,3781204958,3781208209,3781211399,3781214528,3781217598,3781220609,3781223563,3781226461,3781229304,3781232093,3781234829,3781237513,3781240146,3781242729,3781245263,3781247749,3781250187,3781252579,3781254926,3781257228,3781259486,3781261701,3781263874,3781266006,3781268097,3781270149,3781272162,3781274136,3781276073,3781277973,3781279837,3781281666,3781283460,3781285220,3781286946,3781288639,3781290300,3781291930,3781293529,3781295097,3781296636,3781298145,3781299626,3781301078,3781302503,3781303901,3781305272,3781306617,3781307937,3781309231,3781310501,3781311747,3781312969,3781314168,3781315344,3781316498,3781317630,3781318740,3781319829,3781320897,3781321945,3781322973,3781323982,3781324972,3781325943,3781326895,3781327829,3781328745,3781329644,3781330526,3781331391,3781332240,3781333073,3781333890,3781334691,3781335477,3781336248,3781337004,3781337746,3781338474,3781339188,3781339888,3781340575,3781341249,3781341910,3781342559,3781343195,3781343819,3781344431,3781345032,3781345621,3781346199,3781346766,3781347322,3781347868,3781348403,3781348928,3781349443,3781349948,3781350444,3781350930,3781351407,3781351875,3781352334,3781352784,3781353226,3781353659,3781354084,3781354501,3781354910,3781355311,3781355705,3781356091,3781356470,3781356842,3781357207,3781357565,3781357916,3781358260,3781358598,3781358929,3781359254,3781359573,3781359886,3781360193,3781360494,3781360789,3781361079,3781361363,3781361642,3781361915,3781362183,3781362446,3781362704,3781362957,3781363205,3781363449,3781363688,3781363922,3781364152,3781364378,3781364599,3781364816,3781365029,3781365238,3781365443,3781365644,3781365841,3781366034,3781366224,3781366410,3781366593,3781366772,3781366948,3781367120,3781367289,3781367455,3781367618,3781367778,3781367934,3781368088,3781368239,3781368387,3781368532,3781368674,3781368813,3781368950,3781369084,3781369216,3781369345,3781369472,3781369596,3781369718,3781369838,3781369955,3781370070,3781370183,3781370294,3781370403,3781370509,3781370613,3781370715,3781370815,3781370914,3781371011,3781371106,3781371199,3781371290,3781371380,3781371468,3781371554,3781371638,3781371721,3781371802,3781371882,3781371960,3781372037,3781372112,3781372186,3781372258,3781372329,3781372399,3781372467,3781372534,3781372600,3781372664,3781372727,3781372789,3781372850,3781372910,3781372969,3781373026,3781373082,3781373137,3781373191,3781373244,3781373296,3781373347,3781373397,3781373446,3781373494,3781373541,3781373587,3781373632,3781373677,3781373721,3781373764,3781373806,3781373847,3781373887,3781373927,3781373966,3781374004,3781374041,3781374078,3781374114,3781374149,3781374184,3781374218,3781374251,3781374284,3781374316,3781374347,3781374378,3781374408,3781374438,3781374467,3781374496,3781374524,3781374551,3781374578,3781374604,3781374630,3781374655,3781374680,3781374704,3781374728,3781374751,3781374774,3781374797,3781374819,3781374841,3781374862,3781374883,3781374903,3781374923,3781374943,3781374962,3781374981,3781375000,3781375018,3781375036,3781375053,3781375070,3781375087,3781375103,3781375119,3781375135,3781375151,3781375166,3781375181,3781375196,3781375210,3781375224,3781375238,3781375252,3781375265,3781375278,3781375291,3781375303,3781375315,3781375327,3781375339,3781375351,3781375362,3781375373,3781375384,3781375395,3781375405,3781375415,3781375425,3781375435,3781375445,3781375454,3781375463,3781375472,3781375481,3781375490,3781375499,3781375507,3781375515,3781375523,3781375531,3781375539,3781375547,3781375554,3781375561,3781375568,3781375575,3781375582,3781375589,3781375596,3781375602,3781375608,3781375614,3781375620,3781375626,3781375632,3781375638,3781375644,3781375649,3781375654,3781375659,3781375664 -//Job - Star Gladiator -50,4047:4048,1,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,54868,70216,77154,84412,105416,133942,165376,179088,193338,235642,289842,348402,373354,399168,477234,572732,674294,716870,760752,895370,1053978,1220492,1409379,1623055,1864120,2135364,2439771,2780523,3161005,3584806,4055720,4577747,5155093,5792168,6493582,7264141,8108843,9032871,10041585,11140513,12335340,13631900,15036161,16554212,18192249,19956561,21853511,23889523,26071060,28404610,30896665,33553702,36382164,39388442,42578852,45959619,49536854,53316538,57304499,61506398,65927706,70573691,75449398,80559633,85908949,91501631,97341682,103432811,109778421,116381598,123245103,130371364,137762466,145420147,153345795,161540442,170004760,178739065,187743310,197017092,206559651,216369871,226446289,236787095,247390140,258252944,269372701,280746288,292370275,304240934,316354248,328705924,341291403,354105871,367144273,380401324,393871522,407549162,421428347,435503003,449766891,464213622,478836669,493629380,508584993,523696648,538957399,554360228,569898056,585563758,601350173,617250114,633256384,649361782,665559118,681841219,698200942,714631183,731124884,747675046,764274732,780917079,797595303,814302708,831032690,847778745,864534475,881293592,898049925,914797422,931530156,948242328,964928270,981582450,998199473,1014774083,1031301167,1047775755,1064193021,1080548287,1096837020,1113054835,1129197495,1145260911,1161241141,1177134391,1192937013,1208645505,1224256509,1239766811,1255173340,1270473164,1285663492,1300741669,1315705176,1330551627,1345278767,1359884471,1374366739,1388723697,1402953592,1417054791,1431025777,1444865147,1458571611,1472143986,1485581197,1498882271,1512046336,1525072618,1537960438,1550709209,1563318435,1575787706,1588116696,1600305161,1612352936,1624259931,1636026131,1647651590,1659136432,1670480845,1681685082,1692749457,1703674340,1714460159,1725107395,1735616581,1745988298,1756223174,1766321883,1776285140,1786113701,1795808361,1805369951,1814799337,1824097418,1833265123,1842303411,1851213268,1859995707,1868651764,1877182497,1885588987,1893872333,1902033652,1910074079,1917994763,1925796869,1933481573,1941050064,1948503540,1955843209,1963070288,1970186001,1977191577,1984088252,1990877264,1997559857,2004137276,2010610768,2016981581,2023250963,2029420161,2035490422,2041462991,2047339109,2053120015,2058806945,2064401129,2069903793,2075316158,2080639439,2085874846,2091023580,2096086837,2101065805,2105961665,2110775588,2115508739,2120162273,2124737336,2129235066,2133656590,2138003026,2142275483,2146475060,2150602844,2154659913,2158647334,2162566165,2166417450,2170202225,2173921514,2177576330,2181167675,2184696540,2188163904,2191570735,2194917991,2198206616,2201437545,2204611701,2207729995,2210793327,2213802586,2216758649,2219662382,2222514640,2225316266,2228068093,2230770942,2233425623,2236032934,2238593664,2241108590,2243578477,2246004081,2248386147,2250725409,2253022589,2255278401,2257493547,2259668720,2261804601,2263901862,2265961164,2267983160,2269968491,2271917789,2273831677,2275710768,2277555665,2279366962,2281145244,2282891087,2284605057,2286287712,2287939601,2289561264,2291153232,2292716028,2294250167,2295756155,2297234490,2298685661,2300110151,2301508433,2302880974,2304228232,2305550658,2306848695,2308122780,2309373341,2310600799,2311805570,2312988060,2314148671,2315287796,2316405822,2317503130,2318580095,2319637084,2320674458,2321692573,2322691778,2323672416,2324634824,2325579333,2326506269,2327415953,2328308698,2329184814,2330044604,2330888366,2331716394,2332528975,2333326392,2334108923,2334876841,2335630414,2336369905,2337095574,2337807674,2338506455,2339192162,2339865036,2340525313,2341173226,2341809003,2342432868,2343045041,2343645738,2344235172,2344813550,2345381078,2345937956,2346484382,2347020550,2347546649,2348062867,2348569387,2349066390,2349554052,2350032547,2350502045,2350962713,2351414717,2351858217,2352293372,2352720337,2353139265,2353550306,2353953607,2354349312,2354737563,2355118500,2355492259,2355858974,2356218777,2356571797,2356918161,2357257994,2357591417,2357918551,2358239514,2358554421,2358863386,2359166519,2359463931,2359755728,2360042016,2360322899,2360598477,2360868851,2361134118,2361394373,2361649711,2361900225,2362146005,2362387140,2362623717,2362855822,2363083539,2363306951,2363526139,2363741182,2363952158,2364159144,2364362215,2364561444,2364756904,2364948666,2365136800,2365321374,2365502455,2365680109,2365854400,2366025392,2366193147,2366357727,2366519191,2366677598,2366833005,2366985469,2367135046,2367281790,2367425755,2367566993,2367705556,2367841494,2367974857,2368105693,2368234050,2368359975,2368483514,2368604712,2368723613,2368840261,2368954698,2369066966,2369177106,2369285159,2369391164,2369495159,2369597183,2369697272,2369795464,2369891794,2369986298,2370079010,2370169964,2370259193,2370346730,2370432607,2370516855,2370599505,2370680588,2370760133,2370838169,2370914725,2370989829,2371063508,2371135789,2371206699,2371276264,2371344509,2371411459,2371477139,2371541573,2371604784,2371666796,2371727631,2371787312,2371845861,2371903299,2371959647,2372014925,2372069154,2372122354,2372174544,2372225744,2372275972,2372325247,2372373587,2372421009,2372467531,2372513170,2372557943,2372601866,2372644955,2372687226,2372728695,2372769376,2372809285,2372848437,2372886845,2372924524,2372961488,2372997750,2373033324,2373068222,2373102458,2373136044,2373168992,2373201314,2373233023,2373264130,2373294646,2373324582,2373353950,2373382760,2373411023,2373438750,2373465950,2373492634,2373518811,2373544491,2373569683,2373594397,2373618641,2373642425,2373665757,2373688646,2373711101,2373733129,2373754739,2373775938,2373796735,2373817137,2373837151,2373856785,2373876046,2373894941,2373913478,2373931663,2373949502,2373967002,2373984170,2374001012,2374017534,2374033742,2374049642,2374065240,2374080542,2374095553,2374110279,2374124726,2374138898,2374152801,2374166440,2374179820,2374192946,2374205822,2374218454,2374230846,2374243002,2374254927,2374266626,2374278103,2374289362,2374300407,2374311242,2374321871,2374332298,2374342527,2374352562,2374362406,2374372063,2374381537,2374390831,2374399948,2374408892,2374417666,2374426273,2374434717,2374443000,2374451126,2374459098,2374466918,2374474590,2374482116,2374489499,2374496742,2374503847,2374510817,2374517655,2374524363,2374530943,2374537398,2374543731,2374549943,2374556037,2374562016,2374567881,2374573635,2374579279,2374584816,2374590248,2374595577,2374600804,2374605932,2374610963,2374615898,2374620739,2374625488,2374630147,2374634718,2374639202,2374643600,2374647915,2374652148,2374656301,2374660375,2374664371,2374668291,2374672137,2374675910,2374679611,2374683242,2374686804,2374690298,2374693726,2374697089,2374700388,2374703624,2374706798,2374709912,2374712967,2374715964,2374718904,2374721788,2374724617,2374727393,2374730116,2374732787,2374735407,2374737978,2374740500,2374742974,2374745401,2374747782,2374750117,2374752408,2374754655,2374756860,2374759023,2374761145,2374763226,2374765268,2374767271,2374769236,2374771164,2374773055,2374774910,2374776730,2374778515,2374780266,2374781984,2374783669,2374785322,2374786944,2374788535,2374790096,2374791627,2374793129,2374794603,2374796049,2374797467,2374798858,2374800223,2374801562,2374802875,2374804163,2374805427,2374806667,2374807883,2374809076,2374810246,2374811394,2374812520,2374813625,2374814709,2374815772,2374816815,2374817838,2374818842,2374819827,2374820793,2374821741,2374822671,2374823583,2374824478,2374825356,2374826217,2374827062,2374827891,2374828704,2374829501,2374830283,2374831050,2374831803,2374832541,2374833265,2374833976,2374834673,2374835357,2374836028,2374836686,2374837332,2374837965,2374838586,2374839195,2374839793,2374840379,2374840954,2374841518,2374842072,2374842615,2374843148,2374843671,2374844184,2374844687,2374845180,2374845664,2374846139,2374846605,2374847062,2374847510,2374847950,2374848381,2374848804,2374849219,2374849626,2374850025,2374850417,2374850801,2374851178,2374851548,2374851911,2374852267,2374852616,2374852959,2374853295,2374853625,2374853948,2374854265,2374854576,2374854881,2374855180,2374855474,2374855762,2374856045,2374856322,2374856594,2374856861,2374857123,2374857380,2374857632,2374857879,2374858121,2374858359,2374858592,2374858821,2374859045,2374859265,2374859481,2374859693,2374859901,2374860105,2374860305,2374860501,2374860693,2374860882,2374861067,2374861249,2374861427,2374861602,2374861773,2374861941,2374862106,2374862268,2374862427,2374862583,2374862736,2374862886,2374863033,2374863177,2374863318,2374863457,2374863593,2374863727,2374863858,2374863986,2374864112,2374864236,2374864357,2374864476,2374864593,2374864707,2374864819,2374864929,2374865037,2374865143,2374865247,2374865349,2374865449,2374865547,2374865643,2374865737,2374865830,2374865921,2374866010,2374866097,2374866183,2374866267,2374866349,2374866430,2374866509,2374866587,2374866663,2374866738,2374866811,2374866883,2374866954,2374867023,2374867091,2374867158,2374867223,2374867287,2374867350,2374867412,2374867473,2374867532,2374867590,2374867647,2374867703,2374867758,2374867812,2374867865,2374867917,2374867968,2374868018,2374868067,2374868115,2374868162,2374868208,2374868253,2374868297,2374868341,2374868384,2374868426,2374868467,2374868507,2374868547,2374868586,2374868624,2374868661,2374868698,2374868734,2374868769,2374868803,2374868837,2374868870,2374868903,2374868935,2374868966,2374868997,2374869027,2374869057,2374869086,2374869114,2374869142,2374869169,2374869196,2374869222,2374869248,2374869273,2374869298,2374869322,2374869346,2374869369,2374869392,2374869414,2374869436,2374869458,2374869479,2374869500,2374869520,2374869540,2374869560,2374869579,2374869598,2374869616,2374869634,2374869652,2374869669,2374869686,2374869703,2374869719,2374869735,2374869751,2374869766,2374869781,2374869796,2374869811,2374869825,2374869839,2374869853,2374869866,2374869879,2374869892,2374869905,2374869917,2374869929,2374869941,2374869953,2374869964,2374869975,2374869986,2374869997,2374870008,2374870018,2374870028,2374870038,2374870048,2374870058,2374870067,2374870076,2374870085,2374870094,2374870103,2374870111,2374870119,2374870127,2374870135,2374870143,2374870151,2374870158,2374870165,2374870172,2374870179,2374870186,2374870193,2374870200,2374870206,2374870212,2374870218,2374870224,2374870230,2374870236,2374870242,2374870248,2374870253,2374870258,2374870263,2374870268,2374870273,2374870278,2374870283,2374870288,2374870293,2374870298,2374870302,2374870306,2374870310,2374870314,2374870318,2374870322,2374870326,2374870330,2374870334,2374870338,2374870342,2374870346,2374870349,2374870352,2374870355,2374870358,2374870361,2374870364,2374870367 -//Job - Baby Novice -10,4023,1,10,18,28,40,91,151,205,268,340,0 -//Job - 1st Baby Classes -50,4024:4025:4026:4027:4028:4029,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 -//Job - 2nd Baby Classes -50,4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 -//Job - Super Baby -99,4045,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 From a7ef583dcb22d4f18ba80d7ccdd2cbb45dcbebb1 Mon Sep 17 00:00:00 2001 From: brianluau Date: Sat, 13 Nov 2010 18:23:35 +0000 Subject: [PATCH 046/129] - Fixed a typo in abra_db.txt (bugreport:4548) - Fixed a weight check in Level 4 Weapon Quest. (bugreport:4533) - Removed a duplicate if() in battle.c, follow up to r14381. (bugreport:4549) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/abra_db.txt | 2 +- doc/script_commands.txt | 2 +- npc/quests/Lvl4_weapon_quest.txt | 3 ++- src/map/battle.c | 21 +++++++++------------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/db/abra_db.txt b/db/abra_db.txt index 788a7243b2..8f5176428c 100644 --- a/db/abra_db.txt +++ b/db/abra_db.txt @@ -96,7 +96,7 @@ 81,Sighttrasher,2,4000 //82,Fire Ivy,1,0 83,Meteor Storm,6,4000 -84,Jupiter Thunder,2,4000 +84,Jupitel Thunder,2,4000 85,Lord of Vermilion,6,4000 86,Water Ball,4,4000 87,Ice Wall,2,4000 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 5efdaa3803..1c75bb0625 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6340,7 +6340,7 @@ Example: *compare (,) -This command returns 1 or 0 when a the substring is in the main string (1) or not (0). +This command returns 1 or 0 when the substring is in the main string (1) or not (0). This command is not case sensitive. Example(s): diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt index dfcea8e080..2e26fe5b26 100644 --- a/npc/quests/Lvl4_weapon_quest.txt +++ b/npc/quests/Lvl4_weapon_quest.txt @@ -2139,7 +2139,8 @@ niflheim,240,193,3 script Kayron#lv4 794,{ } niflheim,99,268,5 script Reyghema#lv4 794,{ - if (now_weight < 3000) { + set .@now_weight,MaxWeight-Weight; + if (.@now_weight < 3000) { mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000"; close; } diff --git a/src/map/battle.c b/src/map/battle.c index b520b1d97b..acd61b23f6 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2860,20 +2860,17 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * int race2 = status_get_race2(src); if (!(nk&NK_NO_ELEFIX)) { - if (!(nk&NK_NO_ELEFIX)) + int ele_fix = tsd->subele[s_ele]; + for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++) { - int ele_fix = tsd->subele[s_ele]; - for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++) - { - if(tsd->subele2[i].ele != s_ele) continue; - if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK && - tsd->subele2[i].flag&md.flag&BF_RANGEMASK && - tsd->subele2[i].flag&md.flag&BF_SKILLMASK)) - continue; - ele_fix += tsd->subele2[i].rate; - } - cardfix=cardfix*(100-ele_fix)/100; + if(tsd->subele2[i].ele != s_ele) continue; + if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK && + tsd->subele2[i].flag&md.flag&BF_RANGEMASK && + tsd->subele2[i].flag&md.flag&BF_SKILLMASK)) + continue; + ele_fix += tsd->subele2[i].rate; } + cardfix=cardfix*(100-ele_fix)/100; } cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[race2])/100; From 0c14edaeb0689a1e9dbaae825f7e002b4712dc87 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 14 Nov 2010 20:07:55 +0000 Subject: [PATCH 047/129] * Updating spawns as a precursor for Eden group quests. * Updated spawns for Juno fields to Renewal. * Updated spawns for Umbala fields to Renewal. * Updated spawns for Comodo fields to Renewal * Updated spawns for Mjolnir fields to Renewal. * Updated spawns for Payon fields to Renewal. * Updated spawns for Morroc fields to Renewal. * Commented out repeatable EXP quests. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14462 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 13 ++- npc/mobs/fields/comodo.txt | 173 ++++++++-------------------------- npc/mobs/fields/geffen.txt | 16 +--- npc/mobs/fields/mjolnir.txt | 95 ++++++++----------- npc/mobs/fields/morocc.txt | 183 ++++++++---------------------------- npc/mobs/fields/payon.txt | 86 +++++++---------- npc/mobs/fields/umbala.txt | 77 ++++----------- npc/mobs/fields/yuno.txt | 99 +++++++------------ npc/scripts_athena.conf | 35 ++++--- 9 files changed, 240 insertions(+), 537 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index d37f991d8b..0b5b2221af 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,13 +1,22 @@ Date Added ====== +2010/11/14 + * Rev. 14462 Updating spawns as a precursor for Eden group quests. [L0ne_W0lf] + * Updated spawns for Juno fields to Renewal. + * Updated spawns for Umbala fields to Renewal. + * Updated spawns for Comodo fields to Renewal + * Updated spawns for Mjolnir fields to Renewal. + * Updated spawns for Payon fields to Renewal. + * Updated spawns for Morroc fields to Renewal. + * Commented out repeatable EXP quests. 2010/11/04 * Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf] - Added a missing close in quests_13_2.txt. (bugreport:4520) - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) 2010/10/23 - * Rev. 14435 Updated spawns for Geffen fields to Rewnewal. [L0ne_W0lf] + * Rev. 14435 Updated spawns for Geffen fields to Renewal. [L0ne_W0lf] 2010/10/20 - * Rev. 14433 Updated spawns for Prontera fields to Rewnewal. [L0ne_W0lf] + * Rev. 14433 Updated spawns for Prontera fields to Renewal. [L0ne_W0lf] 2010/10/10 * Rev. 14422 Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. [L0ne_W0lf] - ...corrected the versions in the file headers as well. :P diff --git a/npc/mobs/fields/comodo.txt b/npc/mobs/fields/comodo.txt index d65e5a8a46..b0e4b7d90a 100644 --- a/npc/mobs/fields/comodo.txt +++ b/npc/mobs/fields/comodo.txt @@ -3,21 +3,20 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 More accurate spawns [Playtester] +//= 1.4 Updated to renewal spawns. [L0ne_W0lf] //============================================================ //================================================== // cmd_fild01 - Papuchicha Forest //================================================== -cmd_fild01,0,0,0,0 monster Alligator 1271,60,0,0,0 -cmd_fild01,0,0,0,0 monster Savage 1166,30,0,0,0 -cmd_fild01,0,0,0,0 monster Poporing 1031,30,0,0,0 -cmd_fild01,0,0,0,0 monster Poison Spore 1077,20,0,0,0 +cmd_fild01,0,0,0,0 monster Grove 1687,150,0,0,0 +cmd_fild01,0,0,0,0 monster Flora 1118,50,0,0,0 cmd_fild01,313,213,10,10 monster Shining Plant 1083,1,1800000,900000,1 cmd_fild01,313,213,10,10 monster Blue Plant 1079,1,1800000,900000,1 cmd_fild01,171,339,10,10 monster Blue Plant 1079,2,1800000,900000,1 @@ -28,28 +27,22 @@ cmd_fild01,0,0,0,0 monster Green Plant 1080,5,1800000,900000,1 //================================================== // cmd_fild02 - Kokomo Beach //================================================== +cmd_fild02,200,130,150,40 monster Seal 1317,110,0,0,0 +cmd_fild02,93,82,40,80 monster Seal 1317,10,0,0,0 +cmd_fild02,0,0,0,0 monster Galapago 1391,30,0,0,0 +cmd_fild02,0,0,0,0 monster Crab 1073,20,0,0,0 +cmd_fild02,0,0,0,0 monster Shellfish 1074,35,0,0,0 +cmd_fild02,93,82,40,80 monster Shellfish 1074,5,,0,0 cmd_fild02,73,100,40,100 monster Aster 1266,5,0,0,0 cmd_fild02,200,130,150,50 monster Aster 1266,5,0,0,0 -cmd_fild02,0,0,0,0 monster Crab 1073,20,0,0,0 -cmd_fild02,0,0,0,0 monster Alligator 1271,10,0,0,0 -cmd_fild02,0,0,0,0 monster Raggler 1254,30,0,0,0 -cmd_fild02,94,85,40,80 monster Raggler 1254,2,60000,0,0 -cmd_fild02,95,89,40,80 monster Cornutus 1067,5,180000,0,0 -cmd_fild02,279,78,100,20 monster Cornutus 1067,10,60000,0,0 -cmd_fild02,0,0,0,0 monster Shellfish 1074,35,0,0,0 -cmd_fild02,93,82,40,80 monster Shellfish 1074,5,180000,0,0 cmd_fild02,0,0,0,0 monster Mobster 1313,1,0,0,0 -cmd_fild02,200,130,150,40 monster Seal 1317,18,0,0,0 -cmd_fild02,93,82,40,80 monster Seal 1317,2,180000,0,0 -cmd_fild02,0,0,0,0 monster Galapago 1391,20,0,0,0 //================================================== // cmd_fild03 - Zenhai Marsh //================================================== -cmd_fild03,0,0,0,0 monster Mutant Dragonoid 1262,1,0,0,1 -cmd_fild03,0,0,0,0 monster Pest 1256,30,0,0,0 -cmd_fild03,0,0,0,0 monster Poporing 1031,10,0,0,0 -cmd_fild03,0,0,0,0 monster Anolian 1206,90,0,0,0 +cmd_fild03,0,0,0,0 monster Alligator 1271,150,0,0,0 +cmd_fild03,0,0,0,0 monster Flora 1118,50,0,0,0 +cmd_fild03,0,0,0,0 monster Mutant Dragonoid 1262,4,0,0,1 cmd_fild03,0,0,0,0 monster Toad 1089,1,3600000,1800000,1 cmd_fild03,356,232,3,3 monster Shining Plant 1083,1,1800000,900000,1 cmd_fild03,262,289,3,3 monster Shining Plant 1083,1,1800000,900000,1 @@ -58,143 +51,55 @@ cmd_fild03,145,191,3,3 monster Shining Plant 1083,1,1800000,900000,1 //================================================== // cmd_fild04 - Kokomo Beach //================================================== -cmd_fild04,221,120,120,40 monster Aster 1266,45,0,0,0 -cmd_fild04,0,0,0,0 monster Alligator 1271,40,0,0,0 +cmd_fild04,221,120,120,40 monster Sea Otter 1323,120,0,0,0 +cmd_fild04,0,0,0,0 monster Galapago 1391,30,0,0,0 cmd_fild04,0,0,0,0 monster Crab 1073,20,0,0,0 -cmd_fild04,0,0,0,0 monster Raggler 1254,20,0,0,0 cmd_fild04,0,0,0,0 monster Shellfish 1074,20,0,0,0 -cmd_fild04,221,120,120,40 monster Sea Otter 1323,20,0,0,0 +cmd_fild04,221,120,120,40 monster Aster 1266,10,0,0,0 //================================================== // cmd_fild05 - Border of Papuchica Forest //================================================== -cmd_fild05,0,0,0,0 monster Frilldora 1119,45,0,0,0 -cmd_fild05,0,0,0,0 monster Alligator 1271,20,0,0,0 -cmd_fild05,0,0,0,0 monster Stem Worm 1215,5,0,0,0 -cmd_fild05,0,0,0,0 monster Poporing 1031,10,0,0,0 -cmd_fild05,0,0,0,0 monster Pest 1256,5,0,0,0 -cmd_fild05,63,158,10,10 monster Shining Plant 1083,1,1800000,900000,1 -cmd_fild05,318,277,10,10 monster Yellow Plant 1081,3,1800000,900000,1 -cmd_fild05,282,49,20,20 monster Yellow Plant 1081,3,1800000,900000,1 -cmd_fild05,0,0,0,0 monster Green Plant 1080,5,1800000,900000,1 +// No Spawns/Disabled Map - 13.3 //================================================== // cmd_fild06 - Fortress Saint Darmain (West) //================================================== -cmd_fild06,0,0,0,0 monster Kobold Archer 1282,5,0,0,0 -cmd_fild06,0,0,0,0 monster Kobold Archer 1282,5,300000,0,0 -cmd_fild06,357,299,80,70 monster Kobold Archer 1282,2,0,0,0 -cmd_fild06,357,299,80,70 monster Kobold Archer 1282,2,120000,0,0 -cmd_fild06,318,146,120,80 monster Kobold Archer 1282,4,0,0,0 -cmd_fild06,318,146,120,80 monster Kobold Archer 1282,4,120000,0,0 -cmd_fild06,244,113,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild06,290,164,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild06,284,197,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild06,286,289,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild06,314,267,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild06,0,0,0,0 monster Goblin Archer 1258,10,0,0,0 -cmd_fild06,0,0,0,0 monster Goblin Archer 1258,10,30000,0,0 -cmd_fild06,355,294,80,70 monster Goblin Archer 1258,3,0,0,0 -cmd_fild06,355,294,80,70 monster Goblin Archer 1258,3,120000,0,0 -cmd_fild06,307,97,70,200 monster Goblin Archer 1258,4,0,0,0 -cmd_fild06,307,97,70,200 monster Goblin Archer 1258,4,120000,0,0 -cmd_fild06,100,265,10,40 monster Goblin Archer 1258,3,130000,0,0 -cmd_fild06,244,110,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,292,169,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,284,129,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,184,126,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,279,199,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,277,186,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,284,186,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,354,342,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,365,342,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,340,334,0,0 monster Goblin Archer 1258,1,180000,0,0 -cmd_fild06,0,0,0,0 monster Drops 1113,20,0,0,0 -cmd_fild06,0,0,0,0 monster Harpy 1376,1,1500000,1000000,0 +cmd_fild06,0,0,0,0 monster Golem 1040,150,0,0,0 +cmd_fild06,0,0,0,0 monster Metaller 1056,50,0,0,0 cmd_fild06,293,235,5,5 monster Yellow Plant 1081,2,1800000,900000,1 cmd_fild06,84,375,10,10 monster Yellow Plant 1081,3,1800000,900000,1 //================================================== // cmd_fild07 - Beacon Island, Pharos //================================================== -cmd_fild07,242,108,40,90 monster Aster 1266,2,60000,0,0 -cmd_fild07,102,177,60,90 monster Aster 1266,3,60000,0,0 -cmd_fild07,240,107,40,90 monster Crab 1073,3,60000,0,0 -cmd_fild07,100,175,60,90 monster Crab 1073,2,60000,0,0 -cmd_fild07,101,176,60,90 monster Raggler 1254,1,180000,0,0 -cmd_fild07,241,106,40,90 monster Raggler 1254,1,180000,0,0 -cmd_fild07,204,317,60,60 monster Raggler 1254,1,60000,0,0 -cmd_fild07,323,310,60,60 monster Raggler 1254,1,60000,0,0 -cmd_fild07,0,0,0,0 monster Drops 1113,20,0,0,0 -cmd_fild07,239,105,40,90 monster Shellfish 1074,2,60000,0,0 -cmd_fild07,104,180,40,90 monster Shellfish 1074,3,60000,0,0 +cmd_fild07,101,176,60,90 monster Raggler 1254,25,0,0,0 +cmd_fild07,241,106,40,90 monster Raggler 1254,25,0,0,0 +cmd_fild07,204,317,60,60 monster Raggler 1254,25,0,0,0 +cmd_fild07,323,310,60,60 monster Raggler 1254,25,0,0,0 +cmd_fild07,240,107,40,90 monster Crab 1073,15,0,0,0 +cmd_fild07,100,175,60,90 monster Crab 1073,15,0,0,0 +cmd_fild07,239,105,40,90 monster Shellfish 1074,15,0,0,0 +cmd_fild07,104,180,40,90 monster Shellfish 1074,15,0,0,0 +cmd_fild07,242,108,40,90 monster Aster 1266,15,0,0,0 +cmd_fild07,102,177,60,90 monster Aster 1266,15,0,0,0 //================================================== // cmd_fild08 - Fortress Saint Darmain (East) //================================================== -cmd_fild08,127,279,30,50 monster Kobold Archer 1282,5,60000,0,0 -cmd_fild08,130,192,110,150 monster Kobold Archer 1282,5,0,0,0 -cmd_fild08,146,136,30,80 monster Kobold Archer 1282,5,0,0,0 -cmd_fild08,73,132,40,100 monster Kobold Archer 1282,5,0,0,0 -cmd_fild08,146,136,30,90 monster Kobold Archer 1282,5,0,0,0 -cmd_fild08,157,329,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,150,320,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,195,174,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,173,168,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,178,363,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,175,367,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,53,248,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,52,238,0,0 monster Kobold Archer 1282,1,190000,0,0 -cmd_fild08,272,175,40,2 monster Kobold Archer 1282,2,60000,0,0 -cmd_fild08,190,115,100,80 monster Kobold Archer 1282,10,0,0,0 -cmd_fild08,130,192,110,150 monster Kobold Archer 1282,7,0,0,0 -cmd_fild08,72,131,40,100 monster Kobold Archer 1282,8,0,0,0 -cmd_fild08,319,177,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,319,172,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,139,71,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,136,64,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,67,80,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,132,149,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,97,144,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,79,140,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,28,102,0,0 monster Kobold Archer 1282,1,180000,0,0 -cmd_fild08,80,348,60,40 monster Goblin Archer 1258,5,0,0,0 -cmd_fild08,130,192,110,150 monster Goblin Archer 1258,5,0,0,0 -cmd_fild08,194,291,25,40 monster Goblin Archer 1258,5,0,0,0 -cmd_fild08,73,132,40,100 monster Goblin Archer 1258,5,0,0,0 -cmd_fild08,182,205,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,177,210,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,58,40,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,55,45,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,104,313,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,98,307,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,41,126,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,37,129,0,0 monster Goblin Archer 1258,1,150000,0,0 -cmd_fild08,66,252,40,30 monster Stem Worm 1215,5,30000,0,0 -cmd_fild08,130,192,110,150 monster Stem Worm 1215,10,0,0,0 -cmd_fild08,70,130,40,90 monster Stem Worm 1215,2,0,0,0 -cmd_fild08,189,64,30,30 monster Stem Worm 1215,3,180000,0,0 -cmd_fild08,174,172,0,0 monster Stem Worm 1215,1,180000,0,0 -cmd_fild08,266,175,0,0 monster Stem Worm 1215,1,180000,0,0 -cmd_fild08,127,273,0,0 monster Stem Worm 1215,1,180000,0,0 -cmd_fild08,92,141,0,0 monster Stem Worm 1215,1,180000,0,0 -cmd_fild08,85,135,0,0 monster Stem Worm 1215,1,180000,0,0 -cmd_fild08,0,0,0,0 monster Drops 1113,10,0,0,0 -cmd_fild08,326,258,50,110 monster Sandman 1165,15,0,0,0 -cmd_fild08,326,258,50,110 monster Kobold Archer 1282,10,0,0,0 -cmd_fild08,326,258,50,110 monster Side Winder 1037,2,0,0,0 -cmd_fild08,0,0,0,0 monster Side Winder 1037,3,0,0,0 -cmd_fild08,130,192,110,150 monster Side Winder 1037,15,0,0,0 -cmd_fild08,0,0,0,0 monster Gryphon 1259,1,3600000,1800000,1 +cmd_fild08,0,0,0,0 monster Andre 1095,50,0,0,0 +cmd_fild08,0,0,0,0 monster Deniro 1105,50,0,0,0 +cmd_fild08,0,0,0,0 monster Piere 1160,50,0,0,0 +cmd_fild08,0,0,0,0 monster Ant Egg 1097,30,0,0,0 +cmd_fild08,0,0,0,0 monster Andre 1040,2,0,0,0 cmd_fild08,60,143,10,10 monster Yellow Plant 1081,4,1800000,900000,1 cmd_fild08,130,201,10,10 monster Yellow Plant 1081,4,1800000,900000,1 //================================================== // cmd_fild09 - Fortress Saint Darmain (South) //================================================== -cmd_fild09,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0 -cmd_fild09,0,0,0,0 monster Drops 1113,20,0,0,0 -cmd_fild09,0,0,0,0 monster Anacondaq 1030,60,0,0,0 -cmd_fild09,0,0,0,0 monster Condor 1009,20,0,0,0 -cmd_fild09,142,325,40,50 monster Hode 1127,3,150000,0,0 -cmd_fild09,140,323,40,50 monster Gargoyle 1253,2,150000,0,0 +cmd_fild09,0,0,0,0 monster Metaller 1056,145,0,0,0 +cmd_fild09,0,0,0,0 monster Andre 1095,15,0,0,0 +cmd_fild09,0,0,0,0 monster Deniro 1105,15,0,0,0 +cmd_fild09,0,0,0,0 monster Piere 1160,15,0,0,0 +cmd_fild09,0,0,0,0 monster Ant Egg 1097,10,0,0,0 diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt index 1eaedab20e..950e68cd99 100644 --- a/npc/mobs/fields/geffen.txt +++ b/npc/mobs/fields/geffen.txt @@ -112,24 +112,14 @@ gef_fild11,0,0,0,0 monster Goblin Leader 1299,1,1800000,1200000,0 //================================================== // gef_fild12 - Kordt Forest //================================================== -//gef_fild12,0,0,0,0 monster Kobold 1133,20,0,0,0 -//gef_fild12,0,0,0,0 monster Kobold 1134,30,0,0,0 -//gef_fild12,0,0,0,0 monster Kobold 1135,30,0,0,0 -//gef_fild12,0,0,0,0 monster Kobold Archer 1282,40,0,0,0 -//gef_fild12,0,0,0,0 monster Poporing 1031,20,0,0,0 -//gef_fild12,0,0,0,0 monster Kobold Leader 1296,1,1800000,1200000,0 +// No spawns/Disabled Map - 13.3 //================================================== // gef_fild13 - Britoniah //================================================== -//gef_fild13,0,0,0,0 monster Poporing 1031,20,0,0,0 -//gef_fild13,0,0,0,0 monster Creamy 1018,40,0,0,0 -//gef_fild13,0,0,0,0 monster Ambernite 1094,30,0,0,0 +// No spawns - 13.3 //================================================== // gef_fild14 - West Orc Village //================================================== -//gef_fild14,0,0,0,0 monster Orc Lady 1273,20,0,0,0 -//gef_fild14,0,0,0,0 monster Orc Warrior 1023,10,0,0,0 -//gef_fild14,0,0,0,0 monster Orc Archer 1189,30,0,0,0 -//gef_fild14,0,0,0,0 monster High Orc 1213,70,0,0,0 +// No spawns/Disabled Map - 13.3 diff --git a/npc/mobs/fields/mjolnir.txt b/npc/mobs/fields/mjolnir.txt index 0d66d9ffcb..b495408938 100644 --- a/npc/mobs/fields/mjolnir.txt +++ b/npc/mobs/fields/mjolnir.txt @@ -3,21 +3,21 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] +//= 1.3 Updated to renewal spawns. [L0ne_W0lf] //============================================================ //================================================== // mjolnir_01 - Mt.Mjolnir //================================================== -mjolnir_01,0,0,0,0 monster Horn 1128,20,0,0,0 +mjolnir_01,0,0,0,0 monster Caramel 1103,140,0,0,0 mjolnir_01,0,0,0,0 monster Creamy 1018,20,0,0,0 -mjolnir_01,0,0,0,0 monster Coco 1104,70,0,0,0 +mjolnir_01,0,0,0,0 monster Bigfoot 1060,20,0,0,0 mjolnir_01,0,0,0,0 monster Stainer 1174,20,0,0,0 -mjolnir_01,0,0,0,0 monster Caramel 1103,40,0,0,0 mjolnir_01,75,85,25,25 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_01,78,219,25,25 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_01,75,85,25,25 monster Green Plant 1080,5,180000,90000,1 @@ -27,11 +27,10 @@ mjolnir_01,311,271,25,25 monster Blue Plant 1079,5,360000,180000,1 //================================================== // mjolnir_02 - Mt.Mjolnir //================================================== -mjolnir_02,0,0,0,0 monster Hornet 1004,30,0,0,0 -mjolnir_02,0,0,0,0 monster Creamy 1018,20,0,0,0 -mjolnir_02,0,0,0,0 monster Petite 1155,50,0,0,0 -mjolnir_02,0,0,0,0 monster Poporing 1031,10,0,0,0 -mjolnir_02,0,0,0,0 monster Flora 1118,30,0,0,0 +mjolnir_02,0,0,0,0 monster Horn 1128,140,0,0,0 +mjolnir_02,0,0,0,0 monster Poporing 1031,20,0,0,0 +mjolnir_02,0,0,0,0 monster Elder Willow 1033,20,0,0,0 +mjolnir_02,0,0,0,0 monster Yoyo 1057,20,0,0,0 mjolnir_02,86,270,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_02,80,211,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_02,86,270,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -70,12 +69,9 @@ mjolnir_02,188,192,10,10 monster Blue Plant 1079,2,360000,180000,1 //================================================== // mjolnir_03 - Mt.Mjolnir //================================================== -mjolnir_03,0,0,0,0 monster Mantis 1139,30,0,0,0 -mjolnir_03,0,0,0,0 monster Creamy 1018,10,0,0,0 -mjolnir_03,0,0,0,0 monster Petite 1156,70,0,0,0 -mjolnir_03,0,0,0,0 monster Poporing 1031,10,0,0,0 -mjolnir_03,0,0,0,0 monster Flora 1118,10,0,0,0 -mjolnir_03,0,0,0,0 monster Argos 1100,20,0,0,0 +mjolnir_03,0,0,0,0 monster Side Winder 1037,130,0,0,0 +mjolnir_03,0,0,0,0 monster Mantis 1139,35,0,0,0 +mjolnir_03,0,0,0,0 monster Driller 1380,35,0,0,0 mjolnir_03,211,216,10,10 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_03,280,252,10,10 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_03,135,94,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -95,11 +91,9 @@ mjolnir_03,91,161,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== // mjolnir_04 - Mt.Mjolnir //================================================== -mjolnir_04,0,0,0,0 monster Mantis 1139,20,0,0,0 -mjolnir_04,0,0,0,0 monster Hornet 1004,70,0,0,0 -mjolnir_04,0,0,0,0 monster Poporing 1031,10,0,0,0 -mjolnir_04,0,0,0,0 monster Flora 1118,30,0,0,0 -mjolnir_04,0,0,0,0 monster Argiope 1099,20,0,0,0 +mjolnir_04,0,0,0,0 monster Driller 1380,130,0,0,0 +mjolnir_04,0,0,0,0 monster Side Winder 1037,35,0,0,0 +mjolnir_04,0,0,0,0 monster Mantis 1139,35,0,0,0 mjolnir_04,0,0,0,0 boss_monster Mistress 1059,1,7200000,600000,1 mjolnir_04,200,200,30,30 monster Shining Plant 1083,3,1800000,900000,1 mjolnir_04,177,34,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -123,11 +117,9 @@ mjolnir_04,205,33,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== // mjolnir_05 - Mt.Mjolnir //================================================== -mjolnir_05,0,0,0,0 monster Mantis 1139,40,0,0,0 -mjolnir_05,0,0,0,0 monster Poporing 1031,10,0,0,0 -mjolnir_05,0,0,0,0 monster Flora 1118,20,0,0,0 -mjolnir_05,0,0,0,0 monster Argiope 1099,70,0,0,0 -mjolnir_05,0,0,0,0 monster Argos 1100,20,0,0,0 +mjolnir_05,0,0,0,0 monster Argiope 1099,130,0,0,0 +mjolnir_05,0,0,0,0 monster Mantis 1139,35,0,0,0 +mjolnir_05,0,0,0,0 monster Driller 1380,35,0,0,0 mjolnir_05,200,240,40,40 monster Blue Plant 1079,3,360000,180000,1 mjolnir_05,200,240,40,40 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_05,134,103,20,20 monster Blue Plant 1079,3,360000,180000,1 @@ -137,11 +129,9 @@ mjolnir_05,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 //================================================== // mjolnir_06 - Mt.Mjolnir //================================================== -mjolnir_06,0,0,0,0 monster Stainer 1174,70,0,0,0 -mjolnir_06,0,0,0,0 monster Horn 1128,20,0,0,0 -mjolnir_06,0,0,0,0 monster Coco 1104,20,0,0,0 -mjolnir_06,0,0,0,0 monster Poporing 1031,20,0,0,0 -mjolnir_06,0,0,0,0 monster Caramel 1103,30,0,0,0 +mjolnir_06,0,0,0,0 monster Poison Spore 1077,140,0,0,0 +mjolnir_06,0,0,0,0 monster Creamy 1018,30,0,0,0 +mjolnir_06,0,0,0,0 monster Smokie 1056,30,0,0,0 mjolnir_06,162,285,0,0 monster Blue Plant 1079,1,360000,180000,1 mjolnir_06,162,255,0,0 monster Blue Plant 1079,1,360000,180000,1 mjolnir_06,304,98,0,0 monster Red Mushroom 1085,1,180000,90000,1 @@ -156,12 +146,9 @@ mjolnir_06,55,276,0,0 monster Red Mushroom 1085,1,180000,90000,1 //================================================== // mjolnir_07 - Mt.Mjolnir //================================================== -mjolnir_07,0,0,0,0 monster Poison Spore 1077,60,0,0,0 -mjolnir_07,0,0,0,0 monster Ambernite 1094,30,0,0,0 -mjolnir_07,0,0,0,0 monster Coco 1104,20,0,0,0 -mjolnir_07,0,0,0,0 monster Horn 1128,20,0,0,0 -mjolnir_07,0,0,0,0 monster Poporing 1031,20,0,0,0 -mjolnir_07,0,0,0,0 monster Hornet 1004,20,0,0,0 +mjolnir_07,0,0,0,0 monster Savage 1166,140,0,0,0 +mjolnir_07,0,0,0,0 monster Beetle King 1494,30,0,0,0 +mjolnir_07,0,0,0,0 monster Flora 1118,30,0,0,0 mjolnir_07,314,133,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_07,299,145,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_07,272,152,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -176,11 +163,9 @@ mjolnir_07,249,214,0,0 monster Blue Plant 1079,2,360000,180000,1 //================================================== // mjolnir_08 - Mt.Mjolnir //================================================== -mjolnir_08,0,0,0,0 monster Mantis 1139,60,0,0,0 -mjolnir_08,0,0,0,0 monster Argiope 1099,30,0,0,0 -mjolnir_08,0,0,0,0 monster Argos 1100,20,0,0,0 -mjolnir_08,0,0,0,0 monster Poporing 1031,20,0,0,0 -mjolnir_08,0,0,0,0 monster Poring 1002,10,0,0,0 +mjolnir_08,0,0,0,0 monster Beetle King 1494,140,0,0,0 +mjolnir_08,0,0,0,0 monster Flora 1118,30,0,0,0 +mjolnir_08,0,0,0,0 monster Savage 1166,30,0,0,0 mjolnir_08,280,280,20,40 monster Blue Plant 1079,2,360000,180000,1 mjolnir_08,207,83,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_08,176,153,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -192,11 +177,9 @@ mjolnir_08,149,328,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== // mjolnir_09 - Mt.Mjolnir //================================================== -mjolnir_09,0,0,0,0 monster Coco 1104,10,0,0,0 -mjolnir_09,0,0,0,0 monster Stainer 1174,20,0,0,0 -mjolnir_09,0,0,0,0 monster Horn 1128,70,0,0,0 -mjolnir_09,0,0,0,0 monster Poporing 1031,20,0,0,0 -mjolnir_09,0,0,0,0 monster Wolf 1013,30,0,0,0 +mjolnir_09,0,0,0,0 monster Savage Babe 1167,140,0,0,0 +mjolnir_09,0,0,0,0 monster Hornet 1004,30,0,0,0 +mjolnir_09,0,0,0,0 monster Willow 1010,30,0,0,0 mjolnir_09,205,352,0,0 monster Red Mushroom 1085,1,180000,90000,1 mjolnir_09,199,344,0,0 monster Red Mushroom 1085,1,180000,90000,1 mjolnir_09,210,331,0,0 monster Red Mushroom 1085,1,180000,90000,1 @@ -212,22 +195,18 @@ mjolnir_09,125,82,0,0 monster Red Mushroom 1085,1,180000,90000,1 //================================================== // mjolnir_10 - Mt.Mjolnir //================================================== -mjolnir_10,0,0,0,0 monster Mantis 1139,20,0,0,0 +mjolnir_10,0,0,0,0 monster Argos 1100,140,0,0,0 mjolnir_10,0,0,0,0 monster Flora 1118,30,0,0,0 -mjolnir_10,0,0,0,0 monster Argos 1100,60,0,0,0 -mjolnir_10,0,0,0,0 monster Poporing 1031,20,0,0,0 -mjolnir_10,0,0,0,0 monster Petite 1155,10,0,0,0 +mjolnir_10,0,0,0,0 monster Beetle King 1494,30,0,0,0 mjolnir_10,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_10,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 //================================================== // mjolnir_11 - Mt.Mjolnir //================================================== -mjolnir_11,0,0,0,0 monster Argiope 1099,10,0,0,0 -mjolnir_11,0,0,0,0 monster Mandragora 1020,50,0,0,0 -mjolnir_11,0,0,0,0 monster Flora 1118,60,0,0,0 -mjolnir_11,0,0,0,0 monster Poporing 1031,10,0,0,0 -mjolnir_11,0,0,0,0 monster Thief Bug Male 1054,30,0,0,0 +mjolnir_11,0,0,0,0 monster Argiope 1099,140,0,0,0 +mjolnir_11,0,0,0,0 monster Argos 1100,35,0,0,0 +mjolnir_11,0,0,0,0 monster Flora 1118,35,0,0,0 mjolnir_11,112,276,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_11,159,283,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_11,116,240,0,0 monster Green Plant 1080,1,180000,90000,1 @@ -245,6 +224,6 @@ mjolnir_11,295,271,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== // mjolnir_12 - Mt.Mjolnir //================================================== -mjolnir_12,0,0,0,0 monster Stem Worm 1215,20,0,0,0 -mjolnir_12,0,0,0,0 monster Dustiness 1114,50,0,0,0 -mjolnir_12,0,0,0,0 monster Thief Bug Female 1053,20,0,0,0 +mjolnir_12,0,0,0,0 monster Dustiness 1114,130,0,0,0 +mjolnir_12,0,0,0,0 monster Hunter Fly 1035,35,0,0,0 +mjolnir_12,0,0,0,0 monster Mantis 1139,35,0,0,0 diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt index 1940951445..0e2e645aae 100644 --- a/npc/mobs/fields/morocc.txt +++ b/npc/mobs/fields/morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -15,27 +15,23 @@ //= 1.6 Added Satan MOrroc static spawn. [L0ne_W0lf] //= Added 30s spawn time for all Morroc Shadows. //= 1.7 Corrected MVP spawn variance. [L0ne_W0lf] +//= 1.8 Updated to renewal spawns. [L0ne_W0lf] //============================================================ //================================================== // moc_fild01 - Sograt Desert //================================================== -moc_fild01,0,0,0,0 monster Baby Desert Wolf 1107,70,0,0,0 -moc_fild01,0,0,0,0 monster Ant Egg 1097,20,0,0,0 +moc_fild01,0,0,0,0 monster Peco Peco 1019,130,0,0,0 +moc_fild01,0,0,0,0 monster Muka 1055,50,0,0,0 moc_fild01,0,0,0,0 monster Peco Peco Egg 1047,20,0,0,0 -moc_fild01,0,0,0,0 monster Picky 1049,10,0,0,0 -moc_fild01,0,0,0,0 monster Drops 1113,30,0,0,0 -moc_fild01,0,0,0,0 monster Poring 1002,10,0,0,0 moc_fild01,194,51,10,10 monster Yellow Plant 1081,10,900000,450000,1 //================================================== // moc_fild02 - Sograt Desert //================================================== -moc_fild02,0,0,0,0 monster Peco Peco 1019,70,0,0,0 -moc_fild02,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -moc_fild02,0,0,0,0 monster Peco Peco Egg 1047,40,0,0,0 -moc_fild02,0,0,0,0 monster Picky 1049,10,0,0,0 -moc_fild02,0,0,0,0 monster Drops 1113,30,0,0,0 +moc_fild02,0,0,0,0 monster Muka 1055,130,0,0,0 +moc_fild02,0,0,0,0 monster Peco Peco 1019,60,0,0,0 +moc_fild02,0,0,0,0 monster Peco Peco Egg 1047,10,0,0,0 moc_fild02,89,315,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild02,99,261,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild02,94,195,0,0 monster Yellow Plant 1081,1,180000,90000,1 @@ -54,12 +50,9 @@ moc_fild02,337,35,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== // moc_fild03 - Sograt Desert //================================================== -moc_fild03,0,0,0,0 monster Elder Willow 1033,70,0,0,0 -moc_fild03,0,0,0,0 monster Greatest General 1277,30,0,0,0 -moc_fild03,0,0,0,0 monster Poporing 1031,20,0,0,0 -moc_fild03,0,0,0,0 monster Eggyra 1116,10,0,0,0 -moc_fild03,0,0,0,0 monster Willow 1010,20,0,0,0 -moc_fild03,0,0,0,0 monster Vagabond Wolf 1092,1,1800000,1200000,0 +moc_fild03,0,0,0,0 monster Wolf 1013,140,0,0,0 +moc_fild03,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0 +moc_fild03,0,0,0,0 monster Argos 1100,20,0,0,0 moc_fild03,77,311,5,5 monster Green Plant 1080,2,180000,90000,1 moc_fild03,108,199,5,5 monster Green Plant 1080,2,180000,90000,1 moc_fild03,96,65,5,5 monster Green Plant 1080,2,180000,90000,1 @@ -71,95 +64,49 @@ moc_fild03,200,263,5,5 monster Green Plant 1080,2,180000,90000,1 //================================================== // moc_fild04 - Sograt Desert //================================================== -//moc_fild04,0,0,0,0 monster Desert Wolf 1106,20,0,0,0 -//moc_fild04,0,0,0,0 monster Scorpion 1001,30,0,0,0 -//moc_fild04,0,0,0,0 monster Metaller 1058,20,0,0,0 -//moc_fild04,0,0,0,0 monster Magnolia 1138,40,0,0,0 -//moc_fild04,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild04,0,0,0,0 monster Andre 1095,20,0,0,0 -//moc_fild04,0,0,0,0 monster Deniro 1105,20,0,0,0 -//moc_fild04,0,0,0,0 monster Piere 1160,20,0,0,0 -//moc_fild04,313,84,10,10 monster Yellow Plant 1081,10,900000,450000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild05 - Sograt Desert //================================================== -//moc_fild05,0,0,0,0 monster Magnolia 1138,30,0,0,0 -//moc_fild05,0,0,0,0 monster Metaller 1058,20,0,0,0 -//moc_fild05,0,0,0,0 monster Golem 1040,70,0,0,0 -//moc_fild05,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild05,208,233,10,10 monster Yellow Plant 1081,5,360000,180000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild06 - Sograt Desert //================================================== -//moc_fild06,0,0,0,0 monster Peco Peco 1019,85,0,0,0 -//moc_fild06,0,0,0,0 monster Muka 1055,30,0,0,0 -//moc_fild06,0,0,0,0 monster Condor 1009,50,0,0,0 -//moc_fild06,0,0,0,0 monster Magnolia 1138,10,0,0,0 -//moc_fild06,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild06,193,203,10,10 monster Yellow Plant 1081,10,900000,450000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild07 - Sograt Desert //================================================== -moc_fild07,0,0,0,0 monster Drops 1113,70,0,0,0 -moc_fild07,0,0,0,0 monster Peco Peco Egg 1047,50,0,0,0 -moc_fild07,0,0,0,0 monster Picky 1050,30,0,0,0 -moc_fild07,0,0,0,0 monster Picky 1049,30,0,0,0 +moc_fild07,0,0,0,0 monster Drops 1113,140,0,0,0 +moc_fild07,0,0,0,0 monster Chonchon 1011,30,0,0,0 +moc_fild07,0,0,0,0 monster Picky 1050,15,0,0,0 +moc_fild07,0,0,0,0 monster Peco Peco Egg 1047,10,0,0,0 +moc_fild07,0,0,0,0 monster Picky 1049,10,0,0,0 moc_fild07,162,333,12,12 monster Yellow Plant 1081,5,360000,180000,1 //================================================== // moc_fild08 - Sograt Desert //================================================== -//moc_fild08,0,0,0,0 monster Magnolia 1138,30,0,0,0 -//moc_fild08,0,0,0,0 monster Scorpion 1001,80,0,0,0 -//moc_fild08,0,0,0,0 monster Desert Wolf 1106,30,0,0,0 -//moc_fild08,0,0,0,0 monster Anacondaq 1030,30,0,0,0 -//moc_fild08,0,0,0,0 monster Baby Desert Wolf 1107,10,0,0,0 -//moc_fild08,0,0,0,0 monster Drops 1113,10,0,0,0 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild09 - Sograt Desert //================================================== -//moc_fild09,0,0,0,0 monster Desert Wolf 1106,10,0,0,0 -//moc_fild09,0,0,0,0 monster Metaller 1058,70,0,0,0 -//moc_fild09,0,0,0,0 monster Magnolia 1138,50,0,0,0 -//moc_fild09,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild09,0,0,0,0 monster Andre 1095,5,0,0,0 -//moc_fild09,0,0,0,0 monster Deniro 1105,5,0,0,0 -//moc_fild09,0,0,0,0 monster Piere 1160,5,0,0,0 -//moc_fild09,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild09,0,0,0,0 monster Frilldora 1119,6,0,0,0 -//moc_fild09,332,341,5,5 monster Yellow Plant 1081,2,180000,90000,1 -//moc_fild09,240,313,5,5 monster Yellow Plant 1081,2,180000,90000,1 -//moc_fild09,305,62,5,5 monster Yellow Plant 1081,2,180000,90000,1 -//moc_fild09,64,78,5,5 monster Yellow Plant 1081,2,180000,90000,1 -//moc_fild09,54,325,5,5 monster Yellow Plant 1081,2,180000,90000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild10 - Sograt Desert //================================================== -//moc_fild10,0,0,0,0 monster Drops 1113,30,0,0,0 -//moc_fild10,0,0,0,0 monster Peco Peco Egg 1047,70,0,0,0 -//moc_fild10,0,0,0,0 monster Picky 1049,50,0,0,0 -//moc_fild10,0,0,0,0 monster Picky 1050,50,0,0,0 -//moc_fild10,0,0,0,0 monster Magnolia 1138,1,0,0,0 -//moc_fild10,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild10,198,150,40,30 monster Yellow Plant 1081,10,180000,90000,1 -//moc_fild10,198,150,40,30 monster Green Plant 1080,5,180000,90000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild11 - Sograt Desert //================================================== -moc_fild11,0,0,0,0 monster Hode 1127,10,0,0,0 -moc_fild11,0,0,0,0 monster Golem 1040,70,0,0,0 -moc_fild11,0,0,0,0 monster Andre 1095,10,0,0,0 -moc_fild11,0,0,0,0 monster Deniro 1105,10,0,0,0 -moc_fild11,0,0,0,0 monster Piere 1160,10,0,0,0 -moc_fild11,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -moc_fild11,0,0,0,0 monster Magnolia 1138,20,0,0,0 -moc_fild11,0,0,0,0 monster Muka 1055,20,0,0,0 +moc_fild11,0,0,0,0 monster Baby Desert Wolf 1107,140,0,0,0 +moc_fild11,0,0,0,0 monster Condor 1009,30,0,0,0 +moc_fild11,0,0,0,0 monster Scorpion 1001,30,0,0,0 moc_fild11,197,216,0,0 monster Shining Plant 1083,1,1800000,900000,1 //================================================== @@ -168,18 +115,18 @@ moc_fild11,197,216,0,0 monster Shining Plant 1083,1,1800000,900000,1 moc_fild12,0,0,0,0 monster Picky 1050,50,0,0,0 moc_fild12,0,0,0,0 monster Picky 1049,50,0,0,0 moc_fild12,0,0,0,0 monster Peco Peco Egg 1047,35,0,0,0 -moc_fild12,0,0,0,0 monster Drops 1113,35,0,0,0 +moc_fild12,0,0,0,0 monster Condor 1009,30,0,0,0 +moc_fild12,0,0,0,0 monster Drops 1113,30,0,0,0 moc_fild12,181,336,40,20 monster Yellow Plant 1081,10,180000,90000,1 //================================================== // moc_fild13 - Sograt Desert //================================================== -moc_fild13,0,0,0,0 monster Desert Wolf 1106,30,0,0,0 -moc_fild13,0,0,0,0 monster Anacondaq 1030,75,0,0,0 -moc_fild13,0,0,0,0 monster Boa 1025,30,0,0,0 -moc_fild13,0,0,0,0 monster Side Winder 1037,5,0,0,0 -moc_fild13,0,0,0,0 monster Poporing 1031,20,0,0,0 -moc_fild13,0,0,0,0 monster Drops 1113,10,0,0,0 +moc_fild13,0,0,0,0 monster Steel Chonchon 1042,140,0,0,0 +moc_fild13,0,0,0,0 monster Wolf 1013,15,0,0,0 +moc_fild13,0,0,0,0 monster Metaller 1058,15,0,0,0 +moc_fild13,0,0,0,0 monster Argos 1100,15,0,0,0 +moc_fild13,0,0,0,0 monster Magnolia 1138,15,0,0,0 moc_fild13,280,99,0,0 monster Red Mushroom 1085,1,180000,90000,1 moc_fild13,264,64,0,0 monster Red Mushroom 1085,1,180000,90000,1 moc_fild13,305,91,0,0 monster Red Mushroom 1085,1,180000,90000,1 @@ -206,59 +153,26 @@ moc_fild13,161,273,5,5 monster Yellow Plant 1081,3,180000,90000,1 //================================================== // moc_fild14 - Sograt Desert //================================================== -//moc_fild14,0,0,0,0 monster Desert Wolf 1106,80,0,0,0 -//moc_fild14,0,0,0,0 monster Side Winder 1037,20,0,0,0 -//moc_fild14,0,0,0,0 monster Baby Desert Wolf 1107,40,0,0,0 -//moc_fild14,0,0,0,0 monster Magnolia 1138,25,0,0,0 -//moc_fild14,124,93,5,5 monster Shining Plant 1083,1,1800000,900000,1 -//moc_fild14,85,271,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild14,165,282,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild14,149,333,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild14,64,342,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild14,160,366,0,0 monster Yellow Plant 1081,1,180000,90000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild15 - Sograt Desert //================================================== -//moc_fild15,0,0,0,0 monster Hode 1127,30,0,0,0 -//moc_fild15,0,0,0,0 monster Scorpion 1001,10,0,0,0 -//moc_fild15,0,0,0,0 monster Desert Wolf 1106,10,0,0,0 -//moc_fild15,0,0,0,0 monster Magnolia 1138,25,0,0,0 -//moc_fild15,0,0,0,0 monster Andre 1095,40,0,0,0 -//moc_fild15,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -//moc_fild15,0,0,0,0 monster Phreeoni 1159,1,7200000,600000,1 -//moc_fild15,40,126,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,57,39,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,46,250,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,104,347,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,195,373,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,341,365,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,353,230,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,341,164,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,370,85,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,158,144,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,232,126,0,0 monster Yellow Plant 1081,1,180000,90000,1 -//moc_fild15,294,74,0,0 monster Yellow Plant 1081,1,180000,90000,1 +// No spawns/Disabled Map - 12.1 //================================================== // moc_fild16 - Sograt Desert //================================================== -moc_fild16,0,0,0,0 monster Sandman 1165,70,0,0,0 +moc_fild16,0,0,0,0 monster Sandman 1165,130,0,0,0 moc_fild16,0,0,0,0 monster Hode 1127,30,0,0,0 -moc_fild16,0,0,0,0 monster Magnolia 1138,25,0,0,0 -moc_fild16,0,0,0,0 monster Andre 1095,10,0,0,0 -moc_fild16,0,0,0,0 monster Deniro 1105,20,0,0,0 -moc_fild16,0,0,0,0 monster Ant Egg 1097,10,0,0,0 +moc_fild16,0,0,0,0 monster Frilldora 1119,10,0,0,0 //================================================== // moc_fild17 - Sograt Desert //================================================== -moc_fild17,0,0,0,0 monster Hode 1127,100,0,0,0 -moc_fild17,0,0,0,0 monster Steel Chonchon 1042,30,0,0,0 -moc_fild17,0,0,0,0 monster Magnolia 1138,15,0,0,0 -moc_fild17,0,0,0,0 monster Frilldora 1119,25,0,0,0 -moc_fild17,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -moc_fild17,0,0,0,0 monster Scorpion 1001,5,0,0,0 +moc_fild17,0,0,0,0 monster Hode 1127,130,0,0,0 +moc_fild16,0,0,0,0 monster Sandman 1165,30,0,0,0 +moc_fild17,0,0,0,0 monster Frilldora 1119,10,0,0,0 moc_fild17,0,0,0,0 boss_monster Phreeoni 1159,1,7200000,600000,1 moc_fild17,40,258,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild17,144,151,0,0 monster Yellow Plant 1081,1,180000,90000,1 @@ -271,13 +185,10 @@ moc_fild17,359,258,0,0 monster Yellow Plant 1081,1,180000,90000,1 //================================================== // moc_fild18 - Sograt Desert //================================================== -moc_fild18,0,0,0,0 monster Steel Chonchon 1042,70,0,0,0 -moc_fild18,0,0,0,0 monster Chonchon 1011,40,0,0,0 -moc_fild18,0,0,0,0 monster Muka 1055,80,0,0,0 -moc_fild18,0,0,0,0 monster Metaller 1058,10,0,0,0 -moc_fild18,0,0,0,0 monster Ant Egg 1097,5,0,0,0 +moc_fild18,0,0,0,0 monster Scorpion 1001,140,0,0,0 +moc_fild18,0,0,0,0 monster Condor 1009,30,0,0,0 +moc_fild18,0,0,0,0 monster Baby Desert Wolf 1107,30,0,0,0 moc_fild18,0,0,0,0 monster Dragon Fly 1091,1,3600000,1800000,1 -moc_fild18,0,0,0,0 monster Hunter Fly 1035,1,7200000,3600000,1 moc_fild18,143,352,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild18,72,333,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild18,119,285,0,0 monster Yellow Plant 1081,1,180000,90000,1 @@ -290,15 +201,6 @@ moc_fild18,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1 //================================================== // moc_fild20 - Dimensional Gorge //================================================== -moc_fild20,0,0,0,0 monster Ant Egg 1097,10,0,0,0 -moc_fild20,0,0,0,0 monster Andre 1095,20,0,0,0 -moc_fild20,0,0,0,0 monster Deniro 1105,20,0,0,0 -moc_fild20,0,0,0,0 monster Piere 1160,20,0,0,0 -moc_fild20,0,0,0,0 monster Metaller 1058,20,0,0,0 -moc_fild20,0,0,0,0 monster Drops 1113,30,0,0,0 -moc_fild20,0,0,0,0 monster Scorpion 1001,70,0,0,0 -moc_fild20,0,0,0,0 monster Picky 1050,50,0,0,0 -moc_fild20,0,0,0,0 monster Picky 1049,50,0,0,0 moc_fild20,0,0,0,0 monster Morroc's Shadow 1918,1,30000,0,0 moc_fild20,0,0,0,0 monster Morroc's Shadow 1919,1,30000,0,0 moc_fild20,0,0,0,0 monster Morroc's Shadow 1920,1,30000,0,0 @@ -307,9 +209,6 @@ moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,30000,0,0 //================================================== // moc_fild21 - Dimensional Gorge //================================================== -moc_fild21,0,0,0,0 monster Golem 1040,61,0,0,0 -moc_fild21,0,0,0,0 monster Stalactic Golem 1278,46,0,0,0 -moc_fild21,0,0,0,0 monster Lava Golem 1366,46,0,0,0 moc_fild21,0,0,0,0 monster Morroc's Shadow 1918,46,30000,0,0 moc_fild21,0,0,0,0 monster Morroc's Shadow 1919,46,30000,0,0 moc_fild21,0,0,0,0 monster Morroc's Shadow 1920,46,30000,0,0 diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt index 9da81082ce..386618fe16 100644 --- a/npc/mobs/fields/payon.txt +++ b/npc/mobs/fields/payon.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -11,15 +11,15 @@ //= 1.2 Some 11.1 spawn changes [Playtester] //= 1.3 More accurate spawns [Playtester] //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf] +//= 1.5 Updated to renewal spawns. [L0ne_W0lf] //============================================================ //================================================== // pay_fild01 - Payon Forest //================================================== -pay_fild01,0,0,0,0 monster Willow 1010,10,0,0,0 -pay_fild01,0,0,0,0 monster Poporing 1031,10,0,0,0 -pay_fild01,0,0,0,0 monster Poring 1002,10,0,0,0 -pay_fild01,0,0,0,0 monster Spore 1014,100,0,0,0 +pay_fild01,0,0,0,0 monster Willow 1010,140,0,0,0 +pay_fild01,0,0,0,0 monster Poring 1002,30,0,0,0 +pay_fild01,0,0,0,0 monster Fabre 1007,30,0,0,0 pay_fild01,340,89,0,0 monster Black Mushroom 1084,1,180000,90000,1 pay_fild01,336,116,0,0 monster Black Mushroom 1084,1,180000,90000,1 pay_fild01,231,258,0,0 monster Black Mushroom 1084,1,180000,90000,1 @@ -40,30 +40,29 @@ pay_fild01,0,0,0,0 monster Green Plant 1080,5,180000,90000,1 //================================================== // pay_fild02 - Payon Forest //================================================== -pay_fild02,0,0,0,0 monster Boa 1025,30,0,0,0 -pay_fild02,0,0,0,0 monster Wolf 1013,70,0,0,0 -pay_fild02,0,0,0,0 monster Spore 1014,10,0,0,0 -pay_fild02,0,0,0,0 monster Poporing 1031,20,0,0,0 +pay_fild02,0,0,0,0 monster Boa 1025,140,0,0,0 +pay_fild02,0,0,0,0 monster Spore 1014,30,0,0,0 +pay_fild02,0,0,0,0 monster Wormtail 1024,30,0,0,0 pay_fild02,105,256,10,10 monster Green Plant 1080,4,360000,180000,1 pay_fild02,105,256,10,10 monster Red Mushroom 1085,4,360000,180000,1 //================================================== // pay_fild03 - Payon Forest //================================================== -pay_fild03,0,0,0,0 monster Poring 1002,30,0,0,0 -pay_fild03,0,0,0,0 monster Willow 1010,30,0,0,0 -pay_fild03,0,0,0,0 monster Pupa 1008,50,0,0,0 -pay_fild03,0,0,0,0 monster Lunatic 1063,50,0,0,0 +pay_fild03,0,0,0,0 monster Fabre 1007,130,0,0,0 +pay_fild03,0,0,0,0 monster Poring 1002,25,0,0,0 +pay_fild03,0,0,0,0 monster Willow 1010,25,0,0,0 +pay_fild03,0,0,0,0 monster Pupa 1008,20,0,0,0 pay_fild03,153,216,10,10 monster Red Mushroom 1085,6,900000,450000,1 pay_fild03,372,64,15,15 monster Green Plant 1080,4,180000,90000,1 //================================================== // pay_fild04 - Sograt Desert //================================================== -pay_fild04,0,0,0,0 monster Poring 1002,40,0,0,0 -pay_fild04,0,0,0,0 monster Drops 1113,40,0,0,0 -pay_fild04,0,0,0,0 monster Poporing 1031,40,0,0,0 -pay_fild04,0,0,0,0 monster Marin 1242,10,0,0,0 +pay_fild04,0,0,0,0 monster Poporing 1031,130,0,0,0 +pay_fild04,0,0,0,0 monster Marin 1242,30,0,0,0 +pay_fild04,0,0,0,0 monster Drops 1113,20,0,0,0 +pay_fild04,0,0,0,0 monster Poring 1002,15,0,0,0 pay_fild04,0,0,0,0 monster Ghostring 1120,1,3600000,1800000,1 pay_fild04,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1 pay_fild04,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1 @@ -74,19 +73,14 @@ pay_fild04,254,193,10,10 monster Green Plant 1080,5,360000,180000,1 //================================================== // pay_fild05 - Payon Forest //================================================== -pay_fild05,0,0,0,0 monster Dragon Tail 1321,5,0,0,0 -pay_fild05,0,0,0,0 monster Poporing 1031,20,0,0,0 -pay_fild05,0,0,0,0 monster Poison Spore 1077,65,0,0,0 -pay_fild05,95,147,5,5 monster Green Plant 1080,4,900000,450000,1 -pay_fild05,86,90,5,5 monster Green Plant 1080,4,900000,450000,1 +// No spawns/Disabled Map - 13.3 //================================================== // pay_fild06 - Payon Forest //================================================== -pay_fild06,0,0,0,0 monster Wormtail 1024,90,0,0,0 -pay_fild06,0,0,0,0 monster Spore 1014,20,0,0,0 -pay_fild06,0,0,0,0 monster Poporing 1031,20,0,0,0 -pay_fild06,0,0,0,0 monster Thief Bug Female 1053,40,0,0,0 +pay_fild06,0,0,0,0 monster Wormtail 1024,140,0,0,0 +pay_fild06,0,0,0,0 monster Spore 1014,30,0,0,0 +pay_fild06,0,0,0,0 monster Boa 1025,30,0,0,0 pay_fild06,211,191,2,10 monster Red Mushroom 1085,8,180000,90000,1 pay_fild06,268,155,20,20 monster Green Plant 1080,10,360000,180000,1 pay_fild06,268,155,20,20 monster Shining Plant 1083,1,1800000,900000,1 @@ -94,41 +88,38 @@ pay_fild06,268,155,20,20 monster Shining Plant 1083,1,1800000,900000,1 //================================================== // pay_fild07 - Payon Forest //================================================== -pay_fild07,0,0,0,0 monster Elder Willow 1033,70,0,0,0 -pay_fild07,0,0,0,0 monster Eggyra 1116,40,0,0,0 -pay_fild07,0,0,0,0 monster Poporing 1031,20,0,0,0 -pay_fild07,0,0,0,0 monster Willow 1010,20,0,0,0 -pay_fild07,0,0,0,0 monster Bigfoot 1060,30,0,0,0 +pay_fild07,0,0,0,0 monster Bigfoot 1060,13,0,0,0 +pay_fild07,0,0,0,0 monster Caramel 1103,30,0,0,0 +pay_fild07,0,0,0,0 monster Creamy 1018,20,0,0,0 +pay_fild07,0,0,0,0 monster Stainer 1174,20,0,0,0 +//pay_fild07,0,0,0,0 monster Eggyra 1116,40,0,0,0 pay_fild07,171,331,20,20 monster Green Plant 1080,8,900000,450000,1 //================================================== // pay_fild08 - Payon Forest //================================================== -pay_fild08,0,0,0,0 monster Poring 1002,30,0,0,0 -pay_fild08,0,0,0,0 monster Willow 1010,50,0,0,0 -pay_fild08,0,0,0,0 monster Pupa 1008,20,0,0,0 -pay_fild08,0,0,0,0 monster Spore 1014,70,0,0,0 +pay_fild08,0,0,0,0 monster Spore 1014,140,0,0,0 +pay_fild08,0,0,0,0 monster Wormtail 1024,30,0,0,0 +pay_fild08,0,0,0,0 monster Boa 1025,30,0,0,0 pay_fild08,0,0,0,0 monster Green Plant 1080,10,60000,30000,1 pay_fild08,143,156,40,40 monster Shining Plant 1083,1,3600000,1800000,1 //================================================== // pay_fild09 - Payon Forest //================================================== -pay_fild09,0,0,0,0 monster Poporing 1031,20,0,0,0 -pay_fild09,0,0,0,0 monster Smokie 1056,80,0,0,0 -pay_fild09,0,0,0,0 monster Bigfoot 1060,70,0,0,0 +pay_fild09,0,0,0,0 monster Elder Willow 1033,140,0,0,0 +pay_fild09,0,0,0,0 monster Coco 1104,30,0,0,0 +pay_fild09,0,0,0,0 monster Horn 1128,30,0,0,0 pay_fild09,198,217,30,30 monster Green Plant 1080,10,360000,180000,0 pay_fild09,198,217,30,30 monster Shining Plant 1083,1,1800000,900000,1 //================================================== // pay_fild10 - Payon Forest //================================================== -pay_fild10,0,0,0,0 monster Greatest General 1277,65,0,0,0 -pay_fild10,0,0,0,0 monster Dokebi 1110,70,0,0,0 -pay_fild10,0,0,0,0 monster Poison Spore 1077,20,0,0,0 -pay_fild10,0,0,0,0 monster Nine Tail 1180,2,0,0,0 -pay_fild10,0,0,0,0 monster Nine Tail 1180,1,1800000,900000,1 -pay_fild10,0,0,0,0 monster Nine Tail 1180,1,900000,450000,1 +pay_fild10,0,0,0,0 monster Greatest General 1277,100,0,0,0 +pay_fild10,0,0,0,0 monster Savage 1166,50,0,0,0 +pay_fild10,0,0,0,0 monster Beetle King 1494,50,0,0,0 +pay_fild10,0,0,0,0 boss_monster Eddga 1115,1,7200000,600000,1 pay_fild10,213,157,10,10 monster Green Plant 1080,5,360000,180000,1 pay_fild10,281,307,10,10 monster Green Plant 1080,5,360000,180000,1 pay_fild10,66,332,10,10 monster Green Plant 1080,5,360000,180000,1 @@ -139,9 +130,4 @@ pay_fild10,66,332,10,10 monster Blue Plant 1079,1,360000,180000,1 //================================================== // pay_fild11 - Payon Forest //================================================== -pay_fild11,0,0,0,0 monster Greatest General 1277,30,0,0,0 -pay_fild11,0,0,0,0 monster Nine Tail 1180,60,180000,0,0 -pay_fild11,0,0,0,0 monster Dragon Tail 1321,50,180000,0,0 -pay_fild11,0,0,0,0 boss_monster Eddga 1115,1,7200000,600000,1 -pay_fild11,241,162,5,5 monster Red Mushroom 1085,3,360000,180000,1 -pay_fild11,66,293,5,5 monster Red Mushroom 1085,3,360000,180000,1 +// No spawns/Disabled Map - 13.3 diff --git a/npc/mobs/fields/umbala.txt b/npc/mobs/fields/umbala.txt index 05a79ffa05..b8f7048369 100644 --- a/npc/mobs/fields/umbala.txt +++ b/npc/mobs/fields/umbala.txt @@ -3,22 +3,23 @@ //===== By: ================================================== //= Darkchild (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any eAthena Version; RO Ep6+ //===== Additional Comments: ================================= //= 1.3 Official kRO 10.1 spawns [Playtester] //= 1.4 More accurate spawns [Playtester] +//= 1.5 Updated spawns to renewal. [L0ne_W0lf] //============================================================ //================================================== // um_fild01 - Luluka Forest //================================================== +um_fild01,0,0,0,0 monster Dryad 1493,70,0,0,0 +um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0 +um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0 um_fild01,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0 -um_fild01,0,0,0,0 monster Stem Worm 1215,15,0,0,0 -um_fild01,0,0,0,0 monster Harpy 1376,2,0,0,0 -um_fild01,0,0,0,0 monster Dryad 1493,65,0,0,0 -um_fild01,0,0,0,0 monster Dustiness 1114,10,0,0,0 +um_fild01,0,0,0,0 monster Wooden Golem 1497,5,0,0,0 um_fild01,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 um_fild01,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 um_fild01,0,0,0,0 monster Shining Plant 1083,6,180000,90000,1 @@ -26,47 +27,20 @@ um_fild01,0,0,0,0 monster Shining Plant 1083,6,180000,90000,1 //================================================== // um_fild02 - Hoomga Forest //================================================== -um_fild02,0,0,0,0 monster Coco 1104,10,0,0,0 +um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,0,0,0 +um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0 +um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0 um_fild02,0,0,0,0 monster Choco 1214,5,0,0,0 -um_fild02,0,0,0,0 monster Beetle King 1494,30,0,0,0 -um_fild02,0,0,0,0 monster Dustiness 1114,20,0,0,0 -um_fild02,0,0,0,0 monster Wootan Fighter 1499,26,0,0,0 -um_fild02,0,0,0,0 monster Stone Shooter 1495,13,0,0,0 -um_fild02,169,215,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,169,215,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,159,285,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,159,285,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,99,303,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,99,303,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,122,242,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,122,242,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,124,198,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,124,198,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,126,133,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,126,133,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,159,171,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,159,171,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,284,247,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,284,247,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,330,262,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,330,262,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,296,187,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,296,187,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,285,105,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,285,105,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,257,137,10,10 monster Stone Shooter 1495,1,120000,60000,0 -um_fild02,257,137,10,10 monster Wootan Fighter 1499,2,120000,60000,0 -um_fild02,360,320,20,30 monster Flora 1118,3,180000,120000,0 um_fild02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1 um_fild02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1 //================================================== // um_fild03 - Kalala Swamp //================================================== -um_fild03,0,0,0,0 monster Parasite 1500,95,0,0,0 -um_fild03,0,0,0,0 monster Dragon Tail 1321,20,0,0,0 -um_fild03,0,0,0,0 monster Alligator 1271,10,0,0,0 -um_fild03,0,0,0,0 monster Gryphon 1259,1,3500000,1900000,0 +um_fild03,0,0,0,0 monster Parasite 1500,60,0,0,0 +um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0 +um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0 +um_fild02,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0 um_fild03,0,0,0,0 monster Blue Plant 1079,5,180000,90000,1 um_fild03,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1 @@ -74,26 +48,11 @@ um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1 //================================================== // um_fild04 - Hoomga Jungle //================================================== -um_fild04,0,0,0,0 monster Beetle King 1494,30,0,0,0 -um_fild04,0,0,0,0 monster Horn 1128,15,0,0,0 +um_fild04,0,0,0,0 monster Wild Rose 1261,30,0,0,0 +um_fild04,0,0,0,0 monster Stone Shooter 1495,5,0,0,0 +um_fild04,0,0,0,0 monster Wooden Golem 1497,5,0,0,0 +um_fild04,0,0,0,0 monster Wootan Shooter 1498,5,0,0,0 +um_fild04,0,0,0,0 monster Wootan Fighter 1499,5,0,0,0 um_fild04,0,0,0,0 monster Choco 1214,2,0,0,0 -um_fild04,0,0,0,0 monster Wootan Shooter 1498,7,0,0,0 -um_fild04,264,293,10,10 monster Horn 1128,2,1200000,60000,0 -um_fild04,264,293,10,10 monster Beetle King 1494,4,120000,60000,0 -um_fild04,121,239,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,91,79,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,244,339,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,295,93,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,118,237,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,118,237,10,10 monster Horn 1128,1,120000,60000,0 -um_fild04,311,285,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,311,285,10,10 monster Horn 1128,1,120000,60000,0 -um_fild04,206,188,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,206,188,10,10 monster Horn 1128,1,120000,60000,0 -um_fild04,239,245,10,10 monster Beetle King 1494,2,120000,60000,0 -um_fild04,239,245,10,10 monster Horn 1128,1,120000,60000,0 -um_fild04,239,245,10,10 monster Wootan Shooter 1498,1,300000,60000,0 -um_fild04,91,79,10,10 monster Wootan Shooter 1498,1,300000,60000,0 -um_fild04,295,93,10,10 monster Wootan Shooter 1498,1,300000,60000,0 um_fild04,0,0,0,0 monster Red Plant 1078,5,180000,90000,1 um_fild04,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1 diff --git a/npc/mobs/fields/yuno.txt b/npc/mobs/fields/yuno.txt index c2daf33fa5..d117057e9d 100644 --- a/npc/mobs/fields/yuno.txt +++ b/npc/mobs/fields/yuno.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -20,15 +20,15 @@ //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.8 Added kRO 10.1 spawns where they fit [Playtester] //= 1.9 More accurate spawns [Playtester] +//= 2.0 Updated spawns to renewal. [L0ne_W0lf] //============================================================ //================================================== // yuno_fild01 - Border Posts //================================================== -yuno_fild01,0,0,0,0 monster Dustiness 1114,50,0,0,0 -yuno_fild01,0,0,0,0 monster Poring 1002,20,0,0,0 -yuno_fild01,0,0,0,0 monster Poporing 1031,20,0,0,0 -yuno_fild01,190,329,80,20 monster Grand Peco 1369,3,50000,25000,0 +yuno_fild01,0,0,0,0 monster Geographer 1368,50,0,0,0 +yuno_fild01,0,0,0,0 monster Dustiness 1114,35,0,0,0 +yuno_fild01,0,0,0,0 monster Mantis 1139,35,0,0,0 yuno_fild01,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1 yuno_fild01,70,370,10,10 monster Blue Plant 1079,2,1800000,900000,1 yuno_fild01,70,370,10,10 monster Shining Plant 1083,1,1800000,900000,1 @@ -41,13 +41,9 @@ yuno_fild01,0,0,0,0 monster Green Plant 1080,20,1800000,900000,1 //================================================== // yuno_fild02 - Kiel Khayr's Cottage //================================================== -yuno_fild02,0,0,0,0 monster Beetle King 1494,40,0,0,0 -yuno_fild02,0,0,0,0 monster Horn 1128,40,0,0,0 -yuno_fild02,0,0,0,0 monster Dustiness 1114,20,0,0,0 -yuno_fild02,0,0,0,0 monster Hunter Fly 1035,10,0,0,0 -yuno_fild02,92,200,43,52 monster Wild Rose 1261,5,0,0,0 -yuno_fild02,185,310,170,37 monster Novus 1715,2,1200000,600000,0 -yuno_fild02,298,194,55,158 monster Novus 1718,2,1200000,600000,0 +yuno_fild02,0,0,0,0 monster Sleeper 1386,130,0,0,0 +yuno_fild02,0,0,0,0 monster Grand Peco 1369,35,0,0,0 +yuno_fild02,0,0,0,0 monster Harpy 1376,35,0,0,0 yuno_fild02,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1 yuno_fild02,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1 yuno_fild02,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1 @@ -55,12 +51,9 @@ yuno_fild02,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1 //================================================== // yuno_fild03 - El Mes Plateau //================================================== -yuno_fild03,0,0,0,0 monster Poporing 1031,50,0,0,0 -yuno_fild03,0,0,0,0 monster Drops 1113,40,0,0,0 -yuno_fild03,0,0,0,0 monster Poring 1002,30,0,0,0 -yuno_fild03,0,0,0,0 monster Marin 1242,20,0,0,0 -yuno_fild03,0,0,0,0 monster Geographer 1368,15,0,0,0 -yuno_fild03,62,131,44,15 monster Side Winder 1037,1,300000,240000,0 +yuno_fild03,0,0,0,0 monster Harpy 1376,130,0,0,0 +yuno_fild03,0,0,0,0 monster Sleeper 1386,35,0,0,0 +yuno_fild03,0,0,0,0 monster Goat 1372,35,0,0,0 yuno_fild03,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1 yuno_fild03,0,0,0,0 monster Deviling 1582,1,3600000,1800000,1 yuno_fild03,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1 @@ -72,11 +65,11 @@ yuno_fild03,358,215,10,10 monster Blue Plant 1079,4,1800000,900000,1 //================================================== // yuno_fild04 - El Mes Plateau //================================================== -yuno_fild04,0,0,0,0 monster Poring 1002,60,0,0,0 -yuno_fild04,0,0,0,0 monster Drops 1113,40,0,0,0 -yuno_fild04,0,0,0,0 monster Condor 1009,20,0,0,0 -yuno_fild04,0,0,0,0 monster Pupa 1008,10,0,0,0 +yuno_fild04,0,0,0,0 monster Harpy 1376,130,0,0,0 +yuno_fild04,0,0,0,0 monster Geographer 1368,35,0,0,0 +yuno_fild04,0,0,0,0 monster Goat 1372,35,0,0,0 yuno_fild04,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1 +yuno_fild04,0,0,0,0 monster Arc Angeling 1388,1,3600000,180000,0 yuno_fild04,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1 yuno_fild04,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1 yuno_fild04,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1 @@ -84,23 +77,13 @@ yuno_fild04,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1 //================================================== // yuno_fild05 - El Mes Plateau //================================================== -yuno_fild05,0,0,0,0 monster Rafflesia 1162,70,0,0,0 -yuno_fild05,0,0,0,0 monster Dustiness 1114,30,0,0,0 -yuno_fild05,0,0,0,0 monster Horn 1128,30,0,0,0 -yuno_fild05,0,0,0,0 monster Beetle King 1494,10,0,0,0 -yuno_fild05,0,0,0,0 monster Arc Angeling 1388,1,3600000,180000,0 -yuno_fild05,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 -yuno_fild05,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 -yuno_fild05,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,0 -yuno_fild05,176,202,8,8 monster Blue Plant 1079,2,180000,90000,1 -yuno_fild05,300,280,5,5 monster Blue Plant 1079,2,180000,90000,1 +// No Spawns/Disabled Map = 13.3 //================================================== // yuno_fild06 - Yuno Field //================================================== -yuno_fild06,0,0,0,0 monster Sleeper 1386,70,0,0,0 -yuno_fild06,0,0,0,0 monster Goat 1372,40,0,0,0 -yuno_fild06,0,0,0,0 monster Demon Pungus 1378,20,120000,0,0 +yuno_fild06,0,0,0,0 monster Sleeper 1386,80,0,0,0 +yuno_fild06,0,0,0,0 monster Geographer 1368,20,0,0,0 yuno_fild06,0,0,0,0 monster Red Plant 1078,10,0,0,0 yuno_fild06,0,0,0,0 monster Yellow Plant 1081,10,0,0,0 yuno_fild06,0,0,0,0 monster Green Plant 1080,10,0,0,0 @@ -108,10 +91,9 @@ yuno_fild06,0,0,0,0 monster Green Plant 1080,10,0,0,0 //================================================== // yuno_fild07 - El Mes Gorge (Valley of Abyss) //================================================== -yuno_fild07,0,0,0,0 monster Goat 1372,10,0,0,0 -yuno_fild07,0,0,0,0 monster Geographer 1368,20,0,0,0 -yuno_fild07,0,0,0,0 monster Driller 1380,10,0,0,0 -yuno_fild07,0,0,0,0 monster Harpy 1376,40,600000,300000,0 +yuno_fild07,0,0,0,0 monster Goat 1372,90,0,0,0 +yuno_fild07,0,0,0,0 monster Harpy 1376,50,0,0,0 +yuno_fild07,0,0,0,0 monster Grand Peco 1369,30,0,0,0 yuno_fild07,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 yuno_fild07,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 yuno_fild07,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 @@ -119,16 +101,13 @@ yuno_fild07,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== // yuno_fild08 - Kiel Khayr's Academy //================================================== -yuno_fild08,0,0,0,0 monster Wild Rose 1261,5,0,0,0 -yuno_fild08,200,300,290,100 monster Grand Peco 1369,30,0,0,0 -yuno_fild08,272,205,100,120 monster Grand Peco 1369,20,0,0,0 -yuno_fild08,230,110,250,90 monster Grand Peco 1369,30,0,0,0 +yuno_fild08,200,300,290,100 monster Grand Peco 1369,50,0,0,0 +yuno_fild08,272,205,100,120 monster Grand Peco 1369,30,0,0,0 +yuno_fild08,230,110,250,90 monster Grand Peco 1369,50,0,0,0 yuno_fild08,200,300,290,100 monster Geographer 1368,12,0,0,0 yuno_fild08,272,205,100,120 monster Geographer 1368,6,0,0,0 yuno_fild08,230,110,250,90 monster Geographer 1368,12,0,0,0 -yuno_fild08,200,300,290,100 monster Dustiness 1114,7,0,0,0 -yuno_fild08,272,205,100,120 monster Dustiness 1114,6,0,0,0 -yuno_fild08,230,110,250,90 monster Dustiness 1114,7,0,0,0 +yuno_fild08,0,0,0,0 monster Goat 1372,30,0,0,0 yuno_fild08,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 yuno_fild08,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 yuno_fild08,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 @@ -136,12 +115,9 @@ yuno_fild08,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== // yuno_fild09 - Schwarzwald Guards Camp //================================================== -yuno_fild09,0,0,0,0 monster Beetle King 1494,40,0,0,0 -yuno_fild09,0,0,0,0 monster Horn 1128,40,0,0,0 -yuno_fild09,0,0,0,0 monster Stainer 1174,20,0,0,0 -yuno_fild09,0,0,0,0 monster Dustiness 1114,20,0,0,0 -yuno_fild09,0,0,0,0 monster Hunter Fly 1035,10,0,0,0 -yuno_fild09,0,0,0,0 monster Wild Rose 1261,5,0,0,0 +yuno_fild09,0,0,0,0 monster Grand Peco 1369,130,0,0,0 +yuno_fild09,0,0,0,0 monster Geographer 1368,30,0,0,0 +yuno_fild09,0,0,0,0 monster Sleeper 1386,30,0,0,0 yuno_fild09,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 yuno_fild09,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 yuno_fild09,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 @@ -149,21 +125,14 @@ yuno_fild09,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== // yuno_fild10 - Yuno Field //================================================== -yuno_fild10,0,0,0,0 monster Beetle King 1494,40,0,0,0 -yuno_fild10,0,0,0,0 monster Stainer 1174,20,0,0,0 -yuno_fild10,0,0,0,0 monster Dustiness 1114,20,0,0,0 -yuno_fild10,0,0,0,0 monster Geographer 1368,20,0,0,0 -yuno_fild10,0,0,0,0 monster Hunter Fly 1035,10,0,0,0 +// No Spawns/Disabled Map - 13.3 //================================================== // yuno_fild11 - Yuno Field //================================================== -yuno_fild11,0,0,0,0 monster Sleeper 1386,10,0,0,0 -yuno_fild11,0,0,0,0 monster Demon Pungus 1378,10,120000,0,0 -yuno_fild11,0,0,0,0 monster Geographer 1368,15,0,0,0 -yuno_fild11,65,294,70,160 monster Sleeper 1386,3,0,0,0 +yuno_fild10,0,0,0,0 monster Goat 1372,100,0,0,0 +yuno_fild11,0,0,0,0 monster Geographer 1368,23,0,0,0 yuno_fild11,65,294,70,160 monster Geographer 1368,2,0,0,0 -yuno_fild11,225,220,125,135 monster Sleeper 1386,30,0,0,0 yuno_fild11,225,220,125,135 monster Geographer 1368,15,0,0,0 yuno_fild11,0,0,0,0 monster Red Plant 1078,10,180000,90000,1 yuno_fild11,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 @@ -172,7 +141,5 @@ yuno_fild11,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== // yuno_fild12 - Border Checkpoint //================================================== -yuno_fild12,0,0,0,0 monster Dustiness 1114,30,0,0,0 -yuno_fild12,0,0,0,0 monster Demon Pungus 1378,20,0,0,0 -yuno_fild12,0,0,0,0 monster Poporing 1031,15,0,0,0 -yuno_fild12,0,0,0,0 monster Geographer 1368,5,0,0,0 +yuno_fild12,0,0,0,0 monster Geographer 1368,60,0,0,0 +yuno_fild01,0,0,0,0 monster Mantis 1139,30,0,0,0 diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index 5b6d2cb87f..7cf64b58a9 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -141,25 +141,25 @@ npc: npc/quests/first_class/tu_sword.txt npc: npc/quests/first_class/tu_thief01.txt //Wandering Minstrel Quest npc: npc/quests/Bard_Quest.txt -// Repeatable EXP quests; -npc: npc/quests/collection/quest_alligator.txt -npc: npc/quests/collection/quest_caramel.txt +// Repeatable EXP quests; Currently not avaliable in RE. +//npc: npc/quests/collection/quest_alligator.txt +//npc: npc/quests/collection/quest_caramel.txt //Exploitable due to vendor selling Acorns in Moscovia //npc: npc/quests/collection/quest_coco.txt -npc: npc/quests/collection/quest_creamy.txt -npc: npc/quests/collection/quest_demonpungus.txt -npc: npc/quests/collection/quest_dokebi.txt -npc: npc/quests/collection/quest_dryad.txt -npc: npc/quests/collection/quest_fabre.txt -npc: npc/quests/collection/quest_frilldora.txt +//npc: npc/quests/collection/quest_creamy.txt +//npc: npc/quests/collection/quest_demonpungus.txt +//npc: npc/quests/collection/quest_dokebi.txt +//npc: npc/quests/collection/quest_dryad.txt +//npc: npc/quests/collection/quest_fabre.txt +//npc: npc/quests/collection/quest_frilldora.txt //Exploitable due to vendor selling Antelope Horns in Niflheim //npc: npc/quests/collection/quest_goat.txt -npc: npc/quests/collection/quest_golem.txt -npc: npc/quests/collection/quest_hode.txt -npc: npc/quests/collection/quest_leafcat.txt +//npc: npc/quests/collection/quest_golem.txt +//npc: npc/quests/collection/quest_hode.txt +//npc: npc/quests/collection/quest_leafcat.txt //Exploitable due to vendor selling Bill of Birds in Morroc //npc: npc/quests/collection/quest_pecopeco.txt -npc: npc/quests/collection/quest_pupa.txt +//npc: npc/quests/collection/quest_pupa.txt //Town Relay Quests npc: npc/quests/2007_relay.txt //Guild Relay Quests @@ -178,6 +178,15 @@ npc: npc/quests/okolnir/godse_sch04.txt npc: npc/quests/okolnir/godse_sch05.txt npc: npc/quests/quests_13_1.txt npc: npc/quests/quests_13_2.txt +// Eden Group +//npc: npc/quests/eden/Eden.txt +//npc: npc/quests/eden/Eden_Service.txt +//npc: npc/quests/eden/Quests_Eden.txt +//npc: npc/quests/eden/11-25.txt +//npc: npc/quests/eden/26-40.txt +//npc: npc/quests/eden/41-55.txt +//npc: npc/quests/eden/56-70.txt +//npc: npc/quests/eden/71-85.txt // -------------------------------------------------------------- // --------------------------- Guides --------------------------- npc: npc/guides/guides_alb.txt From fa7003afd32b1252925e740e9be9d478cb8a6e68 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 14 Nov 2010 22:26:26 +0000 Subject: [PATCH 048/129] * Updated quest_read_db. Might need reviewing. ;-; - Reports entries when read by server at start up like other DBs. - Will now skip blank lines instead of reporting false errors. - Will report when entries are > MAX_QUEST_DB. * Updated quest and item DB with Eden Group information. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14463 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 5 ++ conf/battle/exp.conf | 2 +- conf/mapflag/nomemo.txt | 1 + conf/mapflag/nopenalty.txt | 1 + conf/mapflag/noteleport.txt | 1 + db/Changelog.txt | 2 + db/item_db.txt | 44 +++++----- db/item_trade.txt | 25 ++++++ db/quest_db.txt | 159 ++++++++++++++++++++++++++++++++---- src/common/mmo.h | 2 +- src/map/quest.c | 8 +- 11 files changed, 210 insertions(+), 40 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 488fb69e5c..59c2aea239 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,10 @@ Date Added +2010/11/14 + * Rev. 14463 Updated quest_read_db. [L0ne_W0lf] + - Reports entries when read by server at start up like other DBs. + - Will now skip blank lines instead of reporting false errors. + - Will report when entries are > MAX_QUEST_DB. 2010/11/10 * Made bAtkRate add the rate rather than setting it. (bugreport:4499) [Paradox924X] * Added an item_delay database usable for item-specific use delays. [Paradox924X] diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf index 7e9675ed22..f3d438ea28 100644 --- a/conf/battle/exp.conf +++ b/conf/battle/exp.conf @@ -92,7 +92,7 @@ death_penalty_job: 100 zeny_penalty: 0 // Will display experience gained from killing a monster. (Note 1) -disp_experience: yes +disp_experience: no // Will display zeny earned (from mobs, trades, etc) (Note 1) disp_zeny: no diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 9e2d412a20..6e57620c91 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -106,6 +106,7 @@ ra_temsky mapflag nomemo ve_in mapflag nomemo ve_in02 mapflag nomemo thor_camp mapflag nomemo +moc_para01 mapflag nomemo // Fields =================== alb2trea mapflag nomemo diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index b34c991919..0d22861aa5 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -124,6 +124,7 @@ veins mapflag nopenalty ve_in mapflag nopenalty ve_in02 mapflag nopenalty thor_camp mapflag nopenalty +moc_para01 mapflag nopenalty // Job Quests ======================== job_sword1 mapflag nopenalty diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index a00dc26a76..10672aea9c 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -117,6 +117,7 @@ kh_dun01 mapflag noteleport ve_in mapflag noteleport ve_in02 mapflag noteleport thor_camp mapflag noteleport +moc_para01 mapflag noteleport // Job Quests ==================== job_sword1 mapflag noteleport diff --git a/db/Changelog.txt b/db/Changelog.txt index 3cec5e1bb6..9297c98bc4 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/14 + * Rev. 14463 Updated quest and item DBs with Eden Group information. [L0ne_W0lf] 2010/11/11 * Rev. 14459 Updated known EXP values, and deleted exp2.txt. [L0ne_W0lf] 2010/11/10 diff --git a/db/item_db.txt b/db/item_db.txt index 4e1dc27eae..4993745cc0 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -542,8 +542,8 @@ 1189,Krasnaya,Krasnaya,4,20,,3800,200,,1,3,0x00004082,2,2,34,2,50,1,3,{ if(readparam(bStr)>=95) { bonus bAtk,20; } },{},{} 1190,Claymore_C,Claymore,4,20,,0,220,,1,0,0x00004080,7,2,34,3,1,0,3,{ bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{} //1191,Alca_Bringer, -//1192,P_Slayer1,Eden Slayer I, -//1193,P_Slayer1,Eden Slayer II, +1192,P_Slayer1,Eden Slayer I,4,0,,0,162,,1,0,0x00004082,7,2,34,2,26,0,3,{},{},{} +1193,P_Slayer2,Eden Slayer II,4,0,,0,185,,1,0,0x00004082,7,2,34,2,40,0,3,{},{},{} //1194,Executioner, // Daggers 1201,Knife,Knife,4,50,,400,17,,1,3,0xFE9F7EEF,7,2,2,1,1,1,1,{},{},{} @@ -894,8 +894,8 @@ 1647,Croce_Staff,Croce Staff,4,20,,400,10,,1,1,0x00008110,2,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20; },{},{} 1648,Staff_Of_Bordeaux,Staff Of Bordeaux,4,0,,500,30,,1,0,0x00010204,2,2,2,4,50,1,10,{ bonus bMatkRate,15; bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{} //1649,Rafini_Staff, -//1650,P_Staff1,Eden Staff I, -//1651,P_Staff2,Eden Staff II, +1650,P_Staff1,Eden Staff I,4,0,,0,69,,1,0,0x00818314,7,2,2,2,26,0,10,{ bonus bInt,1; bonus bMatkRate,15; },{},{} +1651,P_Staff2,Eden Staff II,4,0,,0,60,,1,0,0x00818314,7,2,2,2,40,0,10,{ bonus bInt,2; bonus bMatkRate,15; },{},{} // Bows 1701,Bow,Bow,4,1000,,500,15,,5,3,0x000A0848,7,2,34,1,4,1,11,{},{},{} 1702,Bow_,Bow,4,1000,,500,15,,5,4,0x000A0848,7,2,34,1,4,1,11,{},{},{} @@ -942,8 +942,8 @@ 1744,Bow_Of_Evil,Bow Of Evil,4,0,,0,170,,5,0,0x000A0848,7,2,34,4,1,0,11,{ bonus2 bSkillAtk,"AC_DOUBLE",25; bonus bDex,2; },{},{} 1745,Falken_Blitz,Falken Blitz,4,0,,1000,100,,5,2,0x00080808,2,2,34,3,50,1,11,{ bonus2 bSkillAtk,"SN_SHARPSHOOTING",10; bonus2 bSkillAtk,"AC_DOUBLE",10; bonus2 bSkillAtk,"AC_CHARGEARROW",10; },{},{} //1746,Elven_Bow, -//1747,P_Bow1,Eden Bow I, -//1748,P_Bow2,Eden Bow II, +1747,P_Bow1,Eden Bow I,4,0,,0,82,,5,3,0x000A0848,7,2,34,2,26,0,11,{},{},{} +1748,P_Bow2,Eden Bow II,4,0,,0,120,,5,3,0x000A0848,7,2,34,2,40,0,11,{},{},{} // Arrows 1750,Arrow,Arrow,10,1,,1,25,,,,0x000A1848,7,2,32768,,1,,1,{},{},{} 1751,Silver_Arrow,Silver Arrow,10,3,,2,30,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Holy; },{},{} @@ -1380,9 +1380,9 @@ //2453,Freya_Spirit_Sandals3,Freya Spirit Sandals, //2454,Freya_Spirit_Sandals4,Freya Spirit Sandals, //2455,Guardian_Boots,Guardian Boots, -//2456,Para_Team_Boots1,Eden Team Boots I, -//2457,Para_Team_Boots2,Eden Team Boots II, -//2458,Para_Team_Boots3,Eden Team Boots III, +2456,Para_Team_Boots1,Eden Team Boots I,5,0,,0,,12,,0,0xFFFFFFFF,7,2,64,,12,0,0,{ bonus bHPrecovRate,10; bonus bSPrecovRate,2; },{},{} +2457,Para_Team_Boots2,Eden Team Boots II,5,0,,0,,16,,0,0xFFFFFFFF,7,2,64,,26,0,0,{ bonus bHPrecovRate,12; bonus bSPrecovRate,4; },{},{} +2458,Para_Team_Boots3,Eden Team Boots III,5,0,,0,,18,,0,0xFFFFFFFF,7,2,64,,40,0,0,{ bonus bHPrecovRate,14; bonus bSPrecovRate,6; },{},{} // Garments //=================================================================== 2501,Hood,Hood,5,1000,,200,,1,,0,0xFFFFFFFF,7,2,4,,0,1,0,{},{},{} @@ -1444,7 +1444,7 @@ //2557,Freya_Soul_Scarf3,Freya Soul Scarf, //2558,Freya_Soul_Scarf4,Freya Soul Scarf, //2559,Guardian_Manteau,Guardian Manteau, -//2560,Para_Team_Manteau,Eden Team Manteau, +2560,Para_Team_Manteau,Eden Team Manteau,5,0,,0,,14,,0,0xFFFFFFFF,7,2,4,,12,0,0,{ bonus2 bSubEle,Ele_Neutral,10; },{},{} // Accessories //=================================================================== 2601,Ring,Ring,5,30000,,100,,0,,0,0xFFFFFFFE,7,2,136,,20,0,0,{ bonus bStr,2; },{},{} @@ -2788,7 +2788,7 @@ 5580,Red_Beret,Red Beret,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,559,{},{},{} 5581,Cancer_Crown,Cancer Crown,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,560,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bHealPower,3; bonus bFlee,10; } },{},{} 5582,Cancer_Diadem,Cancer Diadem,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,561,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMDef,1; bonus bHealPower,3; bonus bMatkRate,2; } },{},{} -5583,Paradise_Hat,Paradise Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,1,{},{},{} +5583,Para_Team_Hat,Eden Team Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,465,{},{},{} 5584,Majestic_Evil_Horn,Majestic Evil Horns,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,562,{ bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; },{},{} 5585,Rune_Cloth_Circlet,Rune Cloth Circlet,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,564,{},{},{} 5586,Mogikiller,Mosquito Coil,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,563,{},{},{} @@ -3162,7 +3162,7 @@ //6215,Tear_Gas,Tear Gas,3,500,,1,,,,,,,,,,,,,{},{},{} //6216,Oil_Bottle,Oil Bottle,3,1000,,1,,,,,,,,,,,,,{},{},{} //6217,Mandragora_Flowerpot,Mandragora Flowerpot,3,2000,,1,,,,,,,,,,,,,{},{},{} -//6218,Delivery_Daishin_Box, +6218,Disin_Delivery_Box,Delivery_Daishin_Box,3,20,,0,,,,,,,,,,,,,{},{},{} 6219,Para_Team_Mark,Eden Group Mark,3,20,,0,,,,,,,,,,,,,{},{},{} //6220,Mysterious_Dyestuffs //6221,Mystic_Leaf_Cat_Ball @@ -5027,8 +5027,8 @@ 13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,100; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{} 13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,100; autobonus "{ bonus bAtkRate,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{} //13048,Damascus_C -//13050,P_Dagger,Eden Dagger I, -//13051,P_Dagger,Eden Dagger II, +13050,P_Dagger1,Eden Dagger I,4,0,,0,124,,1,0,0xFE9F7EEF,7,2,2,2,26,0,1,{},{},{} +13051,P_Dagger2,Eden Dagger II,4,0,,0,158,,1,0,0xFE9F7EEF,7,2,2,2,40,0,1,{},{},{} //13053,Moonlight_Sword, //13054,Combat_Knife, //13055,Asura, @@ -5046,6 +5046,8 @@ //13109,Wasteland_Outlaw_C 13110,Krieger_Pistol1,Glorious Pistol,4,0,,0,80,,7,0,0x01000000,7,2,34,4,80,1,17,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) { bonus4 bAutoSpellOnSkill,"GS_RAPIDSHOWER","GS_GLITTERING",1,1000; bonus2 bSkillAtk,"GS_RAPIDSHOWER",getrefine()*2; } },{},{} //13111,Sharpshooter_Revolver +13112,P_Revolver1,Eden Revlover I,4,0,,0,4,,7,0,0x01000000,7,2,34,1,26,0,17,{ bonus bHit,-5; },{},{} +13113,P_Revolver2,Eden Revlover II,4,0,,0,60,,7,0,0x01000000,7,2,34,1,40,0,17,{ bonus bHit,-5; },{},{} 13150,Branch,Branch,4,3000,,500,50,,9,3,0x01000000,7,2,34,1,1,1,18,{},{},{} 13151,The_Cyclone,Cyclone,4,17500,,700,120,,9,1,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{} 13152,The_Cyclone_,Cyclone,4,17500,,700,120,,9,2,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{} @@ -5158,8 +5160,8 @@ //13420,Honglyun's_Sword 13421,Ruber,Ruber,4,20,,1500,170,,1,1,0x000444A2,2,2,2,3,50,1,2,{ autobonus "{ bonus2 bSkillAtk,\"KN_BOWLINGBASH\",20; bonus2 bSkillAtk,\"SM_BASH\",20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{} //13422,Flamberge_C -//13423,P_Sabre1,Eden Sabre I, -//13424,P_Sabre2,Eden Sabre II, +13423,P_Sabre1,Eden Sabre I,4,0,,0,147,,1,0,0x000654E2,7,2,2,2,26,0,2,{},{},{} +13424,P_Sabre2,Eden Sabre II,4,0,,0,170,,1,0,0x000654E2,7,2,2,2,40,0,2,{},{},{} //13426,Cutlas_C //13427,Solar_Sword_C // More Cash Shop Items @@ -6094,9 +6096,9 @@ 15000,Bone_Plate,Bone Plate,5,20,,1000,,7,,1,0x00021040,2,2,16,,85,1,0,{ bonus bStr,1; bonus bMDef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{} 15001,Odin's_Blessing_I,Odin's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 15002,Rune_Plate,Rune Plate,2,0,,0,,,,1,0xFFFFFFFF,7,2,,,,,,{},{},{} -//15009,Para_Team_Uniform1,Eden Team Uniform I, -//15010,Para_Team_Uniform2,Eden Team Uniform II, -//15011,Para_Team_Uniform3,Eden Team Uniform III, +15009,Para_Team_Uniform1,Eden Team Uniform I,5,0,,0,,35,,0,0xFFFFFFFF,7,2,16,,12,0,0,{ bonus bMaxHP,100; bonus bMaxSP,10; },{},{} +15010,Para_Team_Uniform2,Eden Team Uniform II,5,0,,0,,46,,0,0xFFFFFFFF,7,2,16,,26,0,0,{ bonus bMaxHP,200; bonus bMaxSP,20; },{},{} +15011,Para_Team_Uniform3,Eden Team Uniform III,5,0,,0,,58,,0,0xFFFFFFFF,7,2,16,,40,0,0,{ bonus bMaxHP,300; bonus bMaxSP,30; bonus bMDef,5; },{},{} //15012,Puente_Robe, //15013,Claire_Suits, //15014,Ebone_Armor, @@ -6104,8 +6106,8 @@ 16001,Red_Square_Bag,Red Square Bag,4,20,,500,130,,,2,0x0004C5B2,2,2,2,4,50,1,8,{ bonus bMaxHP,200; bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus2 bAddMonsterDropItem,501,50; bonus2 bAddMonsterDropItem,502,20; bonus2 bAddMonsterDropItem,503,20; bonus2 bAddMonsterDropItem,504,20; bonus2 bAddMonsterDropItem,505,10; if(readparam(bStr)>=95) bonus2 bAddEff,Eff_Stun,500; },{},{} 16002,Stunner_C,Stunner,2,20,,2000,140,,1,0,0x00008110,7,2,2,3,27,1,8,{ bonus2 bAddEff,Eff_Stun,1000; bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{} //16003,Carga_Mace, -//16004,P_Mace1,Eden Mace I, -//16005,P_Mace2,Eden Mace II, +16004,P_Mace1,Eden Mace I,4,0,,0,142,,1,0,0x0004C5B2,7,2,2,2,26,0,8,{},{},{} +16005,P_Mace2,Eden Mace II,4,0,,0,163,,1,0,0x0004C5B2,7,2,2,2,40,0,8,{},{},{} //16008,Spanner, 16134,King_Frog_Hat_Box,Frog King Hat Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 16135,Evil's_Bone_Hat_Box,Satanic Bone Helm Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} diff --git a/db/item_trade.txt b/db/item_trade.txt index ca8035ed5b..cd41e3fd91 100644 --- a/db/item_trade.txt +++ b/db/item_trade.txt @@ -1517,3 +1517,28 @@ 12345,91,100 // Luciola's_Honey_Jam 12348,91,100 // Manuk's_Faith 12349,91,100 // Cornus'_Tears + +// Epidode 13.3 +1192,123,100 // P_Slayer1 +1193,123,100 // P_Slayer2 +1650,123,100 // P_Staff1 +1651,123,100 // P_Staff2 +1747,123,100 // P_Bow1 +1748,123,100 // P_Bow2 +2456,123,100 // Para_Team_Boots1 +2457,123,100 // Para_Team_Boots2 +2458,123,100 // Para_Team_Boots3 +2560,123,100 // Para_Team_Manteau +5583,123,100 // Para_Team_Hat +6219,123,100 // Para_Team_Mark +13050,123,100 // P_Dagger1 +13051,123,100 // P_Dagger2 +13112,123,100 // P_Revolver1 +13113,123,100 // P_Revolver2 +13423,123,100 // P_Sabre1 +13424,123,100 // P_Sabre2 +15009,123,100 // Para_Team_Uniform1 +15010,123,100 // Para_Team_Uniform2 +15011,123,100 // Para_Team_Uniform3 +16004,123,100 // P_Mace1 +16005,123,100 // P_Mace2 diff --git a/db/quest_db.txt b/db/quest_db.txt index f196f8a02a..55e8f2c225 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -2,7 +2,6 @@ // // Structure of Database : // Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,Quest Title -// 1000,0,0,0,0,0,0,0,"Transcend" 1001,0,0,0,0,0,0,0,"Job Change to Acolyte" 1002,0,0,0,0,0,0,0,"Job Change to Acolyte" @@ -139,10 +138,10 @@ 2129,0,0,0,0,0,0,0,"Thor Volcano base camp" 2130,0,0,0,0,0,0,0,"Thor Volcano base camp" 2131,0,0,0,0,0,0,0,"Thor Volcano base camp" -// + 2143,50,0,0,0,0,0,0,"Guild Dungeon Event" 2144,0,0,0,0,0,0,0,"Guild Dungeon Event" -// + 2147,0,0,0,0,0,0,0,"Attitude to the New" 2148,0,0,0,0,0,0,0,"Attitude to the New" 2149,0,0,0,0,0,0,0,"Attitude to the New" @@ -203,7 +202,7 @@ 3044,0,0,0,0,0,0,0,"The Gigantic Magestic Goat" 3045,9600,0,0,0,0,0,0,"Sealed Shrine" 3046,0,0,0,0,0,0,0,"Sealed Shrine After-effect" -// + 3050,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 1" 3051,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 2" 3052,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 3" @@ -245,7 +244,7 @@ 3092,0,0,0,0,0,0,0,"Report to the continent - Success to restore!" 3093,0,0,0,0,0,0,0,"Report to the continent - Report to the continent" 3094,0,0,0,0,0,0,0,"Report to the continent - Return to the expedition" -// + 3100,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Lost Bond of Debt" 3101,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Strange Heap of Earth" 3102,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Bond of Debt Found, but..." @@ -283,6 +282,23 @@ 3134,0,0,0,0,0,0,0,"Z Gang Wanted - Clean Sweep of Z Gang" 3135,0,0,0,0,0,0,0,"Nidhoggur's Nest" 3136,0,0,0,0,0,0,0,"Nidhoggur's Nest Time Limit" + +3250,0,1041,30,0,0,0,0,"Request - What is this bandage for?" +3251,0,1271,30,0,0,0,0,"Request - An alligator of Counterattack" +3252,0,1264,30,0,0,0,0,"Request - My mermaid don't do like this way!" +3253,0,0,0,0,0,0,0,"Request - Missing occult mania" +3254,0,0,0,0,0,0,0,"Request - A country wants you" +3255,0,1166,30,0,0,0,0,"Request - A wild boar subjugate operation" +3256,0,0,0,0,0,0,0,"Request - Ready for waiting summer" +3257,0,1170,30,0,0,0,0,"Request - A grudge of women" +3258,0,0,0,0,0,0,0,"Request - A material of delicacy" +3259,0,1143,30,0,0,0,0,"Request - A agony of a doll maste" +3260,0,1035,30,0,0,0,0,"Request - Tiresome flies" +3261,0,1026,30,0,0,0,0,"Request - Unclean girl" +3262,0,0,0,0,0,0,0,"Request - Queer hobby" +3263,0,0,0,0,0,0,0,"Request - A mallet of goblin" +3265,0,0,0,0,0,0,0,"Request - Missing occult mania" + 4000,0,0,0,0,0,0,0,"Sherin's Job Interview" 4001,0,0,0,0,0,0,0,"Job Change to Hunter" 4002,0,0,0,0,0,0,0,"Job Change to Hunter" @@ -316,7 +332,7 @@ 4032,0,0,0,0,0,0,0,"Conspiracy of the two families" 4033,0,0,0,0,0,0,0,"Death of Ahrum" 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7" -// + 6000,0,0,0,0,0,0,0,"Job Change to Taekwon" 6001,0,0,0,0,0,0,0,"Job Change to Taekwon" 6002,0,0,0,0,0,0,0,"Job Change to Taekwon" @@ -420,7 +436,40 @@ 7080,86400,0,0,0,0,0,0,"Finding Refined Bradium" 7081,0,0,0,0,0,0,0,"Helping the Laphine Craftsman" 7082,86400,0,0,0,0,0,0,"Helping the Laphine Craftsman" -// + +7128,0,0,0,0,0,0,0,"Training course 'conquest a desert!' -start" +7129,0,1009,10,0,0,0,0,"The training course 'conquer the desert!' - A real battle 1" +7130,0,1107,10,0,0,0,0,"The training course 'conquer the desert!' - A real battle 2" +7131,0,1001,5,0,0,0,0,"The training course 'conquer the desert!' - A real battle 3" +7132,0,0,0,0,0,0,0,"The training course 'conquer the desert!' - Complete a quest" +7133,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Start" +7134,0,1051,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle1" +7135,0,1175,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle2" +7136,0,1005,5,0,0,0,0,"The training course 'conquer the culvert!' - A real battle3" +7137,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Complete a quest" +7138,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Start" +7139,0,1076,15,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle1" +7140,0,1031,10,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle2" +7141,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Complete a quest" +7142,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Start" +7143,0,1160,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle1" +7144,0,1095,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle2" +7145,0,1176,10,0,0,0,0,"The training course 'conquer ant hell!' - A real battle3" +7146,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Complete a quest" +7147,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - start" +7148,0,1686,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle1" +7149,0,1023,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle2" +7150,0,1273,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle3" +7151,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - Complete a quest" +7152,0,0,0,0,0,0,0,"bThe training course 'conquer the orc dungeon!' - start" +7153,0,1153,20,0,0,0,0,"The training course 'conquer the orc dungeon!' - A real battle1" +7154,0,1152,20,0,0,0,0,"The training course 'conquer the orc dungeon!'- A real battle2" +7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest" +7156,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - start" +7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle1" +7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle2" +7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest" + 8000,0,0,0,0,0,0,0,"Quitting Job Change" 8001,0,0,0,0,0,0,0,"Job Change to Assassin" 8002,0,0,0,0,0,0,0,"Job Change to Assassin" @@ -593,7 +642,7 @@ 8169,0,0,0,0,0,0,0,"Living and Dead Water" 8170,0,0,0,0,0,0,0,"Living and Dead Water" 8171,0,0,0,0,0,0,0,"Living and Dead Water" -// + 8181,0,0,0,0,0,0,0,"Sight Blaster" 8182,0,0,0,0,0,0,0,"Push Back Theory" 8183,0,0,0,0,0,0,0,"Sight Blaster" @@ -667,7 +716,22 @@ 8251,0,0,0,0,0,0,0,"Injection of Magic" 8252,0,0,0,0,0,0,0,"Handworked jewels" 8253,3600,0,0,0,0,0,0,"Language translation device" -// + +8266,0,1077,10,0,0,0,0,"Hunting poison spore!" +8267,0,1056,10,0,0,0,0,"Hunting smokie!" +8268,0,1033,10,0,0,0,0,"Hunt elder wilow!" +8269,0,1104,10,0,0,0,0,"Hunt coco!" +8270,0,1034,10,0,0,0,0,"Hunt tharafrog!" +8271,0,0,0,0,0,0,0,"Toxic sprays delivery!" +8272,0,0,0,0,0,0,0,"Deliver a honey!" +8273,0,0,0,0,0,0,0,"Deliver a blanket!" +8274,0,0,0,0,0,0,0,"Collect bones!" +8275,0,0,0,0,0,0,0,"Collect feet!" +8276,0,0,0,0,0,0,0,"Collect scell!" +8277,0,0,0,0,0,0,0,"Collect tails!" +8278,0,0,0,0,0,0,0,"Collect cookies!" +8279,0,0,0,0,0,0,0,"Collect mustache!" + 9000,0,0,0,0,0,0,0,"Job Change to Knight" 9001,0,0,0,0,0,0,0,"Loyalty of a Knight" 9002,0,0,0,0,0,0,0,"Loyalty of a Knight" @@ -786,7 +850,30 @@ 10087,0,0,0,0,0,0,0,"Escape from the reality, into the broad world" 10088,0,0,0,0,0,0,0,"Escape from the reality, into the broad world" 10089,0,0,0,0,0,0,0,"Escape from the reality, into the broad world" -// + +10102,0,0,0,0,0,0,0,"To client - the chapter of the sphinx dungeon" +10103,0,0,0,0,0,0,0,"To client - the chapter of Glast heim" +10104,0,0,0,0,0,0,0,"To client - the chapter of Yuno" +10105,0,0,0,0,0,0,0,"To client - the chapter of a clock tower" +10106,0,0,0,0,0,0,0,"To client - the chapter of localizing " +10107,0,1164,10,0,0,0,0,"Sphinx dungeon - Requiem" +10108,0,1140,10,0,0,0,0,"Sphinx dungeon - Marduk" +10109,0,1154,10,0,0,0,0,"Sphinx dungeon - Pasana" +10110,0,1260,10,0,0,0,0,"Glast heim - Dark Frame" +10111,0,1117,10,0,0,0,0,"Glast heim - Evil druid" +10112,0,1192,10,0,0,0,0,"Glast heim - Wraith" +10113,0,1276,10,0,0,0,0,"Glast Heim - Raydric Archer" +10114,0,1369,20,0,0,0,0,"Juno - Grand Peco" +10115,0,1386,20,0,0,0,0,"Juno - sleeper" +10116,0,1372,20,0,0,0,0,"Juno - Goat" +10117,0,1376,20,0,0,0,0,"Juno - Harpy" +10118,0,1269,10,0,0,0,0,"clock tower - Clock" +10119,0,1199,15,0,0,0,0,"clock tower - Punk" +10120,0,1195,15,0,0,0,0,"clock tower - Rideword" +10121,0,1883,15,0,0,0,0,"Localizing - Uzhas" +10122,0,1404,15,0,0,0,0,"Localizing - Miyabi Doll" +10123,0,1516,15,0,0,0,0,"Localizing - Mi Gao" + 11000,0,0,0,0,0,0,0,"Inspection of Odin Shrine" 11001,0,0,0,0,0,0,0,"Inspection of Odin Shrine" 11002,0,0,0,0,0,0,0,"Inspection of Odin Shrine" @@ -882,7 +969,28 @@ 11103,0,0,0,0,0,0,0,"Secret note of Bazet" 11104,0,0,0,0,0,0,0,"Resting time" 11105,0,0,0,0,0,0,0,"Tendrilrion skin" -// + +11114,0,1004,10,0,0,0,0,"Request : Hunt Honet" +11115,0,1009,20,0,0,0,0,"Request : Hunt Condor" +11116,0,1052,10,0,0,0,0,"Request : Hunt grasshopper's leg" +11117,0,1024,20,0,0,0,0,"Request : Hunt Worm tail" +11118,0,1014,30,0,0,0,0,"Request : Hunt Spore" +11119,0,1048,20,0,0,0,0,"Request : Pest control" +11120,0,1055,20,0,0,0,0,"Request : Hunt Muka" +11121,0,1005,20,0,0,0,0,"Request : Hunt Farmiliar" +11122,0,1019,30,0,0,0,0,"Request : Collect feather" +11123,0,1077,30,0,0,0,0,"Request : Collect Poison spore" +11124,86400,0,0,0,0,0,0,"Request : Hunt honet - Complete" +11125,86400,0,0,0,0,0,0,"Request : Hunt condor - Complete" +11126,86400,0,0,0,0,0,0,"Request : Hunt grasshopper's leg - Complete" +11127,86400,0,0,0,0,0,0,"Request : Hunt Worm tail - Complete" +11128,86400,0,0,0,0,0,0,"Request : Hunt spore - Complete" +11129,86400,0,0,0,0,0,0,"Request : Pest control - Complete" +11130,86400,0,0,0,0,0,0,"Request : Hunt muka - Complete" +11131,86400,0,0,0,0,0,0,"Request : Hunt Farmiliar - Complete" +11132,86400,0,0,0,0,0,0,"Request : Collect feather - Complete" +11133,86400,0,0,0,0,0,0,"Request : Collect Poison spore - Complete" + 12000,0,0,0,0,0,0,0,"An old friend" 12001,0,0,0,0,0,0,0,"Digotz, Maku's old friend" 12002,0,0,0,0,0,0,0,"Messenger of Friendship" @@ -947,7 +1055,25 @@ 12061,0,0,0,0,0,0,0,"Concentration" 12062,86400,0,0,0,0,0,0,"Today's Mining Closed" 12070,0,0,0,0,0,0,0,"Limited time for enter" -// + +12072,0,1034,20,0,0,0,0,"Hunt tharafrog" +12073,0,1248,15,0,0,0,0,"Remove Cruiser" +12074,0,1070,30,0,0,0,0,"Remove Kukre" +12075,0,1686,15,0,0,0,0,"Remove orcbaby" +12076,0,1023,20,0,0,0,0,"Remove orcwarroir" +12077,0,1066,15,0,0,0,0,"Hunt vadon" +12078,0,1064,30,0,0,0,0,"Hunt Megalodon" +12079,0,1144,15,0,0,0,0,"Hunt Marse" +12080,0,1067,20,0,0,0,0,"Hunt Cornutus" +12081,0,1151,15,0,0,0,0,"Remove Myst" +12082,0,1074,30,0,0,0,0,"Hunt shellfish" +12083,0,1142,15,0,0,0,0,"Hunt Marine sphere" +12084,0,1158,20,0,0,0,0,"Hunt Phen" +12085,0,1152,15,0,0,0,0,"Remove orcskeleton" +12086,0,1177,30,0,0,0,0,"Remove Zenorc" +12087,0,1041,15,0,0,0,0,"Remove mummy" +12088,0,0,0,0,0,0,0,"Accomplishing a request" + 16000,0,0,0,0,0,0,0,"Metz Brayde's Notice" 16001,0,0,0,0,0,0,0,"First examination" 16002,0,0,0,0,0,0,0,"Fetching Items for Arian -1" @@ -1106,7 +1232,7 @@ 17015,0,0,0,0,0,0,0,"The Research Note" 17016,0,0,0,0,0,0,0,"Regicide" 17017,0,0,0,0,0,0,0,"Reporting the King's Death" -// + 18001,0,0,0,0,0,0,0,"Delivery for Rooney" 18002,0,0,0,0,0,0,0,"Delivery for Rooney" 18003,0,0,0,0,0,0,0,"Delivery for Rooney" @@ -1224,7 +1350,7 @@ 19127,0,0,0,0,0,0,0,"The Eye of Hellion" 19128,0,0,0,0,0,0,0,"The Eye of Hellion" 19129,0,0,0,0,0,0,0,"The Eye of Hellion" -// + 50000,0,0,0,0,0,0,0,"Pirate Dagger materials" 50001,0,0,0,0,0,0,0,"Weather Beaten Old Man" 50002,0,0,0,0,0,0,0,"Lost Treasure?" @@ -1254,7 +1380,7 @@ 50027,0,0,0,0,0,0,0,"Buried treasure" 50028,0,0,0,0,0,0,0,"Stolen treasure!" 50029,0,0,0,0,0,0,0,"A Pirate's Spirit!" -// + //60000,0,0,0,0,0,0,0,"60000" 60001,0,0,0,0,0,0,0,"Monster Extermination" 60002,0,0,0,0,0,0,0,"Monster Extermination" @@ -1408,7 +1534,7 @@ 60188,0,1365,50,0,0,0,0,"Hunting Apocalypse" 60189,0,1365,100,0,0,0,0,"Hunting Apocalypse" 60190,0,1365,150,0,0,0,0,"Hunting Apocalypse" -// + 60200,604800,0,0,0,0,0,0,"Endless Tower Effect" 60201,14400,0,0,0,0,0,0,"Endless Tower Time Limit" 60301,0,1155,100,0,0,0,0,"Dragon Hunting" @@ -1421,3 +1547,4 @@ 60308,0,1713,200,0,0,0,0,"Dragon Hunting" 60309,0,1716,100,0,0,0,0,"Dragon Hunting" 60310,0,1716,200,0,0,0,0,"Dragon Hunting" + diff --git a/src/common/mmo.h b/src/common/mmo.h index 0d48418c3c..b1a257e9ce 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -105,7 +105,7 @@ #define MAX_GUILDCASTLE 34 // Updated to include new entries for WoE:SE. [L0ne_W0lf] #define MAX_GUILDLEVEL 50 #define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] -#define MAX_QUEST_DB 1500 //Max quests that the server will load +#define MAX_QUEST_DB 2000 //Max quests that the server will load #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest #define MIN_HAIR_STYLE battle_config.min_hair_style diff --git a/src/map/quest.c b/src/map/quest.c index d751b27fff..3e43fcda64 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -314,6 +314,10 @@ int quest_read_db(void) while(fgets(line, sizeof(line), fp)) { + if (k == MAX_QUEST_DB) { + ShowError("quest_read_db: Too many entries specified in %s/quest_db.txt!\n", db_path); + break; + } if(line[0]=='/' && line[1]=='/') continue; memset(str,0,sizeof(str)); @@ -326,6 +330,8 @@ int quest_read_db(void) *np = 0; p = np + 1; } + else if (str[0] == NULL) + continue; else { ShowError("quest_read_db: insufficient columes in line %s\n", line); @@ -352,7 +358,7 @@ int quest_read_db(void) k++; } fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","quest_db.txt"); + ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", k, "quest_db.txt"); return 0; } From 8f8d25a76db86aaf558a218ee39895449937abdb Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 16 Nov 2010 02:01:19 +0000 Subject: [PATCH 049/129] Follow-up to r14456. Default initialize atk_rate to 0 instead of 100 to match new effect of bonus bAtkRate. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14464 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/pc.h | 2 +- src/map/status.c | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 59c2aea239..4fbac2046c 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/15 + * Follow-up to r14456. Default initialize atk_rate to 0 instead of 100 to match new effect of bonus bAtkRate. [Paradox924X] 2010/11/14 * Rev. 14463 Updated quest_read_db. [L0ne_W0lf] - Reports entries when read by server at start up like other DBs. diff --git a/src/map/pc.h b/src/map/pc.h index 0c3cb89eb3..3744886090 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -270,6 +270,7 @@ struct map_session_data { struct s_autobonus autobonus[MAX_PC_BONUS], autobonus2[MAX_PC_BONUS], autobonus3[MAX_PC_BONUS]; //Auto script on attack, when attacked, on skill usage // manually zeroed structures end here. // zeroed vars start here. + int atk_rate; int arrow_atk,arrow_ele,arrow_cri,arrow_hit; int nsshealhp,nsshealsp; int critical_def,double_rate; @@ -304,7 +305,6 @@ struct map_session_data { // zeroed vars end here. int castrate,delayrate,hprate,sprate,dsprate; - int atk_rate; int hprecov_rate,sprecov_rate; int matk_rate; int critical_rate,hit_rate,flee_rate,flee2_rate,def_rate,def2_rate,mdef_rate,mdef2_rate; diff --git a/src/map/status.c b/src/map/status.c index 3b34d0e53f..95d7f37968 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1721,13 +1721,13 @@ int status_calc_pc_(struct map_session_data* sd, bool first) sd->dsprate=100; sd->hprecov_rate = 100; sd->sprecov_rate = 100; - sd->atk_rate = sd->matk_rate = 100; + sd->matk_rate = 100; sd->critical_rate = sd->hit_rate = sd->flee_rate = sd->flee2_rate = 100; sd->def_rate = sd->def2_rate = sd->mdef_rate = sd->mdef2_rate = 100; sd->regen.state.block = 0; - // zeroed arrays, order follows the order in map.h. - // add new arrays to the end of zeroed area in map.h (see comments) and size here. [zzo] + // zeroed arrays, order follows the order in pc.h. + // add new arrays to the end of zeroed area in pc.h (see comments) and size here. [zzo] memset (sd->param_bonus, 0, sizeof(sd->param_bonus) + sizeof(sd->param_equip) + sizeof(sd->subele) @@ -1805,7 +1805,8 @@ int status_calc_pc_(struct map_session_data* sd, bool first) ); // vars zeroing. ints, shorts, chars. in that order. - memset (&sd->arrow_atk, 0,sizeof(sd->arrow_atk) + memset (&sd->atk_rate, 0,sizeof(sd->atk_rate) + + sizeof(sd->arrow_atk) + sizeof(sd->arrow_ele) + sizeof(sd->arrow_cri) + sizeof(sd->arrow_hit) From 1c0fef53433e5ebe69fe915ea11e73da2a9e369f Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Wed, 17 Nov 2010 02:16:13 +0000 Subject: [PATCH 050/129] Added a missing argument to a warning containing a format specifier. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14465 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/mob.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 4fbac2046c..fc2bd2d1f0 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/16 + * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 * Follow-up to r14456. Default initialize atk_rate to 0 instead of 100 to match new effect of bonus bAtkRate. [Paradox924X] 2010/11/14 diff --git a/src/map/mob.c b/src/map/mob.c index 7452bbd812..81fc9e68b2 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3418,7 +3418,7 @@ static bool mob_parse_dbrow(char** str) return false; } if (pcdb_checkid(class_)) { - ShowWarning("Mob with ID: %d not loaded. That ID is reserved for player classes.\n"); + ShowWarning("Mob with ID: %d not loaded. That ID is reserved for player classes.\n", class_); return false; } From fb7617d57538e17c05c64b811ed0f10baebbf13d Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 19 Nov 2010 21:25:30 +0000 Subject: [PATCH 051/129] * Various VC6-related fixes and tweaks. [Ai4rei] - Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727). - Fixed usage of 'long long' in Sql_P_BindSqlDataType preventing SQL VC6 projects from compiling (bugreport:1741, since r10779). - Fixed usage of 'long long' in strtoull preventing VC6 projects from compiling (bugreport:4059, follow up to r14245). - Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245). - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14466 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 7 +++++++ src/common/db.c | 32 ++++++++++++++++---------------- src/common/sql.c | 4 ++-- src/common/strlib.c | 9 +++++++-- src/common/strlib.h | 2 +- vcproj-6/login-server_sql.dsp | 2 +- vcproj-6/login-server_txt.dsp | 2 +- 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index fc2bd2d1f0..7ae626efed 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,12 @@ Date Added +2010/11/19 + * Various VC6-related fixes and tweaks. [Ai4rei] + - Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727). + - Fixed usage of 'long long' in Sql_P_BindSqlDataType preventing SQL VC6 projects from compiling (bugreport:1741, since r10779). + - Fixed usage of 'long long' in strtoull preventing VC6 projects from compiling (bugreport:4059, follow up to r14245). + - Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245). + - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/common/db.c b/src/common/db.c index 537f26e6ae..4dcf1d0b02 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -2229,10 +2229,10 @@ DBComparator db_default_cmp(DBType type) { DB_COUNTSTAT(db_default_cmp); switch (type) { - case DB_INT: return db_int_cmp; - case DB_UINT: return db_uint_cmp; - case DB_STRING: return db_string_cmp; - case DB_ISTRING: return db_istring_cmp; + case DB_INT: return &db_int_cmp; + case DB_UINT: return &db_uint_cmp; + case DB_STRING: return &db_string_cmp; + case DB_ISTRING: return &db_istring_cmp; default: ShowError("db_default_cmp: Unknown database type %u\n", type); return NULL; @@ -2253,10 +2253,10 @@ DBHasher db_default_hash(DBType type) { DB_COUNTSTAT(db_default_hash); switch (type) { - case DB_INT: return db_int_hash; - case DB_UINT: return db_uint_hash; - case DB_STRING: return db_string_hash; - case DB_ISTRING: return db_istring_hash; + case DB_INT: return &db_int_hash; + case DB_UINT: return &db_uint_hash; + case DB_STRING: return &db_string_hash; + case DB_ISTRING: return &db_istring_hash; default: ShowError("db_default_hash: Unknown database type %u\n", type); return NULL; @@ -2284,12 +2284,12 @@ DBReleaser db_default_release(DBType type, DBOptions options) options = db_fix_options(type, options); if (options&DB_OPT_RELEASE_DATA) { // Release data, what about the key? if (options&(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY)) - return db_release_both; // Release both key and data - return db_release_data; // Only release data + return &db_release_both; // Release both key and data + return &db_release_data; // Only release data } if (options&(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY)) - return db_release_key; // Only release key - return db_release_nothing; // Release nothing + return &db_release_key; // Only release key + return &db_release_nothing; // Release nothing } /** @@ -2307,10 +2307,10 @@ DBReleaser db_custom_release(DBRelease which) { DB_COUNTSTAT(db_custom_release); switch (which) { - case DB_RELEASE_NOTHING: return db_release_nothing; - case DB_RELEASE_KEY: return db_release_key; - case DB_RELEASE_DATA: return db_release_data; - case DB_RELEASE_BOTH: return db_release_both; + case DB_RELEASE_NOTHING: return &db_release_nothing; + case DB_RELEASE_KEY: return &db_release_key; + case DB_RELEASE_DATA: return &db_release_data; + case DB_RELEASE_BOTH: return &db_release_both; default: ShowError("db_custom_release: Unknown release options %u\n", which); return NULL; diff --git a/src/common/sql.c b/src/common/sql.c index c0668d17c4..f7c45c6319 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -489,8 +489,8 @@ static int Sql_P_BindSqlDataType(MYSQL_BIND* bind, enum SqlDataType buffer_type, buffer_len = sizeof(long); break; case SQLDT_ULONGLONG: bind->is_unsigned = 1; - case SQLDT_LONGLONG: bind->buffer_type = Sql_P_SizeToMysqlIntType(sizeof(long long)); - buffer_len = sizeof(long long); + case SQLDT_LONGLONG: bind->buffer_type = Sql_P_SizeToMysqlIntType(sizeof(int64)); + buffer_len = sizeof(int64); break; // floating point case SQLDT_FLOAT: bind->buffer_type = MYSQL_TYPE_FLOAT; diff --git a/src/common/strlib.c b/src/common/strlib.c index c388f949a2..7a6c134e72 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -253,9 +253,9 @@ size_t strnlen (const char* string, size_t maxlen) #endif #if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200 -unsigned long long strtoull(const char* str, char** endptr, int base) +uint64 strtoull(const char* str, char** endptr, int base) { - unsigned long long result; + uint64 result; int count; int n; @@ -266,8 +266,13 @@ unsigned long long strtoull(const char* str, char** endptr, int base) else if( str[0] == '0' ) base = 8; + else + base = 10; } + if( base == 8 ) + count = sscanf(str, "%I64o%n", &result, &n); + else if( base == 10 ) count = sscanf(str, "%I64u%n", &result, &n); else diff --git a/src/common/strlib.h b/src/common/strlib.h index 29af060151..23f1e191af 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -29,7 +29,7 @@ size_t strnlen (const char* string, size_t maxlen); #endif #if defined(WIN32) && defined(_MSC_VER) && _MSC_VER <= 1200 -unsigned long long strtoull(const char* str, char** endptr, int base); +uint64 strtoull(const char* str, char** endptr, int base); #endif int e_mail_check(char* email); diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp index 561976f4e4..cdb0356bdc 100644 --- a/vcproj-6/login-server_sql.dsp +++ b/vcproj-6/login-server_sql.dsp @@ -231,7 +231,7 @@ SOURCE=..\src\login\loginlog.h # End Source File # Begin Source File -SOURCE=..\src\login\loginlog_sql.h +SOURCE=..\src\login\loginlog_sql.c # End Source File # End Group # End Target diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp index 8982737891..5a074475b3 100644 --- a/vcproj-6/login-server_txt.dsp +++ b/vcproj-6/login-server_txt.dsp @@ -219,7 +219,7 @@ SOURCE=..\src\login\loginlog.h # End Source File # Begin Source File -SOURCE=..\src\login\loginlog_txt.h +SOURCE=..\src\login\loginlog_txt.c # End Source File # End Group # End Target From eacbf99c3971efb99e38b68c93c675378de51ad8 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 19 Nov 2010 22:06:33 +0000 Subject: [PATCH 052/129] * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14467 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/common/plugins.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 7ae626efed..479034a4fe 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -7,6 +7,7 @@ Date Added - Fixed usage of 'long long' in strtoull preventing VC6 projects from compiling (bugreport:4059, follow up to r14245). - Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245). - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. + * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/common/plugins.c b/src/common/plugins.c index c6c362de50..2d81548a17 100644 --- a/src/common/plugins.c +++ b/src/common/plugins.c @@ -160,8 +160,8 @@ static int plugin_iscompatible(char* version) if( version == NULL ) return 0; sscanf(version, "%d.%d", &req_major, &req_minor); - sscanf(version, "%d.%d", &major, &minor); - return ( req_major == major || req_minor <= minor ); + sscanf(PLUGIN_VERSION, "%d.%d", &major, &minor); + return ( req_major == major && req_minor <= minor ); } Plugin* plugin_open(const char* filename) From fb6ef522104697889b9c44759eff16107ead56a5 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 19 Nov 2010 22:57:01 +0000 Subject: [PATCH 053/129] * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14468 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char/char.c | 2 +- src/char_sql/char.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 479034a4fe..8b4f90dbef 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -8,6 +8,7 @@ Date Added - Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245). - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] + * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/char/char.c b/src/char/char.c index 98a213316b..91ad7d33de 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3893,7 +3893,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data) memcpy(WFIFOP(login_fd,26), passwd, 24); WFIFOL(login_fd,50) = 0; WFIFOL(login_fd,54) = htonl(char_ip); - WFIFOL(login_fd,58) = htons(char_port); + WFIFOW(login_fd,58) = htons(char_port); memcpy(WFIFOP(login_fd,60), server_name, 20); WFIFOW(login_fd,80) = 0; WFIFOW(login_fd,82) = char_maintenance; diff --git a/src/char_sql/char.c b/src/char_sql/char.c index be94c920fe..36944cd35d 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -3624,7 +3624,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data) memcpy(WFIFOP(login_fd,26), passwd, 24); WFIFOL(login_fd,50) = 0; WFIFOL(login_fd,54) = htonl(char_ip); - WFIFOL(login_fd,58) = htons(char_port); + WFIFOW(login_fd,58) = htons(char_port); memcpy(WFIFOP(login_fd,60), server_name, 20); WFIFOW(login_fd,80) = 0; WFIFOW(login_fd,82) = char_maintenance; From 1aeb3224db9d3aa79afd7eee2b3ac7f40a4b1c38 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 19 Nov 2010 23:15:49 +0000 Subject: [PATCH 054/129] * Fixed packet layout of wanttoconnection for packet_ver 16 and 22 (bugreport:3359, since r9958). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14469 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/packet_db.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index 9297c98bc4..fb7bb0bb00 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/19 + * Rev. 14469 Fixed packet layout of wanttoconnection for packet_ver 16 and 22 (bugreport:3359, since r9958). [Ai4rei] 2010/11/14 * Rev. 14463 Updated quest and item DBs with Eden Group information. [L0ne_W0lf] 2010/11/11 diff --git a/db/packet_db.txt b/db/packet_db.txt index e8e9ee5ae7..a8f6404193 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -678,7 +678,7 @@ packet_ver: 16 0x0089,8,ticksend,4 0x008c,11,getcharnamerequest,7 0x0094,14,movetokafra,7:10 -0x009b,26,wanttoconnection,4:9:17:18:25 +0x009b,26,wanttoconnection,4:9:17:21:25 0x009f,14,useitem,4:10 0x00a2,15,solvecharname,11 0x00a7,8,walktoxy,5 @@ -977,7 +977,7 @@ packet_ver: 22 0x0089,8,ticksend,4 0x008c,11,getcharnamerequest,7 0x0094,14,movetokafra,7:10 -0x009b,26,wanttoconnection,4:9:17:18:25 +0x009b,26,wanttoconnection,4:9:17:21:25 0x009f,14,useitem,4:10 0x00a2,15,solvecharname,11 //0x00a7,8,walktoxy,5 From 8acc97c446258cb5f296b02b81ba6923aa4ec181 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 00:44:46 +0000 Subject: [PATCH 055/129] * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14470 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/script.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 8b4f90dbef..72c556c78c 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -9,6 +9,7 @@ Date Added - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei] + * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/map/script.c b/src/map/script.c index 68f291f2c2..d823ae597f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11575,6 +11575,10 @@ BUILDIN_FUNC(getmapxy) if (sd && sd->hd) bl = &sd->hd->bl; break; + default: + ShowWarning("script: buildin_getmapxy: Invalid type %d\n", type); + script_pushint(st,-1); + return 1; } if (!bl) { //No object found. script_pushint(st,-1); From 9c50c4006b3859292a9d2678182fc9fa9e851e79 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 01:09:31 +0000 Subject: [PATCH 056/129] * Fixed pc_marriage not checking spouse character job for baby class. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14471 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/pc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 72c556c78c..1fdf5768e1 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -10,6 +10,7 @@ Date Added * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei] * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei] + * Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/map/pc.c b/src/map/pc.c index 433b67b462..e93ae8a938 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7394,7 +7394,7 @@ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) { if(sd == NULL || dstsd == NULL || sd->status.partner_id > 0 || dstsd->status.partner_id > 0 || - sd->class_&JOBL_BABY) + (sd->class_&JOBL_BABY) || (dstsd->class_&JOBL_BABY)) return -1; sd->status.partner_id = dstsd->status.char_id; dstsd->status.partner_id = sd->status.char_id; From 32a31768bb9080051fd60ec0165dda64e67b596f Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 01:28:50 +0000 Subject: [PATCH 057/129] * Removed ; from INTPTR_* defines (since r13449). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14472 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/common/cbasetypes.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 1fdf5768e1..a400034cdf 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -11,6 +11,7 @@ Date Added * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei] * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei] * Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei] + * Removed ; from INTPTR_* defines (since r13449). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index b377d6ef09..488e4db496 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -205,15 +205,15 @@ typedef uint64 uintptr; typedef int64 intptr; #define UINTPTR_MIN UINT64_MIN #define UINTPTR_MAX UINT64_MAX -#define INTPTR_MIN INT64_MIN; -#define INTPTR_MAX INT64_MAX; +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX #else typedef uint32 uintptr; typedef int32 intptr; #define UINTPTR_MIN UINT32_MIN #define UINTPTR_MAX UINT32_MAX -#define INTPTR_MIN INT32_MIN; -#define INTPTR_MAX INT32_MAX; +#define INTPTR_MIN INT32_MIN +#define INTPTR_MAX INT32_MAX #endif @@ -254,7 +254,7 @@ typedef char bool; #define true (1==1) ////////////////////////////// -#endif // not cplusplus +#endif // not __cplusplus ////////////////////////////// ////////////////////////////////////////////////////////////////////////// From bb4dce5aa17f7dd1eed6479a8b38cb8b55214536 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 01:39:28 +0000 Subject: [PATCH 058/129] * Fixed a crash when SqlStmt_ShowDebug is given NULL pointer as statement handle (since r10753, related r10818). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14473 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/common/sql.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index a400034cdf..d9a826e04f 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -12,6 +12,7 @@ Date Added * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei] * Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei] * Removed ; from INTPTR_* defines (since r13449). [Ai4rei] + * Fixed a crash when SqlStmt_ShowDebug is given NULL pointer as statement handle (since r10753, related r10818). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/common/sql.c b/src/common/sql.c index f7c45c6319..d8e397e8d6 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -920,7 +920,7 @@ void SqlStmt_ShowDebug_(SqlStmt* self, const char* debug_file, const unsigned lo { if( self == NULL ) ShowDebug("at %s:%lu - self is NULL\n", debug_file, debug_line); - if( StringBuf_Length(&self->buf) > 0 ) + else if( StringBuf_Length(&self->buf) > 0 ) ShowDebug("at %s:%lu - %s\n", debug_file, debug_line, StringBuf_Value(&self->buf)); else ShowDebug("at %s:%lu\n", debug_file, debug_line); From 42c1887afc3a8e3136ba1bdb5416318dadb1aafc Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 20 Nov 2010 03:49:44 +0000 Subject: [PATCH 059/129] - Fixed equip locations and view IDs for some headgears. (bugreport:4336) - Corrected the value of hit given by Military Ration C. (bugreport:4369) - Updated bonus for items that increase attack by class. (bugreport:4387) These 'fixes' should be considered a temporary fix until proper bonuses can be added to emulate aegis. - Added bonus increase_agi autocast to Krieger_shoes01. (bugreport:4406) - Added EXP script to Miracle and Secre Medicine items. (bugreport:4416) - Corrected weight of Some_of_Report to 0, as per desc. (bugreport:4541) - Corrected typos in skill name column in abra_db.txt. (bugreport:4557) - Corrected what jobs can use the Weihna and Krieg. (bugreport:4558) git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14474 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 13 +++++++++ db/abra_db.txt | 44 ++++++++++++++--------------- db/const.txt | 40 +++++++++++++++++++++++++++ db/exp.txt | 2 +- db/item_db.txt | 72 ++++++++++++++++++++++++------------------------ 5 files changed, 112 insertions(+), 59 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index fb7bb0bb00..6aedc2764f 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -9,6 +9,19 @@ 13005 Angelic Wing Dagger: NEED INFO. ======================= 2010/11/19 + * Rev. 14474 Item Database bugfixing. [L0ne_W0lf] + - Fixed equip locations and view IDs for some headgears. (bugreport:4336) + - Corrected the value of hit given by Military Ration C. (bugreport:4369) + - Updated bonus for items that increase attack by class. (bugreport:4387) + These 'fixes' should be considered a temporary fix + until proper bonuses can be added to emulate aegis. + - Added bonus increase_agi autocast to Krieger_shoes01. (bugreport:4406) + - Added EXP script to Miracle and Secre Medicine items. (bugreport:4416) + - Corrected weight of Some_of_Report to 0, as per desc. (bugreport:4541) + - Corrected typos in skill name column in abra_db.txt. (bugreport:4557) + - Corrected what jobs can use the Weihna and Krieg. (bugreport:4558) + * Added 3rd job constants to const.txt. + * Corrected level for third jobs in exp.txt. * Rev. 14469 Fixed packet layout of wanttoconnection for packet_ver 16 and 22 (bugreport:3359, since r9958). [Ai4rei] 2010/11/14 * Rev. 14463 Updated quest and item DBs with Eden Group information. [L0ne_W0lf] diff --git a/db/abra_db.txt b/db/abra_db.txt index 8f5176428c..ae7f59e116 100644 --- a/db/abra_db.txt +++ b/db/abra_db.txt @@ -50,8 +50,8 @@ 41,Vending,4,5000 42,Mammonite,1,5000 -//43,Owl?s Eye,1,0 -//44,Vulture?s Eye,1,0 +//43,Owl's Eye,1,0 +//44,Vulture's Eye,1,0 45,Improve Concentration,4,5000 46,Double Strafe,1,5000 47,Arrow Shower,2,5000 @@ -77,7 +77,7 @@ //64,Cavalier Mastery,1,0 //65,Mace Mastery,1,0 -66,Imposito Manus,1,4000 +66,Impositio Manus,1,4000 67,Suffragium,2,4000 68,Aspersio,2,4000 69,B.S Sacramenti,4,4000 @@ -93,7 +93,7 @@ 79,Magnus Exorcismus,6,4000 80,Fire Pillar,2,4000 -81,Sighttrasher,2,4000 +81,Sightrasher,2,4000 //82,Fire Ivy,1,0 83,Meteor Storm,6,4000 84,Jupitel Thunder,2,4000 @@ -103,7 +103,7 @@ 88,Frost Nova,1,4000 89,Storm Gust,6,4000 90,Earth spike,1,4000 -91,Heaven?s Drive,2,4000 +91,Heaven's Drive,2,4000 92,Quagmire,4,4000 93,Sense,1,4000 @@ -162,7 +162,7 @@ 142,First Aid,1,5000 143,Act Dead,1,5000 //144,Moving HP-Recovery,1,0 -//145,Attack Weak Point,1,0 +//145,Fatal Blow,1,0 146,Auto Berserk,1,0 147,Arrow Crafting,1,5000 148,Arrow Repel,1,5000 @@ -207,16 +207,16 @@ 236,Synthetic Armor,4,4000 237,Biochemical Helm,4,4000 -//238,Basis of Life,1,0 +//238,Bioethics,1,0 //239,Biotechnology,1,0 //240,Life Creation,1,0 //241,Cultivation,1,0 //242,Flame control,1,0 -//243,Call Hommunculus,1,0 -//244,Peaceful Rest,1,0 +//243,Call Homunculus,1,0 +//244,Vaporize,1,0 //245,Drillmaster,1,0 -//246,Heal Hommunculus,1,0 -//247,Resurrect Hommunculus,1,0 +//246,Heal Homunculus,1,0 +//247,Resurrect Homunculus,1,0 //248,Faith,1,0 249,Guard,1,4000 @@ -226,7 +226,7 @@ 253,Holy cross,2,4000 254,Grand cross,6,4000 255,Sacrifice,4,4000 -256,Resistant Soul,2,4000 +256,Resistant Souls,2,4000 257,Defending Aura,4,4000 258,Spear Quicken,1,4000 @@ -234,7 +234,7 @@ //260,Spiritual Cadence,1,0 261,Summon Spirit Sphere,1,4000 262,Absorb Spirit Sphere,1,4000 -//263,Raging Triple Blow,1,0 +//263,Raging Trifecta Blow,1,0 264,Snap,4,4000 //265,Dodge,1,0 266,Occult Impact,2,4000 @@ -268,15 +268,15 @@ 291,Monocell,4,2500 292,Class Change,8,2500 293,Summon Monster,6,3500 -294,Orcish Face,4,5000 -295,Death,8,2000 -296,Fortune,6,4000 -297,Tame Monster,6,4000 -298,Question,4,5000 +294,Grampus Morph,4,5000 +295,Grim Reaper,8,2000 +296,Gold Digger,6,4000 +297,Beastly Hypnosis,6,4000 +298,Questioning,4,5000 299,Gravity,4,5000 -300,Level Up,10,500 -301,Instant Death,4,2000 -302,Full Recovery,8,3000 +300,Leveling,10,500 +301,Suicide,4,2000 +302,Rejuvination,8,3000 303,Coma,4,4000 // Dancer / Bard commonness @@ -293,7 +293,7 @@ //314,Ragnarok,1,0 // Bard skill -//315,Music Lesson,1,0 +//315,Music Lessons,1,0 316,Melody Strike,1,4000 317,Unchained Serenade,1,0 318,Unbarring Octave,2,4000 diff --git a/db/const.txt b/db/const.txt index c6a8bcbffd..7f0c610c7e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -80,6 +80,46 @@ Job_Star_Gladiator 4047 Job_Star_Gladiator2 4048 Job_Soul_Linker 4049 +Job_Rune_Knight 4054 +Job_Warlock 4055 +Job_Ranger 4056 +Job_Archbishop 4057 +Job_Mechanic 4058 +Job_Guillotine_Cross 4059 +Job_Rune_Knight_H 4060 +Job_Warlock_H 4061 +Job_RANGER_H 4062 +Job_Archbishop_H 4063 +Job_Mechanic_H 4064 +Job_Guillotine_Cross_H 4065 +Job_Royal_Guard 4066 +Job_Sorcerer 4067 +Job_Minstrel 4068 +Job_Wandrer 4069 +Job_Sura 4070 +Job_Genetic 4071 +Job_Shadow_Chaser 4072 +Job_Royal_Guard_H 4073 +Job_Sorcerer_H 4074 +Job_Minstrel_H 4075 +Job_Wandrer_H 4076 +Job_Sura_H 4077 +Job_Genetic_H 4078 +Job_Shadow_Chaser_H 4079 +Job_Rune_Knight_B 4096 +Job_Warlock_B 4097 +Job_RANGER_B 4098 +Job_Archbishop_B 4099 +Job_Mechanic_B 4100 +Job_Guillotine_Cross_B 4101 +Job_Royal_Guard_B 4102 +Job_Sorcerer_B 4103 +Job_Minstrel_B 4104 +Job_Wandrer_B 4105 +Job_Sura_B 4106 +Job_Genetic_B 4107 +Job_Shadow_Chaser_B 4108 + EAJL_2_1 0x100 EAJL_2_2 0x200 EAJL_2 0x300 diff --git a/db/exp.txt b/db/exp.txt index 1c983923d0..dfa3586d71 100644 --- a/db/exp.txt +++ b/db/exp.txt @@ -5,7 +5,7 @@ //Base - Adv Jobs 99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,4620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,96800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000 //Base - 3rd Jobs -//130,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12930000,13150000,14030000,14420000,15420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000 +//150,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12930000,13150000,14030000,14420000,15420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000 //Job - Novice 10,0:4023,1,10,18,28,40,91,151,205,268,340 //Job - 1st Classes diff --git a/db/item_db.txt b/db/item_db.txt index 4993745cc0..ea77722ae7 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1104,7 +1104,7 @@ 2130,Cross_Shield,Cross Shield,5,20,,2000,,6,,1,0x00004000,7,2,32,,80,1,1,{ bonus bStr,1; bonus2 bSkillAtk,"PA_SHIELDCHAIN",30; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",30; bonus bUseSPrate,10; },{},{} 2131,Magic_Study_Vol1,Magic Bible Vol1,5,20,,1000,,2,,1,0x00010204,2,2,32,,70,1,1,{ bonus bMDef,3; bonus bInt,2; bonus2 bAddEffWhenHit,Eff_Stun,1000; },{},{} 2132,Shelter_Resistance,Shell Of Resistance,5,0,,0,,9,,0,0xFFFFFFFF,2,2,32,,0,0,1,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Holy,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; bonus bShortWeaponDamageReturn,1; },{},{} -2133,Tournament_Shield,Tournament Shield,5,20,,1000,,5,,1,0x00004082,2,2,32,,50,1,3,{ bonus bAtkRate,1; if( Class == Job_Lord_Knight ) bonus bAspdRate,-5; if( isequipped(1420) || isequipped(1421) || isequipped(1422) ) { bonus bAtkRate,4; bonus bDef,2; } },{},{} +2133,Tournament_Shield,Tournament Shield,5,20,,1000,,5,,1,0x00004082,2,2,32,,50,1,3,{ bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; if( Class == Job_Lord_Knight ) bonus bAspdRate,-5; if( isequipped(1420) || isequipped(1421) || isequipped(1422) ) { bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bDef,2; } },{},{} 2134,Shield_Of_Naga,Shield of Naga,5,20,,500,,3,,1,0x00CFFF80,2,2,32,,70,1,3,{ bonus bMdef,3; autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; },{},{} 2135,Shadow_Guard,Shadow Guard,5,20,,800,,4,,1,0x00020000,2,2,32,,70,1,3,{ if( isequipped(2426) ) { bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; } },{},{} 2136,Cracked_Buckler,Cracked Buckler,5,0,,0,,5,,0,0xFFFFFFFF,2,2,32,,0,1,2,{ bonus bAgi,2; bonus2 bAddEle,Ele_Neutral,-10; bonus3 bAutoSpellWhenHit,"PR_KYRIE",1,50; bonus bMdef,1; },{},{} @@ -1297,8 +1297,8 @@ 2371,G_Strings_,Pantie,5,1000,,100,,4,,1,0xFFFFFFFF,7,2,16,,0,1,0,{},{},{} 2372,Mage_Coat_,Mage Coat,5,20,,600,,5,,1,0x00810204,7,2,16,,50,1,0,{ bonus bMdef,5; bonus bInt,1; },{},{} 2373,Holy_Robe_,Holy Robe,5,20,,1700,,7,,1,0x00008110,7,2,16,,60,1,0,{ bonus bMdef,5; bonus2 bSubRace,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; },{},{} -2374,Diabolus_Robe,Diabolus Robe,5,20,,300,,6,,1,0x00098B1C,2,2,16,,55,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus bHealPower,6; bonus bDelayRate,-10; if (isequipped(2729)) { bonus bAtkRate,3; bonus bMatkRate,3; } },{},{} -2375,Diabolus_Armor,Diabolus Armor,5,20,,600,,7,,1,0x000654E2,2,2,16,,55,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) { bonus bAtkRate,3; bonus bMatkRate,3; } },{},{} +2374,Diabolus_Robe,Diabolus Robe,5,20,,300,,6,,1,0x00098B1C,2,2,16,,55,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus bHealPower,6; bonus bDelayRate,-10; if (isequipped(2729)) { bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; } },{},{} +2375,Diabolus_Armor,Diabolus Armor,5,20,,600,,7,,1,0x000654E2,2,2,16,,55,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) { bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; } },{},{} 2376,Assaulter_Plate,Assaulter Plate,5,0,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bSkillHeal2,"AL_HEAL",10; bonus2 bAddItemHealRate,IG_Recovery,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }; },{},{} 2377,Elite_Engineer_Armor,Elite Engineer Armor,5,0,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor,0; }; },{},{} 2378,Assassin_Robe,Assassin Robe,5,0,,0,,7,,1,0x02021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }; },{},{} @@ -1317,7 +1317,7 @@ 2391,Life_Link,Life Link,5,20,,3500,,9,,1,0x00004082,2,2,16,,82,1,0,{ bonus bVit,2; bonus bMdef,5; bonus bHPrecovRate,50; },{},{} 2392,Old_Pant,Old Green Pantie,5,0,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,1,0,{ bonus bStr,2; bonus bVit,2; bonus bMaxHP,200; bonus3 bAutoSpellWhenHit,"MO_CALLSPIRITS",5,20; bonus bMdef,1; },{},{} 2393,N_Adventurer's_Suit,Novice Adventurer's Suit,5,1,,0,,8,,1,0x00000001,7,2,16,,0,0,0,{},{},{} -2394,Krieger_Suit1,Glorious Suit,5,0,,0,,0,,0,0xFFFFFFFE,7,2,16,,81,1,0,{ bonus bMaxHPRate,20; bonus2 bSubRace,RC_DemiHuman,7; if( isequipped(2444,2549) ) { bonus bAtkRate,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; } },{},{} +2394,Krieger_Suit1,Glorious Suit,5,0,,0,,0,,0,0xFFFFFFFE,7,2,16,,81,1,0,{ bonus bMaxHPRate,20; bonus2 bSubRace,RC_DemiHuman,7; if( isequipped(2444,2549) ) { bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; } },{},{} 2395,Krieger_Suit2,Glorious Popularized Suit,5,0,,0,,0,,0,0xFFFFFFFE,7,2,16,,61,1,0,{ bonus bMaxHP,600; bonus bSPrecovRate,10; },{},{} 2396,Krieger_Suit3,Glorious Mass-Production Suit,5,0,,0,,0,,0,0xFFFFFFFE,7,2,16,,61,1,0,{ bonus bMaxHP,500; },{},{} 2397,Incredible_Coat,Incredible Event Resignation Coat,5,0,,900,,2,,0,0xFFFFFFFF,7,2,16,,0,1,0,{},{},{} @@ -1368,7 +1368,7 @@ 2441,Beach_Sandal,Beach Sandals,5,20,,200,,0,,0,0xFFFFFFFF,7,2,64,,0,1,0,{ bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10; if (isequipped(2546)) bonus bFlee,5; },{},{} 2442,Boots_Perforated,Red Stocking Boots,5,0,,0,,7,,0,0xFFFFFFFF,7,2,64,,0,1,0,{ bonus bLuk,2; bonus bHPrecovRate,10; bonus bSPrecovRate,10; bonus3 bAutoSpellWhenHit,"WZ_QUAGMIRE",3,20; bonus bMdef,1; },{},{} 2443,Fish_Shoes,Fisher's Boots,5,0,,200,,0,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{} -2444,Krieger_Shoes1,Glorious Shoes,5,0,,0,,0,,0,0xFFFFFFFE,7,2,64,,81,1,0,{ bonus bMaxHPRate,10; bonus2 bSubRace,RC_DemiHuman,4; },{},{} +2444,Krieger_Shoes1,Glorious Shoes,5,0,,0,,0,,0,0xFFFFFFFE,7,2,64,,81,1,0,{ bonus bMaxHPRate,10; bonus2 bSubRace,RC_DemiHuman,4; bonus3 bAutoSpellWhenHit,"AL_INCAGI",1,10; },{},{} 2445,Krieger_Shoes2,Glorious Popularized Shoes,5,0,,0,,0,,0,0xFFFFFFFE,7,2,64,,61,1,0,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; },{},{} 2446,Krieger_Shoes3,Glorious Mass-Production Shoes,5,0,,0,,0,,0,0xFFFFFFFE,7,2,64,,61,1,0,{ bonus bMaxHPRate,5; },{},{} 2447,Military_Boots,Army Boots,5,0,,1000,,5,,0,0xFFFFFFFE,7,2,64,,0,1,0,{},{},{} @@ -1489,7 +1489,7 @@ 2641,Fashionable_Sack,Fashion Hip Sack,5,20,,700,,0,,0,0x00040420,7,2,136,,50,0,0,{ bonus bStr,2; },{},{} 2642,Serin's_Gold_Ring,Serin's Gold Ring,5,20,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2643,Serin's_Gold_Ring_,Serin's Gold Ring,5,45000,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} -2644,The_Sign_,The Sign,5,2,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus2 bAddRace2,5,5; bonus bMatkRate,5; },{},{} +2644,The_Sign_,The Sign,5,2,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; },{},{} 2645,Moonlight_Ring,Moonlight Ring,5,40000,,200,,0,,0,0x02021040,7,2,136,,60,0,0,{ bonus bMdef,2; },{},{} 2646,Bunch_Of_Carnation,Bunch of Carnations,5,2,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2647,Nile_Rose,Nile Rose,5,2,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMaxHP,10; },{},{} @@ -1565,12 +1565,12 @@ 2717,Pocket_Watch_,Pocket Watch,5,20,,200,,0,,0,0x00010204,7,2,136,,80,0,0,{},{},{} 2718,Lunatic_Brooch,Lunatic Brooch,5,20,,200,,0,,1,0x00080808,7,2,136,,65,0,0,{},{},{} 2719,Iron_Wrist,Iron Wrist,5,20,,700,,1,,0,0x000444A2,7,2,136,,50,0,0,{ bonus2 bSkillAtk,"SM_BASH",6; bonus2 bSkillAtk,"MC_MAMMONITE",6; },{},{} -2720,Medal_Swordman,Medal of Honor,5,0,,0,,1,,0,0x00404082,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bHit,10; bonus bMaxHP,500; bonus bMaxSP,50; bonus3 bAddEff,Eff_Stun,100,ATF_SHORT; },{},{} -2721,Medal_Thief,Medal of Honor,5,0,,0,,1,,0,0x02021040,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bFlee,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Poison,100,ATF_SHORT; },{},{} -2722,Medal_Acolyte,Medal of Honor,5,0,,0,,1,,0,0x00008110,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bMdef,6; bonus bMaxHP,600; bonus3 bAddEff,Eff_Silence,100,ATF_SHORT; },{},{} -2723,Medal_Mage,Medal of Honor,5,0,,0,,1,,0,0x00810204,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bMdef,6; bonus bMaxHP,600; bonus2 bAddEffWhenHit,Eff_Stone,100; },{},{} -2724,Medal_Archer,Medal of Honor,5,0,,0,,1,,0,0x00080808,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bCritical,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Blind,100,ATF_LONG; },{},{} -2725,Medal_Merchant,Medal of Honor,5,0,,0,,1,,0,0x00040420,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bAspdRate,10; bonus bMaxHP,500; bonus bMaxSP,50; bonus3 bAddEff,Eff_Curse,100,ATF_SHORT; },{},{} +2720,Medal_Swordman,Medal of Honor,5,0,,0,,1,,0,0x00404082,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bHit,10; bonus bMaxHP,500; bonus bMaxSP,50; bonus3 bAddEff,Eff_Stun,100,ATF_SHORT; },{},{} +2721,Medal_Thief,Medal of Honor,5,0,,0,,1,,0,0x02021040,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bFlee,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Poison,100,ATF_SHORT; },{},{} +2722,Medal_Acolyte,Medal of Honor,5,0,,0,,1,,0,0x00008110,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bMdef,6; bonus bMaxHP,600; bonus3 bAddEff,Eff_Silence,100,ATF_SHORT; },{},{} +2723,Medal_Mage,Medal of Honor,5,0,,0,,1,,0,0x00810204,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bMdef,6; bonus bMaxHP,600; bonus2 bAddEffWhenHit,Eff_Stone,100; },{},{} +2724,Medal_Archer,Medal of Honor,5,0,,0,,1,,0,0x00080808,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bCritical,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Blind,100,ATF_LONG; },{},{} +2725,Medal_Merchant,Medal of Honor,5,0,,0,,1,,0,0x00040420,7,2,136,,70,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bAspdRate,10; bonus bMaxHP,500; bonus bMaxSP,50; bonus3 bAddEff,Eff_Curse,100,ATF_SHORT; },{},{} 2726,Icarus_Wing,Icarus Wings,5,20,,100,,0,,0,0x00000800,2,2,136,,70,0,0,{ bonus bMaxSP,50; bonus bDex,3; },{},{} 2727,Bowman_Scarf,Bowman Scarf,5,20,,200,,0,,0,0x00000800,2,2,136,,0,0,0,{ bonus bMaxSP,50; bonus bDex,3; if (isequipped(2726)) bonus bUseSPrate,-25; },{},{} 2728,Cursed_Hand,Cursed Hand,5,0,,50,,0,,1,0xFFFFFFFE,7,2,136,,80,0,0,{ bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,30; bonus bHit,10; bonus bHPrecovRate,20; },{},{} @@ -1578,14 +1578,14 @@ 2730,Morroc_Seal,Seal of Continental Guard,5,0,,50,,0,,1,0xFFFFFFFE,7,2,136,,80,0,0,{ bonus bMaxHP,50; bonus bAspdRate,3; },{},{} 2731,Morroc_Charm_Stone,Rune Spellstone,5,0,,50,,0,,1,0xFFFFFFFE,7,2,136,,80,0,0,{ bonus bMaxSP,50; bonus bCastRate,-1; },{},{} 2732,Morroc_Ring,Death Loop,5,0,,50,,0,,1,0xFFFFFFFE,7,2,136,,80,0,0,{ bonus bCritical,5; },{},{} -2733,Medal_Gunner,Sheriff Badge,5,0,,0,,1,,0,0x01000000,7,2,136,,80,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bCritical,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Blind,1000,ATF_LONG; },{},{} +2733,Medal_Gunner,Sheriff Badge,5,0,,0,,1,,0,0x01000000,7,2,136,,80,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; bonus bCritical,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus3 bAddEff,Eff_Blind,1000,ATF_LONG; },{},{} 2734,Directive_A,Directive,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{},{},{} 2735,Directive_B,Directive,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{},{},{} 2736,Navel_Ring,Navel Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,75,0,0,{ bonus bDex,3; bonus bLuk,3; bonus bMdef,2; },{},{} 2737,Foot_Ring,Foot Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,75,0,0,{ bonus bVit,3; bonus bMaxHPRate,10; },{},{} -2738,Shiny_Coin,Shiny Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus bAtkRate,6; bonus bMatkRate,6; },{},{} -2739,Ordinary_Coin,Ordinary Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; },{},{} -2740,Rusty_Coin,Rusty Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus bAtkRate,3; bonus bMatkRate,3; },{},{} +2738,Shiny_Coin,Shiny Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus2 bAddRace,RC_NonBoss,6; bonus2 bAddRace,RC_Boss,6; bonus bMatkRate,6; },{},{} +2739,Ordinary_Coin,Ordinary Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,5; },{},{} +2740,Rusty_Coin,Rusty Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; },{},{} 2741,All_In_One_Ring,All In One Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{} //2742,Lucky_Clip,Lucky Clip,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} 2743,Angelic_Ring,Angelic Ring,5,0,,100,,0,,0,0xFDF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,2000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,2000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,2000,"PR_SANCTUARY"; },{},{} @@ -1597,7 +1597,7 @@ 2749,Linen_Glove,Linen Glove,5,0,,120,,1,,1,0xFDF80,2,2,136,,90,0,0,{ bonus bMdef,2; bonus bAgi,2; bonus bDex,1; if( isequipped(2390) ) bonus bFlee2,5; },{},{} //2750,Summer_Night_Dream,Summer Night Dream,5,0,,0,,0,,0,0x18315,7,2,136,,0,0,0,{},{},{} 2751,Academy_Badge,Academy Of Badge,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ if(BaseLevel < 80) { bonus bMaxHP,400; bonus bMaxSP,200; } },{},{} -2752,Praxinus_C,Praccsinos,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bAtkRate,5; bonus bMatkrate,5; },{},{} +2752,Praxinus_C,Praccsinos,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkrate,5; },{},{} 2753,Beholder_Ring,Beholder Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Formless,15; },{},{} 2754,Hallow_Ring,Hallow Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_undead,15; },{},{} 2755,Clamorous_Ring,Clamorous Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Brute,15; },{},{} @@ -1617,7 +1617,7 @@ 2769,Archer_Figure,Archer Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bDex,1; if(Class == Job_Archer) bonus bBaseAtk,10; },{},{} 2770,Thief_Figure,Thief Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAgi,1; if(Class == Job_Thief) bonus bAspdRate,3; },{},{} 2771,Merchant_Figure,Merchant Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bStr,1; if(Class == Job_Merchant) bonus bCritical,5; },{},{} -2772,Krieger_Ring1,Glorious Ring,5,0,,0,,0,,0,0xFFFFFFFE,7,2,136,,81,0,0,{ bonus bMaxHP,300; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; bonus bAspdRate,5; bonus bCastrate,-3; bonus bHealPower,5; if( isequipped(2720) || isequipped(2721) || isequipped(2722) || isequipped(2723) || isequipped(2724) || isequipped(2725) || isequipped(2733) ) { bonus bAtkRate,5; bonus bMatkRate,3; bonus bHealPower,5; } },{},{} +2772,Krieger_Ring1,Glorious Ring,5,0,,0,,0,,0,0xFFFFFFFE,7,2,136,,81,0,0,{ bonus bMaxHP,300; bonus2 bSubEle,Ele_Water,10; bonus2 bSubEle,Ele_Wind,10; bonus2 bSubEle,Ele_Earth,10; bonus2 bSubEle,Ele_Fire,10; bonus bAspdRate,5; bonus bCastrate,-3; bonus bHealPower,5; if( isequipped(2720) || isequipped(2721) || isequipped(2722) || isequipped(2723) || isequipped(2724) || isequipped(2725) || isequipped(2733) ) { bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } },{},{} 2773,Krieger_Ring2,Glorious Mass-Production Ring,5,0,,0,,0,,0,0xFFFFFFFE,7,2,136,,61,0,0,{ bonus bAllStats,2; },{},{} 2774,Krieger_Ring3,Glorious Popularized Ring,5,0,,0,,0,,0,0xFFFFFFFE,7,2,136,,61,0,0,{ bonus bAllStats,1; },{},{} 2775,Lure,Lure,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} @@ -1634,7 +1634,7 @@ 2786,Spiritual_Ring_M,Spiritual Ring,5,20,,100,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus bInt,2; bonus bDex,1; if(isequipped(2607) || isequipped(2608) || isequipped(2626)) { bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; } },{},{} 2787,Waterdrop_Brooch,Waterdrop Brooch,5,0,,200,,0,,1,0xFFFFFFFE,7,2,136,,75,0,0,{ bonus2 bSubEle,Ele_Water,5; bonus bMaxHP,80; bonus bMdef,2; },{},{} 2788,Bradium_Earing,Bradium Earring,5,0,,200,,0,,1,0xFFFFFFFE,7,2,136,,60,0,0,{ bonus bMatkRate,2; bonus bInt,1; bonus bDex,1; },{},{} -2789,Bradium_Ring,Bradium Ring,5,0,,200,,0,,1,0xFFFFFFFE,7,2,136,,60,0,0,{ bonus bAtkRate,2; bonus bStr,1; bonus bVit,1; },{},{} +2789,Bradium_Ring,Bradium Ring,5,0,,200,,0,,1,0xFFFFFFFE,7,2,136,,60,0,0,{ bonus2 bAddRace,RC_NonBoss,2; bonus2 bAddRace,RC_Boss,2; bonus bStr,1; bonus bVit,1; },{},{} 2790,Bradium_Brooch,Bradium Brooch,5,0,,200,,0,,1,0xFFFFFFFE,7,2,136,,60,0,0,{ bonus bFlee,4; bonus bAspdRate,2; bonus bAgi,1; },{},{} 2791,Just_Got_Fish,Fresh Fish,5,0,,0,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bHit,3; },{},{} //2792,Ring_Of_Flame_Lord_I,Ring of Flame Lord,5,20,,0,,0,,0,0x00CFDF80,2,2,136,,1,0,0,{ bonus bStr,2; bonus bVit,1; bonus bBaseAtk,15; bonus2 bSubEle,Ele_Fire,10; bonus3 bAutoSpell,"CH_SOULCOLLECT",1,30; bonus3 bAutoSpell,"MO_EXPLOSIONSPIRITS",1,10; bonus3 bAutoSpell,"PA_PRESSURE",2,30; bonus3 bAutoSpell,"MG_FIREBALL",1,150; bonus3 bAutoSpell,"KN_BOWLINGBASH",5,20; if(isequipped(2679)) { bonus4 bAutoSpell,"MO_EXTREMITYFIST",1,3,1; bonus3 bAutoSpell,"PR_LEXAETERNA",1,20; bonus3 bAutoSpell,"AS_SONICBLOW",5,50; bonus3 bAutoSpell,"MO_INVESTIGATE",5,20; bonus3 bAutoSpell,"ASC_METEORASSAULT",2,50; } },{},{} @@ -1986,7 +1986,7 @@ 4302,Tao_Gunka_Card,Tao Gunka Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,100; bonus bDef,-50; bonus bMdef,-50; },{},{} 4303,Whisper_Boss_Card,Giant Whisper Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; if(readparam(bStr)>=80) bonus bBaseAtk,20; if(readparam(bVit)>=80) bonus bMaxHPrate,3; if(readparam(bLuk)>=80) bonus bCritical,3; },{},{} 4304,Tamruan_Card,Tamruan Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,2; bonus2 bSkillAtk,"CR_SHIELDCHARGE",10; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",10; },{},{} -4305,Turtle_General_Card,Turtle General Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace,RC_NonBoss,20; bonus2 bAddRace,RC_Boss,20; bonus2 bAddRace2,5,20; bonus3 bAutoSpell,"SM_MAGNUM",10,30; },{},{} +4305,Turtle_General_Card,Turtle General Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace,RC_NonBoss,20; bonus2 bAddRace,RC_Boss,20; bonus3 bAutoSpell,"SM_MAGNUM",10,30; },{},{} 4306,Toad_Card,Toad Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee2,1; if(isequipped(4014)) bonus bFlee,18; },{},{} 4307,Kind_Of_Beetle_Card,Beetle King Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Fish,5; },{},{ heal 0,-5; } 4308,Tri_Joint_Card,Tri Joint Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Formless,5; },{},{ heal 0,-5; } @@ -2416,7 +2416,7 @@ 5208,Rideword_Hat,Rideword Hat,5,20,,300,,2,,1,0xFFFFFFFE,7,2,256,,40,1,262,{ bonus2 bHPDrainRate,50,8; bonus2 bSPDrainRate,10,4; bonus2 bHPLossRate,10,5000; },{},{} 5209,Yellow_Baseball_Cap,Love Dad Cap,5,20,,300,,2,,0,0xFFFFFFFE,7,2,256,,0,1,263,{},{},{} 5210,Flying_Angel,Flapping Angel Wing,5,20,,300,,1,,0,0xFFFFFFFF,7,2,256,,10,1,264,{ bonus bCastrate,-3; bonus bAspdRate,3; bonus bInt,1; bonus bAgi,1; },{},{} -5211,Dress_Hat,Dress Hat,5,0,,200,,2,,1,0xFFFFFFFF,7,2,256,,20,1,265,{ bonus bMdef,7; bonus bStr,1; bonus bInt,1; if(getrefine() >= 7) {bonus bAtkRate,3; bonus bMAtkRate,3; bonus2 bSkillHeal,"AL_HEAL",6;} else { bonus bAtkRate,2; bonus bMAtkRate,2; bonus2 bSkillHeal,"AL_HEAL",5;} },{},{} +5211,Dress_Hat,Dress Hat,5,0,,200,,2,,1,0xFFFFFFFF,7,2,256,,20,1,265,{ bonus bMdef,7; bonus bStr,1; bonus bInt,1; bonus2 bAddRace,RC_NonBoss,2; bonus2 bAddRace,RC_Boss,2; bonus bMAtkRate,2; bonus bHealPower,5; if(getrefine() >= 7) { bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; bonus bMAtkRate,1; bonus bHealPower,1; } },{},{} 5212,Satellite_Hairband,Satellite Hairband,5,0,,1000,,3,,1,0xFFFFFFFF,7,2,256,,30,1,266,{ bonus bMaxHP,50; bonus bMaxSP,10; skill "AL_RUWACH",1; },{},{ sc_end SC_RUWACH; } 5213,Black_Bunny_Band,Sheila Hairnet,5,0,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,267,{ bonus bAgi,2; bonus bMdef,3; },{},{} 5214,Moonlight_Flower_Hat,Moonlight Flower Hat,5,0,,200,,3,,0,0xFFFFFFFF,7,2,768,,0,1,268,{ bonus bDex,2; bonus3 bAutoSpell,"AL_INCAGI",1,50; },{},{} @@ -2662,7 +2662,7 @@ 5454,Dog_Cap_,Puppy Hat,5,,,500,,3,,1,0xFFFFFFFF,7,2,256,,0,1,234,{ autobonus "{ bonus bCritical,100; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bIgnoreMdefRate,100; }",10,3000,BF_MAGIC,"{ specialeffect2 EF_MAGICALATTHIT; }"; },{},{} 5455,Geographer_Band_,Decorative Geographer,5,,,500,,1,,1,0xFFFFFFFF,7,2,256,,0,1,238,{ bonus3 bAutoSpell,"AL_HEAL",5,50; bonus3 bAutoSpellWhenHit,"AL_HEAL",5,30; },{},{} 5456,Vacation_Hat_,Summer Hat,5,,,200,,0,,1,0xFFFFFFFF,7,2,256,,0,1,315,{ bonus bHPrecovRate,20; bonus bSPrecovRate,15; },{},{} -5457,Spring_Rabbit_Hat,Moon Rabbit Hat,5,,,300,,2,,1,0xFFFFFFFE,7,2,256,,0,1,455,{ bonus bAgi,3; bonus bAtkRate,5; bonus bMatkRate,5; if (getrefine()>4) { bonus bAtkRate,getrefine()-4; bonus bMatkRate,getrefine()-4; } },{},{} +5457,Spring_Rabbit_Hat,Moon Rabbit Hat,5,,,300,,2,,1,0xFFFFFFFE,7,2,256,,0,1,455,{ bonus bAgi,3; bonus bBaseAtk,5; bonus bMatkRate,5; if (getrefine()>4) { bonus bBaseAtk,getrefine()-4; bonus bMatkRate,getrefine()-4; } },{},{} 5458,Pinwheel_Cap,Pinwheel Hat,5,,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,456,{ bonus bHPrecovRate,5; bonus bHPrecovRate,5; },{},{} 5459,Drooping_Bunny_Chusuk,Drooping Bunny,5,,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,249,{ bonus bDex,1; bonus bFlee,2; },{},{} //5460,Adv_Dragon_Skull,Evolved Dragon Skull Hat,5,,,1000,,7,,0,0xFFFFFFFF,7,2,256,,60,1,457,{ bonus bAllStats,2; bonus bMaxHPrate,3; },{},{} @@ -2725,7 +2725,7 @@ //5517,Hawk_Eyes02,Hawk Eyes,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{},{},{} 5518,L_Magestic_Goat2,Gigantic Majestic Goat,5,20,,800,,5,,0,0xFFFFFFFF,7,2,256,,50,1,513,{ bonus2 bSubRace,RC_DemiHuman,12; bonus bBaseAtk,(JobLevel*2)/7; },{},{} 5519,Peacock_Feather,Peacock Feather,5,20,,800,,2,,1,0xFFFFFFFF,7,2,256,,0,1,514,{ bonus bInt,2; },{},{} -5520,Rabbit_Earplug,Rabbit Earplugs,5,,,400,,0,,1,0xFFFFFFFF,7,2,768,,1,1,515,{ bonus bAtkRate,4; bonus bMatkRate,4; },{},{} +5520,Rabbit_Earplug,Rabbit Earplugs,5,,,400,,0,,1,0xFFFFFFFF,7,2,768,,1,1,515,{ bonus2 bAddRace,RC_NonBoss,4; bonus2 bAddRace,RC_Boss,4; bonus bMatkRate,4; },{},{} 5521,Angry_Mouth_C,Angry Mouth,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,0,0,194,{ bonus bDelayRate,-3; },{},{} 5522,Fanta_Zero_Lemon_Hat,Fanta Zero Lemon Hat,5,,,100,,2,,1,0xFFFFFFFF,7,2,256,,0,1,516,{},{},{} 5523,Sakura_Mist_Hat,Sakura Mist Hat,5,,,100,,2,,1,0xFFFFFFFF,7,2,256,,0,1,517,{ bonus bDex,1; },{},{} @@ -2781,13 +2781,13 @@ 5573,Dokebi_Horn,Dokebi Horn,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,554,{},{},{} 5574,Pencil_in_Mouth,Well-Chewed Pencil,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,555,{ bonus bdex,2; bonus bHitRate,3; },{},{} //5575,Oingiri_Hat,Rice Ball Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,556,{},{},{} -//5576,Sake_Bottle,Wine Cup,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,557,{},{},{} +//5576,Sake_Bottle,Wine Cup,5,20,,100,,1,,0,0xFFFFFFFF,7,2,1,,0,1,557,{},{},{} 5577,Dark_Knight_Mask_,Dark Knight Mask,5,,,3000,,5,,0,0xFFFFFFFF,7,2,769,,80,1,479,{ bonus bStr,3; if(isequipped(2779,2780)) { bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } },{},{} 5578,Voyage_Hat,Voyage_Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,236,{},{},{} 5579,Satgat,Wanderer's Sakkat,5,20,,300,,2,,0,0xFFFFFFFF,7,2,768,,70,1,558,{ bonus bAgi,2; },{},{} 5580,Red_Beret,Red Beret,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,559,{},{},{} -5581,Cancer_Crown,Cancer Crown,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,560,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bHealPower,3; bonus bFlee,10; } },{},{} -5582,Cancer_Diadem,Cancer Diadem,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,561,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMDef,1; bonus bHealPower,3; bonus bMatkRate,2; } },{},{} +5581,Cancer_Diadem,Cancer Diadem,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,561,{ bonus bInt,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMDef,1; bonus bHealPower,3; bonus bMatkRate,2; } },{},{} +5582,Cancer_Crown,Cancer Crown,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,560,{ bonus bStr,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bHealPower,3; bonus bFlee,10; } },{},{} 5583,Para_Team_Hat,Eden Team Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,465,{},{},{} 5584,Majestic_Evil_Horn,Majestic Evil Horns,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,562,{ bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; },{},{} 5585,Rune_Cloth_Circlet,Rune Cloth Circlet,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,564,{},{},{} @@ -2810,10 +2810,10 @@ //5603,RTC_Winner_Only,RTC First Place,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,577,{},{},{} //5604,RTC_Second_Best,RTC Second Place,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,578,{},{},{} //5605,RTC_Third_Best,RTC Third Place,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,579,{},{},{} -//5606,Hat_02,...,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{},{},{} -//5609,Chung_Hairpin,Chung_Hairpin,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{},{},{} -//5610,Ice_Ear_Wing,Ice_Ear_Wing,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{},{},{} -//5611,Turtle_Hat_M,Turtle_Hat,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{},{},{} +//5606,Hat_02,Champune Hat,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,580,{},{},{} +//5609,Chung_Hairpin,Chung_Hairpin,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,583,{},{},{} +//5610,Ice_Ear_Wing,Ice_Ear_Wing,5,20,,800,,1,,0,0xFFFFFFFF,7,2,512,,0,1,584,{},{},{} +//5611,Turtle_Hat_M,Turtle_Hat,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,585,{},{},{} 5612,Blue_Drooping_Kitty_M,Blue Drooping Cat,5,20,,500,,1,,0,0xFFFFFFFE,7,2,256,,1,1,277,{ bonus2 bResEff,Eff_Curse,3000; bonus bMdef,15; },{},{} 5613,Flying_Angel_M,Flapping Angel Wing,5,20,,300,,1,,0,0xFFFFFFFF,7,2,256,,1,1,264,{ bonus bCastrate,-3; bonus bAspdRate,3; bonus bInt,1; bonus bAgi,1; },{},{} 5614,Smoking_Pipe_M,Pipe,5,20,,100,,0,,0,0xFFFFFFFE,7,2,1,,1,0,55,{ bonus bVit,1; bonus2 bSubRace,RC_Brute,5; },{},{} @@ -2984,7 +2984,7 @@ 6037,Rough_File,Messy File,3,0,,10,,,,,,,,,,,,,{},{},{} 6038,Neat_Report,Neat Report,3,0,,10,,,,,,,,,,,,,{},{},{} 6039,Piece_Of_Fish,Piece of Fish,3,0,,10,,,,,,,,,,,,,{},{},{} -6040,Some_Of_Report,Part of a Report,3,0,,10,,,,,,,,,,,,,{},{},{} +6040,Some_Of_Report,Part of a Report,3,0,,0,,,,,,,,,,,,,{},{},{} 6041,Strong_Bine,Strong Vine,3,20,,10,,,,,,,,,,,,,{},{},{} 6042,Ordinary_Branch,Ordinary Branch,3,0,,10,,,,,,,,,,,,,{},{},{} 6043,Letter_From_Lugen,Letter from Lugen,3,0,,10,,,,,,,,,,,,,{},{},{} @@ -4625,9 +4625,9 @@ 12256,PRO_Gift_Box,PRO Gift Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12257,Cold_Medicine,Cold Medicine,2,20,,100,,,,,0xFFFFFFFF,7,2,,,50,,,{ percentheal 25,25; },{},{} 12258,Bombring_Box,Bomb Poring Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",1904,1,""; },{},{} -12259,Miracle_Medicine,Miracle Tonic,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12259,Miracle_Medicine,Miracle Tonic,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp 3000000,1500000; },{},{} 12260,Cool_Summer_Outfit,Cool Summer Outfit,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Summer,600000,0; },{},{} -12261,Secret_Medicine,Leap of Fantasy,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12261,Secret_Medicine,Leap of Fantasy,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp 2000000,1000000; },{},{} 12262,Inspector_Certificate_,Authoritative Badge,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,180000,0; },{},{} 12263,Comp_Battle_Manual,Field Manual,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{} 12264,Comp_Bubble_Gum,Bubble Gum,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{} @@ -4638,7 +4638,7 @@ 12269,Tasty_Colonel,Tasty Pink Ration,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,15; },{},{} 12270,Tasty_Major,Tasty White Ration,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,600000,15; },{},{} 12271,Mre_A,Military Ration A,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,0; },{},{} -12272,Mre_B,Military Ration B,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,3; },{},{} +12272,Mre_B,Military Ration B,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,33; },{},{} 12273,Mre_C,Military Ration C,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,600000,33; },{},{} 12274,Gold_Pill_1,Daehwandan,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMHPRATE,36000000,5; percentheal 10,0; },{},{} 12275,Gold_Pill_2,Taecheongdan,0,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMSPRATE,36000000,5; percentheal 0,10; },{},{} @@ -5024,8 +5024,8 @@ //13043,Fortune_Sword_I //13044,House_Auger_I //13045,Kamaitachi_I -13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,100; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{} -13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,100; autobonus "{ bonus bAtkRate,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{} +13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00021040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,100; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{} +13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00021040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,100; autobonus "{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{} //13048,Damascus_C 13050,P_Dagger1,Eden Dagger I,4,0,,0,124,,1,0,0xFE9F7EEF,7,2,2,2,26,0,1,{},{},{} 13051,P_Dagger2,Eden Dagger II,4,0,,0,158,,1,0,0xFE9F7EEF,7,2,2,2,40,0,1,{},{},{} From 6d1b42b85f124b45cd2abcef5277884204ee6345 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 08:19:44 +0000 Subject: [PATCH 060/129] * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14475 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/atcommand.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index d9a826e04f..597f278fb5 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/20 + * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] 2010/11/19 * Various VC6-related fixes and tweaks. [Ai4rei] - Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727). diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a6eb86163f..a5805ad188 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3479,7 +3479,6 @@ int atcommand_doom(const int fd, struct map_session_data* sd, const char* comman struct s_mapiterator* iter; nullpo_retr(-1, sd); - clif_specialeffect(&sd->bl,450,ALL_SAMEMAP); iter = mapit_getallusers(); for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) @@ -3487,6 +3486,7 @@ int atcommand_doom(const int fd, struct map_session_data* sd, const char* comman if (pl_sd->fd != fd && pc_isGM(sd) >= pc_isGM(pl_sd)) { status_kill(&pl_sd->bl); + clif_specialeffect(&pl_sd->bl,450,AREA); clif_displaymessage(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgement. } } @@ -3506,7 +3506,6 @@ int atcommand_doommap(const int fd, struct map_session_data* sd, const char* com struct s_mapiterator* iter; nullpo_retr(-1, sd); - clif_specialeffect(&sd->bl,450,ALL_CLIENT); iter = mapit_getallusers(); for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) @@ -3514,6 +3513,7 @@ int atcommand_doommap(const int fd, struct map_session_data* sd, const char* com if (pl_sd->fd != fd && sd->bl.m == pl_sd->bl.m && pc_isGM(sd) >= pc_isGM(pl_sd)) { status_kill(&pl_sd->bl); + clif_specialeffect(&pl_sd->bl,450,AREA); clif_displaymessage(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgement. } } From baf479401248daca204ccb70e9b387f36ef69a5c Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 10:10:11 +0000 Subject: [PATCH 061/129] * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). - Failure to retrieve account engine and initializing it is now considered fatal and causes the server to exit immediately. - Fixed two data type inconsistencies, while being at it. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14476 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 3 +++ src/login/login.c | 16 ++++++++++------ src/login/login.h | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 597f278fb5..01d5bd6827 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -2,6 +2,9 @@ Date Added 2010/11/20 * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] + * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] + - Failure to retrieve account engine and initializing it is now considered fatal and causes the server to exit immediately. + - Fixed two data type inconsistencies, while being at it. 2010/11/19 * Various VC6-related fixes and tweaks. [Ai4rei] - Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727). diff --git a/src/login/login.c b/src/login/login.c index 59a110348c..e888d21f60 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -577,7 +577,7 @@ int parse_fromchar(int fd) struct mmo_account acc; int account_id = RFIFOL(fd,2); - int state = RFIFOL(fd,6); + unsigned int state = RFIFOL(fd,6); RFIFOSKIP(fd,10); if( !accounts->load_num(accounts, &acc, account_id) ) @@ -1543,7 +1543,7 @@ int login_config_read(const char* cfgName) else if(!strcmpi(w1, "check_client_version")) login_config.check_client_version = (bool)config_switch(w2); else if(!strcmpi(w1, "client_version_to_connect")) - login_config.client_version_to_connect = atoi(w2); + login_config.client_version_to_connect = strtoul(w2, NULL, 10); else if(!strcmpi(w1, "use_MD5_passwords")) login_config.use_md5_passwds = (bool)config_switch(w2); else if(!strcmpi(w1, "min_level_to_connect")) @@ -1723,14 +1723,18 @@ int do_init(int argc, char** argv) accounts = get_account_engine(); if( accounts == NULL ) { - ShowError("do_init: account engine '%s' not found.\n", login_config.account_engine); - runflag = 0; - return 1; + ShowFatalError("do_init: account engine '%s' not found.\n", login_config.account_engine); + exit(EXIT_FAILURE); } else { ShowInfo("Using account engine '%s'.\n", login_config.account_engine); - accounts->init(accounts); + + if(!accounts->init(accounts)) + { + ShowFatalError("do_init: Failed to initialize account engine '%s'.\n", login_config.account_engine); + exit(EXIT_FAILURE); + } } if( login_config.console ) diff --git a/src/login/login.h b/src/login/login.h index 2e5af3b5ec..807caaed68 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -58,7 +58,7 @@ struct Login_Config { bool use_md5_passwds; // work with password hashes instead of plaintext passwords? int min_level_to_connect; // minimum level of player/GM (0: player, 1-99: GM) to connect bool check_client_version; // check the clientversion set in the clientinfo ? - int client_version_to_connect; // the client version needed to connect (if checking is enabled) + uint32 client_version_to_connect; // the client version needed to connect (if checking is enabled) bool admin_state; // is ladmin support enabled? char admin_pass[24]; // security password for ladmin From 068e6685bbcf5524585483dcddbecbafc8149667 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 20 Nov 2010 11:38:53 +0000 Subject: [PATCH 062/129] * Made atcommand declarations use ACMD_FUNC macro (bugreport:4252, related r11607). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14477 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/atcommand.c | 450 +++++++++++++++++++++--------------------- 2 files changed, 226 insertions(+), 225 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 01d5bd6827..020e647a4a 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -5,6 +5,7 @@ Date Added * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] - Failure to retrieve account engine and initializing it is now considered fatal and causes the server to exit immediately. - Fixed two data type inconsistencies, while being at it. + * Made atcommand declarations use ACMD_FUNC macro (bugreport:4252, related r11607). [Ai4rei] 2010/11/19 * Various VC6-related fixes and tweaks. [Ai4rei] - Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727). diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a5805ad188..77aef527f7 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -63,7 +63,7 @@ typedef struct AtCommandInfo static AtCommandInfo* get_atcommandinfo_byname(const char* name); static AtCommandInfo* get_atcommandinfo_byfunc(const AtCommandFunc func); -int atcommand_commands(const int fd, struct map_session_data* sd, const char* command, const char* message); +ACMD_FUNC(commands); /*========================================= @@ -176,7 +176,7 @@ void do_final_msg(void) /*========================================== * @send (used for testing packet sends from the client) *------------------------------------------*/ -int atcommand_send(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(send) { int len=0,off,end,type; long num; @@ -411,7 +411,7 @@ int atcommand_send(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @rura, @warp, @mapmove *------------------------------------------*/ -int atcommand_mapmove(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mapmove) { char map_name[MAP_NAME_LENGTH_EXT]; unsigned short mapindex; @@ -464,7 +464,7 @@ int atcommand_mapmove(const int fd, struct map_session_data* sd, const char* com /*========================================== * Displays where a character is. Corrected version by Silent. [Skotlex] *------------------------------------------*/ -int atcommand_where(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(where) { struct map_session_data* pl_sd; @@ -494,7 +494,7 @@ int atcommand_where(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_jumpto(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jumpto) { struct map_session_data *pl_sd = NULL; @@ -545,7 +545,7 @@ int atcommand_jumpto(const int fd, struct map_session_data* sd, const char* comm /*========================================== * *------------------------------------------*/ -int atcommand_jump(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jump) { int x = 0, y = 0; @@ -581,7 +581,7 @@ int atcommand_jump(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @who3 = Player name, his location *------------------------------------------*/ -int atcommand_who3(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(who3) { char temp0[100]; struct map_session_data *pl_sd; @@ -656,7 +656,7 @@ int atcommand_who3(const int fd, struct map_session_data* sd, const char* comman /*========================================== * Player name, BLevel, Job, *------------------------------------------*/ -int atcommand_who2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(who2) { char temp0[100]; struct map_session_data *pl_sd; @@ -726,7 +726,7 @@ int atcommand_who2(const int fd, struct map_session_data* sd, const char* comman /*========================================== * Player name, Playrs Party / Guild name *------------------------------------------*/ -int atcommand_who(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(who) { char temp0[100]; struct map_session_data *pl_sd; @@ -806,7 +806,7 @@ int atcommand_who(const int fd, struct map_session_data* sd, const char* command /*========================================== * *------------------------------------------*/ -int atcommand_whomap3(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whomap3) { struct map_session_data *pl_sd; struct s_mapiterator* iter; @@ -862,7 +862,7 @@ int atcommand_whomap3(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_whomap2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whomap2) { struct map_session_data *pl_sd; struct s_mapiterator* iter; @@ -920,7 +920,7 @@ int atcommand_whomap2(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_whomap(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whomap) { char temp0[100]; char temp1[100]; @@ -994,7 +994,7 @@ int atcommand_whomap(const int fd, struct map_session_data* sd, const char* comm /*========================================== * *------------------------------------------*/ -int atcommand_whogm(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whogm) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -1080,7 +1080,7 @@ int atcommand_whogm(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_save(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(save) { nullpo_retr(-1, sd); @@ -1098,7 +1098,7 @@ int atcommand_save(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_load(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(load) { int m; @@ -1123,7 +1123,7 @@ int atcommand_load(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_speed(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(speed) { int speed; @@ -1146,7 +1146,7 @@ int atcommand_speed(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_storage(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(storage) { nullpo_retr(-1, sd); @@ -1168,7 +1168,7 @@ int atcommand_storage(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_guildstorage(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(guildstorage) { nullpo_retr(-1, sd); @@ -1198,7 +1198,7 @@ int atcommand_guildstorage(const int fd, struct map_session_data* sd, const char /*========================================== * *------------------------------------------*/ -int atcommand_option(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(option) { int param1 = 0, param2 = 0, param3 = 0; nullpo_retr(-1, sd); @@ -1220,7 +1220,7 @@ int atcommand_option(const int fd, struct map_session_data* sd, const char* comm /*========================================== * *------------------------------------------*/ -int atcommand_hide(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hide) { nullpo_retr(-1, sd); if (sd->sc.option & OPTION_INVISIBLE) { @@ -1243,7 +1243,7 @@ int atcommand_hide(const int fd, struct map_session_data* sd, const char* comman /*========================================== * Changes a character's class *------------------------------------------*/ -int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jobchange) { //FIXME: redundancy, potentially wrong code, should use job_name() or similar instead of hardcoding the table [ultramage] int job = 0, upper = 0; @@ -1412,7 +1412,7 @@ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* c /*========================================== * *------------------------------------------*/ -int atcommand_die(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(die) { nullpo_retr(-1, sd); clif_specialeffect(&sd->bl,450,SELF); @@ -1425,7 +1425,7 @@ int atcommand_die(const int fd, struct map_session_data* sd, const char* command /*========================================== * *------------------------------------------*/ -int atcommand_kill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(kill) { struct map_session_data *pl_sd; nullpo_retr(-1, sd); @@ -1460,7 +1460,7 @@ int atcommand_kill(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_alive(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(alive) { nullpo_retr(-1, sd); if (!status_revive(&sd->bl, 100, 100)) @@ -1476,7 +1476,7 @@ int atcommand_alive(const int fd, struct map_session_data* sd, const char* comma /*========================================== * +kamic [LuzZza] *------------------------------------------*/ -int atcommand_kami(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(kami) { unsigned long color=0; nullpo_retr(-1, sd); @@ -1513,7 +1513,7 @@ int atcommand_kami(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_heal(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(heal) { int hp = 0, sp = 0; // [Valaris] thanks to fov nullpo_retr(-1, sd); @@ -1571,7 +1571,7 @@ int atcommand_heal(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @item command (usage: @item ) (modified by [Yor] for pet_egg) *------------------------------------------*/ -int atcommand_item(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(item) { char item_name[100]; int number = 0, item_id, flag; @@ -1629,7 +1629,7 @@ int atcommand_item(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_item2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(item2) { struct item item_tmp; struct item_data *item_data; @@ -1709,7 +1709,7 @@ int atcommand_item2(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_itemreset(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(itemreset) { int i; nullpo_retr(-1, sd); @@ -1732,7 +1732,7 @@ int atcommand_itemreset(const int fd, struct map_session_data* sd, const char* c /*========================================== * Atcommand @lvlup *------------------------------------------*/ -int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(baselevelup) { int level=0, i=0, status_point=0; nullpo_retr(-1, sd); @@ -1789,7 +1789,7 @@ int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_joblevelup(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(joblevelup) { int level=0; nullpo_retr(-1, sd); @@ -1843,7 +1843,7 @@ int atcommand_joblevelup(const int fd, struct map_session_data* sd, const char* /*========================================== * @help *------------------------------------------*/ -int atcommand_help(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(help) { char buf[2048], w1[2048], w2[2048]; int i, gm_level; @@ -1881,7 +1881,7 @@ int atcommand_help(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @help2 - Char commands [Kayla] *------------------------------------------*/ -int atcommand_help2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(help2) { char buf[2048], w1[2048], w2[2048]; int i, gm_level; @@ -1944,7 +1944,7 @@ static int atcommand_pvpoff_sub(struct block_list *bl,va_list ap) return 0; } -int atcommand_pvpoff(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(pvpoff) { nullpo_retr(-1, sd); @@ -1980,7 +1980,7 @@ static int atcommand_pvpon_sub(struct block_list *bl,va_list ap) return 0; } -int atcommand_pvpon(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(pvpon) { nullpo_retr(-1, sd); @@ -2005,7 +2005,7 @@ int atcommand_pvpon(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_gvgoff(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(gvgoff) { nullpo_retr(-1, sd); @@ -2025,7 +2025,7 @@ int atcommand_gvgoff(const int fd, struct map_session_data* sd, const char* comm /*========================================== * *------------------------------------------*/ -int atcommand_gvgon(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(gvgon) { nullpo_retr(-1, sd); @@ -2044,7 +2044,7 @@ int atcommand_gvgon(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_model(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(model) { int hair_style = 0, hair_color = 0, cloth_color = 0; nullpo_retr(-1, sd); @@ -2076,7 +2076,7 @@ int atcommand_model(const int fd, struct map_session_data* sd, const char* comma /*========================================== * @dye && @ccolor *------------------------------------------*/ -int atcommand_dye(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(dye) { int cloth_color = 0; nullpo_retr(-1, sd); @@ -2103,7 +2103,7 @@ int atcommand_dye(const int fd, struct map_session_data* sd, const char* command /*========================================== * @hairstyle && @hstyle *------------------------------------------*/ -int atcommand_hair_style(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hair_style) { int hair_style = 0; nullpo_retr(-1, sd); @@ -2130,7 +2130,7 @@ int atcommand_hair_style(const int fd, struct map_session_data* sd, const char* /*========================================== * @haircolor && @hcolor *------------------------------------------*/ -int atcommand_hair_color(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hair_color) { int hair_color = 0; nullpo_retr(-1, sd); @@ -2157,7 +2157,7 @@ int atcommand_hair_color(const int fd, struct map_session_data* sd, const char* /*========================================== * @go [city_number or city_name] - Updated by Harbin *------------------------------------------*/ -int atcommand_go(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(go) { int i; int town; @@ -2325,7 +2325,7 @@ int atcommand_go(const int fd, struct map_session_data* sd, const char* command, /*========================================== * *------------------------------------------*/ -int atcommand_monster(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(monster) { char name[NAME_LENGTH]; char monster[NAME_LENGTH]; @@ -2411,7 +2411,7 @@ int atcommand_monster(const int fd, struct map_session_data* sd, const char* com } // small monster spawning [Valaris] -int atcommand_monstersmall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(monstersmall) { char name[NAME_LENGTH] = ""; char monster[NAME_LENGTH] = ""; @@ -2487,7 +2487,7 @@ int atcommand_monstersmall(const int fd, struct map_session_data* sd, const char return 0; } // big monster spawning [Valaris] -int atcommand_monsterbig(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(monsterbig) { char name[NAME_LENGTH] = ""; char monster[NAME_LENGTH] = ""; @@ -2607,7 +2607,7 @@ void atcommand_killmonster_sub(const int fd, struct map_session_data* sd, const return; } -int atcommand_killmonster(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(killmonster) { atcommand_killmonster_sub(fd, sd, message, 1); return 0; @@ -2616,7 +2616,7 @@ int atcommand_killmonster(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_killmonster2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(killmonster2) { atcommand_killmonster_sub(fd, sd, message, 0); return 0; @@ -2625,7 +2625,7 @@ int atcommand_killmonster2(const int fd, struct map_session_data* sd, const char /*========================================== * *------------------------------------------*/ -int atcommand_refine(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(refine) { int i,j, position = 0, refine = 0, current_position, final_refine; int count; @@ -2703,7 +2703,7 @@ int atcommand_refine(const int fd, struct map_session_data* sd, const char* comm /*========================================== * *------------------------------------------*/ -int atcommand_produce(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(produce) { char item_name[100]; int item_id, attribute = 0, star = 0; @@ -2766,7 +2766,7 @@ int atcommand_produce(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_memo(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(memo) { int position = 0; nullpo_retr(-1, sd); @@ -2802,7 +2802,7 @@ int atcommand_memo(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_gat(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(gat) { int y; nullpo_retr(-1, sd); @@ -2827,7 +2827,7 @@ int atcommand_gat(const int fd, struct map_session_data* sd, const char* command /*========================================== * *------------------------------------------*/ -int atcommand_displaystatus(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(displaystatus) { int i, type, flag, tick; nullpo_retr(-1, sd); @@ -2847,7 +2847,7 @@ int atcommand_displaystatus(const int fd, struct map_session_data* sd, const cha /*========================================== * @stpoint (Rewritten by [Yor]) *------------------------------------------*/ -int atcommand_statuspoint(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(statuspoint) { int point, new_status_point; @@ -2879,7 +2879,7 @@ int atcommand_statuspoint(const int fd, struct map_session_data* sd, const char* /*========================================== * @skpoint (Rewritten by [Yor]) *------------------------------------------*/ -int atcommand_skillpoint(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(skillpoint) { int point, new_skill_point; nullpo_retr(-1, sd); @@ -2912,7 +2912,7 @@ int atcommand_skillpoint(const int fd, struct map_session_data* sd, const char* /*========================================== * @zeny (Rewritten by [Yor]) *------------------------------------------*/ -int atcommand_zeny(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(zeny) { int zeny, new_zeny; nullpo_retr(-1, sd); @@ -2946,7 +2946,7 @@ int atcommand_zeny(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_param(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(param) { int i, value = 0, new_value, max; const char* param[] = { "str", "agi", "vit", "int", "dex", "luk" }; @@ -3000,7 +3000,7 @@ int atcommand_param(const int fd, struct map_session_data* sd, const char* comma /*========================================== * Stat all by fritz (rewritten by [Yor]) *------------------------------------------*/ -int atcommand_stat_all(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(stat_all) { int index, count, value, max, new_value; short* status[6]; @@ -3056,7 +3056,7 @@ int atcommand_stat_all(const int fd, struct map_session_data* sd, const char* co /*========================================== * *------------------------------------------*/ -int atcommand_guildlevelup(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(guildlevelup) { int level = 0; short added_level; @@ -3097,7 +3097,7 @@ int atcommand_guildlevelup(const int fd, struct map_session_data* sd, const char /*========================================== * *------------------------------------------*/ -int atcommand_makeegg(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(makeegg) { struct item_data *item_data; int id, pet_id; @@ -3137,7 +3137,7 @@ int atcommand_makeegg(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_hatch(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hatch) { nullpo_retr(-1, sd); if (sd->status.pet_id <= 0) @@ -3153,7 +3153,7 @@ int atcommand_hatch(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_petfriendly(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(petfriendly) { int friendly; struct pet_data *pd; @@ -3190,7 +3190,7 @@ int atcommand_petfriendly(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_pethungry(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(pethungry) { int hungry; struct pet_data *pd; @@ -3225,7 +3225,7 @@ int atcommand_pethungry(const int fd, struct map_session_data* sd, const char* c /*========================================== * *------------------------------------------*/ -int atcommand_petrename(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(petrename) { struct pet_data *pd; nullpo_retr(-1, sd); @@ -3250,7 +3250,7 @@ int atcommand_petrename(const int fd, struct map_session_data* sd, const char* c /*========================================== * *------------------------------------------*/ -int atcommand_recall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(recall) { struct map_session_data *pl_sd = NULL; @@ -3298,7 +3298,7 @@ int atcommand_recall(const int fd, struct map_session_data* sd, const char* comm * charblock command (usage: charblock ) * This command do a definitiv ban on a player *------------------------------------------*/ -int atcommand_char_block(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(char_block) { nullpo_retr(-1, sd); @@ -3330,7 +3330,7 @@ int atcommand_char_block(const int fd, struct map_session_data* sd, const char* * @ban +1m-2mn1s-6y test_player * this example adds 1 month and 1 second, and substracts 2 minutes and 6 years at the same time. *------------------------------------------*/ -int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(char_ban) { char * modif_p; int year, month, day, hour, minute, second, value; @@ -3397,7 +3397,7 @@ int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* co /*========================================== * charunblock command (usage: charunblock ) *------------------------------------------*/ -int atcommand_char_unblock(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(char_unblock) { nullpo_retr(-1, sd); @@ -3418,7 +3418,7 @@ int atcommand_char_unblock(const int fd, struct map_session_data* sd, const char /*========================================== * charunban command (usage: charunban ) *------------------------------------------*/ -int atcommand_char_unban(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(char_unban) { nullpo_retr(-1, sd); @@ -3439,7 +3439,7 @@ int atcommand_char_unban(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_night(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(night) { nullpo_retr(-1, sd); @@ -3456,7 +3456,7 @@ int atcommand_night(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_day(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(day) { nullpo_retr(-1, sd); @@ -3473,7 +3473,7 @@ int atcommand_day(const int fd, struct map_session_data* sd, const char* command /*========================================== * *------------------------------------------*/ -int atcommand_doom(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(doom) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3500,7 +3500,7 @@ int atcommand_doom(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_doommap(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(doommap) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3541,7 +3541,7 @@ static void atcommand_raise_sub(struct map_session_data* sd) /*========================================== * *------------------------------------------*/ -int atcommand_raise(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(raise) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3561,7 +3561,7 @@ int atcommand_raise(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_raisemap(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(raisemap) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3582,7 +3582,7 @@ int atcommand_raisemap(const int fd, struct map_session_data* sd, const char* co /*========================================== * *------------------------------------------*/ -int atcommand_kick(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(kick) { struct map_session_data *pl_sd; nullpo_retr(-1, sd); @@ -3614,7 +3614,7 @@ int atcommand_kick(const int fd, struct map_session_data* sd, const char* comman /*========================================== * *------------------------------------------*/ -int atcommand_kickall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(kickall) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3638,7 +3638,7 @@ int atcommand_kickall(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_allskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(allskill) { nullpo_retr(-1, sd); pc_allskillup(sd); // all skills @@ -3652,7 +3652,7 @@ int atcommand_allskill(const int fd, struct map_session_data* sd, const char* co /*========================================== * *------------------------------------------*/ -int atcommand_questskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(questskill) { int skill_id; nullpo_retr(-1, sd); @@ -3683,7 +3683,7 @@ int atcommand_questskill(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_lostskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(lostskill) { int skill_id; nullpo_retr(-1, sd); @@ -3716,7 +3716,7 @@ int atcommand_lostskill(const int fd, struct map_session_data* sd, const char* c /*========================================== * *------------------------------------------*/ -int atcommand_spiritball(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(spiritball) { int max_spiritballs = min(ARRAYLENGTH(sd->spirit_timer), 0x7FFF); int number; @@ -3742,7 +3742,7 @@ int atcommand_spiritball(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_party(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(party) { char party[NAME_LENGTH]; nullpo_retr(-1, sd); @@ -3762,7 +3762,7 @@ int atcommand_party(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_guild(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(guild) { char guild[NAME_LENGTH]; int prev; @@ -3786,7 +3786,7 @@ int atcommand_guild(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_agitstart(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(agitstart) { nullpo_retr(-1, sd); if (agit_flag == 1) { @@ -3804,7 +3804,7 @@ int atcommand_agitstart(const int fd, struct map_session_data* sd, const char* c /*========================================== * *------------------------------------------*/ -int atcommand_agitstart2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(agitstart2) { nullpo_retr(-1, sd); if (agit2_flag == 1) { @@ -3822,7 +3822,7 @@ int atcommand_agitstart2(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_agitend(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(agitend) { nullpo_retr(-1, sd); if (agit_flag == 0) { @@ -3840,7 +3840,7 @@ int atcommand_agitend(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_agitend2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(agitend2) { nullpo_retr(-1, sd); if (agit2_flag == 0) { @@ -3858,7 +3858,7 @@ int atcommand_agitend2(const int fd, struct map_session_data* sd, const char* co /*========================================== * @mapexit - shuts down the map server *------------------------------------------*/ -int atcommand_mapexit(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mapexit) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3883,7 +3883,7 @@ int atcommand_mapexit(const int fd, struct map_session_data* sd, const char* com /*========================================== * idsearch : revrited by [Yor] *------------------------------------------*/ -int atcommand_idsearch(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(idsearch) { char item_name[100]; unsigned int i, match; @@ -3919,7 +3919,7 @@ int atcommand_idsearch(const int fd, struct map_session_data* sd, const char* co /*========================================== * Recall All Characters Online To Your Location *------------------------------------------*/ -int atcommand_recallall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(recallall) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -3964,7 +3964,7 @@ int atcommand_recallall(const int fd, struct map_session_data* sd, const char* c /*========================================== * Recall online characters of a guild to your location *------------------------------------------*/ -int atcommand_guildrecall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(guildrecall) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -4023,7 +4023,7 @@ int atcommand_guildrecall(const int fd, struct map_session_data* sd, const char* /*========================================== * Recall online characters of a party to your location *------------------------------------------*/ -int atcommand_partyrecall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(partyrecall) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -4082,7 +4082,7 @@ int atcommand_partyrecall(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_reloaditemdb(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloaditemdb) { nullpo_retr(-1, sd); itemdb_reload(); @@ -4094,7 +4094,7 @@ int atcommand_reloaditemdb(const int fd, struct map_session_data* sd, const char /*========================================== * *------------------------------------------*/ -int atcommand_reloadmobdb(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadmobdb) { nullpo_retr(-1, sd); mob_reload(); @@ -4108,7 +4108,7 @@ int atcommand_reloadmobdb(const int fd, struct map_session_data* sd, const char* /*========================================== * *------------------------------------------*/ -int atcommand_reloadskilldb(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadskilldb) { nullpo_retr(-1, sd); skill_reload(); @@ -4121,7 +4121,7 @@ int atcommand_reloadskilldb(const int fd, struct map_session_data* sd, const cha /*========================================== * @reloadatcommand - reloads atcommand_athena.conf *------------------------------------------*/ -int atcommand_reloadatcommand(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadatcommand) { atcommand_config_read(ATCOMMAND_CONF_FILENAME); clif_displaymessage(fd, msg_txt(254)); @@ -4130,7 +4130,7 @@ int atcommand_reloadatcommand(const int fd, struct map_session_data* sd, const c /*========================================== * @reloadbattleconf - reloads battle_athena.conf *------------------------------------------*/ -int atcommand_reloadbattleconf(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadbattleconf) { struct Battle_Config prev_config; memcpy(&prev_config, &battle_config, sizeof(prev_config)); @@ -4180,7 +4180,7 @@ int atcommand_reloadbattleconf(const int fd, struct map_session_data* sd, const /*========================================== * @reloadstatusdb - reloads job_db1.txt job_db2.txt job_db2-2.txt refine_db.txt size_fix.txt *------------------------------------------*/ -int atcommand_reloadstatusdb(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadstatusdb) { status_readdb(); clif_displaymessage(fd, msg_txt(256)); @@ -4189,7 +4189,7 @@ int atcommand_reloadstatusdb(const int fd, struct map_session_data* sd, const ch /*========================================== * @reloadpcdb - reloads exp.txt skill_tree.txt attr_fix.txt statpoint.txt *------------------------------------------*/ -int atcommand_reloadpcdb(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadpcdb) { pc_readdb(); clif_displaymessage(fd, msg_txt(257)); @@ -4199,7 +4199,7 @@ int atcommand_reloadpcdb(const int fd, struct map_session_data* sd, const char* /*========================================== * @reloadmotd - reloads motd.txt *------------------------------------------*/ -int atcommand_reloadmotd(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadmotd) { pc_read_motd(); clif_displaymessage(fd, msg_txt(268)); @@ -4209,7 +4209,7 @@ int atcommand_reloadmotd(const int fd, struct map_session_data* sd, const char* /*========================================== * @reloadscript - reloads all scripts (npcs, warps, mob spawns, ...) *------------------------------------------*/ -int atcommand_reloadscript(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reloadscript) { nullpo_retr(-1, sd); //atcommand_broadcast( fd, sd, "@broadcast", "eAthena Server is Rehashing..." ); @@ -4233,7 +4233,7 @@ int atcommand_reloadscript(const int fd, struct map_session_data* sd, const char * 2 = Shows NPCs in that map * 3 = Shows the shops/chats in that map (not implemented) *------------------------------------------*/ -int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mapinfo) { struct map_session_data* pl_sd; struct s_mapiterator* iter; @@ -4474,7 +4474,7 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mount_peco) { nullpo_retr(-1, sd); @@ -4504,7 +4504,7 @@ int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char* /*========================================== *Spy Commands by Syrus22 *------------------------------------------*/ -int atcommand_guildspy(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(guildspy) { char guild_name[NAME_LENGTH]; struct guild *g; @@ -4545,7 +4545,7 @@ int atcommand_guildspy(const int fd, struct map_session_data* sd, const char* co /*========================================== * *------------------------------------------*/ -int atcommand_partyspy(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(partyspy) { char party_name[NAME_LENGTH]; struct party_data *p; @@ -4587,7 +4587,7 @@ int atcommand_partyspy(const int fd, struct map_session_data* sd, const char* co /*========================================== * @repairall [Valaris] *------------------------------------------*/ -int atcommand_repairall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(repairall) { int count, i; nullpo_retr(-1, sd); @@ -4616,7 +4616,7 @@ int atcommand_repairall(const int fd, struct map_session_data* sd, const char* c /*========================================== * @nuke [Valaris] *------------------------------------------*/ -int atcommand_nuke(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(nuke) { struct map_session_data *pl_sd; nullpo_retr(-1, sd); @@ -4647,7 +4647,7 @@ int atcommand_nuke(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @tonpc *------------------------------------------*/ -int atcommand_tonpc(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(tonpc) { char npcname[NAME_LENGTH+1]; struct npc_data *nd; @@ -4677,7 +4677,7 @@ int atcommand_tonpc(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_shownpc(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(shownpc) { char NPCname[NAME_LENGTH+1]; nullpo_retr(-1, sd); @@ -4703,7 +4703,7 @@ int atcommand_shownpc(const int fd, struct map_session_data* sd, const char* com /*========================================== * *------------------------------------------*/ -int atcommand_hidenpc(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hidenpc) { char NPCname[NAME_LENGTH+1]; nullpo_retr(-1, sd); @@ -4725,7 +4725,7 @@ int atcommand_hidenpc(const int fd, struct map_session_data* sd, const char* com return 0; } -int atcommand_loadnpc(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(loadnpc) { FILE *fp; @@ -4751,7 +4751,7 @@ int atcommand_loadnpc(const int fd, struct map_session_data* sd, const char* com return 0; } -int atcommand_unloadnpc(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(unloadnpc) { struct npc_data *nd; char NPCname[NAME_LENGTH+1]; @@ -4819,7 +4819,7 @@ char* txt_time(unsigned int duration) * @time/@date/@serverdate/@servertime: Display the date/time of the server (by [Yor] * Calculation management of GM modification (@day/@night GM commands) is done *------------------------------------------*/ -int atcommand_servertime(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(servertime) { const struct TimerData * timer_data; const struct TimerData * timer_data2; @@ -4920,7 +4920,7 @@ static void get_jail_time(int jailtime, int* year, int* month, int* day, int* ho * @jail by [Yor] * Special warp! No check with nowarp and nowarpto flag *------------------------------------------*/ -int atcommand_jail(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jail) { struct map_session_data *pl_sd; int x, y; @@ -4975,7 +4975,7 @@ int atcommand_jail(const int fd, struct map_session_data* sd, const char* comman * @unjail/@discharge by [Yor] * Special warp! No check with nowarp and nowarpto flag *------------------------------------------*/ -int atcommand_unjail(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(unjail) { struct map_session_data *pl_sd; @@ -5010,7 +5010,7 @@ int atcommand_unjail(const int fd, struct map_session_data* sd, const char* comm return 0; } -int atcommand_jailfor(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jailfor) { struct map_session_data *pl_sd = NULL; int year, month, day, hour, minute, value; @@ -5123,7 +5123,7 @@ int atcommand_jailfor(const int fd, struct map_session_data* sd, const char* com //By Coltaro -int atcommand_jailtime(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(jailtime) { int year, month, day, hour, minute; @@ -5156,7 +5156,7 @@ int atcommand_jailtime(const int fd, struct map_session_data* sd, const char* co /*========================================== * @disguise by [Valaris] (simplified by [Yor]) *------------------------------------------*/ -int atcommand_disguise(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(disguise) { int id = 0; nullpo_retr(-1, sd); @@ -5201,7 +5201,7 @@ int atcommand_disguise(const int fd, struct map_session_data* sd, const char* co /*========================================== * DisguiseAll *------------------------------------------*/ -int atcommand_disguiseall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(disguiseall) { int mob_id=0; struct map_session_data *pl_sd; @@ -5233,7 +5233,7 @@ int atcommand_disguiseall(const int fd, struct map_session_data* sd, const char* /*========================================== * @undisguise by [Yor] *------------------------------------------*/ -int atcommand_undisguise(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(undisguise) { nullpo_retr(-1, sd); if (sd->disguise) { @@ -5250,7 +5250,7 @@ int atcommand_undisguise(const int fd, struct map_session_data* sd, const char* /*========================================== * UndisguiseAll *------------------------------------------*/ -int atcommand_undisguiseall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(undisguiseall) { struct map_session_data *pl_sd; struct s_mapiterator* iter; @@ -5270,7 +5270,7 @@ int atcommand_undisguiseall(const int fd, struct map_session_data* sd, const cha /*========================================== * @exp by [Skotlex] *------------------------------------------*/ -int atcommand_exp(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(exp) { char output[CHAT_SIZE_MAX]; double nextb, nextj; @@ -5294,7 +5294,7 @@ int atcommand_exp(const int fd, struct map_session_data* sd, const char* command /*========================================== * @broadcast by [Valaris] *------------------------------------------*/ -int atcommand_broadcast(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(broadcast) { nullpo_retr(-1, sd); @@ -5314,7 +5314,7 @@ int atcommand_broadcast(const int fd, struct map_session_data* sd, const char* c /*========================================== * @localbroadcast by [Valaris] *------------------------------------------*/ -int atcommand_localbroadcast(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(localbroadcast) { nullpo_retr(-1, sd); @@ -5335,7 +5335,7 @@ int atcommand_localbroadcast(const int fd, struct map_session_data* sd, const ch /*========================================== * @email by [Yor] *------------------------------------------*/ -int atcommand_email(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(email) { char actual_email[100]; char new_email[100]; @@ -5371,7 +5371,7 @@ int atcommand_email(const int fd, struct map_session_data* sd, const char* comma /*========================================== *@effect *------------------------------------------*/ -int atcommand_effect(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(effect) { int type = 0, flag = 0; nullpo_retr(-1, sd); @@ -5390,7 +5390,7 @@ int atcommand_effect(const int fd, struct map_session_data* sd, const char* comm * @killer by MouseJstr * enable killing players even when not in pvp *------------------------------------------*/ -int atcommand_killer(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(killer) { nullpo_retr(-1, sd); sd->state.killer = !sd->state.killer; @@ -5408,7 +5408,7 @@ int atcommand_killer(const int fd, struct map_session_data* sd, const char* comm * @killable by MouseJstr * enable other people killing you *------------------------------------------*/ -int atcommand_killable(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(killable) { nullpo_retr(-1, sd); sd->state.killable = !sd->state.killable; @@ -5426,7 +5426,7 @@ int atcommand_killable(const int fd, struct map_session_data* sd, const char* co * @skillon by MouseJstr * turn skills on for the map *------------------------------------------*/ -int atcommand_skillon(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(skillon) { nullpo_retr(-1, sd); map[sd->bl.m].flag.noskill = 0; @@ -5438,7 +5438,7 @@ int atcommand_skillon(const int fd, struct map_session_data* sd, const char* com * @skilloff by MouseJstr * Turn skills off on the map *------------------------------------------*/ -int atcommand_skilloff(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(skilloff) { nullpo_retr(-1, sd); map[sd->bl.m].flag.noskill = 1; @@ -5450,7 +5450,7 @@ int atcommand_skilloff(const int fd, struct map_session_data* sd, const char* co * @npcmove by MouseJstr * move a npc *------------------------------------------*/ -int atcommand_npcmove(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(npcmove) { int x = 0, y = 0, m; struct npc_data *nd = 0; @@ -5488,7 +5488,7 @@ int atcommand_npcmove(const int fd, struct map_session_data* sd, const char* com * @addwarp by MouseJstr * Create a new static warp point. *------------------------------------------*/ -int atcommand_addwarp(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(addwarp) { char mapname[32]; int x,y; @@ -5523,7 +5523,7 @@ int atcommand_addwarp(const int fd, struct map_session_data* sd, const char* com * @follow by [MouseJstr] * Follow a player .. staying no more then 5 spaces away *------------------------------------------*/ -int atcommand_follow(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(follow) { struct map_session_data *pl_sd = NULL; nullpo_retr(-1, sd); @@ -5559,7 +5559,7 @@ int atcommand_follow(const int fd, struct map_session_data* sd, const char* comm * @dropall by [MouseJstr] * Drop all your possession on the ground *------------------------------------------*/ -int atcommand_dropall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(dropall) { int i; nullpo_retr(-1, sd); @@ -5577,7 +5577,7 @@ int atcommand_dropall(const int fd, struct map_session_data* sd, const char* com * @storeall by [MouseJstr] * Put everything into storage *------------------------------------------*/ -int atcommand_storeall(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(storeall) { int i; nullpo_retr(-1, sd); @@ -5607,7 +5607,7 @@ int atcommand_storeall(const int fd, struct map_session_data* sd, const char* co * @skillid by [MouseJstr] * lookup a skill by name *------------------------------------------*/ -int atcommand_skillid(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(skillid) { int skillen, idx; nullpo_retr(-1, sd); @@ -5635,7 +5635,7 @@ int atcommand_skillid(const int fd, struct map_session_data* sd, const char* com * @useskill by [MouseJstr] * A way of using skills without having to find them in the skills menu *------------------------------------------*/ -int atcommand_useskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(useskill) { struct map_session_data *pl_sd = NULL; struct block_list *bl; @@ -5680,7 +5680,7 @@ int atcommand_useskill(const int fd, struct map_session_data* sd, const char* co * Debug command to locate new skill IDs. It sends the * three possible skill-effect packets to the area. *------------------------------------------*/ -int atcommand_displayskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(displayskill) { struct status_data * status; unsigned int tick; @@ -5705,7 +5705,7 @@ int atcommand_displayskill(const int fd, struct map_session_data* sd, const char * @skilltree by [MouseJstr] * prints the skill tree for a player required to get to a skill *------------------------------------------*/ -int atcommand_skilltree(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(skilltree) { struct map_session_data *pl_sd = NULL; int skillnum; @@ -5789,7 +5789,7 @@ void getring (struct map_session_data* sd) * @marry by [MouseJstr], fixed by Lupus * Marry two players *------------------------------------------*/ -int atcommand_marry(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(marry) { struct map_session_data *pl_sd1 = NULL; struct map_session_data *pl_sd2 = NULL; @@ -5831,7 +5831,7 @@ int atcommand_marry(const int fd, struct map_session_data* sd, const char* comma * @divorce by [MouseJstr], fixed by [Lupus] * divorce two players *------------------------------------------*/ -int atcommand_divorce(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(divorce) { struct map_session_data *pl_sd = NULL; @@ -5862,7 +5862,7 @@ int atcommand_divorce(const int fd, struct map_session_data* sd, const char* com /*========================================== * @changelook by [Celest] *------------------------------------------*/ -int atcommand_changelook(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(changelook) { int i, j = 0, k = 0; int pos[6] = { LOOK_HEAD_TOP,LOOK_HEAD_MID,LOOK_HEAD_BOTTOM,LOOK_WEAPON,LOOK_SHIELD,LOOK_SHOES }; @@ -5889,7 +5889,7 @@ int atcommand_changelook(const int fd, struct map_session_data* sd, const char* * @autotrade by durf [Lupus] [Paradox924X] * Turns on/off Autotrade for a specific player *------------------------------------------*/ -int atcommand_autotrade(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(autotrade) { nullpo_retr(-1, sd); @@ -5923,7 +5923,7 @@ int atcommand_autotrade(const int fd, struct map_session_data* sd, const char* c * @changegm by durf (changed by Lupus) * Changes Master of your Guild to a specified guild member *------------------------------------------*/ -int atcommand_changegm(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(changegm) { struct guild *g; struct map_session_data *pl_sd; @@ -5960,7 +5960,7 @@ int atcommand_changegm(const int fd, struct map_session_data* sd, const char* co * @changeleader by Skotlex * Changes the leader of a party. *------------------------------------------*/ -int atcommand_changeleader(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(changeleader) { nullpo_retr(-1, sd); @@ -5979,7 +5979,7 @@ int atcommand_changeleader(const int fd, struct map_session_data* sd, const char * @partyoption by Skotlex * Used to change the item share setting of a party. *------------------------------------------*/ -int atcommand_partyoption(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(partyoption) { struct party_data *p; int mi, option; @@ -6023,7 +6023,7 @@ int atcommand_partyoption(const int fd, struct map_session_data* sd, const char* * @autoloot by Upa-Kun * Turns on/off AutoLoot for a specific player *------------------------------------------*/ -int atcommand_autoloot(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(autoloot) { int rate; double drate; @@ -6055,7 +6055,7 @@ int atcommand_autoloot(const int fd, struct map_session_data* sd, const char* co /*========================================== * @autolootitem *------------------------------------------*/ -int atcommand_autolootitem(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(autolootitem) { struct item_data *item_data = NULL; @@ -6090,7 +6090,7 @@ int atcommand_autolootitem(const int fd, struct map_session_data* sd, const char /*========================================== * It is made to rain. *------------------------------------------*/ -int atcommand_rain(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(rain) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.rain) { @@ -6108,7 +6108,7 @@ int atcommand_rain(const int fd, struct map_session_data* sd, const char* comman /*========================================== * It is made to snow. *------------------------------------------*/ -int atcommand_snow(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(snow) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.snow) { @@ -6127,7 +6127,7 @@ int atcommand_snow(const int fd, struct map_session_data* sd, const char* comman /*========================================== * Cherry tree snowstorm is made to fall. (Sakura) *------------------------------------------*/ -int atcommand_sakura(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(sakura) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.sakura) { @@ -6145,7 +6145,7 @@ int atcommand_sakura(const int fd, struct map_session_data* sd, const char* comm /*========================================== * Clouds appear. *------------------------------------------*/ -int atcommand_clouds(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(clouds) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.clouds) { @@ -6164,7 +6164,7 @@ int atcommand_clouds(const int fd, struct map_session_data* sd, const char* comm /*========================================== * Different type of clouds using effect 516 *------------------------------------------*/ -int atcommand_clouds2(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(clouds2) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.clouds2) { @@ -6183,7 +6183,7 @@ int atcommand_clouds2(const int fd, struct map_session_data* sd, const char* com /*========================================== * Fog hangs over. *------------------------------------------*/ -int atcommand_fog(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(fog) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.fog) { @@ -6201,7 +6201,7 @@ int atcommand_fog(const int fd, struct map_session_data* sd, const char* command /*========================================== * Fallen leaves fall. *------------------------------------------*/ -int atcommand_leaves(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(leaves) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.leaves) { @@ -6220,7 +6220,7 @@ int atcommand_leaves(const int fd, struct map_session_data* sd, const char* comm /*========================================== * Fireworks appear. *------------------------------------------*/ -int atcommand_fireworks(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(fireworks) { nullpo_retr(-1, sd); if (map[sd->bl.m].flag.fireworks) { @@ -6239,7 +6239,7 @@ int atcommand_fireworks(const int fd, struct map_session_data* sd, const char* c /*========================================== * Clearing Weather Effects by Dexity *------------------------------------------*/ -int atcommand_clearweather(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(clearweather) { nullpo_retr(-1, sd); map[sd->bl.m].flag.rain=0; @@ -6259,7 +6259,7 @@ int atcommand_clearweather(const int fd, struct map_session_data* sd, const char /*=============================================================== * Sound Command - plays a sound for everyone around! [Codemaster] *---------------------------------------------------------------*/ -int atcommand_sound(const int fd, struct map_session_data *sd, const char *command, const char *message) +ACMD_FUNC(sound) { char sound_file[100]; @@ -6281,7 +6281,7 @@ int atcommand_sound(const int fd, struct map_session_data *sd, const char *comma /*========================================== * MOB Search *------------------------------------------*/ -int atcommand_mobsearch(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mobsearch) { char mob_name[100]; int mob_id; @@ -6344,7 +6344,7 @@ static int atcommand_cleanmap_sub(struct block_list *bl, va_list ap) return 0; } -int atcommand_cleanmap(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(cleanmap) { map_foreachinarea(atcommand_cleanmap_sub, sd->bl.m, sd->bl.x-AREA_SIZE*2, sd->bl.y-AREA_SIZE*2, @@ -6358,7 +6358,7 @@ int atcommand_cleanmap(const int fd, struct map_session_data* sd, const char* co * make a NPC/PET talk * @npctalkc [SnakeDrak] *------------------------------------------*/ -int atcommand_npctalk(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(npctalk) { char name[NAME_LENGTH],mes[100],temp[100]; struct npc_data *nd; @@ -6397,7 +6397,7 @@ int atcommand_npctalk(const int fd, struct map_session_data* sd, const char* com return 0; } -int atcommand_pettalk(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(pettalk) { char mes[100],temp[100]; struct pet_data *pd; @@ -6447,7 +6447,7 @@ int atcommand_pettalk(const int fd, struct map_session_data* sd, const char* com /// @users - displays the number of players present on each map (and percentage) /// #users displays on the target user instead of self -int atcommand_users(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(users) { char buf[CHAT_SIZE_MAX]; int i; @@ -6494,7 +6494,7 @@ int atcommand_users(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_reset(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reset) { pc_resetstate(sd); pc_resetskill(sd,1); @@ -6506,7 +6506,7 @@ int atcommand_reset(const int fd, struct map_session_data* sd, const char* comma /*========================================== * *------------------------------------------*/ -int atcommand_summon(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(summon) { char name[NAME_LENGTH]; int mob_id = 0; @@ -6558,7 +6558,7 @@ int atcommand_summon(const int fd, struct map_session_data* sd, const char* comm * Temp adjust the GM level required to use a GM command * Useful during beta testing to allow players to use GM commands for short periods of time *------------------------------------------*/ -int atcommand_adjcmdlvl(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(adjcmdlvl) { int newlev, newremotelev; char name[100]; @@ -6602,7 +6602,7 @@ int atcommand_adjcmdlvl(const int fd, struct map_session_data* sd, const char* c * Create a temp GM * Useful during beta testing to allow players to use GM commands for short periods of time *------------------------------------------*/ -int atcommand_adjgmlvl(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(adjgmlvl) { int newlev; char user[NAME_LENGTH]; @@ -6629,7 +6629,7 @@ int atcommand_adjgmlvl(const int fd, struct map_session_data* sd, const char* co * @trade by [MouseJstr] * Open a trade window with a remote player *------------------------------------------*/ -int atcommand_trade(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(trade) { struct map_session_data *pl_sd = NULL; nullpo_retr(-1, sd); @@ -6653,7 +6653,7 @@ int atcommand_trade(const int fd, struct map_session_data* sd, const char* comma * @setbattleflag by [MouseJstr] * set a battle_config flag without having to reboot *------------------------------------------*/ -int atcommand_setbattleflag(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(setbattleflag) { char flag[128], value[128]; nullpo_retr(-1, sd); @@ -6677,7 +6677,7 @@ int atcommand_setbattleflag(const int fd, struct map_session_data* sd, const cha /*========================================== * @unmute [Valaris] *------------------------------------------*/ -int atcommand_unmute(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(unmute) { struct map_session_data *pl_sd = NULL; nullpo_retr(-1, sd); @@ -6708,7 +6708,7 @@ int atcommand_unmute(const int fd, struct map_session_data* sd, const char* comm /*========================================== * @uptime by MC Cameri *------------------------------------------*/ -int atcommand_uptime(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(uptime) { unsigned long seconds = 0, day = 24*60*60, hour = 60*60, minute = 60, days = 0, hours = 0, minutes = 0; @@ -6732,7 +6732,7 @@ int atcommand_uptime(const int fd, struct map_session_data* sd, const char* comm * @changesex * => Changes one's sex. Argument sex can be 0 or 1, m or f, male or female. *------------------------------------------*/ -int atcommand_changesex(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(changesex) { nullpo_retr(-1, sd); chrif_changesex(sd); @@ -6742,7 +6742,7 @@ int atcommand_changesex(const int fd, struct map_session_data* sd, const char* c /*================================================ * @mute - Mutes a player for a set amount of time *------------------------------------------------*/ -int atcommand_mute(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mute) { struct map_session_data *pl_sd = NULL; int manner; @@ -6784,7 +6784,7 @@ int atcommand_mute(const int fd, struct map_session_data* sd, const char* comman /*========================================== * @refresh (like @jumpto <>) *------------------------------------------*/ -int atcommand_refresh(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(refresh) { nullpo_retr(-1, sd); clif_refresh(sd); @@ -6795,7 +6795,7 @@ int atcommand_refresh(const int fd, struct map_session_data* sd, const char* com * @identify * => GM's magnifier. *------------------------------------------*/ -int atcommand_identify(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(identify) { int i,num; @@ -6818,7 +6818,7 @@ int atcommand_identify(const int fd, struct map_session_data* sd, const char* co * @gmotd (Global MOTD) * by davidsiaw :P *------------------------------------------*/ -int atcommand_gmotd(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(gmotd) { char buf[CHAT_SIZE_MAX]; FILE *fp; @@ -6842,7 +6842,7 @@ int atcommand_gmotd(const int fd, struct map_session_data* sd, const char* comma return 0; } -int atcommand_misceffect(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(misceffect) { int effect = 0; nullpo_retr(-1, sd); @@ -6858,7 +6858,7 @@ int atcommand_misceffect(const int fd, struct map_session_data* sd, const char* /*========================================== * MAIL SYSTEM *------------------------------------------*/ -int atcommand_mail(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mail) { nullpo_ret(sd); #ifndef TXT_ONLY @@ -6871,7 +6871,7 @@ int atcommand_mail(const int fd, struct map_session_data* sd, const char* comman * Show Monster DB Info v 1.0 * originally by [Lupus] eAthena *------------------------------------------*/ -int atcommand_mobinfo(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mobinfo) { unsigned char msize[3][7] = {"Small", "Medium", "Large"}; unsigned char mrace[12][11] = {"Formless", "Undead", "Beast", "Plant", "Insect", "Fish", "Demon", "Demi-Human", "Angel", "Dragon", "Boss", "Non-Boss"}; @@ -6992,7 +6992,7 @@ int atshowmobs_timer(int tid, unsigned int tick, int id, intptr data) return 1; } -int atcommand_showmobs(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(showmobs) { char mob_name[100]; int mob_id; @@ -7056,7 +7056,7 @@ int atcommand_showmobs(const int fd, struct map_session_data* sd, const char* co /*========================================== * homunculus level up [orn] *------------------------------------------*/ -int atcommand_homlevel(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homlevel) { TBL_HOM * hd; int level = 0, i = 0; @@ -7089,7 +7089,7 @@ int atcommand_homlevel(const int fd, struct map_session_data* sd, const char* co /*========================================== * homunculus evolution H [orn] *------------------------------------------*/ -int atcommand_homevolution(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homevolution) { nullpo_retr(-1, sd); @@ -7109,7 +7109,7 @@ int atcommand_homevolution(const int fd, struct map_session_data* sd, const char /*========================================== * call choosen homunculus [orn] *------------------------------------------*/ -int atcommand_makehomun(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(makehomun) { int homunid; nullpo_retr(-1, sd); @@ -7138,7 +7138,7 @@ int atcommand_makehomun(const int fd, struct map_session_data* sd, const char* c /*========================================== * modify homunculus intimacy [orn] *------------------------------------------*/ -int atcommand_homfriendly(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homfriendly) { int friendly = 0; @@ -7165,7 +7165,7 @@ int atcommand_homfriendly(const int fd, struct map_session_data* sd, const char* /*========================================== * modify homunculus hunger [orn] *------------------------------------------*/ -int atcommand_homhungry(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homhungry) { int hungry = 0; @@ -7192,7 +7192,7 @@ int atcommand_homhungry(const int fd, struct map_session_data* sd, const char* c /*========================================== * make the homunculus speak [orn] *------------------------------------------*/ -int atcommand_homtalk(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homtalk) { char mes[100],temp[100]; @@ -7222,7 +7222,7 @@ int atcommand_homtalk(const int fd, struct map_session_data* sd, const char* com /*========================================== * Show homunculus stats *------------------------------------------*/ -int atcommand_hominfo(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(hominfo) { struct homun_data *hd; struct status_data *status; @@ -7258,7 +7258,7 @@ int atcommand_hominfo(const int fd, struct map_session_data* sd, const char* com return 0; } -int atcommand_homstats(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homstats) { struct homun_data *hd; struct s_homunculus_db *db; @@ -7327,7 +7327,7 @@ int atcommand_homstats(const int fd, struct map_session_data* sd, const char* co return 0; } -int atcommand_homshuffle(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(homshuffle) { nullpo_retr(-1, sd); @@ -7346,7 +7346,7 @@ int atcommand_homshuffle(const int fd, struct map_session_data* sd, const char* * Show Items DB Info v 1.0 * originally by [Lupus] eAthena *------------------------------------------*/ -int atcommand_iteminfo(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(iteminfo) { char *itype[12] = {"Potion/Food", "BUG!", "Usable", "Etc", "Weapon", "Protection", "Card", "Egg", "Pet Acessory", "BUG!", "Arrow"}; //, "Lure/Scroll"}; No need, type 11 items are converted to type 2 upon loading [Skotlex] @@ -7398,7 +7398,7 @@ int atcommand_iteminfo(const int fd, struct map_session_data* sd, const char* co /*========================================== * Show who drops the item. *------------------------------------------*/ -int atcommand_whodrops(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whodrops) { struct item_data *item_data, *item_array[MAX_SEARCH]; int i,j, count = 1; @@ -7442,7 +7442,7 @@ int atcommand_whodrops(const int fd, struct map_session_data* sd, const char* co return 0; } -int atcommand_whereis(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(whereis) { struct mob_db *mob, *mob_array[MAX_SEARCH]; int count; @@ -7494,7 +7494,7 @@ int atcommand_whereis(const int fd, struct map_session_data* sd, const char* com * @adopt by [Veider] * adopt a novice *------------------------------------------*/ -int atcommand_adopt(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(adopt) { struct map_session_data *pl_sd1, *pl_sd2, *pl_sd3; char player1[NAME_LENGTH], player2[NAME_LENGTH], player3[NAME_LENGTH]; @@ -7536,7 +7536,7 @@ int atcommand_adopt(const int fd, struct map_session_data* sd, const char* comma return 0; } -int atcommand_version(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(version) { const char * revision; @@ -7573,7 +7573,7 @@ static int atcommand_mutearea_sub(struct block_list *bl,va_list ap) return 0; } -int atcommand_mutearea(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mutearea) { int time; nullpo_ret(sd); @@ -7593,7 +7593,7 @@ int atcommand_mutearea(const int fd, struct map_session_data* sd, const char* co } -int atcommand_rates(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(rates) { char buf[CHAT_SIZE_MAX]; @@ -7620,7 +7620,7 @@ int atcommand_rates(const int fd, struct map_session_data* sd, const char* comma * @me by lordalfa * => Displays the OUTPUT string on top of the Visible players Heads. *------------------------------------------*/ -int atcommand_me(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(me) { char tempmes[CHAT_SIZE_MAX]; nullpo_retr(-1, sd); @@ -7649,7 +7649,7 @@ int atcommand_me(const int fd, struct map_session_data* sd, const char* command, * @size * => Resize your character sprite. [Valaris] *------------------------------------------*/ -int atcommand_size(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(size) { int size=0; @@ -7676,7 +7676,7 @@ int atcommand_size(const int fd, struct map_session_data* sd, const char* comman * @monsterignore * => Makes monsters ignore you. [Valaris] *------------------------------------------*/ -int atcommand_monsterignore(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(monsterignore) { nullpo_retr(-1, sd); @@ -7694,7 +7694,7 @@ int atcommand_monsterignore(const int fd, struct map_session_data* sd, const cha * @fakename * => Gives your character a fake name. [Valaris] *------------------------------------------*/ -int atcommand_fakename(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(fakename) { char name[NAME_LENGTH]; nullpo_retr(-1, sd); @@ -7729,7 +7729,7 @@ int atcommand_fakename(const int fd, struct map_session_data* sd, const char* co * => Shows information about the map flags [map name] * Also set flags *------------------------------------------*/ -int atcommand_mapflag(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(mapflag) { // WIP return 0; @@ -7738,7 +7738,7 @@ int atcommand_mapflag(const int fd, struct map_session_data* sd, const char* com /*=================================== * Remove some messages *-----------------------------------*/ -int atcommand_showexp(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(showexp) { if (sd->state.showexp) { sd->state.showexp = 0; @@ -7751,7 +7751,7 @@ int atcommand_showexp(const int fd, struct map_session_data* sd, const char* com return 0; } -int atcommand_showzeny(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(showzeny) { if (sd->state.showzeny) { sd->state.showzeny = 0; @@ -7764,7 +7764,7 @@ int atcommand_showzeny(const int fd, struct map_session_data* sd, const char* co return 0; } -int atcommand_showdelay(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(showdelay) { if (sd->state.showdelay) { sd->state.showdelay = 0; @@ -7786,7 +7786,7 @@ int atcommand_showdelay(const int fd, struct map_session_data* sd, const char* c * @reject - reject invitation * @leave - leave duel *------------------------------------------*/ -int atcommand_invite(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(invite) { unsigned int did = sd->duel_group; struct map_session_data *target_sd = map_nick2sd((char *)message); @@ -7830,7 +7830,7 @@ int atcommand_invite(const int fd, struct map_session_data* sd, const char* comm return 0; } -int atcommand_duel(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(duel) { char output[CHAT_SIZE_MAX]; unsigned int maxpl=0, newduel; @@ -7885,7 +7885,7 @@ int atcommand_duel(const int fd, struct map_session_data* sd, const char* comman } -int atcommand_leave(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(leave) { if(sd->duel_group <= 0) { // "Duel: @leave without @duel." @@ -7898,7 +7898,7 @@ int atcommand_leave(const int fd, struct map_session_data* sd, const char* comma return 0; } -int atcommand_accept(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(accept) { char output[CHAT_SIZE_MAX]; @@ -7921,7 +7921,7 @@ int atcommand_accept(const int fd, struct map_session_data* sd, const char* comm return 0; } -int atcommand_reject(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(reject) { if(sd->duel_invite <= 0) { // "Duel: @reject without invititation." @@ -7938,7 +7938,7 @@ int atcommand_reject(const int fd, struct map_session_data* sd, const char* comm /*=================================== * Cash Points *-----------------------------------*/ -int atcommand_cash(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(cash) { int value; nullpo_retr(-1, sd); @@ -7969,7 +7969,7 @@ int atcommand_cash(const int fd, struct map_session_data* sd, const char* comman /*=================================== * Away message (@away, @aw) [LuzZza] *-----------------------------------*/ -int atcommand_away(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(away) { if(strlen(message) > 0) { if(strlen(message) > 128) @@ -7991,7 +7991,7 @@ int atcommand_away(const int fd, struct map_session_data* sd, const char* comman } // @clone/@slaveclone/@evilclone [Valaris] -int atcommand_clone(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(clone) { int x=0,y=0,flag=0,master=0,i=0; struct map_session_data *pl_sd=NULL; @@ -8045,7 +8045,7 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma * Main chat [LuzZza] * Usage: @main *-----------------------------------*/ -int atcommand_main(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(main) { if(strlen(message) > 0) { @@ -8097,7 +8097,7 @@ int atcommand_main(const int fd, struct map_session_data* sd, const char* comman * Autorejecting Invites/Deals [LuzZza] * Usage: @noask *-------------------------------------*/ -int atcommand_noask(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(noask) { if(sd->state.noask) { clif_displaymessage(fd, msg_txt(391)); // Autorejecting is deactivated. @@ -8114,7 +8114,7 @@ int atcommand_noask(const int fd, struct map_session_data* sd, const char* comma * Send a @request message to all GMs of lowest_gm_level. * Usage: @request *-------------------------------------*/ -int atcommand_request(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(request) { if (!message || !*message) { clif_displaymessage(sd->fd,msg_txt(277)); // Usage: @request . @@ -8131,7 +8131,7 @@ int atcommand_request(const int fd, struct map_session_data* sd, const char* com /*========================================== * Feel (SG save map) Reset [HiddenDragon] *------------------------------------------*/ -int atcommand_feelreset(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(feelreset) { pc_resetfeel(sd); clif_displaymessage(fd, "Reset 'Feeling' maps."); @@ -8142,7 +8142,7 @@ int atcommand_feelreset(const int fd, struct map_session_data* sd, const char* c /*========================================== * AUCTION SYSTEM *------------------------------------------*/ -int atcommand_auction(const int fd, struct map_session_data *sd, const char *command, const char *message) +ACMD_FUNC(auction) { nullpo_ret(sd); @@ -8156,7 +8156,7 @@ int atcommand_auction(const int fd, struct map_session_data *sd, const char *com /*========================================== * Kill Steal Protection *------------------------------------------*/ -int atcommand_ksprotection(const int fd, struct map_session_data *sd, const char *command, const char *message) +ACMD_FUNC(ksprotection) { nullpo_retr(-1,sd); @@ -8191,7 +8191,7 @@ int atcommand_ksprotection(const int fd, struct map_session_data *sd, const char /*========================================== * Map Kill Steal Protection Setting *------------------------------------------*/ -int atcommand_allowks(const int fd, struct map_session_data *sd, const char *command, const char *message) +ACMD_FUNC(allowks) { nullpo_retr(-1,sd); @@ -8207,7 +8207,7 @@ int atcommand_allowks(const int fd, struct map_session_data *sd, const char *com return 0; } -int atcommand_resetstat(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(resetstat) { nullpo_retr(-1, sd); @@ -8217,7 +8217,7 @@ int atcommand_resetstat(const int fd, struct map_session_data* sd, const char* c return 0; } -int atcommand_resetskill(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(resetskill) { nullpo_retr(-1,sd); @@ -8232,7 +8232,7 @@ int atcommand_resetskill(const int fd, struct map_session_data* sd, const char* * #cartlist: Displays contents of target's cart. * #itemlist: Displays contents of target's inventory. *------------------------------------------*/ -int atcommand_itemlist(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(itemlist) { int i, j, count, counter; const char* location; @@ -8393,7 +8393,7 @@ int atcommand_itemlist(const int fd, struct map_session_data* sd, const char* co return 0; } -int atcommand_stats(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(stats) { char job_jobname[100]; char output[CHAT_SIZE_MAX]; @@ -8454,7 +8454,7 @@ int atcommand_stats(const int fd, struct map_session_data* sd, const char* comma return 0; } -int atcommand_delitem(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(delitem) { char item_name[100]; int i, number = 0, item_id, item_position, count; @@ -8517,7 +8517,7 @@ int atcommand_delitem(const int fd, struct map_session_data* sd, const char* com /*========================================== * Custom Fonts *------------------------------------------*/ -int atcommand_font(const int fd, struct map_session_data *sd, const char *command, const char *message) +ACMD_FUNC(font) { int font_id; nullpo_retr(-1,sd); @@ -9105,7 +9105,7 @@ void do_final_atcommand() /*========================================== * @commands Lists available @ commands to you *------------------------------------------*/ -int atcommand_commands(const int fd, struct map_session_data* sd, const char* command, const char* message) +ACMD_FUNC(commands) { char line_buff[CHATBOX_SIZE]; int i, gm_lvl = pc_isGM(sd), count = 0; From 10aab493067becdbc3e1c7cc21aacd1314a300d1 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 21 Nov 2010 13:44:10 +0000 Subject: [PATCH 063/129] * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14478 54d463be-8e91-2dee-dedb-b68131a5f0ec --- 3rdparty/msinttypes/include/inttypes.h | 305 +++++++++++++++++++++++++ 3rdparty/msinttypes/include/stdint.h | 247 ++++++++++++++++++++ Changelog-Renewal.txt | 2 + src/common/cbasetypes.h | 13 +- vcproj-6/char-server_sql.dsp | 2 +- vcproj-6/char-server_txt.dsp | 2 +- vcproj-6/login-server_sql.dsp | 2 +- vcproj-6/login-server_txt.dsp | 2 +- vcproj-6/map-server_sql.dsp | 2 +- vcproj-6/map-server_txt.dsp | 2 +- vcproj-7.1/char-server_sql.vcproj | 4 +- vcproj-7.1/char-server_txt.vcproj | 4 +- vcproj-7.1/login-server_sql.vcproj | 4 +- vcproj-7.1/login-server_txt.vcproj | 2 + vcproj-7.1/map-server_sql.vcproj | 4 +- vcproj-7.1/map-server_txt.vcproj | 4 +- vcproj-7.1/mapcache.vcproj | 4 +- vcproj-8/char-server_sql.vcproj | 4 +- vcproj-8/char-server_txt.vcproj | 4 +- vcproj-8/ladmin.vcproj | 4 +- vcproj-8/login-server_sql.vcproj | 4 +- vcproj-8/login-server_txt.vcproj | 2 + vcproj-8/map-server_sql.vcproj | 4 +- vcproj-8/map-server_txt.vcproj | 4 +- vcproj-8/mapcache.vcproj | 4 +- vcproj-8/txt-converter-char.vcproj | 4 +- vcproj-8/txt-converter-login.vcproj | 4 +- vcproj-9/char-server_sql.vcproj | 4 +- vcproj-9/char-server_txt.vcproj | 4 +- vcproj-9/ladmin.vcproj | 4 +- vcproj-9/login-server_sql.vcproj | 4 +- vcproj-9/login-server_txt.vcproj | 2 + vcproj-9/map-server_sql.vcproj | 4 +- vcproj-9/map-server_txt.vcproj | 4 +- vcproj-9/mapcache.vcproj | 4 +- vcproj-9/txt-converter-char.vcproj | 4 +- vcproj-9/txt-converter-login.vcproj | 4 +- 37 files changed, 622 insertions(+), 59 deletions(-) create mode 100644 3rdparty/msinttypes/include/inttypes.h create mode 100644 3rdparty/msinttypes/include/stdint.h diff --git a/3rdparty/msinttypes/include/inttypes.h b/3rdparty/msinttypes/include/inttypes.h new file mode 100644 index 0000000000..4b3828a216 --- /dev/null +++ b/3rdparty/msinttypes/include/inttypes.h @@ -0,0 +1,305 @@ +// ISO C9x compliant inttypes.h for Microsoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _MSC_VER // [ +#error "Use this header only with Microsoft Visual C++ compilers!" +#endif // _MSC_VER ] + +#ifndef _MSC_INTTYPES_H_ // [ +#define _MSC_INTTYPES_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#include "stdint.h" + +// 7.8 Format conversion of integer types + +typedef struct { + intmax_t quot; + intmax_t rem; +} imaxdiv_t; + +// 7.8.1 Macros for format specifiers + +#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 + +// The fprintf macros for signed integers are: +#define PRId8 "d" +#define PRIi8 "i" +#define PRIdLEAST8 "d" +#define PRIiLEAST8 "i" +#define PRIdFAST8 "d" +#define PRIiFAST8 "i" + +#define PRId16 "hd" +#define PRIi16 "hi" +#define PRIdLEAST16 "hd" +#define PRIiLEAST16 "hi" +#define PRIdFAST16 "hd" +#define PRIiFAST16 "hi" + +#define PRId32 "I32d" +#define PRIi32 "I32i" +#define PRIdLEAST32 "I32d" +#define PRIiLEAST32 "I32i" +#define PRIdFAST32 "I32d" +#define PRIiFAST32 "I32i" + +#define PRId64 "I64d" +#define PRIi64 "I64i" +#define PRIdLEAST64 "I64d" +#define PRIiLEAST64 "I64i" +#define PRIdFAST64 "I64d" +#define PRIiFAST64 "I64i" + +#define PRIdMAX "I64d" +#define PRIiMAX "I64i" + +#define PRIdPTR "Id" +#define PRIiPTR "Ii" + +// The fprintf macros for unsigned integers are: +#define PRIo8 "o" +#define PRIu8 "u" +#define PRIx8 "x" +#define PRIX8 "X" +#define PRIoLEAST8 "o" +#define PRIuLEAST8 "u" +#define PRIxLEAST8 "x" +#define PRIXLEAST8 "X" +#define PRIoFAST8 "o" +#define PRIuFAST8 "u" +#define PRIxFAST8 "x" +#define PRIXFAST8 "X" + +#define PRIo16 "ho" +#define PRIu16 "hu" +#define PRIx16 "hx" +#define PRIX16 "hX" +#define PRIoLEAST16 "ho" +#define PRIuLEAST16 "hu" +#define PRIxLEAST16 "hx" +#define PRIXLEAST16 "hX" +#define PRIoFAST16 "ho" +#define PRIuFAST16 "hu" +#define PRIxFAST16 "hx" +#define PRIXFAST16 "hX" + +#define PRIo32 "I32o" +#define PRIu32 "I32u" +#define PRIx32 "I32x" +#define PRIX32 "I32X" +#define PRIoLEAST32 "I32o" +#define PRIuLEAST32 "I32u" +#define PRIxLEAST32 "I32x" +#define PRIXLEAST32 "I32X" +#define PRIoFAST32 "I32o" +#define PRIuFAST32 "I32u" +#define PRIxFAST32 "I32x" +#define PRIXFAST32 "I32X" + +#define PRIo64 "I64o" +#define PRIu64 "I64u" +#define PRIx64 "I64x" +#define PRIX64 "I64X" +#define PRIoLEAST64 "I64o" +#define PRIuLEAST64 "I64u" +#define PRIxLEAST64 "I64x" +#define PRIXLEAST64 "I64X" +#define PRIoFAST64 "I64o" +#define PRIuFAST64 "I64u" +#define PRIxFAST64 "I64x" +#define PRIXFAST64 "I64X" + +#define PRIoMAX "I64o" +#define PRIuMAX "I64u" +#define PRIxMAX "I64x" +#define PRIXMAX "I64X" + +#define PRIoPTR "Io" +#define PRIuPTR "Iu" +#define PRIxPTR "Ix" +#define PRIXPTR "IX" + +// The fscanf macros for signed integers are: +#define SCNd8 "d" +#define SCNi8 "i" +#define SCNdLEAST8 "d" +#define SCNiLEAST8 "i" +#define SCNdFAST8 "d" +#define SCNiFAST8 "i" + +#define SCNd16 "hd" +#define SCNi16 "hi" +#define SCNdLEAST16 "hd" +#define SCNiLEAST16 "hi" +#define SCNdFAST16 "hd" +#define SCNiFAST16 "hi" + +#define SCNd32 "ld" +#define SCNi32 "li" +#define SCNdLEAST32 "ld" +#define SCNiLEAST32 "li" +#define SCNdFAST32 "ld" +#define SCNiFAST32 "li" + +#define SCNd64 "I64d" +#define SCNi64 "I64i" +#define SCNdLEAST64 "I64d" +#define SCNiLEAST64 "I64i" +#define SCNdFAST64 "I64d" +#define SCNiFAST64 "I64i" + +#define SCNdMAX "I64d" +#define SCNiMAX "I64i" + +#ifdef _WIN64 // [ +# define SCNdPTR "I64d" +# define SCNiPTR "I64i" +#else // _WIN64 ][ +# define SCNdPTR "ld" +# define SCNiPTR "li" +#endif // _WIN64 ] + +// The fscanf macros for unsigned integers are: +#define SCNo8 "o" +#define SCNu8 "u" +#define SCNx8 "x" +#define SCNX8 "X" +#define SCNoLEAST8 "o" +#define SCNuLEAST8 "u" +#define SCNxLEAST8 "x" +#define SCNXLEAST8 "X" +#define SCNoFAST8 "o" +#define SCNuFAST8 "u" +#define SCNxFAST8 "x" +#define SCNXFAST8 "X" + +#define SCNo16 "ho" +#define SCNu16 "hu" +#define SCNx16 "hx" +#define SCNX16 "hX" +#define SCNoLEAST16 "ho" +#define SCNuLEAST16 "hu" +#define SCNxLEAST16 "hx" +#define SCNXLEAST16 "hX" +#define SCNoFAST16 "ho" +#define SCNuFAST16 "hu" +#define SCNxFAST16 "hx" +#define SCNXFAST16 "hX" + +#define SCNo32 "lo" +#define SCNu32 "lu" +#define SCNx32 "lx" +#define SCNX32 "lX" +#define SCNoLEAST32 "lo" +#define SCNuLEAST32 "lu" +#define SCNxLEAST32 "lx" +#define SCNXLEAST32 "lX" +#define SCNoFAST32 "lo" +#define SCNuFAST32 "lu" +#define SCNxFAST32 "lx" +#define SCNXFAST32 "lX" + +#define SCNo64 "I64o" +#define SCNu64 "I64u" +#define SCNx64 "I64x" +#define SCNX64 "I64X" +#define SCNoLEAST64 "I64o" +#define SCNuLEAST64 "I64u" +#define SCNxLEAST64 "I64x" +#define SCNXLEAST64 "I64X" +#define SCNoFAST64 "I64o" +#define SCNuFAST64 "I64u" +#define SCNxFAST64 "I64x" +#define SCNXFAST64 "I64X" + +#define SCNoMAX "I64o" +#define SCNuMAX "I64u" +#define SCNxMAX "I64x" +#define SCNXMAX "I64X" + +#ifdef _WIN64 // [ +# define SCNoPTR "I64o" +# define SCNuPTR "I64u" +# define SCNxPTR "I64x" +# define SCNXPTR "I64X" +#else // _WIN64 ][ +# define SCNoPTR "lo" +# define SCNuPTR "lu" +# define SCNxPTR "lx" +# define SCNXPTR "lX" +#endif // _WIN64 ] + +#endif // __STDC_FORMAT_MACROS ] + +// 7.8.2 Functions for greatest-width integer types + +// 7.8.2.1 The imaxabs function +#define imaxabs _abs64 + +// 7.8.2.2 The imaxdiv function + +// This is modified version of div() function from Microsoft's div.c found +// in %MSVC.NET%\crt\src\div.c +#ifdef STATIC_IMAXDIV // [ +static +#else // STATIC_IMAXDIV ][ +_inline +#endif // STATIC_IMAXDIV ] +imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) +{ + imaxdiv_t result; + + result.quot = numer / denom; + result.rem = numer % denom; + + if (numer < 0 && result.rem > 0) { + // did division wrong; must fix up + ++result.quot; + result.rem -= denom; + } + + return result; +} + +// 7.8.2.3 The strtoimax and strtoumax functions +#define strtoimax _strtoi64 +#define strtoumax _strtoui64 + +// 7.8.2.4 The wcstoimax and wcstoumax functions +#define wcstoimax _wcstoi64 +#define wcstoumax _wcstoui64 + + +#endif // _MSC_INTTYPES_H_ ] diff --git a/3rdparty/msinttypes/include/stdint.h b/3rdparty/msinttypes/include/stdint.h new file mode 100644 index 0000000000..d02608a597 --- /dev/null +++ b/3rdparty/msinttypes/include/stdint.h @@ -0,0 +1,247 @@ +// ISO C9x compliant stdint.h for Microsoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006-2008 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _MSC_VER // [ +#error "Use this header only with Microsoft Visual C++ compilers!" +#endif // _MSC_VER ] + +#ifndef _MSC_STDINT_H_ // [ +#define _MSC_STDINT_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#include + +// For Visual Studio 6 in C++ mode and for many Visual Studio versions when +// compiling for ARM we should wrap include with 'extern "C++" {}' +// or compiler give many errors like this: +// error C2733: second C linkage of overloaded function 'wmemchr' not allowed +#ifdef __cplusplus +extern "C" { +#endif +# include +#ifdef __cplusplus +} +#endif + +// Define _W64 macros to mark types changing their size, like intptr_t. +#ifndef _W64 +# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 +# define _W64 __w64 +# else +# define _W64 +# endif +#endif + + +// 7.18.1 Integer types + +// 7.18.1.1 Exact-width integer types + +// Visual Studio 6 and Embedded Visual C++ 4 doesn't +// realize that, e.g. char has the same size as __int8 +// so we give up on __intX for them. +#if (_MSC_VER < 1300) + typedef signed char int8_t; + typedef signed short int16_t; + typedef signed int int32_t; + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef unsigned int uint32_t; +#else + typedef signed __int8 int8_t; + typedef signed __int16 int16_t; + typedef signed __int32 int32_t; + typedef unsigned __int8 uint8_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; +#endif +typedef signed __int64 int64_t; +typedef unsigned __int64 uint64_t; + + +// 7.18.1.2 Minimum-width integer types +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + +// 7.18.1.3 Fastest minimum-width integer types +typedef int8_t int_fast8_t; +typedef int16_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; +typedef uint8_t uint_fast8_t; +typedef uint16_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint64_t uint_fast64_t; + +// 7.18.1.4 Integer types capable of holding object pointers +#ifdef _WIN64 // [ + typedef signed __int64 intptr_t; + typedef unsigned __int64 uintptr_t; +#else // _WIN64 ][ + typedef _W64 signed int intptr_t; + typedef _W64 unsigned int uintptr_t; +#endif // _WIN64 ] + +// 7.18.1.5 Greatest-width integer types +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; + + +// 7.18.2 Limits of specified-width integer types + +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 + +// 7.18.2.1 Limits of exact-width integer types +#define INT8_MIN ((int8_t)_I8_MIN) +#define INT8_MAX _I8_MAX +#define INT16_MIN ((int16_t)_I16_MIN) +#define INT16_MAX _I16_MAX +#define INT32_MIN ((int32_t)_I32_MIN) +#define INT32_MAX _I32_MAX +#define INT64_MIN ((int64_t)_I64_MIN) +#define INT64_MAX _I64_MAX +#define UINT8_MAX _UI8_MAX +#define UINT16_MAX _UI16_MAX +#define UINT32_MAX _UI32_MAX +#define UINT64_MAX _UI64_MAX + +// 7.18.2.2 Limits of minimum-width integer types +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MIN INT64_MIN +#define INT_LEAST64_MAX INT64_MAX +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +// 7.18.2.3 Limits of fastest minimum-width integer types +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MIN INT64_MIN +#define INT_FAST64_MAX INT64_MAX +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +// 7.18.2.4 Limits of integer types capable of holding object pointers +#ifdef _WIN64 // [ +# define INTPTR_MIN INT64_MIN +# define INTPTR_MAX INT64_MAX +# define UINTPTR_MAX UINT64_MAX +#else // _WIN64 ][ +# define INTPTR_MIN INT32_MIN +# define INTPTR_MAX INT32_MAX +# define UINTPTR_MAX UINT32_MAX +#endif // _WIN64 ] + +// 7.18.2.5 Limits of greatest-width integer types +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX + +// 7.18.3 Limits of other integer types + +#ifdef _WIN64 // [ +# define PTRDIFF_MIN _I64_MIN +# define PTRDIFF_MAX _I64_MAX +#else // _WIN64 ][ +# define PTRDIFF_MIN _I32_MIN +# define PTRDIFF_MAX _I32_MAX +#endif // _WIN64 ] + +#define SIG_ATOMIC_MIN INT_MIN +#define SIG_ATOMIC_MAX INT_MAX + +#ifndef SIZE_MAX // [ +# ifdef _WIN64 // [ +# define SIZE_MAX _UI64_MAX +# else // _WIN64 ][ +# define SIZE_MAX _UI32_MAX +# endif // _WIN64 ] +#endif // SIZE_MAX ] + +// WCHAR_MIN and WCHAR_MAX are also defined in +#ifndef WCHAR_MIN // [ +# define WCHAR_MIN 0 +#endif // WCHAR_MIN ] +#ifndef WCHAR_MAX // [ +# define WCHAR_MAX _UI16_MAX +#endif // WCHAR_MAX ] + +#define WINT_MIN 0 +#define WINT_MAX _UI16_MAX + +#endif // __STDC_LIMIT_MACROS ] + + +// 7.18.4 Limits of other integer types + +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 + +// 7.18.4.1 Macros for minimum-width integer constants + +#define INT8_C(val) val##i8 +#define INT16_C(val) val##i16 +#define INT32_C(val) val##i32 +#define INT64_C(val) val##i64 + +#define UINT8_C(val) val##ui8 +#define UINT16_C(val) val##ui16 +#define UINT32_C(val) val##ui32 +#define UINT64_C(val) val##ui64 + +// 7.18.4.2 Macros for greatest-width integer constants +#define INTMAX_C INT64_C +#define UINTMAX_C UINT64_C + +#endif // __STDC_CONSTANT_MACROS ] + + +#endif // _MSC_STDINT_H_ ] diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 020e647a4a..6ecb567de0 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/21 + * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] 2010/11/20 * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 488e4db496..aee54a4bcd 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -73,6 +73,11 @@ # define __attribute__(x) #endif +////////////////////////////////////////////////////////////////////////// +// portable printf/scanf format macros and integer definitions +// NOTE: Visual C++ uses and provided in /3rdparty +////////////////////////////////////////////////////////////////////////// +#include ////////////////////////////////////////////////////////////////////////// // typedefs to compensate type size change from 32bit to 64bit @@ -174,22 +179,20 @@ typedef int ssize_t; typedef __int64 int64; typedef signed __int64 sint64; typedef unsigned __int64 uint64; -#define LLCONST(a) (a##i64) #else typedef long long int64; typedef signed long long sint64; typedef unsigned long long uint64; -#define LLCONST(a) (a##ll) #endif #ifndef INT64_MIN -#define INT64_MIN (LLCONST(-9223372036854775807)-1) +#define INT64_MIN (INT64_C(-9223372036854775807)-1) #endif #ifndef INT64_MAX -#define INT64_MAX (LLCONST(9223372036854775807)) +#define INT64_MAX (INT64_C(9223372036854775807)) #endif #ifndef UINT64_MAX -#define UINT64_MAX (LLCONST(18446744073709551615u)) +#define UINT64_MAX (UINT64_C(18446744073709551615)) #endif diff --git a/vcproj-6/char-server_sql.dsp b/vcproj-6/char-server_sql.dsp index 02714fd0d7..f055ec3bc3 100644 --- a/vcproj-6/char-server_sql.dsp +++ b/vcproj-6/char-server_sql.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-6/char-server_txt.dsp b/vcproj-6/char-server_txt.dsp index 9fa2e55dcd..975f7cf8f8 100644 --- a/vcproj-6/char-server_txt.dsp +++ b/vcproj-6/char-server_txt.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp index cdb0356bdc..7348d33615 100644 --- a/vcproj-6/login-server_sql.dsp +++ b/vcproj-6/login-server_sql.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp index 5a074475b3..ee54b5b76a 100644 --- a/vcproj-6/login-server_txt.dsp +++ b/vcproj-6/login-server_txt.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-6/map-server_sql.dsp b/vcproj-6/map-server_sql.dsp index 397bf3956f..629fe4639b 100644 --- a/vcproj-6/map-server_sql.dsp +++ b/vcproj-6/map-server_sql.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-6/map-server_txt.dsp b/vcproj-6/map-server_txt.dsp index bbb84716d3..1359adc15b 100644 --- a/vcproj-6/map-server_txt.dsp +++ b/vcproj-6/map-server_txt.dsp @@ -38,7 +38,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c +# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\zlib\include" /I "..\3rdparty\pcre\include" /I "..\3rdparty\msinttypes\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c # ADD BASE RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/vcproj-7.1/char-server_sql.vcproj b/vcproj-7.1/char-server_sql.vcproj index d9432e83ef..67b4bcb87f 100644 --- a/vcproj-7.1/char-server_sql.vcproj +++ b/vcproj-7.1/char-server_sql.vcproj @@ -20,7 +20,7 @@ Date: Sun, 21 Nov 2010 14:10:59 +0000 Subject: [PATCH 064/129] * Added 64-bit variants of the socket and buffer I/O macros. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14479 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/common/socket.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 6ecb567de0..693dea8b63 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -2,6 +2,7 @@ Date Added 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] + * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] 2010/11/20 * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] diff --git a/src/common/socket.h b/src/common/socket.h index 73322a206b..f7309f6d3d 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -32,6 +32,8 @@ #define WFIFOW(fd,pos) (*(uint16*)WFIFOP(fd,pos)) #define RFIFOL(fd,pos) (*(uint32*)RFIFOP(fd,pos)) #define WFIFOL(fd,pos) (*(uint32*)WFIFOP(fd,pos)) +#define RFIFOQ(fd,pos) (*(uint64*)RFIFOP(fd,pos)) +#define WFIFOQ(fd,pos) (*(uint64*)WFIFOP(fd,pos)) #define RFIFOSPACE(fd) (session[fd]->max_rdata - session[fd]->rdata_size) #define WFIFOSPACE(fd) (session[fd]->max_wdata - session[fd]->wdata_size) @@ -52,11 +54,13 @@ #define RBUFB(p,pos) (*(uint8*)RBUFP((p),(pos))) #define RBUFW(p,pos) (*(uint16*)RBUFP((p),(pos))) #define RBUFL(p,pos) (*(uint32*)RBUFP((p),(pos))) +#define RBUFQ(p,pos) (*(uint64*)RBUFP((p),(pos))) #define WBUFP(p,pos) (((uint8*)(p)) + (pos)) #define WBUFB(p,pos) (*(uint8*)WBUFP((p),(pos))) #define WBUFW(p,pos) (*(uint16*)WBUFP((p),(pos))) #define WBUFL(p,pos) (*(uint32*)WBUFP((p),(pos))) +#define WBUFQ(p,pos) (*(uint64*)WBUFP((p),(pos))) #define TOB(n) ((uint8)((n)&UINT8_MAX)) #define TOW(n) ((uint16)((n)&UINT16_MAX)) From 27d81db9f4c5a260d81ba3a4b5106d9f6b9e34be Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 21 Nov 2010 16:20:26 +0000 Subject: [PATCH 065/129] * Added enumeration RC2_* for mob data 'race2' (bugreport:4561). - Fixed race2-related bonus arrays using RC_MAX, rather than race2 maximum (since r6221, related r1277). - Fixed bSubRace2 lacking bounds check (since r1257). - Fixed bSubRace2 being documented as bSPSubRace2 (since r1257). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14480 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 3 +++ db/Changelog.txt | 3 +++ db/const.txt | 8 ++++++++ doc/item_bonus.txt | 2 +- src/map/map.h | 11 +++++++++++ src/map/mob.c | 2 +- src/map/mob.h | 1 - src/map/pc.c | 5 +++-- src/map/pc.h | 4 ++-- 9 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 693dea8b63..1fa18948f6 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -3,6 +3,9 @@ Date Added 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] + * Added enumeration RC2_* for mob data 'race2' (bugreport:4561). [Ai4rei] + - Fixed race2-related bonus arrays using RC_MAX, rather than race2 maximum (since r6221, related r1277). + - Fixed bSubRace2 lacking bounds check (since r1257). 2010/11/20 * Fixed @doom and @doommap spamming packets for the visual effect on invoker unnecessarily over whole map and server respectively. The effect is now displayed on each killed character (bugreport:871, since r311). [Ai4rei] * Fixed login-server account engine initialization not getting checked, whether it succeeds or not (bugreport:4361, since r12700, related r13000). [Ai4rei] diff --git a/db/Changelog.txt b/db/Changelog.txt index 6aedc2764f..c558962f58 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,9 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/11/21 + * Rev. 14480 Added enumeration RC2_* to const.txt for mob data 'race2' (bugreport:4561). [Ai4rei] + - Fixed bSubRace2 being documented as bSPSubRace2 (since r1257). 2010/11/19 * Rev. 14474 Item Database bugfixing. [L0ne_W0lf] - Fixed equip locations and view IDs for some headgears. (bugreport:4336) diff --git a/db/const.txt b/db/const.txt index 7f0c610c7e..6310a0d7f9 100644 --- a/db/const.txt +++ b/db/const.txt @@ -527,6 +527,14 @@ RC_Boss 10 RC_NonBoss 11 RC_NonDemiHuman 12 +RC2_None 0 +RC2_Goblin 1 +RC2_Kobold 2 +RC2_Orc 3 +RC2_Golem 4 +RC2_Guardian 5 +RC2_Ninja 6 + BF_WEAPON 0x0001 BF_MAGIC 0x0002 BF_MISC 0x0004 diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index d9224e1963..78e34f2fc8 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -285,7 +285,7 @@ bonus2 bSPRegenRate,n,x; Gain n SP every x milliseconds bonus2 bSPLossRate,n,x; Lose n SP every x milliseconds bonus2 bExpAddRace,n,x; Increase exp gained by x% vs. enemies of race n bonus2 bSPGainRace,n,x; When killing a monster of race n by physical attack gain x amount of sp -bonus2 bSPSubRace2,n,x; Damage x% reduction from enemies of race n +bonus2 bSubRace2,n,x; Damage x% reduction from enemies of race n (Check db/mob_race2_db.txt) bonus2 bAddMonsterDropItemGroup,n,x; x% chance to get an item of group type n when you kill a monster diff --git a/src/map/map.h b/src/map/map.h index 199db618da..9f25249e29 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -210,6 +210,17 @@ enum { RC_MAX }; +enum { + RC2_NONE = 0, + RC2_GOBLIN, + RC2_KOBOLD, + RC2_ORC, + RC2_GOLEM, + RC2_GUARDIAN, + RC2_NINJA, + RC2_MAX +}; + enum { ELE_NEUTRAL=0, ELE_WATER, diff --git a/src/map/mob.c b/src/map/mob.c index 81fc9e68b2..413d88f269 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -4349,7 +4349,7 @@ static int mob_readdb_race(void) continue; race=atoi(str[0]); - if (race < 0 || race >= MAX_MOB_RACE_DB) + if (race < RC2_NONE || race >= RC2_MAX) continue; for (j=1; j<20; j++) { diff --git a/src/map/mob.h b/src/map/mob.h index b0efdbfb42..e8bd0a8378 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -12,7 +12,6 @@ #define MAX_RANDOMMONSTER 4 -#define MAX_MOB_RACE_DB 6 // Change this to increase the table size in your mob_db to accomodate a larger mob database. // Be sure to note that IDs 4001 to 4048 are reserved for advanced/baby/expanded classes. diff --git a/src/map/pc.c b/src/map/pc.c index e93ae8a938..c52a61003c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -27,7 +27,6 @@ #include "homunculus.h" #include "instance.h" #include "mercenary.h" -#include "mob.h" // MAX_MOB_RACE_DB #include "npc.h" // fake_nd #include "pet.h" // pet_unlocktarget() #include "party.h" // party_search() @@ -2741,7 +2740,7 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } break; case SP_ADDRACE2: - if (!(type2 > 0 && type2 < MAX_MOB_RACE_DB)) + if (!(type2 > RC2_NONE && type2 < RC2_MAX)) break; if(sd->state.lr_flag != 2) sd->right_weapon.addrace2[type2] += val; @@ -2753,6 +2752,8 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) sd->subsize[type2]+=val; break; case SP_SUBRACE2: + if (!(type2 > RC2_NONE && type2 < RC2_MAX)) + break; if(sd->state.lr_flag != 2) sd->subrace2[type2]+=val; break; diff --git a/src/map/pc.h b/src/map/pc.h index 3744886090..7bf3a050f1 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -31,7 +31,7 @@ struct weapon_data { int def_ratio_atk_race; int addele[ELE_MAX]; int addrace[RC_MAX]; - int addrace2[RC_MAX]; + int addrace2[RC2_MAX]; int addsize[3]; struct drain_data { @@ -219,7 +219,7 @@ struct map_session_data { int param_bonus[6],param_equip[6]; //Stores card/equipment bonuses. int subele[ELE_MAX]; int subrace[RC_MAX]; - int subrace2[RC_MAX]; + int subrace2[RC2_MAX]; int subsize[3]; int reseff[SC_COMMON_MAX-SC_COMMON_MIN+1]; int weapon_coma_ele[ELE_MAX]; From e1f53f04ecc44ff1f6f14cae847b8b51a0643b74 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 21 Nov 2010 19:14:26 +0000 Subject: [PATCH 066/129] * Changed party_share_level from 10 to 15 as per kRO maintenance from 2010/04/14. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14481 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/Changelog.txt | 2 ++ conf/inter_athena.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 7351258729..297c04ed2f 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2010/11/21 + * Changed party_share_level from 10 to 15 as per kRO maintenance from 2010/04/14. [Ai4rei] 2010/10/10 * Added cashfood_use_interval config setting. [Paradox924X] 2010/05/25 diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf index bcb53bdf8c..4c61913898 100644 --- a/conf/inter_athena.conf +++ b/conf/inter_athena.conf @@ -9,7 +9,7 @@ log_inter: 1 inter_log_filename: log/inter.log // Level range for sharing within a party -party_share_level: 10 +party_share_level: 15 // TXT version options only From 9938ca73a3e00f35a7a77e7105d2262bc292598f Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 09:09:01 +0000 Subject: [PATCH 067/129] * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14482 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/map/mail.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 1fa18948f6..2286d261a0 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/11/22 + * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/map/mail.c b/src/map/mail.c index c79381c66a..f0869185a5 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -175,12 +175,15 @@ void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) nullpo_retv(sd); nullpo_retv(msg); - // Item recieve (due to failure) - if(log_config.enable_logs&0x2000) - log_pick_pc(sd, "E", msg->item.nameid, msg->item.amount, &msg->item); + if( msg->item.amount > 0 ) + { + // Item recieve (due to failure) + if(log_config.enable_logs&0x2000) + log_pick_pc(sd, "E", msg->item.nameid, msg->item.amount, &msg->item); + + pc_additem(sd, &msg->item, msg->item.amount); + } - pc_additem(sd, &msg->item, msg->item.amount); - if( msg->zeny > 0 ) { //Zeny recieve (due to failure) From 9849471a846386063316476c2a6344bd401c86c1 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 10:48:57 +0000 Subject: [PATCH 068/129] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14483 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char/int_storage.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 2286d261a0..01d031adfd 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -2,6 +2,7 @@ Date Added 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] + * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 09e2f123d7..bae72fcf4e 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -23,8 +23,8 @@ char storage_txt[1024]="save/storage.txt"; char guild_storage_txt[1024]="save/g_storage.txt"; -static DBMap* storage_db; // int account_id -> struct storage_data* -static DBMap* guild_storage_db; // int guild_id -> struct guild_storage* +static DBMap* storage_db = NULL; // int account_id -> struct storage_data* +static DBMap* guild_storage_db = NULL; // int guild_id -> struct guild_storage* // qɃf[^𕶎ɕϊ bool storage_tostr(char* str, int account_id, struct storage_data* p) @@ -280,8 +280,14 @@ int inter_storage_init() } void inter_storage_final() { - storage_db->destroy(storage_db, NULL); - guild_storage_db->destroy(guild_storage_db, NULL); + if(storage_db) + { + storage_db->destroy(storage_db, NULL); + } + if(guild_storage_db) + { + guild_storage_db->destroy(guild_storage_db, NULL); + } return; } From 67820415f5f004488c0bacb7280a6e80306e15eb Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 12:36:39 +0000 Subject: [PATCH 069/129] * Batch files (Windows) now detect whether the server crashed, aborted or shutdown cleanly (Ctrl+C or @mapexit) and print appropriate message, instead of always assuming, that the server crashed (bugreport:3476, since r1818). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14484 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + charserv-sql.bat | 11 ++------ charserv.bat | 11 ++------ logserv-sql.bat | 11 ++------ logserv.bat | 11 ++------ mapserv-sql.bat | 11 ++------ mapserv.bat | 11 ++------ serv.bat | 59 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 72 insertions(+), 54 deletions(-) create mode 100755 serv.bat diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 01d031adfd..a3426bd21d 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -3,6 +3,7 @@ Date Added 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] + * Batch files (Windows) now detect whether the server crashed, aborted or shutdown cleanly (Ctrl+C or @mapexit) and print appropriate message, instead of always assuming, that the server crashed (bugreport:3476, since r1818). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/charserv-sql.bat b/charserv-sql.bat index 90b58b205c..c881684750 100755 --- a/charserv-sql.bat +++ b/charserv-sql.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -char-server_sql.exe -echo . -echo . -echo Char server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat char-server_sql.exe Char-Server diff --git a/charserv.bat b/charserv.bat index cda0f4eb49..b21efac35e 100755 --- a/charserv.bat +++ b/charserv.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -char-server.exe -echo . -echo . -echo Char server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat char-server.exe Char-Server diff --git a/logserv-sql.bat b/logserv-sql.bat index 3280c40955..e38daa6d57 100755 --- a/logserv-sql.bat +++ b/logserv-sql.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -login-server_sql.exe -echo . -echo . -echo Login server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat login-server_sql.exe Login-Server diff --git a/logserv.bat b/logserv.bat index 9ea82e4c0c..a36e07f17b 100755 --- a/logserv.bat +++ b/logserv.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -login-server.exe -echo . -echo . -echo Login server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat login-server.exe Login-Server diff --git a/mapserv-sql.bat b/mapserv-sql.bat index ae65d3be37..9938a25f17 100755 --- a/mapserv-sql.bat +++ b/mapserv-sql.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -map-server_sql.exe -echo . -echo . -echo Map server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat map-server_sql.exe Map-Server diff --git a/mapserv.bat b/mapserv.bat index d9eee9f6e0..fc6235092d 100755 --- a/mapserv.bat +++ b/mapserv.bat @@ -1,9 +1,2 @@ -@echo off -rem Writen by Jbain -:end -map-server.exe -echo . -echo . -echo Map server crashed! restarting in 15 seconds! press ctl+C to cancel restart! -PING -n 15 127.0.0.1 >nul -goto end \ No newline at end of file +@ECHO OFF +CALL serv.bat map-server.exe Map-Server diff --git a/serv.bat b/serv.bat new file mode 100755 index 0000000000..6e8037faa2 --- /dev/null +++ b/serv.bat @@ -0,0 +1,59 @@ +@ECHO OFF +IF "%1"=="" GOTO DIRECT +IF "%2"=="" GOTO DIRECT +IF NOT EXIST "%1" GOTO NOTFOUND +GOTO START + +REM == How RESTART_9X and RESTART_NT works ========================= +REM On Windows 9x only the first 8 characters are significant for +REM labels, and the first matching one is called (RESTART_(9X)). +REM Windows NT calls the exact named label (RESTART_NT). +REM Separation between 9X and NT is required, because CHOICE has +REM different syntax on these platforms or does not exist as all. +REM ================================================================ + +REM Windows 95, 98, ME +:RESTART_9X +REM Old Ctrl+C in PING does not work, because that only stops ping, +REM not the batch file. +CHOICE /C:rc /N /T:R,15 Restarting in 15 seconds, press 'C' to cancel. +IF NOT ERRORLEVEL 2 GOTO START +GOTO END + +REM Windows 2000, XP, Vista, 7 +:RESTART_NT +REM There is no CHOICE in 2000 and XP, but you get asked whether to +REM abort the batch file, when pressing Ctrl+C in PING. +ECHO Restarting in 15 seconds, press Ctrl+C to cancel. +PING -n 15 127.0.0.1 > NUL + +:START +%1 +ECHO. +REM Return value > 1 is exception&~0xC0000000 +IF ERRORLEVEL 2 GOTO CRASHED +REM Return value 1 is EXIT_FAILURE +IF ERRORLEVEL 1 GOTO EXIT1 +REM Return value 0 is EXIT_SUCCESS +ECHO %2 has shutdown successfully. +GOTO RESTART_NT + +:EXIT1 +ECHO %2 has terminated abnormally. +GOTO RESTART_NT + +:CRASHED +ECHO %2 has crashed! +GOTO RESTART_NT + +:DIRECT +ECHO Do not run this file directly. It is used by logserv.bat, charserv.bat, +ECHO mapserv.bat and their '-sql' counterparts. +GOTO END + +:NOTFOUND +ECHO %1 was not found. Make sure, that you have compiled the %2. +GOTO END + +:END +PAUSE From f5f3949e4b7509a0cfbfe04989dfaa1be900e58a Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 15:38:43 +0000 Subject: [PATCH 070/129] * Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14485 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/char/int_guild.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index a3426bd21d..a218ef1968 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -4,6 +4,7 @@ Date Added * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] * Batch files (Windows) now detect whether the server crashed, aborted or shutdown cleanly (Ctrl+C or @mapexit) and print appropriate message, instead of always assuming, that the server crashed (bugreport:3476, since r1818). [Ai4rei] + * Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/char/int_guild.c b/src/char/int_guild.c index f5f7222f9f..01d88e4f2d 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -1237,6 +1237,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int switch(type) { case GMI_POSITION: // E g->member[i].position = *((int *)data); + mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); break; case GMI_EXP: // EXP { @@ -1254,6 +1255,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int guild_calcinfo(g); mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4); } + mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); break; } case GMI_HAIR: @@ -1291,7 +1293,6 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int ShowError("int_guild: GuildMemberInfoChange: Unknown type %d\n", type); break; } - mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); return 0; } From 1a8d26e8884aa91dc147ae61753def2609254bb1 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 16:00:03 +0000 Subject: [PATCH 071/129] * Fixed saving/loading errors with compilers (such as VC6, MinGW), which do not recognize %ll format (since r14242). - This also fixes guild leader name being displayed and saved as "(null)" in the guild member list. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14486 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/char/int_guild.c | 4 ++-- src/char_sql/int_guild.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index a218ef1968..fdec5fc245 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -5,6 +5,8 @@ Date Added * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] * Batch files (Windows) now detect whether the server crashed, aborted or shutdown cleanly (Ctrl+C or @mapexit) and print appropriate message, instead of always assuming, that the server crashed (bugreport:3476, since r1818). [Ai4rei] * Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986). [Ai4rei] + * Fixed saving/loading errors with compilers (such as VC6, MinGW), which do not recognize %ll format (since r14242). [Ai4rei] + - This also fixes guild leader name being displayed and saved as "(null)" in the guild member list. 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 01d88e4f2d..ed9e52d96c 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -49,7 +49,7 @@ int inter_guild_tostr(char* str, struct guild* g) for(i = 0; i < g->max_member; i++) { struct guild_member *m = &g->member[i]; - len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%llu,%d,%d\t%s\t", + len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%"PRIu64",%d,%d\t%s\t", m->account_id, m->char_id, m->hair, m->hair_color, m->gender, m->class_, m->lv, m->exp, m->exp_payper, m->position, @@ -160,7 +160,7 @@ int inter_guild_fromstr(char* str, struct guild* g) for( i = 0; i < g->max_member; i++ ) { struct guild_member* m = &g->member[i]; - if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%llu,%d,%d\t%[^\t]\t%n", + if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%"SCNu64",%d,%d\t%[^\t]\t%n", &accountid, &charid, &hair, &hair_color, &gender, &class_, &lv, &exp, &exp_payper, &position, name, &len) < 11) diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 8c165e92cb..3d2df89776 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -265,7 +265,7 @@ int inter_guild_tosql(struct guild *g,int flag) //Since nothing references guild member table as foreign keys, it's safe to use REPLACE INTO Sql_EscapeStringLen(sql_handle, esc_name, m->name, strnlen(m->name, NAME_LENGTH)); if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`) " - "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%llu','%d','%d','%d','%s')", + "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%"PRIu64"','%d','%d','%d','%s')", guild_member_db, g->guild_id, m->account_id, m->char_id, m->hair, m->hair_color, m->gender, m->class_, m->lv, m->exp, m->exp_payper, m->online, m->position, esc_name) ) @@ -455,7 +455,7 @@ struct guild * inter_guild_fromsql(int guild_id) Sql_GetData(sql_handle, 4, &data, NULL); m->gender = atoi(data); Sql_GetData(sql_handle, 5, &data, NULL); m->class_ = atoi(data); Sql_GetData(sql_handle, 6, &data, NULL); m->lv = atoi(data); - Sql_GetData(sql_handle, 7, &data, NULL); m->exp = (uint64)strtoull(data, NULL, 10); + Sql_GetData(sql_handle, 7, &data, NULL); m->exp = strtoull(data, NULL, 10); Sql_GetData(sql_handle, 8, &data, NULL); m->exp_payper = (unsigned int)atoi(data); Sql_GetData(sql_handle, 9, &data, NULL); m->online = atoi(data); Sql_GetData(sql_handle, 10, &data, NULL); m->position = atoi(data); From 980ffd5887045c15fcc3e79854e0c4d117f75975 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 16:52:46 +0000 Subject: [PATCH 072/129] * Fixed guild and guild member exp truncation issue (bugreport:4130, since r14242). - Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14487 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 ++ src/char/int_guild.c | 30 +++++++++++++++--------------- src/char/int_guild.h | 2 +- src/char_sql/int_guild.c | 28 ++++++++++++++-------------- src/char_sql/int_guild.h | 2 +- src/common/mmo.h | 3 ++- src/map/atcommand.c | 2 +- src/map/clif.c | 2 +- src/map/guild.c | 2 +- src/map/guild.h | 2 +- src/map/intif.c | 19 +++++++++---------- 11 files changed, 48 insertions(+), 46 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index fdec5fc245..19f2c6dd3d 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -7,6 +7,8 @@ Date Added * Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986). [Ai4rei] * Fixed saving/loading errors with compilers (such as VC6, MinGW), which do not recognize %ll format (since r14242). [Ai4rei] - This also fixes guild leader name being displayed and saved as "(null)" in the guild member list. + * Fixed guild and guild member exp truncation issue (bugreport:4130, since r14242). [Ai4rei] + - Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986). 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/char/int_guild.c b/src/char/int_guild.c index ed9e52d96c..9a815200f1 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -42,7 +42,7 @@ int inter_guild_tostr(char* str, struct guild* g) int i, c, len; // save guild base info - len = sprintf(str, "%d\t%s\t%s\t%d,%d,%u,%d,%d\t%s#\t%s#\t", + len = sprintf(str, "%d\t%s\t%s\t%d,%d,%"PRIu64",%d,%d\t%s#\t%s#\t", g->guild_id, g->name, g->master, g->guild_lv, g->max_member, g->exp, g->skill_point, 0, g->mes1, g->mes2); // save guild member info @@ -118,13 +118,13 @@ int inter_guild_fromstr(char* str, struct guild* g) char master[256]; // only 24 used int guildlv; int max_member; - unsigned int exp; + uint64 exp; int skpoint; char mes1[256]; // only 60 used char mes2[256]; // only 120 used int len; - if( sscanf(str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%u,%d,%*d\t%[^\t]\t%[^\t]\t%n", + if( sscanf(str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%"SCNu64",%d,%*d\t%[^\t]\t%[^\t]\t%n", &guildid, name, master, &guildlv, &max_member, &exp, &skpoint, mes1, mes2, &len) < 9 ) return 1; @@ -1236,55 +1236,55 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } switch(type) { case GMI_POSITION: // E - g->member[i].position = *((int *)data); + g->member[i].position = *((short *)data); mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); break; case GMI_EXP: // EXP { - unsigned int exp, old_exp=g->member[i].exp; - g->member[i].exp=*((unsigned int *)data); + uint64 exp, old_exp=g->member[i].exp; + g->member[i].exp=*((uint64 *)data); if (g->member[i].exp > old_exp) { exp = g->member[i].exp - old_exp; if (guild_exp_rate != 100) exp = exp*guild_exp_rate/100; - if (exp > UINT_MAX - g->exp) - g->exp = UINT_MAX; + if (exp > UINT64_MAX - g->exp) + g->exp = UINT64_MAX; else g->exp+=exp; guild_calcinfo(g); - mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4); + mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,sizeof(g->exp)); } mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); break; } case GMI_HAIR: { - g->member[i].hair=*((int *)data); + g->member[i].hair=*((short *)data); mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); break; } case GMI_HAIR_COLOR: { - g->member[i].hair_color=*((int *)data); + g->member[i].hair_color=*((short *)data); mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); break; } case GMI_GENDER: { - g->member[i].gender=*((int *)data); + g->member[i].gender=*((short *)data); mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); break; } case GMI_CLASS: { - g->member[i].class_=*((int *)data); + g->member[i].class_=*((short *)data); mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); break; } case GMI_LEVEL: { - g->member[i].lv=*((int *)data); + g->member[i].lv=*((short *)data); mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); break; } @@ -1297,7 +1297,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int return 0; } -int inter_guild_sex_changed(int guild_id,int account_id,int char_id, int gender) +int inter_guild_sex_changed(int guild_id,int account_id,int char_id, short gender) { return mapif_parse_GuildMemberInfoChange(0, guild_id, account_id, char_id, GMI_GENDER, (const char*)&gender, sizeof(gender)); } diff --git a/src/char/int_guild.h b/src/char/int_guild.h index 06293eb0f0..0be6c50d91 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -14,7 +14,7 @@ int inter_guild_parse_frommap(int fd); struct guild *inter_guild_search(int guild_id); int inter_guild_mapif_init(int fd); int inter_guild_leave(int guild_id,int account_id,int char_id); -int inter_guild_sex_changed(int guild_id,int account_id,int char_id, int gender); +int inter_guild_sex_changed(int guild_id,int account_id,int char_id, short gender); extern char guild_txt[1024]; extern char castle_txt[1024]; diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 3d2df89776..00331e8e62 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -241,7 +241,7 @@ int inter_guild_tosql(struct guild *g,int flag) StringBuf_AppendStr(&buf, ", "); else add_comma = true; - StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%u, `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member); + StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%"PRIu64", `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member); } StringBuf_Printf(&buf, " WHERE `guild_id`=%d", g->guild_id); if( SQL_ERROR == Sql_Query(sql_handle, "%s", StringBuf_Value(&buf)) ) @@ -406,7 +406,7 @@ struct guild * inter_guild_fromsql(int guild_id) g->max_member = MAX_GUILD; } Sql_GetData(sql_handle, 5, &data, NULL); g->average_lv = atoi(data); - Sql_GetData(sql_handle, 6, &data, NULL); g->exp = (unsigned int)strtoul(data, NULL, 10); + Sql_GetData(sql_handle, 6, &data, NULL); g->exp = strtoull(data, NULL, 10); Sql_GetData(sql_handle, 7, &data, NULL); g->next_exp = (unsigned int)strtoul(data, NULL, 10); Sql_GetData(sql_handle, 8, &data, NULL); g->skill_point = atoi(data); Sql_GetData(sql_handle, 9, &data, &len); memcpy(g->mes1, data, min(len, sizeof(g->mes1))); @@ -1588,7 +1588,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha { case GMI_POSITION: { - g->member[i].position=*((int *)data); + g->member[i].position=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; @@ -1596,8 +1596,8 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_EXP: { // EXP - unsigned int exp, old_exp=g->member[i].exp; - g->member[i].exp=*((unsigned int *)data); + uint64 exp, old_exp=g->member[i].exp; + g->member[i].exp=*((uint64 *)data); g->member[i].modified = GS_MEMBER_MODIFIED; if (g->member[i].exp > old_exp) { @@ -1608,13 +1608,13 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha exp = exp*guild_exp_rate/100; // Update guild exp - if (exp > UINT_MAX - g->exp) - g->exp = UINT_MAX; + if (exp > UINT64_MAX - g->exp) + g->exp = UINT64_MAX; else g->exp+=exp; guild_calcinfo(g); - mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4); + mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,sizeof(g->exp)); g->save_flag |= GS_LEVEL; } mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); @@ -1623,7 +1623,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_HAIR: { - g->member[i].hair=*((int *)data); + g->member[i].hair=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1631,7 +1631,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_HAIR_COLOR: { - g->member[i].hair_color=*((int *)data); + g->member[i].hair_color=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1639,7 +1639,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_GENDER: { - g->member[i].gender=*((int *)data); + g->member[i].gender=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1647,7 +1647,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_CLASS: { - g->member[i].class_=*((int *)data); + g->member[i].class_=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1655,7 +1655,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha } case GMI_LEVEL: { - g->member[i].lv=*((int *)data); + g->member[i].lv=*((short *)data); g->member[i].modified = GS_MEMBER_MODIFIED; mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1668,7 +1668,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha return 0; } -int inter_guild_sex_changed(int guild_id,int account_id,int char_id, int gender) +int inter_guild_sex_changed(int guild_id,int account_id,int char_id, short gender) { return mapif_parse_GuildMemberInfoChange(0, guild_id, account_id, char_id, GMI_GENDER, (const char*)&gender, sizeof(gender)); } diff --git a/src/char_sql/int_guild.h b/src/char_sql/int_guild.h index a14e09b00d..4577357f3d 100644 --- a/src/char_sql/int_guild.h +++ b/src/char_sql/int_guild.h @@ -28,7 +28,7 @@ int inter_guild_mapif_init(int fd); int inter_guild_leave(int guild_id,int account_id,int char_id); int mapif_parse_BreakGuild(int fd,int guild_id); int inter_guild_broken(int guild_id); -int inter_guild_sex_changed(int guild_id,int account_id,int char_id, int gender); +int inter_guild_sex_changed(int guild_id,int account_id,int char_id, short gender); int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char *name); int inter_guild_CharOnline(int char_id, int guild_id); int inter_guild_CharOffline(int char_id, int guild_id); diff --git a/src/common/mmo.h b/src/common/mmo.h index b1a257e9ce..6a78d840ca 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -468,7 +468,8 @@ struct guild_skill { struct guild { int guild_id; short guild_lv, connect_member, max_member, average_lv; - unsigned int exp,next_exp; + uint64 exp; + unsigned int next_exp; int skill_point; char name[NAME_LENGTH],master[NAME_LENGTH]; struct guild_member member[MAX_GUILD]; diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 77aef527f7..ead204fb59 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3084,7 +3084,7 @@ ACMD_FUNC(guildlevelup) added_level = 1 - guild_info->guild_lv; if (added_level != 0) { - intif_guild_change_basicinfo(guild_info->guild_id, GBI_GUILDLV, &added_level, 2); + intif_guild_change_basicinfo(guild_info->guild_id, GBI_GUILDLV, &added_level, sizeof(added_level)); clif_displaymessage(fd, msg_txt(179)); // Guild level changed. } else { clif_displaymessage(fd, msg_txt(45)); // Guild level change failed. diff --git a/src/map/clif.c b/src/map/clif.c index 94c19287ac..087a411876 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6804,7 +6804,7 @@ int clif_guild_basicinfo(struct map_session_data *sd) WFIFOL(fd,10)=g->connect_member; WFIFOL(fd,14)=g->max_member; WFIFOL(fd,18)=g->average_lv; - WFIFOL(fd,22)=g->exp; + WFIFOL(fd,22)=(uint32)cap_value(g->exp,0,INT_MAX); WFIFOL(fd,26)=g->next_exp; WFIFOL(fd,30)=0; // Tax Points WFIFOL(fd,34)=0; // Tendency: (left) Vulgar [-100,100] Famed (right) diff --git a/src/map/guild.c b/src/map/guild.c index 1b91dfc931..cdc978929a 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1003,7 +1003,7 @@ int guild_recv_message(int guild_id,int account_id,const char *mes,int len) return 0; } // Mho̖EύX -int guild_change_memberposition(int guild_id,int account_id,int char_id,int idx) +int guild_change_memberposition(int guild_id,int account_id,int char_id,short idx) { return intif_guild_change_memberinfo(guild_id,account_id,char_id,GMI_POSITION,&idx,sizeof(idx)); } diff --git a/src/map/guild.h b/src/map/guild.h index 753de0da16..c6b3806470 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -73,7 +73,7 @@ int guild_check_alliance(int guild_id1, int guild_id2, int flag); int guild_send_memberinfoshort(struct map_session_data *sd,int online); int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_); -int guild_change_memberposition(int guild_id,int account_id,int char_id,int idx); +int guild_change_memberposition(int guild_id,int account_id,int char_id,short idx); int guild_memberposition_changed(struct guild *g,int idx,int pos); int guild_change_position(int guild_id,int idx,int mode,int exp_mode,const char *name); int guild_position_changed(int guild_id,int idx,struct guild_position *p); diff --git a/src/map/intif.c b/src/map/intif.c index c8aad3807f..ba5230bab7 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -1124,7 +1124,7 @@ int intif_parse_GuildBasicInfoChanged(int fd) return 0; switch(type) { - case GBI_EXP: g->exp = RFIFOL(fd,10); break; + case GBI_EXP: g->exp = RFIFOQ(fd,10); break; case GBI_GUILDLV: g->guild_lv = RFIFOW(fd,10); break; case GBI_SKILLPOINT: g->skill_point = RFIFOL(fd,10); break; } @@ -1141,8 +1141,7 @@ int intif_parse_GuildMemberInfoChanged(int fd) int account_id = RFIFOL(fd,8); int char_id = RFIFOL(fd,12); int type = RFIFOW(fd,16); - void* data = RFIFOP(fd,18); - int dd = *((int *)data); + //void* data = RFIFOP(fd,18); struct guild* g; int idx; @@ -1156,13 +1155,13 @@ int intif_parse_GuildMemberInfoChanged(int fd) return 0; switch( type ) { - case GMI_POSITION: g->member[idx].position = dd; guild_memberposition_changed(g,idx,dd); break; - case GMI_EXP: g->member[idx].exp = dd; break; - case GMI_HAIR: g->member[idx].hair = dd; break; - case GMI_HAIR_COLOR: g->member[idx].hair_color = dd; break; - case GMI_GENDER: g->member[idx].gender = dd; break; - case GMI_CLASS: g->member[idx].class_ = dd; break; - case GMI_LEVEL: g->member[idx].lv = dd; break; + case GMI_POSITION: g->member[idx].position = RFIFOW(fd,18); guild_memberposition_changed(g,idx,RFIFOW(fd,18)); break; + case GMI_EXP: g->member[idx].exp = RFIFOQ(fd,18); break; + case GMI_HAIR: g->member[idx].hair = RFIFOW(fd,18); break; + case GMI_HAIR_COLOR: g->member[idx].hair_color = RFIFOW(fd,18); break; + case GMI_GENDER: g->member[idx].gender = RFIFOW(fd,18); break; + case GMI_CLASS: g->member[idx].class_ = RFIFOW(fd,18); break; + case GMI_LEVEL: g->member[idx].lv = RFIFOW(fd,18); break; } return 0; } From 8136997bd076b694db79e25b3efe6d07b2adfd66 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 19:43:19 +0000 Subject: [PATCH 073/129] * Fixed disguising as player clone causing the client to crash while looking for non-existing NPC sprites (bugreport:4428, since r14387, related r14383). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14488 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/clif.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 19f2c6dd3d..bb7b5e97b3 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -9,6 +9,7 @@ Date Added - This also fixes guild leader name being displayed and saved as "(null)" in the guild member list. * Fixed guild and guild member exp truncation issue (bugreport:4130, since r14242). [Ai4rei] - Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986). + * Fixed disguising as player clone causing the client to crash while looking for non-existing NPC sprites (bugreport:4428, since r14387, related r14383). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/map/clif.c b/src/map/clif.c index 087a411876..e55a271081 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1017,10 +1017,10 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un static void clif_setdisguise(struct block_list *bl, unsigned char *buf,int len) { #if PACKETVER >= 20091103 - WBUFB(buf,4)= 0x5; //NPC_MOB_TYPE + WBUFB(buf,4)= pcdb_checkid(status_get_viewdata(bl)->class_) ? 0x0 : 0x5; //PC_TYPE : NPC_MOB_TYPE WBUFL(buf,5)=-bl->id; #elif PACKETVER >= 20071106 - WBUFB(buf,2)= 0x5; //NPC_MOB_TYPE + WBUFB(buf,2)= pcdb_checkid(status_get_viewdata(bl)->class_) ? 0x0 : 0x5; //PC_TYPE : NPC_MOB_TYPE WBUFL(buf,3)=-bl->id; #else WBUFL(buf,2)=-bl->id; From 004835214a2d1db9bace57dce5c1ee75a2cb8787 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 22 Nov 2010 20:28:18 +0000 Subject: [PATCH 074/129] * Fixed Rogue skill Steal Coin working on boss monsters (bugreport:2442). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14489 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/pc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index bb7b5e97b3..403b62c7e1 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -10,6 +10,7 @@ Date Added * Fixed guild and guild member exp truncation issue (bugreport:4130, since r14242). [Ai4rei] - Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986). * Fixed disguising as player clone causing the client to crash while looking for non-existing NPC sprites (bugreport:4428, since r14387, related r14383). [Ai4rei] + * Fixed Rogue skill Steal Coin working on boss monsters (bugreport:2442). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/map/pc.c b/src/map/pc.c index c52a61003c..6da104d306 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4015,7 +4015,7 @@ int pc_steal_coin(struct map_session_data *sd,struct block_list *target) return 0; md = (TBL_MOB*)target; - if( md->state.steal_coin_flag || md->sc.data[SC_STONE] || md->sc.data[SC_FREEZE] ) + if( md->state.steal_coin_flag || md->sc.data[SC_STONE] || md->sc.data[SC_FREEZE] || md->status.mode&MD_BOSS ) return 0; if( (md->class_ >= 1324 && md->class_ < 1364) || (md->class_ >= 1938 && md->class_ < 1946) ) From 85a42500604c4280949848ec77615103c5f066a4 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 23 Nov 2010 00:42:25 +0000 Subject: [PATCH 075/129] * Added quest log support for the following quests. - Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, and the Z-Gang Quest git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14490 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/quest_db.txt | 70 ++++---- npc/Changelog.txt | 6 + npc/quests/quests_airship.txt | 176 +++++++++++-------- npc/quests/quests_ein.txt | 30 +++- npc/quests/quests_hugel.txt | 13 +- npc/quests/quests_lighthalzen.txt | 279 ++++++++++++++++-------------- npc/quests/quests_nameless.txt | 84 +++++++-- npc/quests/quests_rachel.txt | 14 +- npc/quests/quests_veins.txt | 67 ++++--- 9 files changed, 468 insertions(+), 271 deletions(-) diff --git a/db/quest_db.txt b/db/quest_db.txt index 55e8f2c225..0a21acea40 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -313,24 +313,27 @@ 4011,0,0,0,0,0,0,0,"Job Change to Hunter - Test" 4012,0,0,0,0,0,0,0,"Job Change to Hunter" 4013,0,0,0,0,0,0,0,"Job Change to Hunter" -4015,0,0,0,0,0,0,0,"Becoming an Adventurer Appraiser" -4016,0,0,0,0,0,0,0,"Proof of Qualification" -4017,0,0,0,0,0,0,0,"Qualification Test" -4018,0,0,0,0,0,0,0,"Preparations for Meeting Princes" -4020,0,0,0,0,0,0,0,"Interview with the Prince" -4021,0,0,0,0,0,0,0,"Interview with the Prince" -4022,0,0,0,0,0,0,0,"Interview with the Prince" -4023,0,0,0,0,0,0,0,"Interview with the Prince" -4024,0,0,0,0,0,0,0,"Interview with the Prince" -4025,0,0,0,0,0,0,0,"Interview with the Prince" -4026,0,0,0,0,0,0,0,"Interview with the Prince" -4027,0,0,0,0,0,0,0,"Interview with the Prince" -4028,0,0,0,0,0,0,0,"The prince, Peter's Favor" -4029,0,0,0,0,0,0,0,"The Girl's Favor" -4030,0,0,0,0,0,0,0,"The Story of Ahrum and Ernst" -4031,0,0,0,0,0,0,0,"The Story of Ahrum and Ernst" -4032,0,0,0,0,0,0,0,"Conspiracy of the two families" -4033,0,0,0,0,0,0,0,"Death of Ahrum" + +// Following entries are depreciated - use 10000-10025 +//4015,0,0,0,0,0,0,0,"Becoming an Adventurer Appraiser" +//4016,0,0,0,0,0,0,0,"Proof of Qualification" +//4017,0,0,0,0,0,0,0,"Qualification Test" +//4018,0,0,0,0,0,0,0,"Preparations for Meeting Princes" +//4020,0,0,0,0,0,0,0,"Interview with the Prince" +//4021,0,0,0,0,0,0,0,"Interview with the Prince" +//4022,0,0,0,0,0,0,0,"Interview with the Prince" +//4023,0,0,0,0,0,0,0,"Interview with the Prince" +//4024,0,0,0,0,0,0,0,"Interview with the Prince" +//4025,0,0,0,0,0,0,0,"Interview with the Prince" +//4026,0,0,0,0,0,0,0,"Interview with the Prince" +//4027,0,0,0,0,0,0,0,"Interview with the Prince" +//4028,0,0,0,0,0,0,0,"The prince, Peter's Favor" +//4029,0,0,0,0,0,0,0,"The Girl's Favor" +//4030,0,0,0,0,0,0,0,"The Story of Ahrum and Ernst" +//4031,0,0,0,0,0,0,0,"The Story of Ahrum and Ernst" +//4032,0,0,0,0,0,0,0,"Conspiracy of the two families" +//4033,0,0,0,0,0,0,0,"Death of Ahrum" + 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7" 6000,0,0,0,0,0,0,0,"Job Change to Taekwon" @@ -443,31 +446,31 @@ 7131,0,1001,5,0,0,0,0,"The training course 'conquer the desert!' - A real battle 3" 7132,0,0,0,0,0,0,0,"The training course 'conquer the desert!' - Complete a quest" 7133,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Start" -7134,0,1051,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle1" -7135,0,1175,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle2" -7136,0,1005,5,0,0,0,0,"The training course 'conquer the culvert!' - A real battle3" +7134,0,1051,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle 1" +7135,0,1175,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle 2" +7136,0,1005,5,0,0,0,0,"The training course 'conquer the culvert!' - A real battle 3" 7137,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Complete a quest" 7138,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Start" -7139,0,1076,15,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle1" -7140,0,1031,10,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle2" +7139,0,1076,15,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle 1" +7140,0,1031,10,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle 2" 7141,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Complete a quest" 7142,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Start" -7143,0,1160,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle1" -7144,0,1095,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle2" -7145,0,1176,10,0,0,0,0,"The training course 'conquer ant hell!' - A real battle3" +7143,0,1160,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle 1" +7144,0,1095,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle 2" +7145,0,1176,10,0,0,0,0,"The training course 'conquer ant hell!' - A real battle 3" 7146,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Complete a quest" 7147,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - start" -7148,0,1686,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle1" -7149,0,1023,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle2" -7150,0,1273,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle3" +7148,0,1686,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle 1" +7149,0,1023,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle 2" +7150,0,1273,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle 3" 7151,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - Complete a quest" 7152,0,0,0,0,0,0,0,"bThe training course 'conquer the orc dungeon!' - start" -7153,0,1153,20,0,0,0,0,"The training course 'conquer the orc dungeon!' - A real battle1" -7154,0,1152,20,0,0,0,0,"The training course 'conquer the orc dungeon!'- A real battle2" +7153,0,1153,20,0,0,0,0,"The training course 'conquer the orc dungeon!' - A real battle 1" +7154,0,1152,20,0,0,0,0,"The training course 'conquer the orc dungeon!'- A real battle 2" 7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest" 7156,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - start" -7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle1" -7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle2" +7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 1" +7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2" 7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest" 8000,0,0,0,0,0,0,0,"Quitting Job Change" @@ -1547,4 +1550,3 @@ 60308,0,1713,200,0,0,0,0,"Dragon Hunting" 60309,0,1716,100,0,0,0,0,"Dragon Hunting" 60310,0,1716,200,0,0,0,0,"Dragon Hunting" - diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 0b5b2221af..c4a12ca7ac 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,11 @@ Date Added ====== +2010/11/22 + * Rev. 14490 Added quest log support for the following quests. [L0ne_W0lf] + - Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, + Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, + Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, + and the Z-Gang Quest 2010/11/14 * Rev. 14462 Updating spawns as a precursor for Eden group quests. [L0ne_W0lf] * Updated spawns for Juno fields to Renewal. diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index 43e51d5d08..935695dab0 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -3,7 +3,7 @@ //===== By: ================================================== // Samuray22 //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,8 +11,8 @@ //= Reward: -Free Ticket for Flyship. //= -Free System to Repair. //= Quest about how work the airship -//= Reward: -Base Experience 200.000 -//= -Job Experience 10.000 +//= Reward: -Base Experience 200,000 +//= -Job Experience 10,000 //===== Additional Comments: ================================= //= 1.0 First Beta. //= 1.1 Added Heart Fragment quest. [SinSloth] @@ -24,6 +24,9 @@ //= 1.5 Replaced effect numerics with constants. [Samuray22] //= 1.6 Changed some variables to scope instead of permanent char. [brianluau] //= 1.7 some minor cleanup updates to the airship invasion. [L0ne_W0lf] +//= 1.8 Added quest log entries for: +//= - Airship Ticket Quest +//= - How the Airship Works //============================================================ //=======================================================================================================// @@ -47,6 +50,7 @@ airplane,47,61,1 script Crewman 833,{ mes "[Kain Himere]"; mes "It's a strange favor to ask, but I'll pay you back as soon as you return."; next; + setquest 2079; set kain_ticket, 5; mes "^3355FFKain Himere has given you a small box.^000000"; close; @@ -270,7 +274,7 @@ airplane,47,61,1 script Crewman 833,{ mes "I needed sent to Einbroch. Anyway, I hope you have a good trip. Oh, and thanks for listening."; close; } - } + } } else if(kain_ticket==3) { mes "[Kain Himere]"; mes "Oh, how are you?"; @@ -368,6 +372,7 @@ airplane,47,61,1 script Crewman 833,{ next; mes "[Kain Himere]"; mes "Would be so kind as to help me by finding that journal and seeing if Tarsha is my daughter?"; + changequest 2081,2082; set kain_ticket, 11; close; } @@ -403,6 +408,7 @@ airplane,47,61,1 script Crewman 833,{ mes "[Kain Himere]"; mes "I know this isn't much, but please understand that it's all I can give you. God bless you for your all your help!"; delitem 7276, 1; + completequest 2085; set kain_ticket, 15; getitem 7311, 4; close; @@ -473,6 +479,7 @@ OnTouch: mes "out 'comrades!'"; close; case 2: + changequest 2079,2080; set kain_ticket, 7; mes "[Elle Cherno]"; mes "This...?"; @@ -519,6 +526,7 @@ OnTouch: mes "^3355FFElle put a big"; mes "doodled message"; mes "in your hand.^000000"; + changequest 2084,2085; set kain_ticket, 14; getitem 7276, 1; //Picture Letter, close; @@ -641,6 +649,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{ next; mes "["+strcharinfo(0)+"]"; mes "I've got to go check something now, but hopefully I'll be back soon with good news!"; + changequest 2080,2081; set kain_ticket, 10; close; } else if(kain_ticket == 10 || kain_ticket == 11) { @@ -708,6 +717,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{ mes "[Tarsha Cherno]"; mes "Ah, right."; mes "Elle wants to see you again. Would you be so kind as to see her before you go?"; + changequest 2083,2084; set kain_ticket, 13; close; case 3: @@ -920,6 +930,7 @@ einbech,45,113,5 script Tree#t1-1::Tree 111,{ close; } else { callfunc "diary"; + changequest 2082,2083; set kain_ticket, 12; close; } @@ -1500,6 +1511,7 @@ airplane_01,238,154,5 script Airship Captain#01 873,{ cutin "",255; end; case 2: + setquest 8032; set lght_air, 2; mes "[Tarlock]"; mes "Ha-hah! I like you"; @@ -1633,6 +1645,7 @@ airplane_01,238,154,5 script Airship Captain#01 873,{ mes "I'm tired for reading"; mes "and writing those long"; mes "letters."; + completequest 8035; set lght_air, 7; getexp 200000, 10000; close2; @@ -1755,6 +1768,7 @@ airplane,236,163,5 script Airship Captain#03 873,{ next; mes "[Ferlock]"; mes "And if you ever meet him, please send him my gratitude and regards."; + changequest 8045,8046; set hg_ma1,5; close2; cutin "",255; @@ -1976,6 +1990,7 @@ airplane,236,163,5 script Airship Captain#03 873,{ mes "is goodbye for now, adventurer."; close2; specialeffect2 EF_ABSORBSPIRITS; + completequest 8043; set lhz_heart,13; getexp 700000,400000; cutin "",255; @@ -2024,71 +2039,73 @@ airplane,236,163,5 script Airship Captain#03 873,{ case 2: if (lght_air == 2) { - set lght_air, 3; - mes "^3131FFYou give Captain Ferlock"; - mes "the letter that his brother"; - mes "Tarlock has written for him.^000000"; - next; - mes "[Ferlock]"; - mes "Oh, this is from my"; - mes "brother? Hey, thanks so"; - mes "much for bringing this to"; - mes "me for him. Ah, give me"; - mes "a minute to read all of"; - mes "this, would you now?"; - next; - mes "[Ferlock]"; - mes "..."; - mes "So that's what he's been"; - mes "up to. Huh. Hahaha! Oh, that's"; - mes "funny. Ah, it's always good to"; - mes "hear from Tarlock. Anyway,"; - mes "I'm sorry to make you wait."; - next; - mes "[Ferlock]"; - mes "Anyway, my brother wrote"; - mes "about the usual stuff, but"; - mes "he mentioned that he was"; - mes "hoping to finally return a few"; - mes "things he borrowed from me."; - mes "However, he lost them..."; - next; - mes "[Ferlock]"; - mes "It turns that those nasty"; - mes "gremlins that sometimes"; - mes "attack his ship stole my"; - mes "things, so was he actually"; - mes "hoping that you would"; - mes "help me get them back."; - next; - mes "[Ferlock]"; - mes "Yeah, yeah. He specifically"; - mes "mentioned that I shouldn't"; - mes "give you my reply until you"; - mes "hunt those monsters and get"; - mes "my stuff back. I'm sorry, but"; - mes "I guess you owe big bro, huh?"; - next; - mes "[Ferlock]"; - mes "Well, if you're willing to"; - mes "help me, would you get my"; - mes "^ff00002 Will of the Darkness^000000 and"; - mes "^ff00002 Prickly Fruit^000000 back for me?"; - next; - mes "[Ferlock]"; - mes "The monsters that attack"; - mes "Tarlock's Airship should"; - mes "have them. I'd appreciate"; - mes "it if you'd help me out on"; - mes "this, adventurer. Thanks"; - mes "in advance and good luck~"; - close2; - cutin "",255; - end; + changequest 8032,8033; + set lght_air, 3; + mes "^3131FFYou give Captain Ferlock"; + mes "the letter that his brother"; + mes "Tarlock has written for him.^000000"; + next; + mes "[Ferlock]"; + mes "Oh, this is from my"; + mes "brother? Hey, thanks so"; + mes "much for bringing this to"; + mes "me for him. Ah, give me"; + mes "a minute to read all of"; + mes "this, would you now?"; + next; + mes "[Ferlock]"; + mes "..."; + mes "So that's what he's been"; + mes "up to. Huh. Hahaha! Oh, that's"; + mes "funny. Ah, it's always good to"; + mes "hear from Tarlock. Anyway,"; + mes "I'm sorry to make you wait."; + next; + mes "[Ferlock]"; + mes "Anyway, my brother wrote"; + mes "about the usual stuff, but"; + mes "he mentioned that he was"; + mes "hoping to finally return a few"; + mes "things he borrowed from me."; + mes "However, he lost them..."; + next; + mes "[Ferlock]"; + mes "It turns that those nasty"; + mes "gremlins that sometimes"; + mes "attack his ship stole my"; + mes "things, so was he actually"; + mes "hoping that you would"; + mes "help me get them back."; + next; + mes "[Ferlock]"; + mes "Yeah, yeah. He specifically"; + mes "mentioned that I shouldn't"; + mes "give you my reply until you"; + mes "hunt those monsters and get"; + mes "my stuff back. I'm sorry, but"; + mes "I guess you owe big bro, huh?"; + next; + mes "[Ferlock]"; + mes "Well, if you're willing to"; + mes "help me, would you get my"; + mes "^ff00002 Will of the Darkness^000000 and"; + mes "^ff00002 Prickly Fruit^000000 back for me?"; + next; + mes "[Ferlock]"; + mes "The monsters that attack"; + mes "Tarlock's Airship should"; + mes "have them. I'd appreciate"; + mes "it if you'd help me out on"; + mes "this, adventurer. Thanks"; + mes "in advance and good luck~"; + close2; + cutin "",255; + end; } else if(lght_air == 3) { if (countitem(7340) >= 2 && countitem(576) >= 2) { delitem 7340, 2; delitem 576, 2; + changequest 8033,8034; set lght_air, 4; mes "[Ferlock]"; mes "You brought the items!"; @@ -2107,16 +2124,16 @@ airplane,236,163,5 script Airship Captain#03 873,{ cutin "",255; end; } - mes "[Ferlock]"; - mes "Oh, I'm sorry, but it looks"; - mes "like you're missing something."; - mes "Would you please go and find"; - mes "^ff00002 Will of the Darkness^000000 and"; - mes "^ff00002 Prickly Fruit^000000? Thanks,"; - mes "brave adventurer~"; - close2; - cutin "",255; - end; + mes "[Ferlock]"; + mes "Oh, I'm sorry, but it looks"; + mes "like you're missing something."; + mes "Would you please go and find"; + mes "^ff00002 Will of the Darkness^000000 and"; + mes "^ff00002 Prickly Fruit^000000? Thanks,"; + mes "brave adventurer~"; + close2; + cutin "",255; + end; } mes "[Ferlock]"; mes "Well, I hope that"; @@ -2293,6 +2310,7 @@ airplane,236,63,4 script Hallen 706,{ mes "^3355FFHallen gave you"; mes "Mawong's letter to"; mes "be delivered to Kaci.^000000"; + setquest 8036; set lhz_heart,2; next; mes "[Hallen]"; @@ -2456,6 +2474,7 @@ airplane,236,63,4 script Hallen 706,{ mes "is it even possible? Well, if"; mes "you could find out for me, "; mes "it'd be a really big help."; + changequest 8038,8039; set lhz_heart,6; close; } @@ -2518,6 +2537,7 @@ airplane,236,63,4 script Hallen 706,{ mes "Heart Piece. Now where"; mes "have I heard about that"; mes "before? Mm, let me think..."; + changequest 8039,8040; set lhz_heart,7; close; } @@ -2594,6 +2614,7 @@ airplane,236,63,4 script Hallen 706,{ } if(Shinokas_Quest > 9) set lhz_heart,9; else set lhz_heart,8; + changequest 8040,8041; getitem 501,1; mes "[Hallen]"; mes "Here you go~"; @@ -2688,6 +2709,7 @@ airplane,33,69,4 script Kaci 73,{ mes "As for Euslan, please tell her about me and let her know that I hope she gets well soon."; next; mes "^3355FFSince she's begging, I guess I should send her message."; + changequest 8044,8045; set hg_ma1,4; close; } @@ -2718,6 +2740,7 @@ airplane,33,69,4 script Kaci 73,{ mes "asking customers for favors!"; mes "But still, he's really busy..."; next; + changequest 8036,8037; set lhz_heart,3; mes "[Kaci]"; mes "Thank you for bringing"; @@ -2834,6 +2857,7 @@ L_Ask: mes "back to work now."; mes "Have a nice day,"; mes "and I'll see you later~"; + changequest 8037,8038; set lhz_heart,4; close; } @@ -2885,6 +2909,7 @@ L_Ask: mes "that laboratory in Einbroch"; mes "as soon as I can, even if it's"; mes "a heavily restricted area.^000000)"; + changequest 8041,8042; set lhz_heart,9; close; } @@ -3097,6 +3122,7 @@ L_Input: mes "Airship, alright? Now hurry!"; close2; donpcevent "Ferlock#lab::OnInit"; + changequest 8042,8043; set lhz_heart,11; end; } diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 8d330f7475..0ec73cfdc5 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera and The eAthena Dev Team //===== Current Version: ===================================== -//= 2.4 +//= 2.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -46,6 +46,9 @@ //= 2.2a Fixed typos in var names from EIN_LOVERQRQ to EIN_LOVERQ. (bugreport:2464) [Paradox924X] //= 2.3 Removed occurance of PcName. [L0ne_W0lf] //= 2.4 Added missing remove cutin. [Kisuka] +//= 2.5 Added quest log entries for: +//= - Factory Quest +//= - Murder Quest //============================================================ // Oridecon Stone OR Mineral Stone Quest @@ -3368,6 +3371,7 @@ OnTimer600000: einbroch,132,84,3 script Liotzburg#ein 853,2,2,{ if ((EinFactory == 13) || (EinFactory == 14)) { + changequest 8029,8030; set EinFactory,14; mes "[Liotzburg]"; mes "What...?"; @@ -3547,6 +3551,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ delitem 7317,10; //Screw delitem 7319,10; //Old_Steel_Plate set $EinPolution,$EinPolution+1; + completequest 8031; set EinFactory,16; if (BaseLevel < 41) { getexp 615,0; @@ -3639,6 +3644,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "10 ^FF0000Used Iron Plate^000000,"; mes "we could make those repairs."; next; + changequest 8030,8031; set EinFactory,15; mes "[Zelmeto]"; mes "But without funds, there's"; @@ -3684,6 +3690,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "the machines will be safely"; mes "functioning again."; next; + changequest 8028,8029; set EinFactory,13; mes "[Zelmeto]"; mes "First, I better"; @@ -3737,6 +3744,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "use it. I really don't know"; mes "where it could be now."; next; + changequest 8026,8027; set EinFactory,11; mes "[Zelmeto]"; mes "Still, I'm sure that"; @@ -3789,6 +3797,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "of molten metal. You should"; mes "be able to find it pretty easily."; next; + changequest 8024,8025; set EinFactory,9; mes "[Zelmeto]"; mes "Thanks again"; @@ -3843,6 +3852,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "broken, we need to know"; mes "and fix it right away."; next; + changequest 8022,8023; set EinFactory,7; mes "[Zelmeto]"; mes "Thanks again"; @@ -3890,6 +3900,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "condition, even though it's"; mes "operating fine for now..."; next; + changequest 8020,8021; set EinFactory,5; mes "[Zelmeto]"; mes "We need to ensure that"; @@ -3941,6 +3952,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "problem seems small, please"; mes "report it to me. I know it might seem fine now, but I want to prevent an accident if I can."; next; + changequest 8018,8019; set EinFactory,3; mes "[Zelmeto]"; mes "Thank you"; @@ -4033,6 +4045,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ mes "it wouldn't hurt to make sure."; mes "You should find it easily."; next; + setquest 8017; set EinFactory,1; mes "[Zelmeto]"; mes "When you finish your"; @@ -4064,6 +4077,7 @@ ein_in01,67,242,3 script Zelmeto 851,{ ein_in01,49,232,3 script 2nd Control Panel#ins 111,{ if ((EinFactory == 1) || (EinFactory == 2)) { + changequest 8017,8018; set EinFactory,2; mes "^3355FFIt's the 2nd control panel"; mes "Zelmeto asked you to inspect."; @@ -4078,6 +4092,7 @@ ein_in01,49,232,3 script 2nd Control Panel#ins 111,{ ein_in01,108,217,3 script 3rd Pressure Governor#1 111,{ if ((EinFactory == 3) || (EinFactory == 4)) { + changequest 8019,8020; set EinFactory,4; mes "^3355FFAt first glance, this"; mes "pressure governor looks"; @@ -4093,6 +4108,7 @@ ein_in01,108,217,3 script 3rd Pressure Governor#1 111,{ ein_in01,62,258,3 script Main Control Panel#ins 111,{ if ((EinFactory == 5) || (EinFactory == 6)) { + changequest 8021,8022; set EinFactory,6; mes "^3355FFThe main control panel"; mes "doesn't look like it has"; @@ -4108,6 +4124,7 @@ ein_in01,62,258,3 script Main Control Panel#ins 111,{ ein_in01,46,197,3 script Conveyor#ins 111,{ if ((EinFactory == 7) || (EinFactory == 8)) { + changequest 8023,8024; set EinFactory,8; mes "^3355FFThe conveyor's movements"; mes "look jittery and clumsy. The"; @@ -4122,6 +4139,7 @@ ein_in01,46,197,3 script Conveyor#ins 111,{ ein_in01,100,266,3 script Pipe#ins 111,{ if ((EinFactory == 9) || (EinFactory == 10)) { + changequest 8025,8026; set EinFactory,10; mes "^3355FFThe inspection of this"; mes "pipe didn't take very long."; @@ -4137,6 +4155,7 @@ ein_in01,100,266,3 script Pipe#ins 111,{ ein_in01,95,239,3 script Conveyor#ins2 111,{ if ((EinFactory == 11) || (EinFactory == 12)) { + changequest 8027,8028; set EinFactory,12; mes "^3355FFThis conveyor seems"; mes "to have similar problems"; @@ -4380,6 +4399,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{ mes "[Buender Hikeman]"; mes "Then I learned..."; mes "You planned it all along."; + setquest 2071; set Shinokas_Quest,1; close2; cutin "ein_hicman",255; @@ -4491,6 +4511,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{ mes "It wouldn't be a good idea to"; mes "provoke the old man anymore,"; mes "intentionally or not.^000000"; + changequest 2071,2072; set Shinokas_Quest,2; close2; cutin "ein_hicman",255; @@ -4649,6 +4670,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{ mes "their intentions can't be good."; close2; cutin "ein_hicman",255; + completequest 2078; set Shinokas_Quest,11; if (BaseLevel < 70) { getexp 100000,80000; @@ -4885,6 +4907,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{ mes "Alright, I'll tell you what"; mes "happened. But it's a"; mes "long story..."; + changequest 2072,2073; set Shinokas_Quest,3; close; } @@ -4963,6 +4986,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{ mes "[Shinokas]"; mes "I'm too old and weak to leave"; mes "this house, and there's the chance that those men will find me. If you can sympathize with my situation, please find out if the Kapellthaine family has any unique ores..."; + changequest 2073,2074; set Shinokas_Quest,4; close; } @@ -5008,6 +5032,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{ mes "Please go and search the"; mes "Factory for that ore as"; mes "soon as you can."; + changequest 2074,2075; set Shinokas_Quest,6; close; } @@ -5088,6 +5113,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{ mes "can enter that kind"; mes "of place. But I'm sure"; mes "you'll figure something out."; + changequest 2075,2076; set Shinokas_Quest,7; close; } @@ -5216,6 +5242,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{ mes "Shinokas!"; mes "Why, God?"; mes "Why..."; + changequest 2077,2078; set Shinokas_Quest,10; close; } @@ -5552,6 +5579,7 @@ airplane,31,77,5 script Drunken Man#ein 853,{ mes "must have been a piece"; mes "of ^3131FFYmir's Heart^333333. I better"; mes "tell Shinokas about this.)^000000"; + changequest 2076,2077; set Shinokas_Quest,9; close; case 2: diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index aac15ec8ae..617623db26 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets & SinSloth //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -23,6 +23,8 @@ //= 1.8 Added missing checkweight. [L0ne_W0lf] //= 1.9 Replaced effect numerics with constants. [Samuray22] //= 2.0 Commented a break out to fix a script hang. +//= 2.1 Added quest log entries for: +//= - Juno Remedy Quest //============================================================ //------------------------------------------------------------------------- @@ -6968,6 +6970,7 @@ yuno,111,156,3 script Euslan 90,{ mes "know as soon as you can,"; mes "okay? Thanks for cheering"; mes "me up, "+strcharinfo(0)+"."; + setquest 8044; set hg_ma1,3; close; break; @@ -7041,6 +7044,7 @@ yuno,111,156,3 script Euslan 90,{ mes "know as soon as you can,"; mes "okay? Thanks for cheering"; mes "me up, "+strcharinfo(0)+"."; + setquest 8044; set hg_ma1,3; close; break; @@ -7104,6 +7108,7 @@ yuno,111,156,3 script Euslan 90,{ mes "of your way. Still, I'd really"; mes "appreciate your help if you"; mes "happen to pass through Hugel."; + changequest 8046,8047; set hg_ma1,6; close; } @@ -7163,6 +7168,7 @@ yuno,111,156,3 script Euslan 90,{ mes "your safety in your adventures."; mes "Take care of yourself..."; close2; + completequest 8052; set hg_ma1,13; specialeffect EF_ABSORBSPIRITS; getexp 900000,600000; @@ -7242,6 +7248,7 @@ que_bingo,53,190,7 script Eukran 778,{ mes "would Thierry go to such a"; mes "dangerous place? No one goes^FFFFFF ^000000 to the Odin Shrine for no reason."; close2; + changequest 8047,8048; set hg_ma1,8; warp "que_bingo",37,24; end; @@ -7355,6 +7362,7 @@ odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ mes "Euslan's disease. It's not"; mes "curable by modern medicine..."; close2; + changequest 8048,8049; set hg_ma1,9; end; } @@ -7487,6 +7495,7 @@ odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ mes "If they get me, I'll never be"; mes "able to make the medicine!"; close2; + changequest 8050,8051; set hg_ma1,11; end; } @@ -7542,6 +7551,7 @@ odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ mes "has made to give to Euslan.^000000"; close2; delitem 7511,5; //Darkness rune + changequest 8051,8052; set hg_ma1,12; end; } @@ -7598,6 +7608,7 @@ OnTouch: mes "you better go tell him"; mes "about this right now!^000000"; close2; + changequest 8049,8050; set hg_ma1,10; end; } diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 6d7e4ddb28..27d9aa4521 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -4,7 +4,7 @@ //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets, //= Lupus, Lord Gywall //===== Current Version: ===================================== -//= 4.5 +//= 4.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -74,6 +74,8 @@ //= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22] //= Replaced effect numerics with constants. //= 4.5 Official Gangster Alert script. [Gepard] +//= 4.6 Added quest log entries for: +//= - Cursed Spirit Quest //============================================================ // Gangster Alert [Aegis Conversion] @@ -3410,6 +3412,7 @@ OnTouch: if(!lhz_curse) { soundeffect "loli_ruri_stand.wav",0; + setquest 2086; set lhz_curse,1; end; } @@ -3455,6 +3458,7 @@ OnTouch: if(!lhz_curse) { soundeffect "tao_gunka_stand.wav",0; + setquest 2086; set lhz_curse,1; end; } @@ -3500,6 +3504,7 @@ OnTouch: if(!lhz_curse) { soundeffect "tao_gunka_stand.wav",0; + setquest 2086; set lhz_curse,1; end; } @@ -4399,6 +4404,7 @@ lhz_que01,99,74,5 script #pecomaster 48,{ mes "No matter how hard you try,"; mes "you can't open its clasp to see"; mes "what this pendant contains.^000000"; + changequest 2090,2091; set lhz_curse,17; getitem 7341,1; close2; @@ -4638,6 +4644,7 @@ L_NoText: mes "the wrath of these spirits..."; mes "But as long as you let them"; mes "guide you, you ought to be safe."; + changequest 2086,2087; set lhz_curse,6; close; @@ -4708,9 +4715,10 @@ L_NoText: mes "It won't be long until"; mes "the spirits are consumed"; mes "by their supernatural rage..."; + changequest 2091,2092; set lhz_curse,18; close; - case 2: + case 2: mes "[Elder]"; mes "Oh... You look so pale, are"; mes "you alright? Heh heh~"; @@ -4768,9 +4776,10 @@ L_NoText: mes "couple. Somehow, the girl in"; mes "the picture, sitting uncomfortably"; mes "in an old chair, looks familiar...^000000"; + delitem 523,5; // Holy Water + delitem 744,1; // Bouquet + changequest 2092,2093; set lhz_curse,19; - delitem 523,5; - delitem 744,1; close; } else goto L_NoText; @@ -4979,6 +4988,7 @@ lhz_in03,32,162,3 script Crippled Girl 53,{ mes "Sheesh."; mes "Don't kill the"; mes "messenger."; + changequest 2093,2094; set lhz_curse,23; close2; warp "lighthalzen",322,323; @@ -5074,6 +5084,7 @@ lhz_in03,32,162,3 script Crippled Girl 53,{ mes "["+strcharinfo(0)+"]"; mes "Yes, I'm sure of that."; delitem 7341,1; + changequest 2093,2094; set lhz_curse,25; close; @@ -5112,6 +5123,7 @@ lhz_in03,32,162,3 script Crippled Girl 53,{ mes "[Setsu]"; mes "I'll try hard!"; delitem 7341,1; + changequest 2093,2094; set lhz_curse,25; close; } @@ -5206,6 +5218,7 @@ OnTouch: mes "is tied to the ^FF0000Rekenber"; mes "Corporation^000000 and that"; mes "^FF0000Regenschirm Laboratory^000000."; + changequest 2094,2095; set lhz_curse,26; if(BaseLevel < 70) getexp 800000,300000; else if(BaseLevel < 80) getexp 1000000,500000; @@ -5225,68 +5238,69 @@ lhz_in01,114,181,3 script Representative 71,{ if(lhz_curse == 7) menu "Building Information",L_Building,"Corporation History",L_History; else menu "Building Information",L_Building; -L_Building: - mes "[Representative]"; - mes "Please tell me"; - mes "which floor you'd like"; - mes "to know more about."; - next; - switch( select( "1F","2F","B1","Cancel" ) ) - { - case 1: - mes "[Representative]"; - mes "The ^3131FFRekenber Library^000000 can"; - mes "be found at the end of the"; - mes "left hallway. Our library is"; - mes "a great resource of innovative"; - mes "ideas and information for our"; - mes "system development employees."; - next; - mes "[Representative]"; - mes "The ^3131FFBall Room^000000, where"; - mes "various official events are"; - mes "usually held, can be accessed"; - mes "through the right hallway."; - next; - goto L_Building; + while(1) { + mes "[Representative]"; + mes "Please tell me"; + mes "which floor you'd like"; + mes "to know more about."; + next; + switch( select( "1F","2F","B1","Cancel" ) ) + { + case 1: + mes "[Representative]"; + mes "The ^3131FFRekenber Library^000000 can"; + mes "be found at the end of the"; + mes "left hallway. Our library is"; + mes "a great resource of innovative"; + mes "ideas and information for our"; + mes "system development employees."; + next; + mes "[Representative]"; + mes "The ^3131FFBall Room^000000, where"; + mes "various official events are"; + mes "usually held, can be accessed"; + mes "through the right hallway."; + next; + break; - case 2: - mes "[Representative]"; - mes "Please use the stairs"; - mes "located on both sides of"; - mes "the Help Desk to go to the"; - mes "Second Floor. The Second"; - mes "Floor is mostly used for"; - mes "administrative purposes."; - next; - mes "[Representative]"; - mes "There, you can find"; - mes "the ^3131FFConference Room^000000,"; - mes "^3131FFSecretary Office^000000, the"; - mes "^3131FFAuditorium^000000 and the"; - mes "^3131FFChairman's Office^000000."; - next; - goto L_Building; + case 2: + mes "[Representative]"; + mes "Please use the stairs"; + mes "located on both sides of"; + mes "the Help Desk to go to the"; + mes "Second Floor. The Second"; + mes "Floor is mostly used for"; + mes "administrative purposes."; + next; + mes "[Representative]"; + mes "There, you can find"; + mes "the ^3131FFConference Room^000000,"; + mes "^3131FFSecretary Office^000000, the"; + mes "^3131FFAuditorium^000000 and the"; + mes "^3131FFChairman's Office^000000."; + next; + break; - case 3: - mes "[Representative]"; - mes "The first underground floor"; - mes "is used by the ^3131FFRegenshirm^000000,"; - mes "our laboratory affiliate. For"; - mes "security reasons, this floor"; - mes "is not accessible to visitors"; - next; - goto L_Building; + case 3: + mes "[Representative]"; + mes "The first underground floor"; + mes "is used by the ^3131FFRegenshirm^000000,"; + mes "our laboratory affiliate. For"; + mes "security reasons, this floor"; + mes "is not accessible to visitors"; + next; + break; - case 4: - mes "[Representative]"; - mes "We are always doing our"; - mes "best to provide the best"; - mes "services to our customers."; - mes "Remember that Rekenber"; - mes "is the name you can trust."; - mes "Thank you and have a nice day."; - close; + case 4: + mes "[Representative]"; + mes "We are always doing our"; + mes "best to provide the best"; + mes "services to our customers."; + mes "Remember that Rekenber"; + mes "is the name you can trust."; + mes "Thank you and have a nice day."; + close; + } } L_History: @@ -5302,8 +5316,9 @@ L_History: mes "the hallway to the left in"; mes "order to find our Library."; mes "Thank you and have a nice day."; + changequest 2087,2088; set lhz_curse,8; - close; + close; } lhz_in01,27,247,5 script Representative#lhz 71,{ @@ -5348,7 +5363,10 @@ lhz_in01,27,247,5 script Representative#lhz 71,{ mes "Rekenber Corporation to grow"; mes "into the nation's biggest company."; if(lhz_curse == 8) set lhz_curse,9; - else if(lhz_curse == 9) set lhz_curse,10; + else if(lhz_curse == 9) { + changequest 2088,2089; + set lhz_curse,10; + } next; break; @@ -5368,7 +5386,10 @@ lhz_in01,27,247,5 script Representative#lhz 71,{ mes "that Rekenber is the name"; mes "that you can trust."; if (lhz_curse == 8) set lhz_curse,9; - else if(lhz_curse == 9) set lhz_curse,10; + else if(lhz_curse == 9) { + changequest 2088,2089; + set lhz_curse,10; + } next; break; } @@ -5388,68 +5409,69 @@ lhz_in01,27,247,5 script Representative#lhz 71,{ switch( select( "Building Information" ) ) { case 1: -L_Building: - mes "[Representative]"; - mes "Please tell me"; - mes "which floor you'd like"; - mes "to know more about."; - next; - switch( select( "1F","2F","B1","Cancel" ) ) - { - case 1: - mes "[Representative]"; - mes "The ^3131FFRekenber Library^000000 can"; - mes "be found at the end of the"; - mes "left hallway. Our library is"; - mes "a great resource of innovative"; - mes "ideas and information for our"; - mes "system development employees."; - next; - mes "[Representative]"; - mes "The ^3131FFBall Room^000000, where"; - mes "various official events are"; - mes "usually held, can be accessed"; - mes "through the right hallway."; - next; - goto L_Building; + while (1) { + mes "[Representative]"; + mes "Please tell me"; + mes "which floor you'd like"; + mes "to know more about."; + next; + switch( select( "1F","2F","B1","Cancel" ) ) + { + case 1: + mes "[Representative]"; + mes "The ^3131FFRekenber Library^000000 can"; + mes "be found at the end of the"; + mes "left hallway. Our library is"; + mes "a great resource of innovative"; + mes "ideas and information for our"; + mes "system development employees."; + next; + mes "[Representative]"; + mes "The ^3131FFBall Room^000000, where"; + mes "various official events are"; + mes "usually held, can be accessed"; + mes "through the right hallway."; + next; + break; - case 2: - mes "[Representative]"; - mes "Please use the stairs"; - mes "located on both sides of"; - mes "the Help Desk to go to the"; - mes "Second Floor. The Second"; - mes "Floor is mostly used for"; - mes "administrative purposes."; - next; - mes "[Representative]"; - mes "There, you can find"; - mes "the ^3131FFConference Room^000000,"; - mes "^3131FFSecretary Office^000000, the"; - mes "^3131FFAuditorium^000000 and the"; - mes "^3131FFChairman's Office^000000."; - next; - goto L_Building; + case 2: + mes "[Representative]"; + mes "Please use the stairs"; + mes "located on both sides of"; + mes "the Help Desk to go to the"; + mes "Second Floor. The Second"; + mes "Floor is mostly used for"; + mes "administrative purposes."; + next; + mes "[Representative]"; + mes "There, you can find"; + mes "the ^3131FFConference Room^000000,"; + mes "^3131FFSecretary Office^000000, the"; + mes "^3131FFAuditorium^000000 and the"; + mes "^3131FFChairman's Office^000000."; + next; + break; - case 3: - mes "[Representative]"; - mes "The first underground floor"; - mes "is used by the ^3131FFRegenshirm^000000,"; - mes "our laboratory affiliate. For"; - mes "security reasons, this floor"; - mes "is not accessible to visitors"; - next; - goto L_Building; + case 3: + mes "[Representative]"; + mes "The first underground floor"; + mes "is used by the ^3131FFRegenshirm^000000,"; + mes "our laboratory affiliate. For"; + mes "security reasons, this floor"; + mes "is not accessible to visitors"; + next; + break; - case 4: - mes "[Representative]"; - mes "We are always doing our"; - mes "best to provide the best"; - mes "services to our customers."; - mes "Remember that Rekenber"; - mes "is the name you can trust."; - mes "Thank you and have a nice day."; - close; + case 4: + mes "[Representative]"; + mes "We are always doing our"; + mes "best to provide the best"; + mes "services to our customers."; + mes "Remember that Rekenber"; + mes "is the name you can trust."; + mes "Thank you and have a nice day."; + close; + } } } } @@ -5551,6 +5573,7 @@ lhz_in01,273,121,1 script Mad Scientist 865,{ mes "Here's a hint... It's round..."; mes "Shiny... Kids love playing games"; mes "with them! Oh, I said too much!"; + changequest 2089,2090; set lhz_curse,15; close; @@ -6062,6 +6085,7 @@ L_Evidence: mes "on people! Anyway, please"; mes "accept this as a token of"; mes "our gratitude, adventurer."; + changequest 2094,2095; set lhz_curse,31; getitem 617,1; getitem 12016,10; @@ -6107,7 +6131,10 @@ OnTouch: mes "that mad scientist. Only"; mes "his stacks of well organized"; mes "files remain here in the lab.^000000"; - if(lhz_curse == 31) set lhz_curse,32; + if(lhz_curse == 31) { + completequest 2095; + set lhz_curse,32; + } close; } } diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 499c1a95a9..03725e7aac 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -20,7 +20,7 @@ //= - prerequisite Quest to "Broken Diamond" //= - Variable in use: diamond_edq (Max: 14) //= Broken Diamond: -//- - Help Ibrahim rtrieve his stolen diamond. +//- - Help Ibrahim retrieve his stolen diamond. //= - prerequisite Quest to "Unlucky Emerald" //= - Variable in use: diamond_edq (Max: 26) //= Z-Gang Quest: @@ -55,6 +55,10 @@ //= 1.9 Fixed mapwarp warping to disabled map. [L0ne_W0lf] //= 2.0 Removed duplicate dialog. [L0ne_W0lf] //= 2.1 Fixed a race condition blocking progress. [brianluau] +//= 2.2 Added quest log entries for: +//= - Muff's Loan +//= - Broken Diamond +//= - Z-Gang Quest //============================================================ // Nameless Island and Cursed Monestary Access Quest @@ -664,7 +668,7 @@ ve_in,81,296,3 script Soldier#Aru 946,{ mes "Maybe the magistrate would"; mes "know if he was able to finish"; mes "interrogating the smugglers."; - mes "I'm not sure if he did since the smugglers were taken away."; + mes "I'm not sure if he did since the smugglers were taken away."; set aru_monas,10; close; } @@ -681,7 +685,7 @@ ve_in,81,296,3 script Soldier#Aru 946,{ else { mes "[Himus]"; mes "Nice day, isn't it?"; - close; + close; } } @@ -3159,6 +3163,7 @@ comodo,224,187,3 script Muff 86,{ mes "wallet, I'll make sure"; mes "to repay you. Please"; mes "help me if you can!"; + setquest 3100; set diamond_edq,1; close; case 2: @@ -3260,6 +3265,7 @@ comodo,224,187,3 script Muff 86,{ mes "but I really need my bond"; mes "of debt to get my collateral"; mes "back from that Belder."; + setquest 3100; set diamond_edq,1; close; case 2: @@ -3341,6 +3347,7 @@ comodo,224,187,3 script Muff 86,{ mes "him to restore my bond of"; mes "debt. I'll be waiting for"; mes "you right here, okay?"; + changequest 3102,3103; set diamond_edq,6; close; case 2: @@ -3372,6 +3379,7 @@ comodo,224,187,3 script Muff 86,{ mes "him to restore my bond of"; mes "debt. I'll be waiting for"; mes "you right here, okay?"; + changequest 3102,3103; set diamond_edq,6; close; case 2: @@ -3409,6 +3417,7 @@ comodo,224,187,3 script Muff 86,{ mes "You've done well, my friend."; mes "Here, please take these as"; mes "a meager reward for your help."; + completequest 3109; set diamond_edq,14; getitem 603,1; //Old_Blue_Box getitem 608,4; //Seed_Of_Yggdrasil @@ -3588,6 +3597,7 @@ cmd_fild01,55,160,0 script Heap of Earth 844,{ mes "little thing. Now what?"; mes "I dropped it! I have to"; mes "try to dig it up again..."; + changequest 3100,3101; set diamond_edq,2; close; case 2: @@ -3612,6 +3622,7 @@ cmd_fild01,55,160,0 script Heap of Earth 844,{ mes "Well, I've done all"; mes "I can for now. I should"; mes "bring this back to Muff."; + changequest 3101,3102; set diamond_edq,4; close; } @@ -3777,6 +3788,7 @@ izlude_in,110,64,3 script Dorian 878,2,2,{ mes "explain how you can"; mes "repair the Mystic"; mes "Dryer de Elegance."; + changequest 3103,3104; set diamond_edq,9; close; } @@ -3931,6 +3943,7 @@ izlude_in,110,64,3 script Dorian 878,2,2,{ delitem 999,5; //Steel delitem 723,2; //Cardinal_Jewel delitem 716,5; //Red_Gemstone + changequest 3104,3105; set diamond_edq,10; mes "[Dorian]"; mes "I expect you to fail"; @@ -4075,6 +4088,7 @@ izlude_in,110,64,3 script Dorian 878,2,2,{ mes "Elegance? That's expected:"; mes "I didn't really design it for the^FFFFFF ^000000 common user in mind. Well,"; mes "why don't you try it again?"; + erasequest 3106; set diamond_edq,10; close; } @@ -4092,6 +4106,8 @@ izlude_in,110,64,3 script Dorian 878,2,2,{ mes "is insert the damaged"; mes "document and press the"; mes "switch. Simple, yes?"; + erasequest 3106; + changequest 3105,3108; set diamond_edq,13; next; mes "[Dorian]"; @@ -4207,6 +4223,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "The joint is broken..."; mes "You should go back"; mes "to Dorian for help.^000000"; + setquest 3106; set diamond_edq,11; close; } @@ -4244,6 +4261,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "^3355FFYou should tell Dorian"; mes "first so that you can"; mes "use this machine.^000000"; + setquest 3107; set diamond_edq,12; close; } @@ -4267,6 +4285,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; case 1: @@ -4292,6 +4311,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; } @@ -4317,6 +4337,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; case 2: @@ -4342,6 +4363,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; } @@ -4366,6 +4388,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; case 3: @@ -4391,6 +4414,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; } @@ -4416,6 +4440,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; case 4: @@ -4441,6 +4466,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "before coming to a sudden"; mes "stop. That was the wrong"; mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; set diamond_edq,11; close; } @@ -4479,6 +4505,7 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "So this is the original"; mes "bond of debt that Muff"; mes "lost? It looks... Perfect!"; + changequest 3108,3109; getitem 7722,1; //Debt_Note close; } @@ -4604,6 +4631,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "Well, I'll be right"; mes "here. I hope you come"; mes "back with some good news."; + setquest 3110; set diamond_edq,15; close; case 2: @@ -4802,6 +4830,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "Well, I don't know if"; mes "it's enough for what you"; mes "did, but I hope you like it."; + completequest 3118; set diamond_edq,26; getitem 732,2; //Crystal_Jewel__ getitem 603,1; //Old_Blue_Box @@ -5359,6 +5388,7 @@ geffen,128,153,3 script Leblo 883,{ mes "she'll give you my medicine..."; mes "I hope. Anyway, her name is"; mes "^0000FFWola^000000, and she's in Payon."; + changequest 3110,3111; set diamond_edq,17; close; case 2: @@ -5435,6 +5465,7 @@ geffen,128,153,3 script Leblo 883,{ mes "learn more about the Z Gang."; mes "Pretty useful info, huh?"; mes "Take care, my friend."; + changequest 3114,3115; set diamond_edq,22; close; } @@ -5630,6 +5661,7 @@ payon_in03,167,149,3 script Wola 75,2,2,{ next; mes "["+ strcharinfo(0) +"]"; mes "You... You got it."; + changequest 3111,3112; set diamond_edq,19; close; } @@ -5684,6 +5716,7 @@ payon_in03,167,149,3 script Wola 75,2,2,{ mes "some medicine? I completely"; mes "forgot about that for a while."; mes "What did you say exactly?"; + changequest 3112,3113; set diamond_edq,20; next; switch(select("Will you go out with me?:Leblo's back medicine?")) { @@ -5749,6 +5782,7 @@ payon_in03,167,149,3 script Wola 75,2,2,{ mes "be okay in my hands. I need"; mes "to get back to work: please"; mes "take care of yourself!"; + changequest 3113,3114; set diamond_edq,21; close; } @@ -5836,6 +5870,7 @@ payon_in03,167,149,3 script Wola 75,2,2,{ mes "be okay in my hands. I need"; mes "to get back to work: please"; mes "take care of yourself!"; + changequest 3113,3114; set diamond_edq,21; close; } @@ -5854,7 +5889,6 @@ payon_in03,167,149,3 script Wola 75,2,2,{ mes "Take care of yourself!"; close; -//OnTouch2: OnTouch: if (diamond_edq == 17) { mes "[Wola]"; @@ -5961,6 +5995,7 @@ in_rogue,366,46,3 script Rogue Investigator 828,{ mes "in Comodo. I doubt you'll"; mes "find anything there, but"; mes "you can go check it out. "; + changequest 3115,3116; set diamond_edq,23; close; } @@ -6032,6 +6067,7 @@ in_rogue,366,46,3 script Rogue Investigator 828,{ mes "is a large warehouse in"; mes "Comodo where I doubt you'll"; mes "find anything. But who knows? "; + changequest 3115,3116; set diamond_edq,23; close; } @@ -6142,6 +6178,7 @@ cmd_in02,69,188,1 script Small Safe 844,{ mes "sneak out of here, and"; mes "return this big diamond"; mes "to Ibrahim as soon as I can."; + changequest 3117,3118; set diamond_edq,25; close; } @@ -6201,6 +6238,7 @@ cmd_in02,80,189,0 script Odd Switch#Switch2 844,{ next; mes "^3355FF*Click Click*^000000"; next; + changequest 3116,3117; set diamond_edq,24; mes "[" + strcharinfo(0) + "]"; mes "That sound...!"; @@ -6246,6 +6284,7 @@ prontera,150,326,0 script Wanted Notice#edq 111,{ mes "be rewarded with the Book"; mes "of Forbidden Mystery, one"; mes "of the kingdom's treasures."; + setquest 3119; set zdan_edq,1; close; } @@ -6277,7 +6316,7 @@ prontera,150,326,0 script Wanted Notice#edq 111,{ mes "^0000ffCatfoii^000000 - Pet Cat"; next; mes "====National Wanted Notice===="; - mes "These infamous members"; + mes "These infamous members"; mes "of the Z Gang are suspected"; mes "of stealing national treasure,"; mes "committing fraud, forgery,"; @@ -6339,6 +6378,7 @@ prontera,148,326,3 script Chief Officer#edq 734,{ mes "Louis, Martha Hertizan a.k.a."; mes "Martha, and Catfoii a.k.a."; mes "Catfoii must be captured!"; + changequest 3119,3120; set zdan_edq,2; close; } @@ -6512,6 +6552,7 @@ prontera,148,326,3 script Chief Officer#edq 734,{ mes "be recorded in the annals"; mes "of Rune-Midgarts history."; mes "Congratulations! "; + completequest 3134; set zdan_edq,19; getexp 1000000,0; close; @@ -6575,6 +6616,7 @@ prt_in,168,18,1 script Valdes 65,2,2,{ mes "5 bottles! Then... Maybe..."; mes "I'll tell you want you really"; mes "wanna know. Heh heh~ ^666666*Hic!*^000000"; + changequest 3120,3121; set zdan_edq,3; close; case 2: @@ -6664,6 +6706,7 @@ prt_in,168,18,1 script Valdes 65,2,2,{ mes "those Z Gang bastards."; mes "^666666*Sigh*^000000 I think I'll go rest"; mes "a bit now. Good luck!"; + changequest 3121,3122; set zdan_edq,4; close; } @@ -6757,6 +6800,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "or not, I'm gonna continue"; mes "investigating the Z Gang for"; mes "the Rogue Guild and Valdes."; + changequest 3122,3123; set zdan_edq,5; break; case 2: @@ -6924,6 +6968,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "and check it out. Good"; mes "luck finding those Z Gang"; mes "guys. And take care!"; + changequest 3125,3126; set zdan_edq,9; close; } @@ -6989,7 +7034,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "decoders in this kingdom."; next; mes "[" + strcharinfo(0) + "]"; - mes "Goohoo Ahn?"; + mes "Gooho Ahn?"; mes "Why does it feel like"; mes "I should know that"; mes "name? It's so familiar..."; @@ -7003,15 +7048,16 @@ in_rogue,359,116,3 script Marybell 747,{ mes "[Marybell]"; mes "Eh, that's not what's"; mes "important right now."; - mes "Would you talk to Goohoo"; + mes "Would you talk to Gooho"; mes "Ahn and see what he found?"; + changequest 3128,3129; set zdan_edq,12; close; } if ((zdan_edq > 11) && (zdan_edq < 14)) { mes "[Marybell]"; mes "Hey, why don't you talk"; - mes "to Goohoo Ahn in Payon,"; + mes "to Gooho Ahn in Payon,"; mes "and ask if he finished"; mes "decoding that secret letter"; mes "from the Z Gang already?"; @@ -7019,7 +7065,7 @@ in_rogue,359,116,3 script Marybell 747,{ } if (zdan_edq == 14) { mes "[Marybell]"; - mes "Oh, Goohoo decoded everything?"; + mes "Oh, Gooho decoded everything?"; mes "Let's see... Something about"; mes "the Book of Forbidden Mystery...^FFFFFF ^000000 Ah. There we go! The location"; mes "of the Z Gang's hideout!"; @@ -7048,6 +7094,7 @@ in_rogue,359,116,3 script Marybell 747,{ mes "hunt them down separately, and"; mes "whoever finds 'em first gets"; mes "dibs on beating them up!"; + changequest 3131,3132; set zdan_edq,15; close; } @@ -7197,6 +7244,7 @@ payon,244,62,3 script Moonho Ahn 897,{ mes "some time to prep the"; mes "game? When you return,"; mes "we'll be ready to play~"; + changequest 3123,3124; set zdan_edq,6; close; } @@ -7419,6 +7467,7 @@ payon,244,62,3 script Moonho Ahn 897,{ mes "feels good to have"; mes "played with a worthy"; mes "opponent. Thank you~"; + changequest 3124,3125; set zdan_edq,7; close; } @@ -7555,6 +7604,7 @@ payon,244,62,3 script Moonho Ahn 897,{ mes "feels good to have"; mes "played with a worthy"; mes "opponent. Thank you~"; + changequest 3124,3125; set zdan_edq,7; close; } @@ -7707,6 +7757,7 @@ payon,192,176,3 script Gooho Ahn 903,{ mes "I need, I should be able"; mes "to decrypt the rest of"; mes "this secret Z Gang letter."; + changequest 3129,3130; set zdan_edq,13; close; } @@ -7809,6 +7860,7 @@ payon,192,176,3 script Gooho Ahn 903,{ mes "^0000ffWeii arr prowd Z G gna^000000"; mes "^0000ffAynoen hwo sspotp uys^000000"; mes "^0000ffwlil eb kckide on htier ssa!^000000"; + changequest 3130,3131; set zdan_edq,14; close; } @@ -7901,6 +7953,7 @@ moc_ruins,90,67,3 script Suspicious Man#1 99,2,2,{ mes "an informer for the Z Gang."; mes "He can't have gotten too far:"; mes "I have a chance to catch him!"; + changequest 3126,3127; set zdan_edq,10; close; } @@ -8013,6 +8066,7 @@ moc_ruins,90,67,3 script Suspicious Man#1 99,2,2,{ mes "I should head back to"; mes "Marybell, and see if she's"; mes "learned any new information."; + changequest 3127,3128; set zdan_edq,11; set $@zdan,0; stopnpctimer; @@ -8096,6 +8150,7 @@ OnTouch: mes "an informer for the Z Gang."; mes "He can't have gotten too far:"; mes "I have a chance to catch him!"; + changequest 3126,3127; set zdan_edq,10; close; } @@ -8145,6 +8200,7 @@ moc_ruins,78,167,3 script Suspicious Man#2 99,2,2,{ mes "an informer for the Z Gang."; mes "He can't have gotten too far:"; mes "I have a chance to catch him!"; + changequest 3126,3127; set zdan_edq,10; close; } @@ -8234,6 +8290,7 @@ moc_ruins,78,167,3 script Suspicious Man#2 99,2,2,{ mes "I should head back to"; mes "Marybell, and see if she's"; mes "learned any new information."; + changequest 3127,3128; set zdan_edq,11; set $@zdan,0; stopnpctimer; @@ -8342,6 +8399,7 @@ OnTouch: mes "an informer for the Z Gang."; mes "He can't have gotten too far:"; mes "I have a chance to catch him!"; + changequest 3126,3127; set zdan_edq,10; close; } @@ -8421,6 +8479,7 @@ moc_fild17,209,235,0 script Odd Slab 111,4,4,{ mes "What th--?! What's"; mes "happening?! I'm being"; mes "sucked away somewhere!"; + changequest 3132,3133; set zdan_edq,16; close2; warp "z_agit",98,40; @@ -8674,7 +8733,6 @@ OnInit: OnEnable: enablenpc "#ZGuard"; initnpctimer; - set .MyMobCount,3; monster "z_agit",97,78,"Catfoii's Guard",1479,1,"#ZGuard::OnMyMobDead"; monster "z_agit",98,79,"Catfoii's Guard",1479,1,"#ZGuard::OnMyMobDead"; monster "z_agit",96,81,"Catfoii's Guard",1523,1,"#ZGuard::OnMyMobDead"; @@ -8691,8 +8749,7 @@ Onreset: end; OnMyMobDead: - set .MyMobCount,.MyMobCount-1; - if (.MyMobCount < 1) { + if (mobcount("z_agit","#ZGuard::OnMyMobDead") < 1) { mes "[" + strcharinfo(0) + "]"; mes "You cowardly Z Gang!"; mes "Come out and surrender!"; @@ -8830,6 +8887,7 @@ z_agit,97,101,3 script Louis 931,{ mes "But how did we lose?!"; close2; getitem 7724,1; //Forbidden_Secret_Art + changequest 3133,3134; set zdan_edq,18; mapwarp "z_agit","moc_fild17",209,235; set $@monster_zgang,0; @@ -8952,6 +9010,7 @@ z_agit,99,101,3 script Martha 101,{ mes "But how did we lose?!"; close2; getitem 7724,1; //Forbidden_Secret_Art + changequest 3133,3134; set zdan_edq,18; mapwarp "z_agit","moc_fild17",209,235; set $@monster_zgang,0; @@ -9071,6 +9130,7 @@ z_agit,95,101,3 script Catfoii 876,{ mes "But how did we lose?!"; close2; getitem 7724,1; //Forbidden_Secret_Art + changequest 3133,3134; set zdan_edq,18; mapwarp "z_agit","moc_fild17",209,235; set $@monster_zgang,0; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index a8094ffcf5..8c598bd8b7 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 3.3a +//= 3.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -60,6 +60,9 @@ //= 3.3 Fixed occurance of PcName. [L0ne_W0lf] //= Fixed level 4 ID warps always being usable. //= 3.3a Fixed level 4 ID warps again. (Bugreport:4102) [L0ne_W0lf] +//= 3.4 Added quest log entries for: +//= - Ice Necklace Quest +//= - Thor Volcano Base Quest addition. //============================================================ // Lost Child Quest (Prerequisite to High Priest quest) @@ -2884,6 +2887,7 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{ mes "to restore its luster. Then,"; mes "it'll be a fitting tribute to"; mes "our loving goddess Freya."; + setquest 2109; getitem 7572,1; //Magic_Necklace set ice_necklace_q,1; close2; @@ -2923,6 +2927,7 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{ mes " what you have done for me."; delitem 7573,1; //Magic_Necklace_ getexp 700000,0; + completequest 2113; set ice_necklace_q,6; next; mes "["+strcharinfo(0)+"]"; @@ -3150,6 +3155,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "this prison of ice. He can"; mes "be found near Freya's Spring:"; mes "beseech him on my behalf!"; + changequest 2109,2110; set ice_necklace_q,2; close2; cutin "",255; @@ -3276,6 +3282,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ delitem 7569,1; //Wind Of_Hammer getitem 7574,4; //Freezing Snow Powder getitem 7573,1; //Magic_Necklace_ + changequest 2112,2113; set ice_necklace_q,5; close2; cutin "",255; @@ -3381,6 +3388,7 @@ rachel,265,98,3 script Hamion#aru 930,{ mes "not one of those smithing tools."; mes "I'd help you if I could, but..."; mes "I'm just smart, not strong."; + changequest 2110,2111; set ice_necklace_q,3; close; } @@ -3451,6 +3459,7 @@ rachel,265,98,3 script Hamion#aru 930,{ delitem 1354,1; //Empty_Scroll delitem 7433,1; //Hammer getitem 7569,1; //Hammer_of_Wind + changequest 2111,2112; set ice_necklace_q,4; close; } @@ -5768,6 +5777,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "of a really good way"; mes "for you to infiltrate"; mes "that place. Hmmmm..."; + setquest 2114; set aru_vol,1; close2; cutin "ra_gman",255; @@ -5940,6 +5950,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "best chance of entering the Thor"; mes "Volcano camp without suspicion."; delitem 7342,1; //File01 + changequest 2115,2116; set aru_vol,6; } else { @@ -6014,6 +6025,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "I will be contacting you again."; mes "Together, we can protect"; mes "peace between our nations."; + completequest 60213; set aru_vol,27; getexp 200000,0; close2; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 855bdceae8..8decb1264a 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -40,6 +40,9 @@ //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.7 Moved a couple NPCs related to the Spy quest. [L0ne_W0lf] //= 1.8 Fixed some typos and confusing condition checks. [L0ne_W0lf] +//= 1.9 Added quest log entries for: +//= - Siblings Quest +//= - Thor Volcano Base Quest //============================================================ // Stone Quest @@ -1971,7 +1974,6 @@ ein_in01,279,221,0 script Hotel Manager#sch 903,5,5,{ } end; -//OnTouch2: OnTouch: if (que_sch == 14) { mes "[Manager]"; @@ -2030,7 +2032,6 @@ ein_in01,166,282,4 script Employee#sch 904,{ } ein_in01,176,285,0 script ͵ #sch -1,1,1,{ -//OnTouch2: OnTouch: if (que_sch == 15) { disablenpc "Corporate Figure#sch"; @@ -2794,6 +2795,7 @@ veins,327,185,3 script Kid#camelcamel 944,{ mes "I'll go search Thor"; mes "Volcano to find your"; mes "little sister Curdie."; + setquest 3060; set rachel_camel,1; close; } @@ -2833,6 +2835,7 @@ veins,327,185,3 script Kid#camelcamel 944,{ mes "locksmith in the market"; mes "street! You can ask him"; mes "to help free Curdie!"; + changequest 3061,3062; set rachel_camel,3; close; } @@ -3032,6 +3035,7 @@ veins,327,185,3 script Kid#camelcamel 944,{ mes "Good, good..."; mes "It's a promise, then."; mes "I'll see you later~"; + completequest 3083; set rachel_camel,25; specialeffect2 EF_ABSORBSPIRITS; getexp 1000000,700000; @@ -3217,6 +3221,7 @@ que_thor,36,66,5 script Little Curdie 941,{ mes "in town will know of a way"; mes "to unlock your shackles."; mes "I'll be back as soon as I can!"; + changequest 3060,3061; set rachel_camel,2; close; } @@ -3409,6 +3414,7 @@ que_thor,36,66,5 script Little Curdie 941,{ mes "Now you need to take"; mes "the mold back to town"; mes "to Mr. Lockenlock.^000000"; + changequest 3079,3080; set rachel_camel,21; close; } @@ -3478,6 +3484,7 @@ que_thor,36,66,5 script Little Curdie 941,{ mes "volcano? It must have been"; mes "dangerous... Something"; mes "related to the Rachel Army..."; + changequest 3082,3083; set rachel_camel,24; close; } @@ -3620,6 +3627,7 @@ veins,181,166,3 script Lockenlock 900,{ mes "["+strcharinfo(0)+"]"; mes "..........."; delitem 503,1; //Yellow_Potion + changequest 3063,3064; set rachel_camel,5; close; } @@ -3810,6 +3818,7 @@ veins,181,166,3 script Lockenlock 900,{ next; mes "["+strcharinfo(0)+"]"; mes "Alright."; + changequest 3078,3079; set rachel_camel,20; close; } @@ -3856,6 +3865,7 @@ veins,181,166,3 script Lockenlock 900,{ mes "the key, so I can get it done"; mes "as soon as you can bring"; mes "me the Steel. I'll be waiting."; + changequest 3080,3081; set rachel_camel,22; close; } @@ -3949,6 +3959,7 @@ veins,181,166,3 script Lockenlock 900,{ mes "Make sure that you"; mes "bring that child back"; mes "safe to her family!"; + changequest 3081,3082; set rachel_camel,23; close; } @@ -4118,6 +4129,7 @@ veins,227,127,5 script Ivory 940,{ mes "^4D4DFF5 Empty Bottles^000000."; mes "Then we can move"; mes "on to the hard part."; + changequest 3064,3065; set rachel_camel,6; close; } @@ -4163,6 +4175,7 @@ veins,227,127,5 script Ivory 940,{ mes "Okay, so I need to visit"; mes "him if I really need you"; mes "to make the soap..."; + changequest 3065,3066; set rachel_camel,7; close; } @@ -4335,6 +4348,7 @@ veins,227,127,5 script Ivory 940,{ mes "Silk Sand Camel Soap."; mes "you should bring it"; mes "to Mr. Lockenlock.^000000"; + changequest 3077,3078; set rachel_camel,19; close; } @@ -4480,6 +4494,7 @@ veins,115,59,5 script Saraman 847,{ mes "^4D4DFF5 Monster's Feed^000000,"; mes "^4D4DFF1 Empty Bottle^000000, and"; mes "^4D4DFF1 Yellow Potion^000000."; + changequest 3066,3067; set rachel_camel,8; close; } @@ -4524,6 +4539,7 @@ veins,115,59,5 script Saraman 847,{ delitem 503,1; //Yellow_Potion delitem 619,1; //Unripe_Apple delitem 713,1; //Empty_Bottle + changequest 3067,3068; set rachel_camel,9; close; } @@ -4606,6 +4622,7 @@ veins,115,59,5 script Saraman 847,{ mes "so she shouldn't be far from"; mes "here. Please find my camel"; mes "Soony as soon as you can!"; + changequest 3069,3070; set rachel_camel,11; close; } @@ -4675,6 +4692,7 @@ veins,115,59,5 script Saraman 847,{ mes "what you've done for me."; mes "Good luck with getting"; mes "that soap you want made."; + changequest 3076,3077; getitem 617,1; //Old_Violet_Box set rachel_camel,18; close; @@ -4713,6 +4731,7 @@ veins,78,226,5 script Camel#camelcc1::VeinsCamel 938,{ mes "appetite stimulant, but"; mes "brusquely turned its"; mes "nose away from it.^000000"; + changequest 3068,3069; set rachel_camel,10; close; } @@ -4723,7 +4742,6 @@ veins,78,226,5 script Camel#camelcc1::VeinsCamel 938,{ mes "nose away from it."; mes "This probably isn't the"; mes "camel you're looking for.^000000"; - set rachel_camel,10; close; } else { @@ -4765,6 +4783,7 @@ ve_fild07,235,42,3 script Silk Sand Camel 938,{ mes "I guess all I need to"; mes "do is collect some of"; mes "that precious camel dung."; + changequest 3070,3071; set rachel_camel,12; close; } @@ -4918,12 +4937,12 @@ ve_fild07,235,42,3 script Silk Sand Camel 938,{ next; mes "^3355FFIt's time for you to"; mes "return to Mr. Saraman.^000000"; - } delitem 519,2; //Milk delitem 511,20; //Green_Herb delitem 909,10; //Jellopy delitem 713,1; //Empty_Bottle + changequest 3059+rachel_camel,3060+rachel_camel; set rachel_camel,rachel_camel+1; close; case 6: @@ -5056,6 +5075,7 @@ veins,221,120,5 script Young Town Native 943,{ mes "^3355FFFind Mr. Lockenlock"; mes "in the market street, and"; mes "bring him a Yellow Potion.^000000"; + changequest 3062,3063; set rachel_camel,4; close; } @@ -5234,7 +5254,6 @@ OnInit: end; OnTouch: -//OnTouch2: warp "ra_temin",85,137; close; } @@ -5252,7 +5271,6 @@ OnInit: end; OnTouch: -//OnTouch2: warp "ra_temin",85,137; close; } @@ -5301,7 +5319,6 @@ ra_temin,115,140,1 script Flower Vase#vol 111,{ ra_temin,85,131,0 script path_vol1 -1,5,0,{ OnTouch: -//OnTouch2: if ((aru_vol != 3) && (aru_vol != 4)) { warp "ra_temin",85,137; } @@ -5310,7 +5327,6 @@ OnTouch: ra_temin,82,131,0 script path_vol1#2 -1,5,0,{ OnTouch: -//OnTouch2: if (aru_vol != 4) { warp "ra_temin",85,137; } @@ -5319,7 +5335,6 @@ OnTouch: ra_temin,82,127,0 script path_vol1#3 -1,5,1,{ OnTouch: -//OnTouch2: if (aru_vol == 5) { warp "ra_temin",84,124; } @@ -5503,6 +5518,7 @@ ra_temin,85,118,3 script Drawer#vol3 111,{ mes "Research Institute'' on"; mes "the cover, and then you"; mes "close the drawer.^000000"; + changequest 2114,2115; set aru_vol,5; getitem 7342,1; //File01 close; @@ -5568,7 +5584,6 @@ ra_temin,73,126,1 script Ladder#vol1 111,{ ve_in,280,223,0 script #volroom -1,2,2,{ OnTouch: -//OnTouch2: if (aru_vol == 6) { mes "^3355FFThis house looks like"; mes "it's been abandoned for"; @@ -5863,6 +5878,7 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "the feeling that this will"; mes "all turn out in your favor."; mes "You know that feeling, right?^000000"; + changequest 2116,2117; set aru_vol,8; getitem 7705,1; //Note_Of_Geologist close; @@ -5985,6 +6001,7 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "well done. Good work!"; mes "I expected nothing less"; mes "from my star pupil!"; + changequest 60211,60212; set aru_vol,25; delitem 7342,1; //File01 delitem 7704,1; //Broken_Thermometer @@ -6112,6 +6129,7 @@ ve_in,281,214,3 script Bookshelf#vol 111,{ mes "your eyes, and reach inside"; mes "Gio's purple box of goodies.^000000"; next; + changequest 60212,60213; set aru_vol,26; set .@box_box,rand(1,20); if (.@box_box < 7) { @@ -6155,6 +6173,7 @@ thor_v01,37,234,3 script Hot Land Surface#1 111,{ mes "^3355FFYou record the"; mes "temperature in"; mes "your report.^000000"; + changequest 2117,2118; set aru_vol,9; next; mes "["+strcharinfo(0)+"]"; @@ -6192,6 +6211,7 @@ thor_v02,165,37,3 script Hot Land Surface#2 111,{ mes "^3355FFYou record the"; mes "temperature in"; mes "your report.^000000"; + changequest 2118,2119; set aru_vol,10; close; } @@ -6229,6 +6249,7 @@ thor_v02,170,100,3 script Hot Land Surface#3 111,{ mes "measurements. I should"; mes "submit this report to the"; mes "geological camp now~"; + changequest 2119,2120; set aru_vol,11; close; } @@ -6275,6 +6296,7 @@ que_thor,145,66,3 script Guard#vol::VeinsGuard 939,{ mes "ask Sahedi to help you."; mes "He's at the airship just"; mes "south of the train station."; + changequest 2120,2121; set aru_vol,12; close2; warp "thor_camp",248,190; @@ -6387,6 +6409,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "Please go ahead, and"; mes "see if this camp will be"; mes "safe from any disaster."; + changequest 2121,2122; set aru_vol,13; delitem 7342,1; //File01 close; @@ -6501,6 +6524,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "Hopefully he'll have some"; mes "advice for what we can"; mes "do about this disaster..."; + changequest 2128,60211; set aru_vol,24; getitem 7342,1; //File01 close; @@ -6513,7 +6537,6 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ thor_camp,194,220,0 script #Colonel1 -1,5,5,{ OnTouch: -//OnTouch2: if (aru_vol == 13) { enablenpc "Colonel Vito#1"; mes "[????]"; @@ -6546,6 +6569,7 @@ OnTouch: mes "great Colonel Vito. I'll mold"; mes "you into a true warrior for"; mes "Freya! Now follow me!"; + changequest 2122,2123; set aru_vol,14; close2; disablenpc "Colonel Vito#1"; @@ -6568,7 +6592,6 @@ OnTouch: thor_camp,162,182,0 script #Colonel2 -1,7,7,{ OnTouch: -//OnTouch2: if (aru_vol == 13) { enablenpc "Colonel Vito#2"; mes "[????]"; @@ -6601,6 +6624,7 @@ OnTouch: mes "great Colonel Vito. I'll mold"; mes "you into a true warrior for"; mes "Freya! Now follow me!"; + changequest 2122,2123; set aru_vol,14; disablenpc "Colonel Vito#2"; close2; @@ -6851,6 +6875,7 @@ thor_camp,159,74,3 script Colonel Vito#3 946,{ mes "in Freya's service. That"; mes "is all for the first exercise,"; mes "but there's one more left."; + changequest 2123,2124; set aru_vol,16; close; } @@ -6892,6 +6917,7 @@ thor_camp,159,74,3 script Colonel Vito#3 946,{ mes "body. See the dummy in"; mes "front of you? Practice by"; mes "chopping it 10 times. Go!"; + changequest 2125,2126; set aru_vol,19; next; if (select("Yes, sir!:What do you mean by chop?") == 1) { @@ -6942,6 +6968,7 @@ thor_camp,159,74,3 script Colonel Vito#3 946,{ mes "he'll think of me as"; mes "a geological researcher"; mes "instead of as a soldier.^000000)"; + changequest 2126,2127; set aru_vol,21; close; } @@ -6955,7 +6982,6 @@ thor_camp,159,74,3 script Colonel Vito#3 946,{ thor_camp,141,62,0 script #vol_study1::VeinsWarp -1,3,3,{ OnTouch: -//OnTouch2: if ((aru_vol >= 14 && aru_vol <= 16) || (aru_vol == 19)) { warp "thor_camp",156,67; } @@ -6967,7 +6993,6 @@ thor_camp,172,38,0 duplicate(VeinsWarp) #vol_study3 -1,3,3 thor_camp,172,132,0 script #sita_vol -1,3,3,{ OnTouch: -//OnTouch2: if (aru_vol == 21) { mes "^3355FFThere's a stream of"; mes "magma running down"; @@ -6986,7 +7011,6 @@ OnTouch: thor_camp,148,310,0 script #buki_vol -1,5,5,{ OnTouch: -//OnTouch2: if (aru_vol == 22) { mes "^3355FFPeople are carrying"; mes "many heavy wooden boxes"; @@ -6998,6 +7022,7 @@ OnTouch: mes "["+strcharinfo(0)+"]"; mes "I should go back"; mes "to Sahedi now."; + changequest 2127,2128; set aru_vol,23; close; } @@ -7053,6 +7078,7 @@ thor_camp,109,167,3 script Control Panel#vol 111,{ mes "No problems here."; mes "I guess I can go"; mes "back to that colonel."; + changequest 2124,2125; set aru_vol,18; close; } @@ -7272,7 +7298,7 @@ thor_camp,98,213,5 script Thor Volcano Soldier#vo9 939,{ } thor_v02,143,78,0 script #totcamp 45,2,2,{ -OnTouch: +OnTouch_: if (rachel_camel < 24) { warp "que_thor",65,55; end; @@ -7282,20 +7308,19 @@ OnTouch: } que_thor,69,56,0 script #tov_1 45,2,2,{ -OnTouch: +OnTouch_: warp "thor_v02",146,84; end; } que_thor,187,56,0 script #tov_2 45,2,2,{ -OnTouch: +OnTouch_: warp "thor_v02",146,84; end; } thor_camp,62,98,0 script #volbq -1,5,5,{ OnTouch: -//OnTouch2: mes "^3355FFThere is an old man"; mes "in high priest robes"; mes "in front of you.^000000"; @@ -7326,7 +7351,7 @@ thor_camp,246,191,3 script Guard#goto 939,{ } veins,302,166,0 script #whoau -1,2,2,{ -OnTouch: +OnTouch_: mes "[House Owner]"; mes "Wh-who the hell"; mes "are you? Honey!"; From 778f130de93e210884ea2c383c7f6bfc492433de Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 00:49:12 +0000 Subject: [PATCH 076/129] * Fixed map-server displaying 'PK Mode' notice only for pk_mode 1 (since r8402). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14491 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/map.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 403b62c7e1..e7361b53c3 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -11,6 +11,7 @@ Date Added - Fixed guild member position, hair, hair color, gender, class and level could potentially become corrupted due to shorts being read as ints (partially since r2986). * Fixed disguising as player clone causing the client to crash while looking for non-existing NPC sprites (bugreport:4428, since r14387, related r14383). [Ai4rei] * Fixed Rogue skill Steal Coin working on boss monsters (bugreport:2442). [Ai4rei] + * Fixed map-server displaying 'PK Mode' notice only for pk_mode 1 (since r8402). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/map/map.c b/src/map/map.c index e696b874d1..309095ff01 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3676,7 +3676,7 @@ int do_init(int argc, char *argv[]) //##TODO invoke a CONSOLE_START plugin event } - if (battle_config.pk_mode == 1) + if (battle_config.pk_mode) ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n"); ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map_port); From f91260ea570329a39180f3e2ac163f0b9820537d Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 09:26:00 +0000 Subject: [PATCH 077/129] * Added script command pushpc, which is required by newer scripts. - Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14492 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 3 +++ db/const.txt | 9 ++++++++ doc/script_commands.txt | 18 ++++++++++++++++ src/map/script.c | 39 +++++++++++++++++++++++++++++++++ src/map/skill.c | 41 ++--------------------------------- src/map/unit.c | 48 +++++++++++++++++++++++++++++++++++++++++ src/map/unit.h | 1 + 7 files changed, 120 insertions(+), 39 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index e7361b53c3..84fd9c869d 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,8 @@ Date Added +2010/11/23 + * Added script command pushpc, which is required by newer scripts. [Ai4rei] + - Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code. 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] diff --git a/db/const.txt b/db/const.txt index 6310a0d7f9..697ad37bdd 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1882,3 +1882,12 @@ VAR_HEADPALETTE 6 VAR_BODYPALETTE 7 VAR_SHIELD 8 VAR_SHOES 9 + +DIR_NORTH 0 +DIR_NORTHWEST 1 +DIR_WEST 2 +DIR_SOUTHWEST 3 +DIR_SOUTH 4 +DIR_SOUTHEAST 5 +DIR_EAST 6 +DIR_NORTHEAST 7 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 1c75bb0625..29e9edee4d 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -135,6 +135,8 @@ //= 3.28.20091119 //= Added showevent and searchitem commands [Skotlex] //= Added info on strcharinfo(3) [Skotlex] +//= 3.29.20101123 +//= Added 'pushpc' command. [Ai4rei] //========================================================= This document is a reference manual for all the scripting commands and functions @@ -3869,6 +3871,22 @@ example, there is a Stylist script inside the default eAthena installation that you can look at, this may help you create a Stylist of your own: 'custom\dye.txt' +--------------------------------------- + +*pushpc ,; + +This command will push the currently attached player to given direction by given +amount of square cells. Direction is the same as used when declaring npcs, and +can be specified by using one of the DIR_* constants (db/const.txt). + +The knock-back is not restricted by items or map flags, only obstacles are taken +into account. If there is not enough space to perform the push (e.g. due to a +wall), the character is pushed only up to the obstacle. + + // pushes the character 5 cells in 3 o'clock direction from it's + // current position. + pushpc DIR_EAST, 5; + --------------------------------------- \\ 4,1.- Item-related commands diff --git a/src/map/script.c b/src/map/script.c index d823ae597f..906dce5107 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -14380,6 +14380,44 @@ BUILDIN_FUNC(progressbar) return 0; } +BUILDIN_FUNC(pushpc) +{ + int direction, cells, dx, dy; + struct map_session_data* sd; + + if((sd = script_rid2sd(st))==NULL) + { + return 0; + } + + direction = script_getnum(st,2); + cells = script_getnum(st,3); + + if(direction<0 || direction>7) + { + ShowWarning("buildin_pushpc: Invalid direction %d specified.\n", direction); + script_reportsrc(st); + + direction%= 8; // trim spin-over + } + + if(!cells) + {// zero distance + return 0; + } + else if(cells<0) + {// pushing backwards + direction = (direction+4)%8; // turn around + cells = -cells; + } + + dx = dirx[direction]; + dy = diry[direction]; + + unit_blown(&sd->bl, dx, dy, cells, 0); + return 0; +} + // declarations that were supposed to be exported from npc_chat.c #ifdef PCRE_SUPPORT BUILDIN_FUNC(defpattern); @@ -14739,6 +14777,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(setfont,"i"), BUILDIN_DEF(areamobuseskill,"siiiiviiiii"), BUILDIN_DEF(progressbar, "si"), + BUILDIN_DEF(pushpc,"ii"), // WoE SE BUILDIN_DEF(agitstart2,""), BUILDIN_DEF(agitend2,""), diff --git a/src/map/skill.c b/src/map/skill.c index a54bedc206..ccc3d96f9d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1467,8 +1467,7 @@ int skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int -------------------------------------------------------------------------*/ int skill_blown(struct block_list* src, struct block_list* target, int count, int direction, int flag) { - int dx = 0, dy = 0, nx, ny; - int ret; + int dx = 0, dy = 0; struct skill_unit* su = NULL; nullpo_ret(src); @@ -1514,43 +1513,7 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in dy = -diry[direction]; } - ret=path_blownpos(target->m,target->x,target->y,dx,dy,count); - nx = ret>>16; - ny = ret&0xffff; - - if (!su) - unit_stop_walking(target,0); - - dx = nx - target->x; - dy = ny - target->y; - - if (!dx && !dy) //Could not knockback. - return 0; - - map_foreachinmovearea(clif_outsight, target, AREA_SIZE, dx, dy, target->type == BL_PC ? BL_ALL : BL_PC, target); - - if(su) - skill_unit_move_unit_group(su->group,target->m,dx,dy); - else - map_moveblock(target, nx, ny, gettick()); - - map_foreachinmovearea(clif_insight, target, AREA_SIZE, -dx, -dy, target->type == BL_PC ? BL_ALL : BL_PC, target); - - if(!(flag&0x1)) - clif_blown(target); - - if( target->type == BL_PC ) - { - TBL_PC *sd = (TBL_PC*)target; - if( sd->touching_id ) - npc_touchnext_areanpc(sd,false); - if( map_getcell(target->m,target->x,target->y,CELL_CHKNPC) ) - npc_touch_areanpc(sd,target->m,target->x,target->y); - else - sd->areanpc_id=0; - } - - return count; //Return amount of knocked back cells. + return unit_blown(target, dx, dy, count, flag&0x1); } diff --git a/src/map/unit.c b/src/map/unit.c index 0c16977c1f..f2dcdc921c 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -566,6 +566,54 @@ uint8 unit_getdir(struct block_list *bl) return ud->dir; } +// Pushes a unit by given amount of cells into given direction. Only +// map cell restrictions are respected. +// flag: +// &1 Do not send position update packets. +int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag) +{ + int nx, ny, ret; + struct skill_unit* su = BL_CAST(BL_SKILL, bl); + + ret=path_blownpos(bl->m,bl->x,bl->y,dx,dy,count); + nx = ret>>16; + ny = ret&0xffff; + + if (!su) + unit_stop_walking(bl,0); + + dx = nx - bl->x; + dy = ny - bl->y; + + if (!dx && !dy) //Could not knockback. + return 0; + + map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); + + if(su) + skill_unit_move_unit_group(su->group,bl->m,dx,dy); + else + map_moveblock(bl, nx, ny, gettick()); + + map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); + + if(!(flag&0x1)) + clif_blown(bl); + + if( bl->type == BL_PC ) + { + TBL_PC *sd = (TBL_PC*)bl; + if( sd->touching_id ) + npc_touchnext_areanpc(sd,false); + if( map_getcell(bl->m,bl->x,bl->y,CELL_CHKNPC) ) + npc_touch_areanpc(sd,bl->m,bl->x,bl->y); + else + sd->areanpc_id=0; + } + + return count; //Return amount of knocked back cells. +} + //Warps a unit/ud to a given map/position. //In the case of players, pc_setpos is used. //it respects the no warp flags, so it is safe to call this without doing nowarpto/nowarp checks. diff --git a/src/map/unit.h b/src/map/unit.h index 0d8e4535e1..3b82dce567 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -84,6 +84,7 @@ int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool int unit_warp(struct block_list *bl, short map, short x, short y, int type); int unit_setdir(struct block_list *bl,unsigned char dir); uint8 unit_getdir(struct block_list *bl); +int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag); // ܂ŕsłǂ蒅邩̔ bool unit_can_reach_pos(struct block_list *bl,int x,int y,int easy); From 09968c081525cfaf19bba3a0e611516e39975068 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 11:13:49 +0000 Subject: [PATCH 078/129] * Various small cleanups. - Fixed truncation warnings in @statuspoint, @skillpoint and @str/@agi/@vit/@int/@dex/@luk (since r14436). - Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541). - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). - Reformatted unit_blown to make it look cleaner (follow up to r14492). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14493 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 5 +++ src/map/atcommand.c | 74 +++++++++++++++++++++++++------- src/map/battle.c | 4 +- src/map/unit.c | 98 +++++++++++++++++++++++++++---------------- 4 files changed, 126 insertions(+), 55 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 84fd9c869d..c2619d632f 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -3,6 +3,11 @@ Date Added 2010/11/23 * Added script command pushpc, which is required by newer scripts. [Ai4rei] - Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code. + * Various small cleanups. [Ai4rei] + - Fixed truncation warnings in @statuspoint, @skillpoint and @str/@agi/@vit/@int/@dex/@luk (since r14436). + - Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541). + - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). + - Reformatted unit_blown to make it look cleaner (follow up to r14492). 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index ead204fb59..d48dda0dbb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2849,19 +2849,35 @@ ACMD_FUNC(displaystatus) *------------------------------------------*/ ACMD_FUNC(statuspoint) { - int point, new_status_point; + int point; + unsigned int new_status_point; if (!message || !*message || (point = atoi(message)) == 0) { clif_displaymessage(fd, "Please, enter a number (usage: @stpoint )."); return -1; } - if (point < 0 && sd->status.status_point < -point) - new_status_point = 0; + if(point < 0) + { + if(sd->status.status_point < (unsigned int)(-point)) + { + new_status_point = 0; + } + else + { + new_status_point = sd->status.status_point + point; + } + } + else if(UINT_MAX - sd->status.status_point < (unsigned int)point) + { + new_status_point = UINT_MAX; + } else - new_status_point = cap_value((int64)sd->status.status_point + point, 0, INT_MAX); + { + new_status_point = sd->status.status_point + point; + } - if (new_status_point != (int)sd->status.status_point) { + if (new_status_point != sd->status.status_point) { sd->status.status_point = new_status_point; clif_updatestatus(sd, SP_STATUSPOINT); clif_displaymessage(fd, msg_txt(174)); // Number of status points changed. @@ -2881,7 +2897,8 @@ ACMD_FUNC(statuspoint) *------------------------------------------*/ ACMD_FUNC(skillpoint) { - int point, new_skill_point; + int point; + unsigned int new_skill_point; nullpo_retr(-1, sd); if (!message || !*message || (point = atoi(message)) == 0) { @@ -2889,12 +2906,27 @@ ACMD_FUNC(skillpoint) return -1; } - if (point < 0 && sd->status.skill_point < -point) - new_skill_point = 0; + if(point < 0) + { + if(sd->status.skill_point < (unsigned int)(-point)) + { + new_skill_point = 0; + } + else + { + new_skill_point = sd->status.skill_point + point; + } + } + else if(UINT_MAX - sd->status.skill_point < (unsigned int)point) + { + new_skill_point = UINT_MAX; + } else - new_skill_point = cap_value((int64)sd->status.skill_point + point, 0, INT_MAX); - - if (new_skill_point != (int)sd->status.skill_point) { + { + new_skill_point = sd->status.skill_point + point; + } + + if (new_skill_point != sd->status.skill_point) { sd->status.skill_point = new_skill_point; clif_updatestatus(sd, SP_SKILLPOINT); clif_displaymessage(fd, msg_txt(175)); // Number of skill points changed. @@ -2948,7 +2980,7 @@ ACMD_FUNC(zeny) *------------------------------------------*/ ACMD_FUNC(param) { - int i, value = 0, new_value, max; + int i, value = 0, new_value; const char* param[] = { "str", "agi", "vit", "int", "dex", "luk" }; short* status[6]; //we don't use direct initialization because it isn't part of the c standard. @@ -2977,10 +3009,20 @@ ACMD_FUNC(param) status[4] = &sd->status.dex; status[5] = &sd->status.luk; - max = SHRT_MAX; - new_value = cap_value((int64)*status[i] + value, 1, max); - - if (new_value != (int)*status[i]) { + if(value < 0 && *status[i] < -value) + { + new_value = 1; + } + else if(SHRT_MAX - *status[i] < value) + { + new_value = SHRT_MAX; + } + else + { + new_value = *status[i] + value; + } + + if (new_value != *status[i]) { *status[i] = new_value; clif_updatestatus(sd, SP_STR + i); clif_updatestatus(sd, SP_USTR + i); diff --git a/src/map/battle.c b/src/map/battle.c index acd61b23f6..5c6da69e3e 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2770,7 +2770,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * break; case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen] if(tstatus->vit+sstatus->int_) //crash fix - md.damage = (int64)7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_)); + md.damage = (int)((int64)7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_))); else md.damage = 0; if (tsd) md.damage>>=1; @@ -2886,7 +2886,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * cardfix=cardfix*(100-tsd->long_attack_def_rate)/100; if (cardfix != 10000) - md.damage=(int64)md.damage*cardfix/10000; + md.damage=(int)((int64)md.damage*cardfix/10000); } if (sd && (i = pc_skillatk_bonus(sd, skill_num))) diff --git a/src/map/unit.c b/src/map/unit.c index f2dcdc921c..05c0bcb169 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -572,46 +572,70 @@ uint8 unit_getdir(struct block_list *bl) // &1 Do not send position update packets. int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag) { - int nx, ny, ret; - struct skill_unit* su = BL_CAST(BL_SKILL, bl); + int nx, ny, result; + struct map_session_data* sd; + struct skill_unit* su = NULL; - ret=path_blownpos(bl->m,bl->x,bl->y,dx,dy,count); - nx = ret>>16; - ny = ret&0xffff; - - if (!su) - unit_stop_walking(bl,0); - - dx = nx - bl->x; - dy = ny - bl->y; - - if (!dx && !dy) //Could not knockback. - return 0; - - map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); - - if(su) - skill_unit_move_unit_group(su->group,bl->m,dx,dy); - else - map_moveblock(bl, nx, ny, gettick()); - - map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); - - if(!(flag&0x1)) - clif_blown(bl); - - if( bl->type == BL_PC ) + if(count) { - TBL_PC *sd = (TBL_PC*)bl; - if( sd->touching_id ) - npc_touchnext_areanpc(sd,false); - if( map_getcell(bl->m,bl->x,bl->y,CELL_CHKNPC) ) - npc_touch_areanpc(sd,bl->m,bl->x,bl->y); - else - sd->areanpc_id=0; - } + sd = BL_CAST(BL_PC, bl); + su = BL_CAST(BL_SKILL, bl); - return count; //Return amount of knocked back cells. + result = path_blownpos(bl->m, bl->x, bl->y, dx, dy, count); + + nx = result>>16; + ny = result&0xffff; + + if(!su) + { + unit_stop_walking(bl, 0); + } + + dx = nx-bl->x; + dy = ny-bl->y; + + if(dx || dy) + { + map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); + + if(su) + { + skill_unit_move_unit_group(su->group, bl->m, dx, dy); + } + else + { + map_moveblock(bl, nx, ny, gettick()); + } + + map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, bl->type == BL_PC ? BL_ALL : BL_PC, bl); + + if(!(flag&1)) + { + clif_blown(bl); + } + + if(sd) + { + if(sd->touching_id) + { + npc_touchnext_areanpc(sd, false); + } + if(map_getcell(bl->m, bl->x, bl->y, CELL_CHKNPC)) + { + npc_touch_areanpc(sd, bl->m, bl->x, bl->y); + } + else + { + sd->areanpc_id = 0; + } + } + } + else + {// could not knockback + count = 0; + } + } + return count; // return amount of knocked back cells } //Warps a unit/ud to a given map/position. From b0089b0edc27b9fd39f681905601a411374a6b6f Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 11:56:44 +0000 Subject: [PATCH 079/129] * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14494 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 1 + src/map/npc.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index c2619d632f..a241330316 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -8,6 +8,7 @@ Date Added - Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541). - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). - Reformatted unit_blown to make it look cleaner (follow up to r14492). + * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] diff --git a/src/map/npc.c b/src/map/npc.c index 95981ad55c..dcfa521930 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1940,14 +1940,6 @@ int npc_convertlabel_db(DBKey key, void* data, va_list ap) nullpo_ret(label_list_num = va_arg(ap,int*)); nullpo_ret(filepath = va_arg(ap,const char*)); - if( *label_list == NULL ) - { - *label_list = (struct npc_label_list *) aCallocA (1, sizeof(struct npc_label_list)); - *label_list_num = 0; - } else - *label_list = (struct npc_label_list *) aRealloc (*label_list, sizeof(struct npc_label_list)*(*label_list_num+1)); - label = *label_list+*label_list_num; - // In case of labels not terminated with ':', for user defined function support p = lname; while( ISALNUM(*p) || *p == '_' ) @@ -1958,8 +1950,17 @@ int npc_convertlabel_db(DBKey key, void* data, va_list ap) if( len > 23 ) { ShowError("npc_parse_script: label name longer than 23 chars! '%s'\n (%s)", lname, filepath); - exit(EXIT_FAILURE); + return 0; } + + if( *label_list == NULL ) + { + *label_list = (struct npc_label_list *) aCallocA (1, sizeof(struct npc_label_list)); + *label_list_num = 0; + } else + *label_list = (struct npc_label_list *) aRealloc (*label_list, sizeof(struct npc_label_list)*(*label_list_num+1)); + label = *label_list+*label_list_num; + safestrncpy(label->name, lname, sizeof(label->name)); label->pos = lpos; ++(*label_list_num); From c1bd43aef6a334723edce60247cb51616d76b49b Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 15:11:22 +0000 Subject: [PATCH 080/129] * Fixed script command getusers causing map server to crash when called with type 0 without attached character (bugreport:4565). - Lack of character is now reported like other script commands do. Additionally invalid types are reported as well. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14495 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 4 +++- src/map/script.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index a241330316..5b17814e77 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -8,7 +8,9 @@ Date Added - Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541). - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). - Reformatted unit_blown to make it look cleaner (follow up to r14492). - * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). + * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). [Ai4rei] + * Fixed script command getusers causing map server to crash when called with type 0 without attached character (bugreport:4565). [Ai4rei] + - Lack of character is now reported like other script commands do. Additionally invalid types are reported as well. 2010/11/22 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] * Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei] diff --git a/src/map/script.c b/src/map/script.c index 906dce5107..c71debc0d1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8220,13 +8220,38 @@ BUILDIN_FUNC(areaannounce) *------------------------------------------*/ BUILDIN_FUNC(getusers) { - int flag=script_getnum(st,2); - struct block_list *bl=map_id2bl((flag&0x08)?st->oid:st->rid); - int val=0; - switch(flag&0x07){ - case 0: val=map[bl->m].users; break; - case 1: val=map_getusers(); break; + int flag, val = 0; + struct map_session_data* sd; + struct block_list* bl = NULL; + + flag = script_getnum(st,2); + + if(flag&0x8) + {// npc + bl = map_id2bl(st->oid); } + else if((sd = script_rid2sd(st))!=NULL) + {// pc + bl = &sd->bl; + } + + switch(flag&0x07) + { + case 0: + if(bl) + { + val = map[bl->m].users; + } + break; + case 1: + val = map_getusers(); + break; + default: + ShowWarning("buildin_getusers: Unknown type %d.\n", flag); + script_pushint(st,0); + return 1; + } + script_pushint(st,val); return 0; } From 03ab7f382d8b2cb2402147a2d296c8263ab549a2 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 4 Dec 2010 19:34:48 +0000 Subject: [PATCH 081/129] * Added 3rd class stat bonuses (source: kRO website, February 2010). git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14557 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/job_db2.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/db/Changelog.txt b/db/Changelog.txt index c558962f58..3964544656 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/12/04 + * Rev. 14557 Added 3rd class stat bonuses (source: kRO website, February 2010). [Ai4rei] 2010/11/21 * Rev. 14480 Added enumeration RC2_* to const.txt for mob data 'race2' (bugreport:4561). [Ai4rei] - Fixed bSubRace2 being documented as bSPSubRace2 (since r1257). diff --git a/db/job_db2.txt b/db/job_db2.txt index 0144624b9b..ec75ee9c4b 100644 --- a/db/job_db2.txt +++ b/db/job_db2.txt @@ -161,3 +161,55 @@ 4048,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2 // Soul Linker 4049,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5 +// Rune Knight +//4054,4,4,5,3,4,0,0,0,0,1,1,4,4,3,5,0,0,0,5,2,2,4,3,5,0,0,0,0,0,4,5,3,1,0,0,0,0,0,4,5,2,0,0,5,3,4,6,6,6,4 +// Warlock +//4055,4,4,5,0,0,5,4,2,0,0,0,0,5,0,3,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 +// Ranger +//4056,5,4,4,2,0,0,2,5,4,0,0,3,3,3,0,0,5,2,0,0,4,3,5,0,0,1,1,0,0,5,2,3,0,0,0,4,4,4,2,0,0,0,2,5,2,0,0,0,4,2 +// Archbishop +//4057,4,0,3,0,5,0,4,4,0,3,3,0,0,5,5,0,0,1,1,0,0,4,0,1,0,2,2,1,0,0,0,4,0,3,0,5,0,2,2,4,4,0,0,5,3,1,0,0,4,5 +// Mechanic +//4058,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 +// Guillotine Cross +//4059,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 +// Rune Knight High +//4060,4,4,5,3,4,0,0,0,0,1,1,4,4,3,5,0,0,0,5,2,2,4,3,5,0,0,0,0,0,4,5,3,1,0,0,0,0,0,4,5,2,0,0,5,3,4,6,6,6,4 +// Warlock High +//4061,4,4,5,0,0,5,4,2,0,0,0,0,5,0,3,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 +// Ranger High +//4062,5,4,4,2,0,0,2,5,4,0,0,3,3,3,0,0,5,2,0,0,4,3,5,0,0,1,1,0,0,5,2,3,0,0,0,4,4,4,2,0,0,0,2,5,2,0,0,0,4,2 +// Archbishop High +//4063,4,0,3,0,5,0,4,4,0,3,3,0,0,5,5,0,0,1,1,0,0,4,0,1,0,2,2,1,0,0,0,4,0,3,0,5,0,2,2,4,4,0,0,5,3,1,0,0,4,5 +// Mechanic High +//4064,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 +// Guillotine Cross High +//4065,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 +// Royal Guard +//4066,5,5,5,5,5,0,0,0,2,2,2,2,2,0,0,0,1,1,1,1,1,0,0,0,0,6,6,6,6,6,0,0,0,0,0,3,3,3,3,3,0,0,0,0,0,4,4,4,4,4 +// Sorcerer +//4067,4,4,5,3,4,0,0,0,0,1,1,4,4,3,5,0,0,0,5,2,2,4,3,5,0,0,0,0,0,4,5,3,1,0,0,0,0,0,4,5,2,0,0,5,3,4,6,6,6,4 +// Minstrel +//4068,4,0,3,0,5,0,0,4,0,3,3,0,0,5,5,0,0,1,1,0,0,4,0,1,0,2,2,1,0,0,0,4,0,3,0,5,0,2,0,4,4,0,0,5,3,1,0,0,4,5 +// Wanderer +//4069,5,4,4,2,0,0,2,5,4,0,0,3,3,3,0,0,5,2,0,0,4,3,5,0,0,1,1,0,0,5,2,3,0,0,0,4,4,4,2,0,0,0,2,5,2,0,0,0,4,2 +// Sura +//4070,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 +// Genetic +//4071,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 +// Shadow Chaser +//4072,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 +// Royal Guard High +//4073,5,5,5,5,5,0,0,0,2,2,2,2,2,0,0,0,1,1,1,1,1,0,0,0,0,6,6,6,6,6,0,0,0,0,0,3,3,3,3,3,0,0,0,0,0,4,4,4,4,4 +// Sorcerer High +//4074,4,4,5,3,4,0,0,0,0,1,1,4,4,3,5,0,0,0,5,2,2,4,3,5,0,0,0,0,0,4,5,3,1,0,0,0,0,0,4,5,2,0,0,5,3,4,6,6,6,4 +// Minstrel High +//4075,4,0,3,0,5,0,0,4,0,3,3,0,0,5,5,0,0,1,1,0,0,4,0,1,0,2,2,1,0,0,0,4,0,3,0,5,0,2,0,4,4,0,0,5,3,1,0,0,4,5 +// Wanderer High +//4076,5,4,4,2,0,0,2,5,4,0,0,3,3,3,0,0,5,2,0,0,4,3,5,0,0,1,1,0,0,5,2,3,0,0,0,4,4,4,2,0,0,0,2,5,2,0,0,0,4,2 +// Sura High +//4077,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 +// Genetic High +//4078,4,4,5,0,0,5,4,2,0,0,0,4,5,0,3,0,0,0,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 +// Shadow Chaser High +//4079,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 From 6e428a589ad8a84a4ac4297147f1dbbad8673ea8 Mon Sep 17 00:00:00 2001 From: SketchyPhoenix Date: Sun, 26 Dec 2010 03:41:31 +0000 Subject: [PATCH 082/129] * Merry Christmas eAthena! * Exp modifiers based off player/mob level difference. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14625 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/src/map/pc.c b/src/map/pc.c index 6da104d306..7ad0ecfe48 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4860,6 +4860,7 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int { float nextbp=0, nextjp=0; unsigned int nextb=0, nextj=0; + int leveldiff = sd->status.base_level - status_get_lv(src), modifier = 100; nullpo_ret(sd); if(sd->bl.prev == NULL || pc_isdead(sd)) @@ -4898,6 +4899,52 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int } } + /*Adjust exp by mob level difference vs player level. + Higher level creatures give more exp, lower level creatures give less + and you'll get normal experience if they're very close to your level. + + -2 to +5 = 100% + -3 = 105% + -4 = 110% + -5 = 115% + -6 = 120% + -7 = 125% + -8 = 130% + -9 = 135% + -10 = 140% + -11 or lower = 40% + + +6 to +10 = 95% + +11 to +15 = 90% + +15 to +20 = 85% + +21 to +25 = 60% + +26 to +30 = 35% + +31 or higher = 10% */ + + if (leveldiff >= 6 && leveldiff <= 10) + modifier = -5; + if (leveldiff >= 11 && leveldiff <= 15) + modifier = -10; + if (leveldiff >= 16 && leveldiff <= 20) + modifier = -15; + if (leveldiff >= 21 && leveldiff <= 25) + modifier = -40; + if (leveldiff >= 26 && leveldiff <= 30) + modifier = -65; + if (leveldiff > 30) + modifier = -90; + if (leveldiff <= -3 && leveldiff >= -10) + modifier = ((leveldiff * -5)-10); + if (leveldiff <= -10) + modifier = -60; + + if ( modifier < 0 ) + modifier = modifier * -1; + if ( modifier != 100 ) { + base_exp = (int)((float)base_exp - (((float)modifier/100) * (float)base_exp)); + job_exp = (int)((float)job_exp - (((float)modifier/100) * (float)job_exp)); + } + //Cap exp to the level up requirement of the previous level when you are at max level, otherwise cap at UINT_MAX (this is required for some S. Novice bonuses). [Skotlex] if (base_exp) { nextb = nextb?UINT_MAX:pc_thisbaseexp(sd); @@ -4928,7 +4975,7 @@ int pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int if(sd->state.showexp) { char output[256]; sprintf(output, - "Experience Gained Base:%u (%.2f%%) Job:%u (%.2f%%)",base_exp,nextbp*(float)100,job_exp,nextjp*(float)100); + "Experience Gained Base:%u (%.2f%%) Job:%u (%.2f%%)", base_exp, nextbp*(float)100, job_exp, nextjp*(float)100); clif_disp_onlyself(sd,output,strlen(output)); } From 2b6f273e922bcab6e60849cea937404c4fb8159a Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 26 Dec 2010 22:36:41 +0000 Subject: [PATCH 083/129] * Merged changes from trunk [14496:14630/trunk]. git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Renewal.txt | 2 + conf/Changelog.txt | 4 + conf/battle/client.conf | 9 + conf/battle/homunc.conf | 2 +- conf/battle/party.conf | 1 + conf/char_athena.conf | 2 +- conf/charhelp.txt | 46 +- conf/log_athena.conf | 2 +- conf/packet_athena.conf | 7 + conf/script_athena.conf | 6 + db/Changelog.txt | 22 + db/const.txt | 14 + db/item_db.txt | 1686 ++++++++--------- db/item_delay.txt | 1 - db/item_misc.txt | 128 +- db/mercenary_skill_db.txt | 23 +- db/mob_branch.txt | 2 +- db/mob_db.txt | 16 +- db/packet_db.txt | 12 +- db/pet_db.txt | 9 +- db/pet_db2.txt | 60 + db/skill_tree.txt | 6 +- doc/item_bonus.txt | 53 +- doc/item_db.txt | 2 + doc/mob_db_mode_list.txt | 1 + doc/sample/npc_dynamic_shop.txt | 9 +- doc/script_commands.txt | 858 +++++---- eAthena-10.sln | 139 ++ npc/Changelog.txt | 9 + npc/cities/lighthalzen.txt | 8 +- npc/cities/morocc.txt | 5 +- .../eAAC_Scripts/kafraExpress/ke_main.txt | 2 +- npc/events/christmas_2008.txt | 2 +- npc/guild/agit_template.txt | 2 +- npc/instances/EndlessTower.txt | 43 +- npc/instances/OrcsMemory.txt | 54 +- npc/instances/SealedShrine.txt | 566 +++--- npc/kafras/functions_kafras.txt | 2 +- npc/merchants/enchan_arm.txt | 5 +- sql-files/main.sql | 3 +- sql-files/upgrade_svn14507.sql | 1 + sql-files/upgrade_svn14579.sql | 1 + src/char/char.c | 406 ++-- src/char/char.h | 1 - src/char/int_guild.c | 8 +- src/char/int_party.c | 1 - src/char/int_storage.c | 28 +- src/char/inter.c | 2 +- src/char_sql/char.c | 347 ++-- src/char_sql/int_guild.c | 8 +- src/char_sql/int_storage.c | 4 +- src/char_sql/inter.c | 2 +- src/common/lock.c | 9 +- src/common/mmo.h | 16 +- src/common/socket.c | 13 + src/common/strlib.c | 20 +- src/common/utils.c | 9 + src/common/utils.h | 1 + src/ladmin/ladmin.c | 3 +- src/login/login.c | 2 +- src/map/atcommand.c | 207 +- src/map/battle.c | 6 +- src/map/battle.h | 9 + src/map/battleground.c | 4 +- src/map/chrif.c | 38 +- src/map/clif.c | 692 +++---- src/map/clif.h | 121 +- src/map/guild.c | 4 +- src/map/homunculus.c | 50 +- src/map/instance.c | 6 +- src/map/intif.c | 11 +- src/map/itemdb.c | 45 +- src/map/itemdb.h | 7 +- src/map/log.c | 6 +- src/map/map.c | 31 +- src/map/map.h | 3 + src/map/mapreg_sql.c | 4 +- src/map/mercenary.c | 6 +- src/map/mob.c | 444 ++--- src/map/mob.h | 7 + src/map/npc.c | 237 ++- src/map/party.c | 97 +- src/map/party.h | 8 +- src/map/path.c | 2 +- src/map/pc.c | 378 ++-- src/map/pc.h | 20 +- src/map/pet.c | 8 +- src/map/script.c | 1394 ++++++++------ src/map/script.h | 7 + src/map/skill.c | 69 +- src/map/skill.h | 3 +- src/map/status.c | 333 ++-- src/map/storage.c | 63 +- src/map/unit.c | 83 +- src/map/unit.h | 9 +- src/map/vending.c | 2 +- src/plugins/sig.c | 9 +- src/tool/adduser.c | 6 +- src/txt-converter/Makefile.in | 2 + vcproj-10/char-server_sql.vcxproj | 187 ++ vcproj-10/char-server_txt.vcxproj | 177 ++ vcproj-10/ladmin.vcxproj | 149 ++ vcproj-10/login-server_sql.vcxproj | 178 ++ vcproj-10/login-server_txt.vcxproj | 168 ++ vcproj-10/map-server_sql.vcxproj | 231 +++ vcproj-10/map-server_txt.vcxproj | 228 +++ vcproj-10/mapcache.vcxproj | 132 ++ vcproj-10/txt-converter-char.vcxproj | 201 ++ vcproj-10/txt-converter-login.vcxproj | 159 ++ vcproj-8/txt-converter-login.vcproj | 8 + vcproj-9/txt-converter-login.vcproj | 8 + 111 files changed, 6916 insertions(+), 4046 deletions(-) create mode 100644 db/pet_db2.txt create mode 100644 eAthena-10.sln create mode 100644 sql-files/upgrade_svn14507.sql create mode 100644 sql-files/upgrade_svn14579.sql create mode 100644 vcproj-10/char-server_sql.vcxproj create mode 100644 vcproj-10/char-server_txt.vcxproj create mode 100644 vcproj-10/ladmin.vcxproj create mode 100644 vcproj-10/login-server_sql.vcxproj create mode 100644 vcproj-10/login-server_txt.vcxproj create mode 100644 vcproj-10/map-server_sql.vcxproj create mode 100644 vcproj-10/map-server_txt.vcxproj create mode 100644 vcproj-10/mapcache.vcxproj create mode 100644 vcproj-10/txt-converter-char.vcxproj create mode 100644 vcproj-10/txt-converter-login.vcxproj diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 5b17814e77..ed353115c6 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,5 +1,7 @@ Date Added +2010/12/26 + * Merged changes from trunk (r14496:14630). [Ai4rei] 2010/11/23 * Added script command pushpc, which is required by newer scripts. [Ai4rei] - Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code. diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 297c04ed2f..4cbff02fe3 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,9 @@ Date Added +2010/12/12 + * Rev. 14587 Corrected wording of the setting homunculus_autoloot (since r12203). [Ai4rei] +2010/12/10 + * Rev. 14572 Applied update to charhelp.txt provided by EvilPuncker to match current charcommand behavior (bugreport:4632, follow up to r13403). [Ai4rei] 2010/11/21 * Changed party_share_level from 10 to 15 as per kRO maintenance from 2010/04/14. [Ai4rei] 2010/10/10 diff --git a/conf/battle/client.conf b/conf/battle/client.conf index a2db1a6c33..143505a364 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -119,3 +119,12 @@ display_hallucination: yes // Set this to 1 if your client supports status change timers and you want to use them // Clients from 2009 onward support this display_status_timers: yes + +// Randomizes the dice emoticon server-side, to prevent clients from forging +// packets for the desired number. (Note 1) +client_reshuffle_dice: no + +// Sorts the character and guild storage before it is sent to the client. +// Official servers do not sort storage. (Note 1) +// NOTE: Enabling this option degrades performance. +client_sort_storage: no diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf index d9d501f4f2..4b8205f9df 100644 --- a/conf/battle/homunc.conf +++ b/conf/battle/homunc.conf @@ -44,7 +44,7 @@ hvan_explosion_intimate: 45000 // Show stat growth to the owner when an Homunculus levels up homunculus_show_growth: no -// If a monster is killed only by homunculus, can autoloot works? +// Does autoloot work, when a monster is killed by homunculus only? homunculus_autoloot: yes // Should homunculii Vaporize when Master dies? diff --git a/conf/battle/party.conf b/conf/battle/party.conf index 2bb0dbb0c6..f0b2c8de26 100644 --- a/conf/battle/party.conf +++ b/conf/battle/party.conf @@ -38,6 +38,7 @@ show_party_share_picker: yes // 1: IT_HEALING, 2: IT_UNKNOWN, 4: IT_USABLE, 8: IT_ETC, // 16: IT_WEAPON, 32: IT_ARMOR, 64: IT_CARD, 128: IT_PETEGG, // 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO, 2048: IT_DELAYCONSUME +// 262144: IT_CASH show_picker.item_type: 112 // Method of distribution when item party share is enabled in a party: diff --git a/conf/char_athena.conf b/conf/char_athena.conf index d92f2a47ac..af0da99760 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -156,7 +156,7 @@ char_name_option: 1 // Note: Don't add spaces unless you mean to add 'space' to the list. char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 -// How many Characters are allowed per Account ? (0 = disabled) [SQL Only!] +// How many Characters are allowed per Account ? (0 = disabled) chars_per_account: 0 // Restrict character deletion by BaseLevel diff --git a/conf/charhelp.txt b/conf/charhelp.txt index fe877b5e3e..e3acddbb4d 100644 --- a/conf/charhelp.txt +++ b/conf/charhelp.txt @@ -1,28 +1,28 @@ 40:--- CHARACTER CMD --- - 40:#statsall - Displays stats of all characters. + 40:#statsall - Set all stats of a player to maximum. 40:#itemlist - Displays all items of a player. 40:#storagelist - Displays all items of a player's storage. 40:#stats - Displays a characters stats. - 60:#option - Like @option command but only to target character. - 50:#mountpeco - Give/remove to a player a peco (Class is required, but not skill). - 50:#petrename - Re-enable pet rename to a player. - 60:#save - Changes the target players respawn point. - 60:#baselvl <#> - Change a characters base level. - 60:#jlvl <#> - Change a characters job level. - 60:#job/#jobchange - Changes target characters job. - 60:#zeny - Give/take a players Zeny - 60:#cash - Give/take a player cash points - 60:#points - Give/take a player Kafra points - 60:#stpoint - Give/take a players stat points - 60:#skpoint - give/take a players skill points - 60:#skreset - Reset skills of a character. - 60:#streset - Reset stats of a character. - 60:#reset - Reset stats AND skills of a character. - 60:#questskill <#> - Gives to a player the specified quest skill. - 60:#lostskill <#> - Takes away the specified quest skill from the player. - 60:#delitem - Remove items from a character - 50:#model - Changes a player's model - 60:#disguise - Changes disguise of a player + 60:#option - Like @option command but only to target character. + 50:#mountpeco - Give/remove to a player a peco (Class is required, but not skill). + 50:#petrename - Re-enable pet rename to a player. + 60:#save - Changes the target players respawn point. + 60:#baselvl/#blvl <#> - Change a characters base level. + 60:#joblvl/#jlvl <#> - Change a characters job level. + 60:#job/#jobchange - Changes target characters job. + 60:#zeny - Give/take a players Zeny + 60:#cash - Give/take a player cash points + 60:#points - Give/take a player Kafra points + 60:#stpoint - Give/take a players stat points + 60:#skpoint - give/take a players skill points + 60:#skreset - Reset skills of a character. + 60:#streset - Reset stats of a character. + 60:#reset - Reset stats AND skills of a character. + 60:#questskill <#> - Gives to a player the specified quest skill. + 60:#lostskill <#> - Takes away the specified quest skill from the player. + 60:#delitem - Remove items from a character + 50:#model - Changes a player's model + 60:#disguise - Changes disguise of a player 60:#undisguise - Cancels disguise of a player - 60:#changesex - Changes sex of a player (all characters of the account) - 60:#warp/#rura+ - Warps character to location of choice + 60:#changesex - Changes sex of a player (all characters of the account) + 60:#warp/#rura+ - Warps character to location of choice diff --git a/conf/log_athena.conf b/conf/log_athena.conf index b75f1b3631..2f8effd189 100644 --- a/conf/log_athena.conf +++ b/conf/log_athena.conf @@ -30,7 +30,7 @@ sql_logs: 0 // Advanced Filter Bits by item type: || // 0002 - Healing items (0) // 0004 - Etc Items(3) + Arrows (10) -// 0008 - Usable Items(2) + Lures,Scrolls(11) +// 0008 - Usable Items(2) + Lures,Scrolls(11) + Usable Cash Items(18) // 0016 - Weapon(4) // 0032 - Shields,Armor,Headgears,Accessories,etc(5) // 0064 - Cards(6) diff --git a/conf/packet_athena.conf b/conf/packet_athena.conf index 76203bedb2..84711139ae 100644 --- a/conf/packet_athena.conf +++ b/conf/packet_athena.conf @@ -8,6 +8,13 @@ debug: no // How long can a socket stall before closing the connection (in seconds) stall_time: 60 +// Maximum allowed size for clients packets in bytes (default: 20480). +// NOTE: To reduce the size of reported packets, lower the values of defines, which +// have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART. +// NOTE: Do not modify this setting, unless the client has been modified to support +// larger packets. The client will crash, when it receives larger packets. +socket_max_client_packet: 20480 + //----- IP Rules Settings ----- // If IP's are checked when connecting. diff --git a/conf/script_athena.conf b/conf/script_athena.conf index f45af4bad8..8264c0efec 100644 --- a/conf/script_athena.conf +++ b/conf/script_athena.conf @@ -32,4 +32,10 @@ check_gotocount: 2048 //input_max_value: 2147483647 input_max_value: 10000000 +// Specifies whether or not each built-in function's arguments are checked for +// correct type. When a function is given an argument different from what it +// expects, a warning is thrown before the function is ran anyway. +// Default: yes +warn_func_mismatch_argtypes: yes + import: conf/import/script_conf.txt diff --git a/db/Changelog.txt b/db/Changelog.txt index 3964544656..2e974a3daf 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,8 +8,30 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/12/16 + * Rev. 14596 Added missing pet db documentation for fields 'attack_rate', 'defence_attack_rate', 'change_target_rate', 'pet_script' and 'loyal_script' based on the one provided by frenzmu06 (bugreport:4636, follow up to r13752). [Ai4rei] +2010/12/13 + * Rev. 14590 Added pet_db2.txt to make it apparent, that pet db has support for customs as well. [Ai4rei] + - Fixed typo 'HungeyDelay' into 'HungryDelay' in pet database description (bugreport:4636, since r13752). +2010/12/05 + * Rev. 14559 Updated some items to use bonus bAddItemHealRate, and healpower2. [L0ne_W0lf] 2010/12/04 * Rev. 14557 Added 3rd class stat bonuses (source: kRO website, February 2010). [Ai4rei] +2010/12/02 + * Rev. 14555 Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. (burgerport:4569) [L0ne_W0lf] + * Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates. + - As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate. +2010/12/02 + * Rev. 14552 Updated some more cash shop boxes to use rentitem instead of getitem. [L0ne_W0lf] + * Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. + * Rev. 14549 Updated the item types for several of the cash item boxes to 18. [L0ne_W0lf] + * Fixed the Exorcism_Bible bonus, missing {}'s for who knows how long. (bugreport:4342) + * Updated Brasilis monsters stats again, care of Playtester. +2010/11/30 + * Rev. 14529 Fixed a mistake (excess dummy name) in dead branch list fallback value (since r32). [Ai4rei] + * Rev. 14524 Updated comments for skill Berserk in skill_tree.txt, among others because they would cause errors the way they are read now. [Ai4rei] +2010/11/26 + * Rev. 14507 Added killerrid and killedrid param constants to const.txt [ultramage] 2010/11/21 * Rev. 14480 Added enumeration RC2_* to const.txt for mob data 'race2' (bugreport:4561). [Ai4rei] - Fixed bSubRace2 being documented as bSPSubRace2 (since r1257). diff --git a/db/const.txt b/db/const.txt index 697ad37bdd..3cc224d9a2 100644 --- a/db/const.txt +++ b/db/const.txt @@ -316,6 +316,8 @@ Sp 7 1 MaxSp 8 1 BaseJob 119 1 BaseClass 120 1 +killerrid 121 1 +killedrid 122 1 bMaxHP 6 bMaxSP 8 @@ -1891,3 +1893,15 @@ DIR_SOUTH 4 DIR_SOUTHEAST 5 DIR_EAST 6 DIR_NORTHEAST 7 + +IT_HEALING 0 +IT_USABLE 2 +IT_ETC 3 +IT_WEAPON 4 +IT_ARMOR 5 +IT_CARD 6 +IT_PETEGG 7 +IT_PETARMOR 8 +IT_AMMO 10 +IT_DELAYCONSUME 11 +IT_CASH 18 diff --git a/db/item_db.txt b/db/item_db.txt index ea77722ae7..312a29ec1b 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -492,8 +492,8 @@ 1139,Tale_Fing_,Tirfing,4,20,,1000,200,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bHPLossRate,35,10000; },{},{} 1140,Byeorrun_Gum,Byeollungum,4,20,,900,150,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus2 bSubRace,RC_NonBoss,-10; bonus2 bAddRace,RC_Boss,50; bonus bAllStats,2; },{},{} 1141,Immaterial_Sword,Immaterial Sword,4,20,,900,140,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPVanishRate,30,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{} -1142,Jewel_Sword,Jeweled Sword,4,20,,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Jewel,5; },{},{} -1143,Gaia_Sword,Gaia Sword,4,20,,2500,140,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Ore,5; },{},{} +1142,Jewel_Sword,Jeweled Sword,4,20,,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Jewel,100; },{},{} +1143,Gaia_Sword,Gaia Sword,4,20,,2500,140,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Ore,30; },{},{} 1144,Sasimi,Sashimi,4,20,,1400,75,,1,0,0x000654E2,7,2,2,3,48,1,2,{ bonus bAtkEle,Ele_Wind; bonus3 bAddMonsterDropItem,544,RC_Fish,4000; },{},{} 1145,Holy_Avenger,Holy Avenger,4,450000,,1350,125,,1,0,0x00004000,7,2,2,3,75,1,2,{ bonus bAtkEle,Ele_Holy; bonus bVit,2; },{},{} 1146,Town_Sword,Town Sword,4,42000,,800,100,,1,1,0x00000001,7,2,2,3,30,1,2,{},{},{} @@ -1100,7 +1100,7 @@ 2126,Guyak_Shield,Guyak Shield,5,20,,700,,3,,0,0xFFFFFFFE,7,2,32,,75,1,1,{ bonus bMDef,3; },{},{} 2127,Secular_Mission,Secular Mission,5,20,,0,,10,,0,0xFFFFFFFF,7,2,32,1,1,0,1,{ bonus2 bSubRace,RC_NonBoss,25; bonus2 bSubRace,RC_Boss,25; },{},{} 2128,Herald_Of_GOD_,Sacred Mission,5,128000,,1600,,5,,1,0x00004000,7,2,32,,83,1,3,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield,0; },{},{} -2129,Exorcism_Bible,Exorcism Bible,5,20,,600,,5,,0,0x00008100,7,2,32,,50,1,1,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; if(isequipped(1631)) bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; },{},{} +2129,Exorcism_Bible,Exorcism Bible,5,20,,600,,5,,0,0x00008100,7,2,32,,50,1,1,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; if(isequipped(1631)) { bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } },{},{} 2130,Cross_Shield,Cross Shield,5,20,,2000,,6,,1,0x00004000,7,2,32,,80,1,1,{ bonus bStr,1; bonus2 bSkillAtk,"PA_SHIELDCHAIN",30; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",30; bonus bUseSPrate,10; },{},{} 2131,Magic_Study_Vol1,Magic Bible Vol1,5,20,,1000,,2,,1,0x00010204,2,2,32,,70,1,1,{ bonus bMDef,3; bonus bInt,2; bonus2 bAddEffWhenHit,Eff_Stun,1000; },{},{} 2132,Shelter_Resistance,Shell Of Resistance,5,0,,0,,9,,0,0xFFFFFFFF,2,2,32,,0,0,1,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Holy,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; bonus bShortWeaponDamageReturn,1; },{},{} @@ -1299,7 +1299,7 @@ 2373,Holy_Robe_,Holy Robe,5,20,,1700,,7,,1,0x00008110,7,2,16,,60,1,0,{ bonus bMdef,5; bonus2 bSubRace,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; },{},{} 2374,Diabolus_Robe,Diabolus Robe,5,20,,300,,6,,1,0x00098B1C,2,2,16,,55,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus bHealPower,6; bonus bDelayRate,-10; if (isequipped(2729)) { bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; } },{},{} 2375,Diabolus_Armor,Diabolus Armor,5,20,,600,,7,,1,0x000654E2,2,2,16,,55,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) { bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; bonus bMatkRate,3; } },{},{} -2376,Assaulter_Plate,Assaulter Plate,5,0,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bSkillHeal2,"AL_HEAL",10; bonus2 bAddItemHealRate,IG_Recovery,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }; },{},{} +2376,Assaulter_Plate,Assaulter Plate,5,0,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }; },{},{} 2377,Elite_Engineer_Armor,Elite Engineer Armor,5,0,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor,0; }; },{},{} 2378,Assassin_Robe,Assassin Robe,5,0,,0,,7,,1,0x02021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538,2435)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }; },{},{} 2379,Warlock_Battle_Robe,Warlock's Battle Robe,5,0,,0,,3,,1,0x00810204,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539,2436)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }; },{},{} @@ -1310,7 +1310,7 @@ 2384,Spritual_Tunic,Spiritual Tunic,5,20,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bMaxHP,800; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Holy,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; },{},{} 2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; bonus bMagicHPGainValue,60; bonus bMagicSPGainValue,6; },{},{ heal 0,-100; } 2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x000FDF80,2,2,16,,70,1,0,{ bonus bMaxHP,(BaseLevel*7); bonus bMaxSP,(BaseLevel/2); autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; }"; if( BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte ) bonus bMdef,5; else if( BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief ) bonus bDef,3; },{},{} -2387,Sprint_Mail,Sprint Mail,5,20,,1000,,3,,1,0x000FDF80,2,2,16,,70,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; bonus2 bSkillHeal,"AL_HEAL",3; if( isequipped(2440,2744) ) { bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; } },{},{} +2387,Sprint_Mail,Sprint Mail,5,20,,1000,,3,,1,0x000FDF80,2,2,16,,70,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus bAddItemHealRate,3; bonus2 bSkillHeal,"AL_HEAL",3; if( isequipped(2440,2744) ) { bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; } },{},{} 2388,Kandura,Kandura,5,20,,300,,4,,1,0x00001000,2,2,16,,70,1,0,{ bonus bAgi,1; bonus bFlee,5; bonus bAspdRate,2; },{},{} 2389,Armor_Of_Naga,Armor of Naga,5,20,,1000,,5,,1,0x00CFDF80,2,2,16,,70,1,0,{ bonus bMdef,2; autobonus "{ bonus bBaseAtk,20; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{} 2390,Improved_Tights,Improved Tights,5,20,,400,,6,,1,0x00080808,2,2,16,,75,1,0,{ bonus bMdef,2; bonus bFlee2,3; },{},{} @@ -1374,7 +1374,7 @@ 2447,Military_Boots,Army Boots,5,0,,1000,,5,,0,0xFFFFFFFE,7,2,64,,0,1,0,{},{},{} 2448,Air_Boss,Air Boss,5,0,,500,,2,,0,0xFFFFFFFF,7,2,64,,0,1,0,{ bonus bAgi,1; },{},{} 2449,Variant_Shoes_M,Variant Shoes,5,10000,,500,,3,,0,0xFFFFFFFE,2,2,64,,85,1,0,{ bonus bMaxHPRate,20-getrefine(); bonus bMaxSPRate,20-getrefine(); bonus bDef,getrefine()/2; },{},{} -2450,Vital_Tree_Shoes,Vital Tree Shoes,5,0,,500,,4,,0,0xFFFFFFFE,7,2,64,,60,1,0,{ bonus bMaxHPrate,10; bonus2 bHPRegenRate,30,10000; bonus2 bSkillHeal,"AL_HEAL",5; bonus2 bAddItemHealRate,IG_Recovery,5; bonus bMdef,3; bonus bVit,2; },{},{} +2450,Vital_Tree_Shoes,Vital Tree Shoes,5,0,,500,,4,,0,0xFFFFFFFE,7,2,64,,60,1,0,{ bonus bMaxHPrate,10; bonus2 bHPRegenRate,30,10000; bonus bHealpower2,5; bonus bAddItemHealRate,5; bonus bMdef,3; bonus bVit,2; },{},{} //2451,Freya_Spirit_Sandals1,Freya Spirit Sandals, //2452,Freya_Spirit_Sandals2,Freya Spirit Sandals, //2453,Freya_Spirit_Sandals3,Freya Spirit Sandals, @@ -1833,7 +1833,7 @@ 4149,Gargoyle_Card,Gargoyle Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,RC_Insect,100; },{},{} 4150,Goat_Card,Goat Card,6,20,,10,,,,,,,,16,,,,,{ if(getrefine()<6) { bonus bDef,2; bonus bMdef,5; } },{},{} 4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{} -4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItemGroup,IG_Juice,RC_Insect,900; },{},{} +4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,533,RC_Insect,300; },{},{} 4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; if(isequipped(4247,4273)) { bonus3 bAddMonsterDropItem,544,RC_Fish,3000; bonus2 bAddEle,Ele_Water,30; } },{},{} 4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{} 4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{} @@ -1896,11 +1896,11 @@ 4212,Bon_Gun_Card,Bongun Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"SM_BASH",1,20; bonus2 bAddSkillBlow,"SM_BASH",5; bonus2 bAddDefClass,1026,-100; },{},{} 4213,Brilight_Card,Brilight Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,600; },{},{} 4214,Bloody_Murderer_Card,Bloody Murderer Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Insect,7; },{},{} -4215,Blazzer_Card,Blazer Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Food,500; },{},{} +4215,Blazzer_Card,Blazer Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Food,600; },{},{} 4216,Sasquatch_Card,Sasquatch Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,600; },{},{} 4217,Live_Peach_Tree_Card,Enchanted Peach Tree Card,6,20,,10,,,,,,,,32,,,,,{ bonus3 bAutoSpell,"AL_HEAL",1+9*(getskilllv("AL_HEAL")==10),20; if(isequipped(4280,4185,4293,4312)) { bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass == Job_Acolyte) { bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; } } },{},{} 4218,Succubus_Card,Succubus Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHP,1000; if (isequipped(4269)) { bonus bVit,1; bonus bHPrecovRate,10; } else { bonus bVit,-3; bonus bHPrecovRate,-20; } },{},{} -4219,Sageworm_Card,Sage Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Gemstone,90; },{},{} +4219,Sageworm_Card,Sage Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItem,715,30; bonus2 bAddMonsterDropItem,716,30; bonus2 bAddMonsterDropItem,717,30; },{},{} 4220,Solider_Card,Solider Card,6,20,,10,,,,,,,,16,,,,,{ bonus bDef,2; bonus bMdef,2; },{},{} 4221,Skeleton_General_Card,Skeleton General Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Insect,-20; bonus2 bExpAddRace,RC_Insect,10; },{},{} 4222,Skel_Prisoner_Card,Skeleton Prisoner Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,300+600*(isequipped(4025)); },{},{} @@ -1908,7 +1908,7 @@ 4224,Stem_Worm_Card,Stem Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12032,RC_Brute,100; },{},{} 4225,Stone_Shooter_Card,Stone Shooter Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; bonus bHit,10; },{},{} 4226,Sting_Card,Sting Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,2; if(getrefine()>8) bonus bMdef,5; },{},{} -4227,Spring_Rabbit_Card,Spring Rabbit Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Meat,50; bonus3 bAddMonsterDropItemGroup,IG_Meat,RC_Brute,400; },{},{} +4227,Spring_Rabbit_Card,Spring Rabbit Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Meat,50; bonus3 bAddMonsterDropItem,517,RC_Brute,200; bonus3 bAddMonsterDropItem,528,RC_Brute,200; },{},{} 4228,Sleeper_Card,Sleeper Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12031,RC_Fish,100; },{},{} 4229,C_Tower_Manager_Card,Tower Keeper Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bCastrate,-5; if(isequipped(4244,4299,4313)) { bonus bDef,3; bonus bMdef,3; } },{},{} 4230,Shinobi_Card,Shinobi Card,6,20,,10,,,,,,,,136,,,,,{ bonus bAgi,1; bonus3 bAutoSpellWhenHit,"AS_CLOAKING",5,100; },{},{} @@ -1963,7 +1963,7 @@ 4279,Deleter_Card,Earth Deleter Card,6,20,,10,,,,,,,,16,,,,,{ bonus bSPrecovRate,-100; bonus bSPGainValue,10; },{},{ heal 0,-100; } 4280,Geographer_Card,Geographer Card,6,20,,10,,,,,,,,16,,,,,{ bonus3 bAutoSpellWhenHit,"AL_BLESSING",2+8*(getskilllv("AL_BLESSING")==10),30; },{},{} 4281,Zipper_Bear_Card,Zipper Bear Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus2 bSPDrainValue,-1,0; if(BaseClass == Job_Merchant) bonus bUnbreakableWeapon,0; },{},{} -4282,Tengu_Card,Tengu Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Recovery,500; },{},{} +4282,Tengu_Card,Tengu Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Recovery,600; },{},{} 4283,Greatest_General_Card,Greatest General Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"MO_CALLSPIRITS",5,2+18*(BaseClass == Job_Acolyte); },{},{} 4284,Chepet_Card,Chepet Card,6,20,,10,,,,,,,,2,,,,,{ bonus4 bAutoSpell,"AL_HEAL",5,50,1; },{},{} 4285,Choco_Card,Choco Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee2,5; bonus bFlee,10; },{},{} @@ -2007,7 +2007,7 @@ 4323,Garm_Baby_Card,Hatii Babe Card,6,20,,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,50+250*isequipped(4324); },{},{} 4324,Garm_Card,Hatii Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,5000; },{},{} 4325,Harpy_Card,Harpy Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bSkillAtk,"MG_NAPALMBEAT",5; if(isequipped(4191,4208,4258,4309,4327)) { bonus bMaxHP,500; bonus bDef,5; bonus bMDef,5; bonus2 bSkillAtk,14,10; bonus2 bSkillAtk,19,10; bonus2 bSkillAtk,20,10; if(BaseClass == Job_Mage) { bonus bMatkRate,3; bonus bCastrate,-15; } } },{},{} -4326,See_Otter_Card,Sea-Otter Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Fish,50; bonus3 bAddMonsterDropItemGroup,IG_Fish,RC_Fish,600; },{},{} +4326,See_Otter_Card,Sea-Otter Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Fish,50; bonus3 bAddMonsterDropItem,551,RC_Fish,300; bonus3 bAddMonsterDropItem,544,RC_Fish,300; },{},{} 4327,Blood_Butterfly_Card,Bloody Butterfly Card,6,20,,10,,,,,,,,136,,,,,{ bonus bCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,18,5; },{},{} 4328,Hyegun_Card,Yao Jun Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,15; bonus bCritical,1; if(isequipped(4090,4212)) bonus bAllStats,1; },{},{} 4329,Phendark_Card,Phendark Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_DemiHuman,5; },{},{ heal 0,-5; } @@ -2695,7 +2695,7 @@ 5487,J_Poringcake_Hat,Poring Cake Hat,5,,,500,,1,,0,0xFFFFFFFF,7,2,256,,0,1,417,{ bonus bLuk,2; },{},{} 5488,J_Twin_Santahat,Twin Santa Hat,5,,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,390,{ bonus bLuk,1; bonus bMdef,1; },{},{} //5489,Love_Daddy,Love Daddy Hat,5,,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,484,{ bonus bDex,2; },{},{} -//5490,Anubis_Helm,Anubis Helm,5,,,0,,3,,0,0xFFFFFFFF,7,2,256,,70,1,485,{ bonus2 bSubRace,RC_Boss,10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus2 bAddItemHealRate,IG_Recovery,10; },{},{} +//5490,Anubis_Helm,Anubis Helm,5,,,0,,3,,0,0xFFFFFFFF,7,2,256,,70,1,485,{ bonus2 bSubRace,RC_Boss,10; bonus bHealpower2,10; bonus bAddItemHealRate,10; },{},{} //5491,Hat_Of_Outlaw,Bandit Hat,5,,,800,,3,,1,0xFFFFFFFF,7,2,256,,0,1,486,{ bonus bStr,2; bonus2 bSubEle,Ele_Fire,10; },{},{} 5492,Boy's_Cap_I,Student Cap,5,0,,0,,5,,0,0xFFFFFFFE,7,2,256,,0,1,102,{ bonus2 bAddRace,RC_DemiHuman,5; },{},{} 5493,Ulle_Cap_I,Ulle's Cap,5,0,,0,,3,,0,0xFFFFFFFE,7,2,256,,0,1,254,{ bonus bDex,2; bonus bAgi,1; if(isequipped(2353) && readparam(bDex)>=70) bonus bUseSPrate,-10; },{},{} @@ -4875,106 +4875,106 @@ 12744,Chocotate_Box,Chocolate Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} //12745,Vivid Notation, //12746,Curious Snowball, -12900,Battle_Manual_Box,Battle Manual Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} -12901,Insurance_Package,Insurance Package,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} -12902,Bubble_Gum_Box,Bubble Gum Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} -12903,Str_Dish_Box,Steamed Tongue Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,10; },{},{} -12904,Agi_Dish_Box,Steamed Scorpion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,10; },{},{} -12905,Int_Dish_Box,Dragon Breath Cocktail Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; },{},{} -12906,Dex_Dish_Box,Hwergelmir's Tonic Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,10; },{},{} -12907,Luk_Dish_Box,Nine Tail Dish Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,10; },{},{} -12908,Vit_Dish_Box,Stew Of Immortality Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,10; },{},{} -12909,Kafra_Card_Box,Kafra Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,10; },{},{} -12910,Giant_Fly_Wing_Box,Giant Fly Wing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,10; },{},{} -12911,Neuralizer_Box,Neuralizer Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12213,10; },{},{} -12912,Convex_Mirror_Box,Convex Mirror Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,10; },{},{} -12913,Blessing_10_Scroll_Box,Blessing 10 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} -12914,Inc_Agi_10_Scroll_Box,Increase AGI 10 scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} -12915,Aspersio_5_Scroll_Box,Aspersio 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,10; },{},{} -12916,Assumptio_5_Scroll_Box,Assumptio 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,10; },{},{} -12917,Wind_Walk_10_Scroll_Box,Wind Walk 10 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} -12918,Adrenaline_Scroll_Box,Adrenaline 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} -12919,Megaphone_Box,Megaphone Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,10; },{},{} -12920,Enriched_Elunium_Box,Enriched Elunium Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,10; },{},{} -12921,Enriched_Oridecon_Box,Enriched Oridecon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,10; },{},{} -12922,Token_Of_Siegfried_Box,Token of Siegfried Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,10; },{},{} -12923,Pet_Egg_Scroll_Box1,December Lucky Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12925,1; },{},{} -12924,Pet_Egg_Scroll_Box2,Pet Egg Box 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12926,1; },{},{} -12925,Pet_Egg_Scroll1,Kafra Item Mall Prize Package,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12926,Pet_Egg_Scroll2,December Lucky Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12927,J_Aspersio_5_Scroll_Box,Aspersio Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12928,10; },{},{} +12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} +12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} +12902,Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} +12903,Str_Dish_Box,Steamed Tongue Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,10; },{},{} +12904,Agi_Dish_Box,Steamed Scorpion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,10; },{},{} +12905,Int_Dish_Box,Dragon Breath Cocktail Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; },{},{} +12906,Dex_Dish_Box,Hwergelmir's Tonic Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,10; },{},{} +12907,Luk_Dish_Box,Nine Tail Dish Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,10; },{},{} +12908,Vit_Dish_Box,Stew Of Immortality Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,10; },{},{} +12909,Kafra_Card_Box,Kafra Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,10; },{},{} +12910,Giant_Fly_Wing_Box,Giant Fly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,10; },{},{} +12911,Neuralizer_Box,Neuralizer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12213,1; },{},{} +12912,Convex_Mirror_Box,Convex Mirror Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,10; },{},{} +12913,Blessing_10_Scroll_Box,Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} +12914,Inc_Agi_10_Scroll_Box,Increase AGI 10 scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} +12915,Aspersio_5_Scroll_Box,Aspersio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,10; },{},{} +12916,Assumptio_5_Scroll_Box,Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,10; },{},{} +12917,Wind_Walk_10_Scroll_Box,Wind Walk 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} +12918,Adrenaline_Scroll_Box,Adrenaline 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} +12919,Megaphone_Box,Megaphone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,10; },{},{} +12920,Enriched_Elunium_Box,Enriched Elunium Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,10; },{},{} +12921,Enriched_Oridecon_Box,Enriched Oridecon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,10; },{},{} +12922,Token_Of_Siegfried_Box,Token of Siegfried Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,10; },{},{} +12923,Pet_Egg_Scroll_Box1,December Lucky Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12925,1; },{},{} +12924,Pet_Egg_Scroll_Box2,Pet Egg Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12926,1; },{},{} +12925,Pet_Egg_Scroll1,Kafra Item Mall Prize Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12926,Pet_Egg_Scroll2,December Lucky Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12927,J_Aspersio_5_Scroll_Box,Aspersio Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12928,10; },{},{} 12928,J_Aspersio_5_Scroll,Sacred Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "PR_ASPERSIO",5; },{},{} -12929,Pet_Egg_Scroll_Box3,Pet Egg Box 3,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12932,1; },{},{} -12930,Pet_Egg_Scroll_Box4,Pet Egg Box 4,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12933,1; },{},{} -12931,Pet_Egg_Scroll_Box5,Pet Egg Box 5,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12934,1; },{},{} -12932,Pet_Egg_Scroll3,Episode 13.2 Key Package,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12933,Pet_Egg_Scroll4,Summer Hat Pack,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12934,Pet_Egg_Scroll5,Pet Egg Scroll5,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12935,Infiltrator_Box,Infiltrator Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} -12936,Muramasa_Box,Muramasa Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} -12937,Excalibur_Box,Excalibur Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} -12938,Combat_Knife_Box,Combat Knife Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} -12939,Counter_Dagger_Box,Dagger of Counter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} -12940,Kaiser_Knuckle_Box,Kaiser Knuckle Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} -12941,Pole_Axe_Box,Poll Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1419,604800; },{},{} -12942,Mighty_Staff_Box,Mighty Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} -12943,Right_Epsilon_Box,Light Epsilon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} -12944,Balistar_Box,Ballista Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} -12945,Diary_Of_Great_Sage_Box,Sage's Diary Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} -12946,Asura_Box,Asura Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} -12947,Apple_Of_Archer_Box,Apple of Archer Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} -12948,Bunny_Band_Box,Bunny Band Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} -12949,Sahkkat_Box,Sakkat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} -12950,Lord_Circlet_Box,Grand Circlet Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} -12951,Elven_Ears_Box,Elven Ears Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,604800; },{},{} -12952,Steel_Flower_Box,Steel Flower Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} -12953,Critical_Ring_Box,Critical Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} -12954,Earring_Box,Earring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} -12955,Ring_Box,Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} -12956,Necklace_Box,Necklace Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} -12957,Glove_Box,Glove Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} -12958,Brooch_Box,Brooch Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} -12959,Rosary_Box,Rosary Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} -12960,Safety_Ring_Box,Safety Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} -12961,Vesper_Core01_Box,Vesper Core 01 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} -12962,Vesper_Core02_Box,Vesper Core 02 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} -12963,Vesper_Core03_Box,Vesper Core 03 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} -12964,Vesper_Core04_Box,Vesper Core 04 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} -12965,Emergency_Box1,Emergency Level 1 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12968,1; },{},{} -12966,Emergency_Box2,Emergency Level 2 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12969,2; },{},{} -12967,Emergency_Box3,Emergency Level 3 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12970,3; },{},{} +12929,Pet_Egg_Scroll_Box3,Pet Egg Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12932,1; },{},{} +12930,Pet_Egg_Scroll_Box4,Pet Egg Box 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12933,1; },{},{} +12931,Pet_Egg_Scroll_Box5,Pet Egg Box 5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12934,1; },{},{} +12932,Pet_Egg_Scroll3,Episode 13.2 Key Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12933,Pet_Egg_Scroll4,Summer Hat Pack,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12934,Pet_Egg_Scroll5,Pet Egg Scroll5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12935,Infiltrator_Box,Infiltrator Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} +12936,Muramasa_Box,Muramasa Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} +12937,Excalibur_Box,Excalibur Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} +12938,Combat_Knife_Box,Combat Knife Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} +12939,Counter_Dagger_Box,Dagger of Counter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} +12940,Kaiser_Knuckle_Box,Kaiser Knuckle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} +12941,Pole_Axe_Box,Poll Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1419,604800; },{},{} +12942,Mighty_Staff_Box,Mighty Staff Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} +12943,Right_Epsilon_Box,Light Epsilon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} +12944,Balistar_Box,Ballista Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} +12945,Diary_Of_Great_Sage_Box,Sage's Diary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} +12946,Asura_Box,Asura Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} +12947,Apple_Of_Archer_Box,Apple of Archer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} +12948,Bunny_Band_Box,Bunny Band Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} +12949,Sahkkat_Box,Sakkat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} +12950,Lord_Circlet_Box,Grand Circlet Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} +12951,Elven_Ears_Box,Elven Ears Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,604800; },{},{} +12952,Steel_Flower_Box,Steel Flower Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} +12953,Critical_Ring_Box,Critical Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} +12954,Earring_Box,Earring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} +12955,Ring_Box,Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} +12956,Necklace_Box,Necklace Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} +12957,Glove_Box,Glove Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} +12958,Brooch_Box,Brooch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} +12959,Rosary_Box,Rosary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} +12960,Safety_Ring_Box,Safety Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} +12961,Vesper_Core01_Box,Vesper Core 01 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} +12962,Vesper_Core02_Box,Vesper Core 02 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} +12963,Vesper_Core03_Box,Vesper Core 03 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} +12964,Vesper_Core04_Box,Vesper Core 04 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} +12965,Emergency_Box1,Emergency Level 1 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12968,1; },{},{} +12966,Emergency_Box2,Emergency Level 2 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12969,1; },{},{} +12967,Emergency_Box3,Emergency Level 3 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12970,1; },{},{} 12968,Emergency_Scroll1,Emergency Level 1 Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_EMERGENCYCALL",1; },{},{} 12969,Emergency_Scroll2,Emergency Level 2 Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_EMERGENCYCALL",1; },{},{} 12970,Emergency_Scroll3,Emergency Level 3 Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_EMERGENCYCALL",1; },{},{} -12971,Teleport_Box1,Teleport Scroll Box 1,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12977,10; },{},{} -12972,Teleport_Box2,Teleport Scroll Box 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12978,10; },{},{} -12973,Teleport_Box3,Teleport Scroll Box 3,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12979,10; },{},{} -12974,Teleport_Box4,Teleport Scroll Box 4,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12980,10; },{},{} -12975,Teleport_Box5,Teleport Scroll Box 5,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12981,10; },{},{} -12976,Teleport_Box6,Teleport Scroll Box 6,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12982,10; },{},{} +12971,Teleport_Box1,Teleport Scroll Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12977,10; },{},{} +12972,Teleport_Box2,Teleport Scroll Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12978,10; },{},{} +12973,Teleport_Box3,Teleport Scroll Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12979,10; },{},{} +12974,Teleport_Box4,Teleport Scroll Box 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12980,10; },{},{} +12975,Teleport_Box5,Teleport Scroll Box 5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12981,10; },{},{} +12976,Teleport_Box6,Teleport Scroll Box 6,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12982,10; },{},{} 12977,Teleport_Scroll1,Teleport Scroll 1,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",1; },{},{} 12978,Teleport_Scroll2,Teleport Scroll 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",2; },{},{} 12979,Teleport_Scroll3,Teleport Scroll 3,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",3; },{},{} 12980,Teleport_Scroll4,Teleport Scroll 4,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",4; },{},{} 12981,Teleport_Scroll5,Teleport Scroll 5,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",5; },{},{} 12982,Teleport_Scroll6,Teleport Scroll 6,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashTele",6; },{},{} -12983,Pet_Egg_Scroll_Box6,Pet Egg Scroll Box 6,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12989,1; },{},{} -12984,Pet_Egg_Scroll_Box7,Pet Egg Scroll Box 7,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12990,1; },{},{} -12985,Pet_Egg_Scroll_Box8,Pet Egg Scroll Box 8,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12991,1; },{},{} -12986,Pet_Egg_Scroll_Box9,Adventurer Pack Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12992,1; },{},{} -12987,Pet_Egg_Scroll_Box10,Pet Egg Scroll Box 10,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12993,1; },{},{} -12988,Pet_Egg_Scroll_Box11,Pet Egg Scroll Box 11,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12994,1; },{},{} +12983,Pet_Egg_Scroll_Box6,Pet Egg Scroll Box 6,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12989,1; },{},{} +12984,Pet_Egg_Scroll_Box7,Pet Egg Scroll Box 7,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12990,1; },{},{} +12985,Pet_Egg_Scroll_Box8,Pet Egg Scroll Box 8,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12991,1; },{},{} +12986,Pet_Egg_Scroll_Box9,Adventurer Pack Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12992,1; },{},{} +12987,Pet_Egg_Scroll_Box10,Pet Egg Scroll Box 10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12993,1; },{},{} +12988,Pet_Egg_Scroll_Box11,Pet Egg Scroll Box 11,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12994,1; },{},{} 12989,Pet_Egg_Scroll6,Pet Egg Scroll 6,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12990,Pet_Egg_Scroll7,Pet Egg Scroll 7,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12991,Pet_Egg_Scroll8,Party Hard Pack,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12992,Pet_Egg_Scroll9,Adventurer Pack,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12993,Pet_Egg_Scroll10,Pet Egg Scroll 10,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12994,Pet_Egg_Scroll11,Pet Egg Scroll 11,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12995,White_Herb_Box,White Herb Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 509,15; },{},{} -12996,Blue_Herb_Box,Blue Herb Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 510,15; },{},{} -12997,Elunium_Box,Elunium Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 985,5; },{},{} -12998,Oridecon_Box,Oridecon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,5; },{},{} -12999,Branch_Of_Dead_Tree_Box,Dead Branch Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,3; },{},{} +12995,White_Herb_Box,White Herb Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 509,15; },{},{} +12996,Blue_Herb_Box,Blue Herb Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 510,15; },{},{} +12997,Elunium_Box,Elunium Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 985,5; },{},{} +12998,Oridecon_Box,Oridecon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,5; },{},{} +12999,Branch_Of_Dead_Tree_Box,Dead Branch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,3; },{},{} // More Weapons //=================================================================== // Daggers and Ninja Weapons @@ -5165,64 +5165,64 @@ //13426,Cutlas_C //13427,Solar_Sword_C // More Cash Shop Items -13500,Insurance60_Package,Life Insurrance Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14500,10; },{},{} -13501,Assorted_Scroll_Box,Experience Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13502,Drooping_Kitty_Box,Refined Drooping Cat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5279,604800; },{},{} -13503,Magestic_Goat_Box,Baphomet Horns Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5280,604800; },{},{} -13504,Deviruchi_Cap_Box,Refined Deviruchi Hat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5281,604800; },{},{} -13505,Executioner_Box,Executioner Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1174,604800; },{},{} -13506,Brood_Axe_Box,Refined Bloody Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1373,604800; },{},{} -13507,Tomahawk_Box,Tomahawk Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1374,604800; },{},{} -13508,Bow_Of_Rudra_Box,Rudra Bow Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1729,604800; },{},{} -13509,Cutlas_Box,Cutlas Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13402,604800; },{},{} -13510,Solar_Sword_Box,Solar Sword Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13403,604800; },{},{} -13511,Sword_Breaker_Box,Refined Swordbreaker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13024,604800; },{},{} -13512,Mail_Breaker_Box,Refined Mailbreaker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13025,604800; },{},{} -13513,Moonlight_Sword_Box,Moonlight Dagger Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13026,604800; },{},{} -13514,Spanner_Box,Wrench Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1534,604800; },{},{} -13515,Grape_Box,Grape Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 514,10; },{},{} -13516,Royal_Jelly_Box,Royal Jelly Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 526,5; },{},{} -13517,Yggdrasilberry_Box,Yggdrasil Berry Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 607,3; },{},{} -13518,Weapon_Card_Scroll_Box,Weapon Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13558,1; },{},{} -13519,Armor_Card_Scroll_Box,Armor Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13559,1; },{},{} -13520,Helmet_Card_Scroll_Box,Helmet Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13560,1; },{},{} -13521,Garment_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13561,1; },{},{} -13522,Shield_Card_Scroll_Box,Shield Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13562,1; },{},{} -13523,Shoes_Card_Scroll_Box,Shoes Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13563,1; },{},{} -13524,Accy_Card_Scroll_Box,Accessory Card Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13564,1; },{},{} -13525,Zeny_Scroll_Box,Zeny Pet Egg Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14508,1; },{},{} -13526,Pet_Egg_Scroll_Box1_,Pet Egg Scroll Box 12,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12925,30; },{},{} -13527,Pet_Egg_Scroll_Box2_,Pet Egg Scroll Box 13,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12926,30; },{},{} -13528,Pet_Egg_Scroll_Box3_,Pet Egg Scroll Box 14,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12932,30; },{},{} -13529,Pet_Egg_Scroll_Box4_,Pet Egg Scroll Box 15,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12933,30; },{},{} -13530,Pet_Egg_Scroll_Box5_,Pet Egg Scroll Box 16,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12934,30; },{},{} -13531,Light_Red_Pot_Box,Light Red Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 598,50; },{},{} -13532,Light_Orange_Pot_Box,Light Orange Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 599,50; },{},{} -13533,Light_Yellow_Pot_Box,Light Yellow Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11500,50; },{},{} -13534,Light_White_Pot_Box,Light White Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11501,50; },{},{} -13535,Light_Center_Pot_Box,Light Concentration Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14509,20; },{},{} -13536,Light_Awakening_Pot_Box,Light Awakening Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14510,20; },{},{} -13537,Light_Berserk_Pot_Box,Light Berserk Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14511,20; },{},{} -13538,Meteor_10_Scroll_Box,Meteor Storm Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14512,10; },{},{} -13539,Storm_10_Scroll_Box,Storm Gust Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14513,10; },{},{} -13540,Vermilion_10_Scroll_Box,Lord of Vermilion Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14514,10; },{},{} -13541,Lex_Aeterna_Scroll_Box,Lex Aeterna Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14515,10; },{},{} -13542,Magnificat_5_Scroll_Box,Magnificat Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14516,10; },{},{} -13543,CP_Helm_Scroll_Box,Chemical Protection Helm Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14517,10; },{},{} -13544,CP_Shield_Scroll_Box,Chemical Protection Shield Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14518,10; },{},{} -13545,CP_Armor_Scroll_Box,Chemical Protection Armor Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14519,10; },{},{} -13546,CP_Weapon_Scroll_Box,Chemical Protection Weapon Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14520,10; },{},{} -13547,Repair_Scroll_Box,Repair Weapon Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,10; },{},{} -13548,Big_Bun_Box,Big Bun Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,10; },{},{} -13549,Pill__Box,Pill Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,10; },{},{} -13550,Superb_Fish_Slice_Box,Fish Slice Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14524,10; },{},{} -13551,Chewy_Ricecake_Box,Chewy Ricecake Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14525,10; },{},{} -13552,Oriental_Pastry_Box,Pastry Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14526,10; },{},{} -13553,Dun_Tele_Scroll1_Box,Dungeon Teleport Scroll 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,10; },{},{} -13554,Weapon_Card_Scroll_Box2,Weapon Card Pet Egg Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13565,1; },{},{} -13555,Weapon_Card_Scroll_Box3,Weapon Card Pet Egg Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13566,1; },{},{} -13556,Armor_Card_Scroll_Box2,Armor Card Pet Egg Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13567,1; },{},{} -13557,Accy_Card_Scroll_Box2,Accessory Card Pet Egg Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13568,1; },{},{} +13500,Insurance60_Package,Life Insurrance Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14500,10; },{},{} +13501,Assorted_Scroll_Box,Experience Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13502,Drooping_Kitty_Box,Refined Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5279,604800; },{},{} +13503,Magestic_Goat_Box,Baphomet Horns Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5280,604800; },{},{} +13504,Deviruchi_Cap_Box,Refined Deviruchi Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5281,604800; },{},{} +13505,Executioner_Box,Executioner Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1174,604800; },{},{} +13506,Brood_Axe_Box,Refined Bloody Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1373,604800; },{},{} +13507,Tomahawk_Box,Tomahawk Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1374,604800; },{},{} +13508,Bow_Of_Rudra_Box,Rudra Bow Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1729,604800; },{},{} +13509,Cutlas_Box,Cutlas Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13402,604800; },{},{} +13510,Solar_Sword_Box,Solar Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13403,604800; },{},{} +13511,Sword_Breaker_Box,Refined Swordbreaker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13024,604800; },{},{} +13512,Mail_Breaker_Box,Refined Mailbreaker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13025,604800; },{},{} +13513,Moonlight_Sword_Box,Moonlight Dagger Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13026,604800; },{},{} +13514,Spanner_Box,Wrench Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1534,604800; },{},{} +13515,Grape_Box,Grape Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 514,10; },{},{} +13516,Royal_Jelly_Box,Royal Jelly Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 526,5; },{},{} +13517,Yggdrasilberry_Box,Yggdrasil Berry Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 607,3; },{},{} +13518,Weapon_Card_Scroll_Box,Weapon Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13558,1; },{},{} +13519,Armor_Card_Scroll_Box,Armor Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13559,1; },{},{} +13520,Helmet_Card_Scroll_Box,Helmet Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13560,1; },{},{} +13521,Garment_Card_Scroll_Box,Garment Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13561,1; },{},{} +13522,Shield_Card_Scroll_Box,Shield Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13562,1; },{},{} +13523,Shoes_Card_Scroll_Box,Shoes Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13563,1; },{},{} +13524,Accy_Card_Scroll_Box,Accessory Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13564,1; },{},{} +13525,Zeny_Scroll_Box,Zeny Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14508,1; },{},{} +13526,Pet_Egg_Scroll_Box1_,Pet Egg Scroll Box 12,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12925,30; },{},{} +13527,Pet_Egg_Scroll_Box2_,Pet Egg Scroll Box 13,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12926,30; },{},{} +13528,Pet_Egg_Scroll_Box3_,Pet Egg Scroll Box 14,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12932,30; },{},{} +13529,Pet_Egg_Scroll_Box4_,Pet Egg Scroll Box 15,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12933,30; },{},{} +13530,Pet_Egg_Scroll_Box5_,Pet Egg Scroll Box 16,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12934,30; },{},{} +13531,Light_Red_Pot_Box,Light Red Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 598,50; },{},{} +13532,Light_Orange_Pot_Box,Light Orange Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 599,50; },{},{} +13533,Light_Yellow_Pot_Box,Light Yellow Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11500,50; },{},{} +13534,Light_White_Pot_Box,Light White Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11501,50; },{},{} +13535,Light_Center_Pot_Box,Light Concentration Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14509,20; },{},{} +13536,Light_Awakening_Pot_Box,Light Awakening Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14510,20; },{},{} +13537,Light_Berserk_Pot_Box,Light Berserk Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14511,20; },{},{} +13538,Meteor_10_Scroll_Box,Meteor Storm Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14512,1; },{},{} +13539,Storm_10_Scroll_Box,Storm Gust Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14513,1; },{},{} +13540,Vermilion_10_Scroll_Box,Lord of Vermilion Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14514,1; },{},{} +13541,Lex_Aeterna_Scroll_Box,Lex Aeterna Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14515,1; },{},{} +13542,Magnificat_5_Scroll_Box,Magnificat Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14516,1; },{},{} +13543,CP_Helm_Scroll_Box,Chemical Protection Helm Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14517,10; getitem 7139,10; },{},{} +13544,CP_Shield_Scroll_Box,Chemical Protection Shield Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14518,10; getitem 7139,10; },{},{} +13545,CP_Armor_Scroll_Box,Chemical Protection Armor Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14519,10; getitem 7139,10; },{},{} +13546,CP_Weapon_Scroll_Box,Chemical Protection Weapon Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14520,10; getitem 7139,10; },{},{} +13547,Repair_Scroll_Box,Repair Weapon Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14587,5; getitem 1002,5; getitem 998,5; getitem 756,5; getitem 999,5; },{},{} +13548,Big_Bun_Box,Big Bun Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,10; },{},{} +13549,Pill__Box,Pill Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,10; },{},{} +13550,Superb_Fish_Slice_Box,Fish Slice Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14524,10; },{},{} +13551,Chewy_Ricecake_Box,Chewy Ricecake Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14525,10; },{},{} +13552,Oriental_Pastry_Box,Pastry Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14526,10; },{},{} +13553,Dun_Tele_Scroll1_Box,Dungeon Teleport Scroll 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,5; },{},{} +13554,Weapon_Card_Scroll_Box2,Weapon Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13565,1; },{},{} +13555,Weapon_Card_Scroll_Box3,Weapon Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13566,1; },{},{} +13556,Armor_Card_Scroll_Box2,Armor Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13567,1; },{},{} +13557,Accy_Card_Scroll_Box2,Accessory Card Pet Egg Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13568,1; },{},{} 13558,Weapon_Card_Scroll,Weapon Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13559,Armor_Card_Scroll,Armor Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13560,Helmet_Card_Scroll,Helmet Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} @@ -5234,138 +5234,138 @@ 13566,Weapon_Card_Scroll3,Weapon Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13567,Armor_Card_Scroll2,Armor Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13568,Accy_Card_Scroll2,Accessory Card Pet Egg Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13569,PVP_Tele_Scroll_Box,PVP Teleport Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14528,1; },{},{} -13570,Giant_Fly_Wing_Box50,Giant Fly Wing 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,50; },{},{} -13571,Giant_Fly_Wing_Box100,Giant Fly Wing 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,100; },{},{} -13572,Dex_Dish_Box30,Hwergelmir's Tonic 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,30; },{},{} -13573,Dex_Dish_Box50,Hwergelmir's Tonic 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,50; },{},{} -13574,Luk_Dish_Box30,Nine Tail Dish 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,30; },{},{} -13575,Luk_Dish_Box50,Nine Tail Dish 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,50; },{},{} -13576,Inc_Agi_10_Box30,Increase Agility Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,30; },{},{} -13577,Inc_Agi_10_Box50,Increase Agility Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,50; },{},{} -13578,Vit_Dish_Box30,Stew of Immortality 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,30; },{},{} -13579,Vit_Dish_Box50,Stew of Immortality 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,50; },{},{} -13580,Insurance_Package30,Life Insurrance 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,30; },{},{} -13581,Insurance_Package50,Life Insurrance 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,50; },{},{} -13582,Convex_Mirror_Box5,Convex Mirror 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,5; },{},{} -13583,Convex_Mirror_Box30,Convex Mirror 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,30; },{},{} -13584,Blessing10_Box30,Blessing Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,30; },{},{} -13585,Blessing10_Box50,Blessing Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,50; },{},{} -13586,Adrenaline10_Box30,Adrenaline Rush Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,30; },{},{} -13587,Adrenaline10_Box50,Adrenaline Rush Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,50; },{},{} -13588,Assumptio_5_Box30,Assumptio Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,30; },{},{} -13589,Assumptio_5_Box50,Assumptio Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,50; },{},{} -13590,Aspersio_5_Box30,Aspersio Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,30; },{},{} -13591,Aspersio_5_Box50,Aspersio Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,50; },{},{} -13592,Agi_Dish_Box30,Steamed Scorpion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,30; },{},{} -13593,Agi_Dish_Box50,Steamed Scorpion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,50; },{},{} -13594,Wind_Walk10_Box30,Wind Walk Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,30; },{},{} -13595,Wind_Walk10_Box50,Wind Walk Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,50; },{},{} -13596,Int_Dish_Box30,Dragon Breath Cocktail 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,30; },{},{} -13597,Int_Dish_Box50,Dragon Breath Cocktail 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,50; },{},{} -13598,Battle_Manual_Box1,Field Manual Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,1; },{},{} -13599,Battle_Manual_Box5,Field Manual 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; },{},{} -13600,Siegfried_Box5,Token of Siegfried 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,5; },{},{} -13601,Siegfried_Box20,Token of Siegfried 20 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,20; },{},{} -13602,Kafra_Card_Box30,Kafra Card 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,30; },{},{} -13603,Kafra_Card_Box50,Kafra Card 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,50; },{},{} -13604,Str_Dish_Box30,Steamed Tongue 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,30; },{},{} -13605,Str_Dish_Box50,Steamed Tongue 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,50; },{},{} -13606,Bubble_Gum_Box1,Bubble Gum Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,1; },{},{} -13607,Bubble_Gum_Box5,Bubble Gum 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,5; },{},{} -13608,Megaphone_Box1,Megaphone Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,1; },{},{} -13609,Megaphone_Box5,Megaphone 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,5; },{},{} -13610,Enriched_Elunium_Box5,Enriched Elunium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,5; },{},{} -13611,Enriched_Oridecon_Box5,Enriched Oridecon 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,5; },{},{} -13612,Handcuff_Box,Arrest Handcuffs Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2706,1; },{},{} -13613,Super_Pet_Egg_Box1,Super Pet Egg Box 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13617,1; },{},{} -13614,Super_Pet_Egg_Box2,Super Pet Egg Box 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13618,1; },{},{} -13615,Super_Pet_Egg_Box3,Super Pet Egg Box 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13619,1; },{},{} -13616,Super_Pet_Egg_Box4,Super Pet Egg Box 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13620,1; },{},{} +13569,PVP_Tele_Scroll_Box,PVP Teleport Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14528,10; },{},{} +13570,Giant_Fly_Wing_Box50,Giant Fly Wing 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,50; },{},{} +13571,Giant_Fly_Wing_Box100,Giant Fly Wing 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,100; },{},{} +13572,Dex_Dish_Box30,Hwergelmir's Tonic 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,30; },{},{} +13573,Dex_Dish_Box50,Hwergelmir's Tonic 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,50; },{},{} +13574,Luk_Dish_Box30,Nine Tail Dish 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,30; },{},{} +13575,Luk_Dish_Box50,Nine Tail Dish 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,50; },{},{} +13576,Inc_Agi_10_Box30,Increase Agility Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,30; },{},{} +13577,Inc_Agi_10_Box50,Increase Agility Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,50; },{},{} +13578,Vit_Dish_Box30,Stew of Immortality 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,30; },{},{} +13579,Vit_Dish_Box50,Stew of Immortality 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,50; },{},{} +13580,Insurance_Package30,Life Insurrance 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,30; },{},{} +13581,Insurance_Package50,Life Insurrance 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,50; },{},{} +13582,Convex_Mirror_Box5,Convex Mirror 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,5; },{},{} +13583,Convex_Mirror_Box30,Convex Mirror 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,30; },{},{} +13584,Blessing10_Box30,Blessing Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,30; },{},{} +13585,Blessing10_Box50,Blessing Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,50; },{},{} +13586,Adrenaline10_Box30,Adrenaline Rush Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,30; },{},{} +13587,Adrenaline10_Box50,Adrenaline Rush Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,50; },{},{} +13588,Assumptio_5_Box30,Assumptio Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,30; },{},{} +13589,Assumptio_5_Box50,Assumptio Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,50; },{},{} +13590,Aspersio_5_Box30,Aspersio Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,30; },{},{} +13591,Aspersio_5_Box50,Aspersio Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,50; },{},{} +13592,Agi_Dish_Box30,Steamed Scorpion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,30; },{},{} +13593,Agi_Dish_Box50,Steamed Scorpion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,50; },{},{} +13594,Wind_Walk10_Box30,Wind Walk Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,30; },{},{} +13595,Wind_Walk10_Box50,Wind Walk Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,50; },{},{} +13596,Int_Dish_Box30,Dragon Breath Cocktail 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,30; },{},{} +13597,Int_Dish_Box50,Dragon Breath Cocktail 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,50; },{},{} +13598,Battle_Manual_Box1,Field Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,1; },{},{} +13599,Battle_Manual_Box5,Field Manual 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; },{},{} +13600,Siegfried_Box5,Token of Siegfried 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,5; },{},{} +13601,Siegfried_Box20,Token of Siegfried 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,20; },{},{} +13602,Kafra_Card_Box30,Kafra Card 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,30; },{},{} +13603,Kafra_Card_Box50,Kafra Card 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,50; },{},{} +13604,Str_Dish_Box30,Steamed Tongue 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,30; },{},{} +13605,Str_Dish_Box50,Steamed Tongue 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,50; },{},{} +13606,Bubble_Gum_Box1,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,1; },{},{} +13607,Bubble_Gum_Box5,Bubble Gum 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,5; },{},{} +13608,Megaphone_Box1,Megaphone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,1; },{},{} +13609,Megaphone_Box5,Megaphone 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,5; },{},{} +13610,Enriched_Elunium_Box5,Enriched Elunium 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,5; },{},{} +13611,Enriched_Oridecon_Box5,Enriched Oridecon 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,5; },{},{} +13612,Handcuff_Box,Arrest Handcuffs Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2706,1; },{},{} +13613,Super_Pet_Egg_Box1,Super Pet Egg Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13617,1; },{},{} +13614,Super_Pet_Egg_Box2,Super Pet Egg Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13618,1; },{},{} +13615,Super_Pet_Egg_Box3,Super Pet Egg Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13619,1; },{},{} +13616,Super_Pet_Egg_Box4,Super Pet Egg Box 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13620,1; },{},{} 13617,Super_Pet_Egg1,Super Pet Egg 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13618,Super_Pet_Egg2,Super Pet Egg 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13619,Super_Pet_Egg3,Super Pet Egg 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13620,Super_Pet_Egg4,Super Pet Egg 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13621,Greed_Box30,Greed Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,30; },{},{} -13622,Greed_Box50,Greed Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,50; },{},{} -13623,Greed_Box100,Greed Scroll 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,100; },{},{} -13624,Flee_30_Scroll_Box,Evasion Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14530,10; },{},{} -13625,Accuracy_30_Scroll_Box,Concentration Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14531,10; },{},{} -13626,Super_Card_Pet_Egg_Box1,Super Card Pet Egg Box 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13630,1; },{},{} -13627,Super_Card_Pet_Egg_Box2,Super Card Pet Egg Box 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13631,1; },{},{} -13628,Super_Card_Pet_Egg_Box3,Super Card Pet Egg Box 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13632,1; },{},{} -13629,Super_Card_Pet_Egg_Box4,Super Card Pet Egg Box 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13633,1; },{},{} +13621,Greed_Box30,Greed Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,30; },{},{} +13622,Greed_Box50,Greed Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,50; },{},{} +13623,Greed_Box100,Greed Scroll 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14529,100; },{},{} +13624,Flee_30_Scroll_Box,Evasion Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14530,1; },{},{} +13625,Accuracy_30_Scroll_Box,Concentration Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14531,1; },{},{} +13626,Super_Card_Pet_Egg_Box1,Super Card Pet Egg Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13630,1; },{},{} +13627,Super_Card_Pet_Egg_Box2,Super Card Pet Egg Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13631,1; },{},{} +13628,Super_Card_Pet_Egg_Box3,Super Card Pet Egg Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13632,1; },{},{} +13629,Super_Card_Pet_Egg_Box4,Super Card Pet Egg Box 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13633,1; },{},{} 13630,Super_Card_Pet_Egg1,Super Card Pet Egg 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13631,Super_Card_Pet_Egg2,Super Card Pet Egg 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13632,Super_Card_Pet_Egg3,Super Card Pet Egg 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13633,Super_Card_Pet_Egg4,Super Card Pet Egg 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13634,Vigorgra_Package1,1 Hour Package Vol. 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -13635,Vigorgra_Package2,1 Hour Package Vol. 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -13636,Vigorgra_Package3,1 Hour Package Vol. 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12253,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -13637,Vigorgra_Package4,1 Hour Package Vol. 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -13638,Vigorgra_Package5,1 Hour Package Vol. 5,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12250,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -13639,Vigorgra_Package6,1 Hour Package Vol. 6,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12217,20; getitem 12211,1; getitem 7621,1; },{},{} -13640,Vigorgra_Package7,2 Hour Package Vol. 1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -13641,Vigorgra_Package8,2 Hour Package Vol. 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -13642,Vigorgra_Package9,2 Hour Package Vol. 3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12253,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -13643,Vigorgra_Package10,2 Hour Package Vol. 4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -13644,Vigorgra_Package11,2 Hour Package Vol. 5,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12250,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -13645,Vigorgra_Package12,2 Hour Package Vol. 6,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12217,40; getitem 12211,2; getitem 7621,2; },{},{} -13646,Infiltrator_Box1,Refined Infiltrator Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} -13647,Muramasa_Box1,Refined Muramasa Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} -13648,Excalibur_Box1,Refined Excalibur Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} -13649,Combat_Knife_Box1,Refined Combat Knife Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} -13650,Counter_Dagger_Box1,Refined Dagger of Counter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} -13651,Kaiser_Knuckle_Box1,Refined Kaiser Knuckle Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} -13652,Pole_Axe_Box1,Refined Pole Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1419,604800; },{},{} -13653,Mighty_Staff_Box1,Refined Mighty Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} -13654,Right_Epsilon_Box1,Refined Light Epsilon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} -13655,Balistar_Box1,Refined Ballista Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} -13656,Diary_Of_Sage_Box1,Refined Sage's Diary Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} -13657,Asura_Box1,Refined Ashura Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} -13658,Apple_Of_Archer_Box1,Refined Apple of Archer Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} -13659,Bunny_Band_Box1,Refined Bunny Band Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} -13660,Sahkkat_Box1,Refined Sakkat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} -13661,Lord_Circlet_Box1,Refined Grand Circlet Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} -13662,Elven_Ears_Box1,Refined Elven Ears Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,1209600; },{},{} -13663,Steel_Flower_Box1,Refined Romantic Flower Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} -13664,Critical_Ring_Box1,Refined Critical Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} -13665,Earring_Box1,Refined Earring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} -13666,Ring_Box1,Refined Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} -13667,Necklace_Box1,Refined Necklace Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} -13668,Glove_Box1,Refined Glove Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} -13669,Brooch_Box1,Refined Brooch Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} -13670,Rosary_Box1,Refined Rosary Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} -13671,Safety_Ring_Box1,Refined Safety Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} -13672,Vesper_Core01_Box1,Refined Vesper Core 01 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} -13673,Vesper_Core02_Box1,Refined Vesper Core 02 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} -13674,Vesper_Core03_Box1,Refined Vesper Core 03 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} -13675,Vesper_Core04_Box1,Refined Vesper Core 04 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} -13676,Drooping_Kitty_Box1,Refined Drooping Cat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5279,1209600; },{},{} -13677,Magestic_Goat_Box1,Refined Majestic Goat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5280,1209600; },{},{} -13678,Deviruchi_Cap_Box1,Refined Deviruchi Hat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5281,1209600; },{},{} -13679,Executioner_Box1,Refined Executioner Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1174,604800; },{},{} -13680,Brood_Axe_Box1,Refined Bloody Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1373,604800; },{},{} -13681,Tomahawk_Box1,Refined Tomahawk Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1374,604800; },{},{} -13682,Bow_Of_Rudra_Box1,Refined Rudra Bow Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1729,604800; },{},{} -13683,Cutlas_Box1,Refined Cutlus Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13402,604800; },{},{} -13684,Solar_Sword_Box1,Refined Solar Sword Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13403,604800; },{},{} -13685,Sword_Breaker_Box1,Refined Swordbreaker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13024,604800; },{},{} -13686,Mail_Breaker_Box1,Refined Mailbreaker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13025,604800; },{},{} -13687,Moonlight_Sword_Box1,Refined Moonlight Dagger Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13026,604800; },{},{} -13688,Spanner_Box1,Refined Wrench Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1534,604800; },{},{} -13689,Bok_Choy_Box,Bok Choy Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7766,10; },{},{} -13690,Chung_E_Cake_Box,Green Maiden Cake Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7767,10; },{},{} -//13691,Freyja_Overcoat_Box,Freya's Clothes Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2369,1; },{},{} -//13692,Freyja_Boots_Box,Freya's Boots Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2428,1;},{},{} -//13693,Freyja_Cape_Box,Freya's Manteau Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2533,1; },{},{} -//13694,Freyja_Crown_Box,Freya's Crown Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5306,1; },{},{} -13695,Battle_Manual25_Box,Field Manual 25% Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14532,25; },{},{} -13696,Battle_Manual100_Box,Field Manual 100% Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14533,100; },{},{} -13697,J_Blessing10_Box,Blessing Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} -13698,J_Inc_Agi10_Box,Increase Agility Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} -13699,J_Wind_Walk10_Box,Wind Walk Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} -13700,J_Adrenaline10_Box,Adrenaline Rush Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} +13634,Vigorgra_Package1,1 Hour Package Vol. 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +13635,Vigorgra_Package2,1 Hour Package Vol. 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +13636,Vigorgra_Package3,1 Hour Package Vol. 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12253,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +13637,Vigorgra_Package4,1 Hour Package Vol. 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +13638,Vigorgra_Package5,1 Hour Package Vol. 5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12250,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +13639,Vigorgra_Package6,1 Hour Package Vol. 6,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12217,20; getitem 12211,1; getitem 7621,1; },{},{} +13640,Vigorgra_Package7,2 Hour Package Vol. 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +13641,Vigorgra_Package8,2 Hour Package Vol. 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +13642,Vigorgra_Package9,2 Hour Package Vol. 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12253,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +13643,Vigorgra_Package10,2 Hour Package Vol. 4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +13644,Vigorgra_Package11,2 Hour Package Vol. 5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12250,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +13645,Vigorgra_Package12,2 Hour Package Vol. 6,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12217,40; getitem 12211,2; getitem 7621,2; },{},{} +13646,Infiltrator_Box1,Refined Infiltrator Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} +13647,Muramasa_Box1,Refined Muramasa Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} +13648,Excalibur_Box1,Refined Excalibur Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} +13649,Combat_Knife_Box1,Refined Combat Knife Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} +13650,Counter_Dagger_Box1,Refined Dagger of Counter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} +13651,Kaiser_Knuckle_Box1,Refined Kaiser Knuckle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} +13652,Pole_Axe_Box1,Refined Pole Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1419,604800; },{},{} +13653,Mighty_Staff_Box1,Refined Mighty Staff Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} +13654,Right_Epsilon_Box1,Refined Light Epsilon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} +13655,Balistar_Box1,Refined Ballista Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} +13656,Diary_Of_Sage_Box1,Refined Sage's Diary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} +13657,Asura_Box1,Refined Ashura Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} +13658,Apple_Of_Archer_Box1,Refined Apple of Archer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} +13659,Bunny_Band_Box1,Refined Bunny Band Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} +13660,Sahkkat_Box1,Refined Sakkat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} +13661,Lord_Circlet_Box1,Refined Grand Circlet Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} +13662,Elven_Ears_Box1,Refined Elven Ears Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,1209600; },{},{} +13663,Steel_Flower_Box1,Refined Romantic Flower Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} +13664,Critical_Ring_Box1,Refined Critical Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} +13665,Earring_Box1,Refined Earring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} +13666,Ring_Box1,Refined Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} +13667,Necklace_Box1,Refined Necklace Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} +13668,Glove_Box1,Refined Glove Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} +13669,Brooch_Box1,Refined Brooch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} +13670,Rosary_Box1,Refined Rosary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} +13671,Safety_Ring_Box1,Refined Safety Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} +13672,Vesper_Core01_Box1,Refined Vesper Core 01 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} +13673,Vesper_Core02_Box1,Refined Vesper Core 02 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} +13674,Vesper_Core03_Box1,Refined Vesper Core 03 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} +13675,Vesper_Core04_Box1,Refined Vesper Core 04 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} +13676,Drooping_Kitty_Box1,Refined Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5279,1209600; },{},{} +13677,Magestic_Goat_Box1,Refined Majestic Goat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5280,1209600; },{},{} +13678,Deviruchi_Cap_Box1,Refined Deviruchi Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5281,1209600; },{},{} +13679,Executioner_Box1,Refined Executioner Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1174,604800; },{},{} +13680,Brood_Axe_Box1,Refined Bloody Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1373,604800; },{},{} +13681,Tomahawk_Box1,Refined Tomahawk Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1374,604800; },{},{} +13682,Bow_Of_Rudra_Box1,Refined Rudra Bow Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1729,604800; },{},{} +13683,Cutlas_Box1,Refined Cutlus Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13402,604800; },{},{} +13684,Solar_Sword_Box1,Refined Solar Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13403,604800; },{},{} +13685,Sword_Breaker_Box1,Refined Swordbreaker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13024,604800; },{},{} +13686,Mail_Breaker_Box1,Refined Mailbreaker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13025,604800; },{},{} +13687,Moonlight_Sword_Box1,Refined Moonlight Dagger Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13026,604800; },{},{} +13688,Spanner_Box1,Refined Wrench Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1534,604800; },{},{} +13689,Bok_Choy_Box,Bok Choy Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7766,100; },{},{} +13690,Chung_E_Cake_Box,Green Maiden Cake Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7767,100; },{},{} +//13691,Freyja_Overcoat_Box,Freya's Clothes Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2369,1,604800; },{},{} +//13692,Freyja_Boots_Box,Freya's Boots Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2428,1,604800;},{},{} +//13693,Freyja_Cape_Box,Freya's Manteau Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2533,1,604800; },{},{} +//13694,Freyja_Crown_Box,Freya's Crown Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5306,1,604800; },{},{} +13695,Battle_Manual25_Box,Field Manual 25% Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14532,10; },{},{} +13696,Battle_Manual100_Box,Field Manual 100% Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14533,10; },{},{} +13697,J_Blessing10_Box,Blessing Scroll 10 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} +13698,J_Inc_Agi10_Box,Increase Agility Scroll 10 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} +13699,J_Wind_Walk10_Box,Wind Walk Scroll 10 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} +13700,J_Adrenaline10_Box,Adrenaline Rush Scroll 10 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} 13701,Pet_Egg_Scroll12,Pet Egg Scroll 12,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13702,Pet_Egg_Scroll13,Pet Egg Scroll 13,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13703,Pet_Egg_Scroll14,Pet Egg Scroll 14,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} @@ -5375,121 +5375,121 @@ 13707,Super_Pet_Egg8,Super Pet Egg 8,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13708,Pet_Egg_Scroll_E,Pet Egg Scroll E,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13709,BRO_Package_1,BRO Package Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13710,Max_Weight_Up_Box,Gym Pass Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7776,1; },{},{} -13711,Small_Life_Potion_Box,Small Life Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,10; },{},{} -13712,Small_Life_Potion_Box30,Small Life Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,30; },{},{} -13713,Small_Life_Potion_Box50,Small Life Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,50; },{},{} -13714,Med_Life_Potion_Box,Medium Life Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,10; },{},{} -13715,Med_Life_Potion_Box30,Medium Life Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,30; },{},{} -13716,Med_Life_Potion_Box50,Medium Life Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,50; },{},{} -13717,Abrasive_Box5,Abrasive 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,5; },{},{} -13718,Abrasive_Box10,Abrasive 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,10; },{},{} -13719,Regeneration_Box5,Regeneration Potion 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,5; },{},{} -13720,Regeneration_Box10,Regeneration 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,10; },{},{} -13721,Dun_Tele_Scroll_Box10,Dungeon Teleport Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,10; },{},{} -13722,Pecopeco_Hairband_Box,Peco Peco Hairband Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5286,1; },{},{} -13723,Red_Glasses_Box,Red Glasses Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5288,1; },{},{} -13724,Whisper_Mask_Box,Whisper Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5294,1; },{},{} -13725,Ramen_Hat_Box,Ramen Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5293,1; },{},{} -13726,Gold_Box_,Golden Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7777,1; },{},{} -13727,Silver_Box_,Silver Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7778,1; },{},{} -13728,Gold_Key1_Box,Golden Key 1 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7779,1; },{},{} -13729,Gold_Key5_Box,Golden Key 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7779,5; },{},{} -13730,Silver_Key1_Box,Silver Key 1 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7780,1; },{},{} -13731,Silver_Key5_Box,Silver Key 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7780,5; },{},{} +13710,Max_Weight_Up_Box,Gym Pass Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7776,1; },{},{} +13711,Small_Life_Potion_Box,Small Life Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,10; },{},{} +13712,Small_Life_Potion_Box30,Small Life Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,30; },{},{} +13713,Small_Life_Potion_Box50,Small Life Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,50; },{},{} +13714,Med_Life_Potion_Box,Medium Life Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,10; },{},{} +13715,Med_Life_Potion_Box30,Medium Life Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,30; },{},{} +13716,Med_Life_Potion_Box50,Medium Life Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,50; },{},{} +13717,Abrasive_Box5,Abrasive 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,5; },{},{} +13718,Abrasive_Box10,Abrasive 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,10; },{},{} +13719,Regeneration_Box5,Regeneration Potion 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,5; },{},{} +13720,Regeneration_Box10,Regeneration 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,10; },{},{} +13721,Dun_Tele_Scroll_Box10,Dungeon Teleport Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,10; },{},{} +13722,Pecopeco_Hairband_Box,Peco Peco Hairband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5286,1; },{},{} +13723,Red_Glasses_Box,Red Glasses Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5288,1; },{},{} +13724,Whisper_Mask_Box,Whisper Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5294,1; },{},{} +13725,Ramen_Hat_Box,Ramen Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5293,1; },{},{} +13726,Gold_Box_,Golden Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7777,1; },{},{} +13727,Silver_Box_,Silver Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7778,1; },{},{} +13728,Gold_Key1_Box,Golden Key 1 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7779,1; },{},{} +13729,Gold_Key5_Box,Golden Key 5 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7779,5; },{},{} +13730,Silver_Key1_Box,Silver Key 1 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7780,1; },{},{} +13731,Silver_Key5_Box,Silver Key 5 Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7780,5; },{},{} // // -13734,Pecopeco_Hairband_Box1,Peco Peco Hairband Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5286,1; },{},{} -13735,Red_Glasses_Box1,Red Glasses Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5288,1; },{},{} -13736,Whisper_Mask_Box1,Whisper Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5294,1; },{},{} -13737,Ramen_Hat_Box1,Ramen Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5293,1; },{},{} -13738,Glass_Of_Illusion_Box5,Glass of Illusion 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,5; },{},{} -13739,Glass_Of_Illusion_Box10,Glass of Illusion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,10; },{},{} -13740,Shadow_Armor_S_Box5,Shadow Armor Scroll 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,5; },{},{} -13741,Shadow_Armor_S_Box10,Shadow Armor Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,10; },{},{} -13742,Shadow_Armor_S_Box30,Shadow Armor Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,30; },{},{} -13743,Holy_Armor_S_Box5,Holy Armor Scroll 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,5; },{},{} -13744,Holy_Armor_S_Box10,Holy Armor Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,10; },{},{} -13745,Holy_Armor_S_Box30,Holy Armor Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,30; },{},{} -13746,S_Def_Potion_Box10,Small Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,10; },{},{} -13747,S_Def_Potion_Box30,Small Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,30; },{},{} -13748,S_Def_Potion_Box50,Small Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,50; },{},{} -13749,B_Def_Potion_Box10,Big Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,10; },{},{} -13750,B_Def_Potion_Box30,Big Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,30; },{},{} -13751,B_Def_Potion_Box50,Big Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,50; },{},{} -13752,S_Mdef_Potion_Box10,Small Magic Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,10; },{},{} -13753,S_Mdef_Potion_Box30,Small Magic Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,30; },{},{} -13754,S_Mdef_Potion_Box50,Small Magic Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,50; },{},{} -13755,B_Mdef_Potion_Box10,Big Magic Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,10; },{},{} -13756,B_Mdef_Potion_Box30,Big Magic Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,30; },{},{} -13757,B_Mdef_Potion_Box50,Big Magic Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,50; },{},{} -13758,Battle_Manual_X3_Box,Field Manual 300% Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14545,20; },{},{} -13759,In_Blue_Herb_Box,Blue Herb Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 510,50; },{},{} -13760,Honey_Box,Honey Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 518,100; },{},{} -13761,Empty_Bottle_Box,Empty Bottle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 713,500; },{},{} -13762,In_Royal_Jelly_Box,Royal Jelly Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 526,70; },{},{} -13763,5_Anniversary_Coin_Box,Coin Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2709,1; },{},{} -13764,Battle_Manual_Box_TW,Beginner's Field Manual 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7803,5; },{},{} -13765,Certificate_TW_Box,Certificate Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7804,1; },{},{} -13766,Nagan_Box,Refined Nagan Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,604800; },{},{} -13767,Skewer_Box,Refined Brocca Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,604800; },{},{} -13768,Survival_Rod_Box,Refined Survivor's Rod Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,604800; },{},{} -13769,Quadrille_Box,Refined Quadrille Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,604800; },{},{} -13770,Great_Axe_Box,Refined Great Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,604800; },{},{} -13771,Bloody_Roar_Box,Refined Bloody Roar Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,604800; },{},{} -13772,Hardback_Box,Refined Hardcover Book Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,604800; },{},{} -13773,Fire_Brand_Box,Refined Fireblend Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,604800; },{},{} -13774,Immaterial_Sword_Box,Refined Immaterial Sword Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,604800; },{},{} -13775,Unholy_Touch_Box,Refined Unholy Touch Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,604800; },{},{} -13776,Cloak_Of_Survival_Box,Refined Survivor's Manteau Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,1209600; },{},{} -13777,Masquerade_Box,Refined Masquerade Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,1209600; },{},{} -13778,Orc_Hero_Helm_Box,Refined Helmet of Orc Hero Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,1209600; },{},{} -13779,Evil_Wing_Ears_Box,Refined Wing of Diablo Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,1209600; },{},{} -13780,Dark_Blindfold_Box,Refined Dark Blinder Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,1209600; },{},{} -13781,kRO_Drooping_Kitty_Box,Refined Drooping Cat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,1209600; },{},{} -13782,Corsair_Box,Refined Corsair Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,1209600; },{},{} -13783,Bloody_Iron_Ball_Box,Refined Bloodied Shackle Ball Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,604800; },{},{} -13784,Spiritual_Ring_Box,Refined Spiritual Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,604800; },{},{} -13785,Nagan_Box1,Refined Nagan Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,86400; },{},{} -13786,Skewer_Box1,Refined Brocca Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,86400; },{},{} -13787,Survival_Rod_Box1,Refined Survivor's Rod Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,86400; },{},{} -13788,Quadrille_Box1,Refined Quadrille Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,86400; },{},{} -13789,Great_Axe_Box1,Refined Great Axe Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,86400; },{},{} -13790,Bloody_Roar_Box1,Refined Bloody Roar Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,86400; },{},{} -13791,Hardback_Box1,Refined Hardcover Book Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,86400; },{},{} -13792,Fire_Brand_Box1,Refined Fireblend Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,86400; },{},{} -13793,Immaterial_Sword_Box1,Refined Immaterial Sword Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,86400; },{},{} -13794,Unholy_Touch_Box1,Refined Unholy Touch Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,86400; },{},{} -13795,Cloak_Of_Survival_Box1,Refined Survivor's Manteau Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,86400; },{},{} -13796,Masquerade_Box1,Refined Masquerade Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,86400; },{},{} -13797,Orc_Hero_Helm_Box1,Refined Helmet of Orc Hero Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,86400; },{},{} -13798,Evil_Wing_Ears_Box1,Refined Wing of Diablo Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,86400; },{},{} -13799,Dark_Blindfold_Box1,Refined Dark Blinder Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,86400; },{},{} -13800,kRO_Drooping_Kitty_Box1,Refined Drooping Cat Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,86400; },{},{} -13801,Corsair_Box1,Refined Corsair Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,86400; },{},{} -13802,Bloody_Iron_Ball_Box1,Refined Bloodied Shackle Ball Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,86400; },{},{} -13803,Spiritual_Ring_Box1,Refined Spiritual Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,86400; },{},{} -13804,Fire_Cracker_Love_Box,I Love You Firecracker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14546,10; },{},{} -13805,Fire_Cracker_Wday_Box,Whiteday Firecracker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14547,10; },{},{} -13806,Fire_Cracker_Vday_Box,Valentine's Day Firecracker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14548,10; },{},{} -13807,Fire_Cracker_Bday_Box,Birthday Firecracker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14549,10; },{},{} -13808,Fire_Cracker_Xmas_Box,Xmas Firecracker Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14550,10; },{},{} -13809,Blue_Gemstone_Box,Blue Gemstone Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 717,100; },{},{} -13810,Blue_Potion_Box,Blue Potion Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 505,25; },{},{} -13811,Food_Box_Lv1,Food Box Vol 1,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14551,1; getitem 14554,1; getitem 14557,1; getitem 14560,1; getitem 14563,1; getitem 14566,1; },{},{} -13812,Food_Box_Lv2,Food Box Vol 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14552,1; getitem 14555,1; getitem 14558,1; getitem 14561,1; getitem 14564,1; getitem 14567,1; },{},{} -13813,Food_Box_Lv3,Food Box Vol 3,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14553,1; getitem 14556,1; getitem 14559,1; getitem 14562,1; getitem 14565,1; getitem 14568,1; },{},{} -13814,Indonesia_Box,Healing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13815,Knife_Goblin_Box,Knife Goblin Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14569,10; },{},{} -13816,Flail_Goblin_Box,Flail Goblin Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14570,10; },{},{} -13817,Hammer_Goblin_Box,Hammer Goblin Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14571,10; },{},{} -13818,Red_Deleter_Box,Red Deleter Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14572,10; },{},{} -13819,Diabolic_Box,Diabolic Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14573,10; },{},{} -13820,Wanderer_Box,Wanderer Taming Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14574,10; },{},{} -13821,Green_Apple_Box,Green Apple Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7821,10; },{},{} -13822,Whole_Barbecue_Box,Barbeque Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7822,10; },{},{} -13823,Meat_Veg_Skewer_Box,Meat Skewer Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7823,10; },{},{} -13824,Spirit_Liquor_Box,Spirit Liquor Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7824,10; },{},{} +13734,Pecopeco_Hairband_Box1,Peco Peco Hairband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5286,1; },{},{} +13735,Red_Glasses_Box1,Red Glasses Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5288,1; },{},{} +13736,Whisper_Mask_Box1,Whisper Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5294,1; },{},{} +13737,Ramen_Hat_Box1,Ramen Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5293,1; },{},{} +13738,Glass_Of_Illusion_Box5,Glass of Illusion 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,5; },{},{} +13739,Glass_Of_Illusion_Box10,Glass of Illusion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,10; },{},{} +13740,Shadow_Armor_S_Box5,Shadow Armor Scroll 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,5; },{},{} +13741,Shadow_Armor_S_Box10,Shadow Armor Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,10; },{},{} +13742,Shadow_Armor_S_Box30,Shadow Armor Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,30; },{},{} +13743,Holy_Armor_S_Box5,Holy Armor Scroll 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,5; },{},{} +13744,Holy_Armor_S_Box10,Holy Armor Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,10; },{},{} +13745,Holy_Armor_S_Box30,Holy Armor Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,30; },{},{} +13746,S_Def_Potion_Box10,Small Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,10; },{},{} +13747,S_Def_Potion_Box30,Small Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,30; },{},{} +13748,S_Def_Potion_Box50,Small Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,50; },{},{} +13749,B_Def_Potion_Box10,Big Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,10; },{},{} +13750,B_Def_Potion_Box30,Big Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,30; },{},{} +13751,B_Def_Potion_Box50,Big Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,50; },{},{} +13752,S_Mdef_Potion_Box10,Small Magic Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,10; },{},{} +13753,S_Mdef_Potion_Box30,Small Magic Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,30; },{},{} +13754,S_Mdef_Potion_Box50,Small Magic Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,50; },{},{} +13755,B_Mdef_Potion_Box10,Big Magic Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,10; },{},{} +13756,B_Mdef_Potion_Box30,Big Magic Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,30; },{},{} +13757,B_Mdef_Potion_Box50,Big Magic Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,50; },{},{} +13758,Battle_Manual_X3_Box,Field Manual 300% Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14545,20; },{},{} +13759,In_Blue_Herb_Box,Blue Herb Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 510,50; },{},{} +13760,Honey_Box,Honey Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 518,100; },{},{} +13761,Empty_Bottle_Box,Empty Bottle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 713,500; },{},{} +13762,In_Royal_Jelly_Box,Royal Jelly Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 526,70; },{},{} +13763,5_Anniversary_Coin_Box,Coin Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2709,1; },{},{} +13764,Battle_Manual_Box_TW,Beginner's Field Manual 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7803,5; },{},{} +13765,Certificate_TW_Box,Certificate Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7804,1; },{},{} +13766,Nagan_Box,Refined Nagan Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,604800; },{},{} +13767,Skewer_Box,Refined Brocca Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,604800; },{},{} +13768,Survival_Rod_Box,Refined Survivor's Rod Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,604800; },{},{} +13769,Quadrille_Box,Refined Quadrille Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,604800; },{},{} +13770,Great_Axe_Box,Refined Great Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,604800; },{},{} +13771,Bloody_Roar_Box,Refined Bloody Roar Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,604800; },{},{} +13772,Hardback_Box,Refined Hardcover Book Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,604800; },{},{} +13773,Fire_Brand_Box,Refined Fireblend Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,604800; },{},{} +13774,Immaterial_Sword_Box,Refined Immaterial Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,604800; },{},{} +13775,Unholy_Touch_Box,Refined Unholy Touch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,604800; },{},{} +13776,Cloak_Of_Survival_Box,Refined Survivor's Manteau Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,1209600; },{},{} +13777,Masquerade_Box,Refined Masquerade Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,1209600; },{},{} +13778,Orc_Hero_Helm_Box,Refined Helmet of Orc Hero Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,1209600; },{},{} +13779,Evil_Wing_Ears_Box,Refined Wing of Diablo Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,1209600; },{},{} +13780,Dark_Blindfold_Box,Refined Dark Blinder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,1209600; },{},{} +13781,kRO_Drooping_Kitty_Box,Refined Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,1209600; },{},{} +13782,Corsair_Box,Refined Corsair Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,1209600; },{},{} +13783,Bloody_Iron_Ball_Box,Refined Bloodied Shackle Ball Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,604800; },{},{} +13784,Spiritual_Ring_Box,Refined Spiritual Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,604800; },{},{} +13785,Nagan_Box1,Refined Nagan Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,86400; },{},{} +13786,Skewer_Box1,Refined Brocca Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,86400; },{},{} +13787,Survival_Rod_Box1,Refined Survivor's Rod Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,86400; },{},{} +13788,Quadrille_Box1,Refined Quadrille Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,86400; },{},{} +13789,Great_Axe_Box1,Refined Great Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,86400; },{},{} +13790,Bloody_Roar_Box1,Refined Bloody Roar Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,86400; },{},{} +13791,Hardback_Box1,Refined Hardcover Book Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,86400; },{},{} +13792,Fire_Brand_Box1,Refined Fireblend Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,86400; },{},{} +13793,Immaterial_Sword_Box1,Refined Immaterial Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,86400; },{},{} +13794,Unholy_Touch_Box1,Refined Unholy Touch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,86400; },{},{} +13795,Cloak_Of_Survival_Box1,Refined Survivor's Manteau Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,86400; },{},{} +13796,Masquerade_Box1,Refined Masquerade Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,86400; },{},{} +13797,Orc_Hero_Helm_Box1,Refined Helmet of Orc Hero Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,86400; },{},{} +13798,Evil_Wing_Ears_Box1,Refined Wing of Diablo Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,86400; },{},{} +13799,Dark_Blindfold_Box1,Refined Dark Blinder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,86400; },{},{} +13800,kRO_Drooping_Kitty_Box1,Refined Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,86400; },{},{} +13801,Corsair_Box1,Refined Corsair Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,86400; },{},{} +13802,Bloody_Iron_Ball_Box1,Refined Bloodied Shackle Ball Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,86400; },{},{} +13803,Spiritual_Ring_Box1,Refined Spiritual Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,86400; },{},{} +13804,Fire_Cracker_Love_Box,I Love You Firecracker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14546,10; },{},{} +13805,Fire_Cracker_Wday_Box,Whiteday Firecracker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14547,10; },{},{} +13806,Fire_Cracker_Vday_Box,Valentine's Day Firecracker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14548,10; },{},{} +13807,Fire_Cracker_Bday_Box,Birthday Firecracker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14549,10; },{},{} +13808,Fire_Cracker_Xmas_Box,Xmas Firecracker Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14550,10; },{},{} +13809,Blue_Gemstone_Box,Blue Gemstone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 717,100; },{},{} +13810,Blue_Potion_Box,Blue Potion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11502,25; },{},{} +13811,Food_Box_Lv1,Food Box Vol 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14551,1; getitem 14554,1; getitem 14557,1; getitem 14560,1; getitem 14563,1; getitem 14566,1; },{},{} +13812,Food_Box_Lv2,Food Box Vol 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14552,1; getitem 14555,1; getitem 14558,1; getitem 14561,1; getitem 14564,1; getitem 14567,1; },{},{} +13813,Food_Box_Lv3,Food Box Vol 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14553,1; getitem 14556,1; getitem 14559,1; getitem 14562,1; getitem 14565,1; getitem 14568,1; },{},{} +13814,Indonesia_Box,Healing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13815,Knife_Goblin_Box,Knife Goblin Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14569,10; },{},{} +13816,Flail_Goblin_Box,Flail Goblin Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14570,10; },{},{} +13817,Hammer_Goblin_Box,Hammer Goblin Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14571,10; },{},{} +13818,Red_Deleter_Box,Red Deleter Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14572,10; },{},{} +13819,Diabolic_Box,Diabolic Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14573,10; },{},{} +13820,Wanderer_Box,Wanderer Taming Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14574,10; },{},{} +13821,Green_Apple_Box,Green Apple Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7821,10; },{},{} +13822,Whole_Barbecue_Box,Barbeque Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7822,10; },{},{} +13823,Meat_Veg_Skewer_Box,Meat Skewer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7823,10; },{},{} +13824,Spirit_Liquor_Box,Spirit Liquor Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7824,10; },{},{} 13825,Green_Box_,Old Green Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 13826,Power_Box1,Power Box 1,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 682,1; getitem 12123,1; getitem 12122,1; },{},{} 13827,Power_Box2,Power Box 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 683,1; getitem 12123,1; getitem 12122,1; },{},{} @@ -5499,463 +5499,463 @@ 13831,Stat_Boost2,Stat Boost 2,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,60000,5; sc_start SC_INCLUK,60000,5; sc_start SC_INCDEX,60000,5; },{},{} 13832,Stat_Boost3,Stat Boost 3,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCAGI,60000,5; sc_start SC_INCVIT,60000,5; sc_start SC_INCDEX,60000,5; },{},{} 13833,Stat_Boost4,Stat Boost 4,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,60000,5; sc_start SC_INCVIT,60000,5; sc_start SC_INCDEX,60000,5; },{},{} -13834,Dun_Tele_Scroll2_Box5,Dungeon Teleport Scroll II 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,5; },{},{} -13835,Dun_Tele_Scroll2_Box10,Dungeon Teleport Scroll II 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,10; },{},{} -13836,Mbl_Str_Dish_Box,Steamed Tongue Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,1; },{},{} -13837,Mbl_Agi_Dish_Box,Steamed Desert Scorpions Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12251,1; },{},{} -13838,Mbl_Int_Dish_Box,Dragon Breath Cocktail Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,1; },{},{} -13839,Mbl_Dex_Dish_Box,Hwergelmir's Tonic Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12253,1; },{},{} -13840,Mbl_Luk_Dish_Box,Cooked Nine Tail Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12254,1; },{},{} -13841,Mbl_Vit_Dish_Box,Immortal Stew Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12255,1; },{},{} -13842,Mbl_Kafra_Card_Box,Payment Statement for Kafra Employee Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12249,1; },{},{} -13843,Mbl_Battle_Manual_Box,Field Manual Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14532,1; },{},{} -13844,Heroic_Stone_Box,Heroic Stone Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7825,1; },{},{} -13845,Mysterious_Travel_Sack1,Mystery Travel Sack A,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13846,Mysterious_Travel_Sack2,Mystery Travel Sack B,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13847,Mysterious_Travel_Sack3,Mystery Travel Sack C,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13848,Mysterious_Travel_Sack4,Mystery Travel Sack D,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13849,WOB_Box_Rune5,Yellow Butterfly Wing 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,5; },{},{} -13850,WOB_Box_Rune10,Yellow Butterfly Wing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,10; },{},{} -13851,WOB_Box_Schawaltz5,Green Butterfly Wing 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,5; },{},{} -13852,WOB_Box_Schawaltz10,Green Butterfly Wing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,10; },{},{} -13853,WOB_Box_Rachel5,Red Butterfly Wing 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,5; },{},{} -13854,WOB_Box_Rachel10,Red Butterfly Wing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,10; },{},{} -13855,WOB_Box_Local5,Blue Butterfly Wing 5 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,5; },{},{} -13856,WOB_Box_Local10,Blue Butterfly Wing Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,10; },{},{} -13857,Spark_Candy_Box5,Candy 5 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13858,Spark_Candy_Box10,Candy 10 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13859,Directive_A_Envelope,Directive Envelope A,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2734,1; },{},{} -13860,Directive_B_Envelope,Directive Envelope B,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2735,1; },{},{} -13861,Mini_Battle_Manual_Box,Small Field Manual Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13862,Trial_Box,Trial Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13863,Repair_Scroll_Box10,Repair Weapon Scroll 10 Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,10; },{},{} -//13864,Hockey_Mask_Box,Hockey Mask Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5314,1; },{},{} -//13865,Observer_Box,Observer Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5315,1; },{},{} -13866,Flying_Angel_Box,Flying Angel Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5210,1; },{},{} -13867,Neko_Mimi_Box,Neko Mimi Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5099,1; },{},{} -13868,MFH_Box,Moonlight Flower Hat Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5214,1; },{},{} -13869,Chick_Hat_Box,Baby Chick Hat Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5283,1; },{},{} -13870,New_Style_Box,Beauty Gift Certificate Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7622,1; },{},{} -13871,Magician_Card_Box,Mage Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4327,1; getitem 4309,1; getitem 4325,1; getitem 4208,1; getitem 4258,1; getitem 4191,1; },{},{} -13872,Acolyte_Card_Box,Acolyte Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4185,1; getitem 4312,1; getitem 4217,1; getitem 4280,1; getitem 4293,1; },{},{} -13873,Archer_Card_Box,Archer Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4297,1; getitem 4234,1; getitem 4199,1; getitem 4178,1; getitem 4252,1; },{},{} -13874,Swordman_Card_Box,Swordman Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4319,1; getitem 4331,1; getitem 4220,1; getitem 4311,1; getitem 4246,1; },{},{} -13875,Thief_Card_Box,Thief Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4230,1; getitem 4210,1; getitem 4257,1; getitem 4172,1; getitem 4272,1; },{},{} -13876,Merchant_Card_Box,Merchant Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4206,1; getitem 4281,1; getitem 4186,1; getitem 4233,1; getitem 4321,1; },{},{} -13877,Clock_Tower_Card_Box,Clock Tower Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4244,1; getitem 4299,1; getitem 4313,1; getitem 4229,1; },{},{} -13878,Geffenia_Card_Box,Geffenia Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4218,1; getitem 4269,1; },{},{} -13879,Owl_Card_Box,Owl Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4237,1; getitem 4238,1; },{},{} -13880,Ghost_Card_Box,Ghost Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4193,1; getitem 4294,1; },{},{} -13881,Nightmare_Card_Box,Nightmare Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4127,1; getitem 4166,1; },{},{} -13882,Curse_Card_Box,Curse Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4076,4; },{},{} -13883,Sleep_Card_Box,Sleep Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4024,4; },{},{} -13884,Freeze_Card_Box,Freeze Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4055,4; },{},{} -13885,Stun_Card_Box,Stun Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4017,4; },{},{} -13886,Silence_Card_Box,Silence Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4057,4; },{},{} -13887,Blind_Card_Box,Blind Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4020,4; },{},{} -13888,Chaos_Card_Box,Chaos Card Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4104,4; },{},{} -13889,Elunium_Box_,Elunium Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 985,10; },{},{} -13890,Oridecon_Box_,Oridecon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,10; },{},{} -13891,Fire_Converter_Box,Fire Converter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12114,10; },{},{} -13892,Water_Converter_Box,Water Converter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12115,10; },{},{} -13893,Wind_Converter_Box,Wind Converter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12117,10; },{},{} -13894,Earth_Converter_Box,Earth Converter Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12116,10; },{},{} -13895,Starter_Pack,Starter Pack,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13896,Mimic_Summon_Box5,Mimic Summoning 5 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13897,Disguise_Summon_Box5,Disguise Summoning 5 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13898,Alice_Summon_Box5,Alice Summoning 5 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13899,Mimic_Summon_Box10,Mimic Summoning 10 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13900,Disguise_Summon_Box10,Disguise Summoning 10 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13901,Alice_Summon_Box10,Alice Summoning 10 Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13902,Fish_Head_Hat_Box,Fish Head Hat Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5380,1; },{},{} -13903,Santa_Poring_Hat_Box,Santa Poring Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5381,1; },{},{} -13904,Bell_Ribbon_Box,Bell Ribbon Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5382,1; },{},{} -13905,Hard_Core_Set_Box,XM Hardcore Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; getitem 12209,10; getitem 12210,10; },{},{} -13906,Kitty_Set_Box,XM Kitty Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5230,1; getitem 5231,1; getitem 5232,1; getitem 5233,1; getitem 5234,1; },{},{} -13907,Soft_Core_Set_Box,XM Softcore Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; getitem 12209,5; getitem 12210,5; },{},{} -13908,Deviruchi_Set_Box,XM Deviruchi Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5227,1; getitem 5228,1; getitem 5229,1; },{},{} -13909,MVP_Hunt_Box,MVP Hunting Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3; },{},{} -13910,Brewing_Box,XM Brewing Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; getitem 12205,10; getitem 12206,10; },{},{} +13834,Dun_Tele_Scroll2_Box5,Dungeon Teleport Scroll II 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,5; },{},{} +13835,Dun_Tele_Scroll2_Box10,Dungeon Teleport Scroll II 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,10; },{},{} +13836,Mbl_Str_Dish_Box,Steamed Tongue Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,1; },{},{} +13837,Mbl_Agi_Dish_Box,Steamed Desert Scorpions Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12251,1; },{},{} +13838,Mbl_Int_Dish_Box,Dragon Breath Cocktail Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,1; },{},{} +13839,Mbl_Dex_Dish_Box,Hwergelmir's Tonic Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12253,1; },{},{} +13840,Mbl_Luk_Dish_Box,Cooked Nine Tail Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12254,1; },{},{} +13841,Mbl_Vit_Dish_Box,Immortal Stew Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12255,1; },{},{} +13842,Mbl_Kafra_Card_Box,Payment Statement for Kafra Employee Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12249,1; },{},{} +13843,Mbl_Battle_Manual_Box,Field Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14532,1; },{},{} +13844,Heroic_Stone_Box,Heroic Stone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7825,1; },{},{} +13845,Mysterious_Travel_Sack1,Mystery Travel Sack A,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13846,Mysterious_Travel_Sack2,Mystery Travel Sack B,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13847,Mysterious_Travel_Sack3,Mystery Travel Sack C,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13848,Mysterious_Travel_Sack4,Mystery Travel Sack D,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13849,WOB_Box_Rune5,Yellow Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,5; },{},{} +13850,WOB_Box_Rune10,Yellow Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,10; },{},{} +13851,WOB_Box_Schawaltz5,Green Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,5; },{},{} +13852,WOB_Box_Schawaltz10,Green Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,10; },{},{} +13853,WOB_Box_Rachel5,Red Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,5; },{},{} +13854,WOB_Box_Rachel10,Red Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,10; },{},{} +13855,WOB_Box_Local5,Blue Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,5; },{},{} +13856,WOB_Box_Local10,Blue Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,10; },{},{} +13857,Spark_Candy_Box5,Candy 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14586,5; },{},{} +13858,Spark_Candy_Box10,Candy 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14586,10; },{},{} +13859,Directive_A_Envelope,Directive Envelope A,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2734,1; },{},{} +13860,Directive_B_Envelope,Directive Envelope B,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2735,1; },{},{} +13861,Mini_Battle_Manual_Box,Small Field Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,4; },{},{} +13862,Trial_Box,Trial Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,2; getitem 12215,15; getitem 12216,15; },{},{} +13863,Repair_Scroll_Box10,Repair Weapon Scroll 10 Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,10; getitem 1002,10; getitem 998,10; getitem 756,10; getitem 999,10; },{},{} +//13864,Hockey_Mask_Box,Hockey Mask Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5314,604800; },{},{} +//13865,Observer_Box,Observer Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5315,604800; },{},{} +13866,Flying_Angel_Box,Flying Angel Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5210,1; },{},{} +13867,Neko_Mimi_Box,Neko Mimi Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5099,1; },{},{} +13868,MFH_Box,Moonlight Flower Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5214,1; },{},{} +13869,Chick_Hat_Box,Baby Chick Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5283,1; },{},{} +13870,New_Style_Box,Beauty Gift Certificate Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7622,1; },{},{} +13871,Magician_Card_Box,Mage Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4327,1; getitem 4309,1; getitem 4325,1; getitem 4208,1; getitem 4258,1; getitem 4191,1; },{},{} +13872,Acolyte_Card_Box,Acolyte Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4185,1; getitem 4312,1; getitem 4217,1; getitem 4280,1; getitem 4293,1; },{},{} +13873,Archer_Card_Box,Archer Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4297,1; getitem 4234,1; getitem 4199,1; getitem 4178,1; getitem 4252,1; },{},{} +13874,Swordman_Card_Box,Swordman Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4319,1; getitem 4331,1; getitem 4220,1; getitem 4311,1; getitem 4246,1; },{},{} +13875,Thief_Card_Box,Thief Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4230,1; getitem 4210,1; getitem 4257,1; getitem 4172,1; getitem 4272,1; },{},{} +13876,Merchant_Card_Box,Merchant Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4206,1; getitem 4281,1; getitem 4186,1; getitem 4233,1; getitem 4321,1; },{},{} +13877,Clock_Tower_Card_Box,Clock Tower Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4244,1; getitem 4299,1; getitem 4313,1; getitem 4229,1; },{},{} +13878,Geffenia_Card_Box,Geffenia Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4218,1; getitem 4269,1; },{},{} +13879,Owl_Card_Box,Owl Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4237,1; getitem 4238,1; },{},{} +13880,Ghost_Card_Box,Ghost Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4193,1; getitem 4294,1; },{},{} +13881,Nightmare_Card_Box,Nightmare Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4127,1; getitem 4166,1; },{},{} +13882,Curse_Card_Box,Curse Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4076,4; },{},{} +13883,Sleep_Card_Box,Sleep Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4024,4; },{},{} +13884,Freeze_Card_Box,Freeze Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4055,4; },{},{} +13885,Stun_Card_Box,Stun Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4017,4; },{},{} +13886,Silence_Card_Box,Silence Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4057,4; },{},{} +13887,Blind_Card_Box,Blind Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4020,4; },{},{} +13888,Chaos_Card_Box,Chaos Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4104,4; },{},{} +13889,Elunium_Box_,Elunium Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 985,10; },{},{} +13890,Oridecon_Box_,Oridecon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,10; },{},{} +13891,Fire_Converter_Box,Fire Converter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12114,10; },{},{} +13892,Water_Converter_Box,Water Converter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12115,10; },{},{} +13893,Wind_Converter_Box,Wind Converter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12117,10; },{},{} +13894,Earth_Converter_Box,Earth Converter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12116,10; },{},{} +13895,Starter_Pack,Starter Pack,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7229,2; getitem 569,300; getitem 504,20; getitem 505,20; getitem 7060,30; getitem 2403,1; getitem 5039,1; getitem 2503,1; getitem 2307,1; getitem 616,1; getitem 603,1; getitem 617,1; getitem 610,5; getitem 604,5; },{},{} +13896,Mimic_Scroll_Box5,Mimic Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,5; },{},{} +13897,Disguise_Croll_Box5,Disguise Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,5; },{},{} +13898,Alice_Scroll_Box5,Alice Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,5; },{},{} +13899,Mimic_Scroll_Box10,Mimic Summoning 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,10; },{},{} +13900,Disguise_Croll_Box10,Disguise Summoning 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,10; },{},{} +13901,Alice_Scroll_Box10,Alice Summoning 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,10; },{},{} +13902,Fish_Head_Hat_Box,Fish Head Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5380,1; },{},{} +13903,Santa_Poring_Hat_Box,Santa Poring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5381,1; },{},{} +13904,Bell_Ribbon_Box,Bell Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5382,1; },{},{} +13905,Hard_Core_Set_Box,XM Hardcore Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; getitem 12209,10; getitem 12210,10; },{},{} +13906,Kitty_Set_Box,XM Kitty Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5230,1; getitem 5231,1; getitem 5232,1; getitem 5233,1; getitem 5234,1; },{},{} +13907,Soft_Core_Set_Box,XM Softcore Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; getitem 12209,5; getitem 12210,5; },{},{} +13908,Deviruchi_Set_Box,XM Deviruchi Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5227,1; getitem 5228,1; getitem 5229,1; },{},{} +13909,MVP_Hunt_Box,MVP Hunting Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,1; getitem 12210,1; getitem 12221,1; getitem 12214,3; },{},{} +13910,Brewing_Box,XM Brewing Set Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; getitem 12205,10; getitem 12206,10; },{},{} 13911,Christmas_Pet_Scroll,Christmas Pet Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13912,Pty_Blessing_Box,Party Blessing 10 Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14588,10; },{},{} -13913,Pty_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14589,10; },{},{} -13914,Pty_Assumptio_Box,Party Assumptio 5 Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14590,10; },{},{} -13915,Love_Angel_Box,Love Angel Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{} -13916,Squirrel_Box,Squirrel Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{} -13917,Gogo_Box,Gogo Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{} -//13918,Drooping_W_Kitty_Box,Koneko Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5372,1; },{},{} -//13919,L_Magestic_Goat_Box,Baphomet Horns Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5374,1; },{},{} -//13920,Satanic_Chain_P_Box,Flying Evil Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5376,1; },{},{} -//13921,Antique_Pipe_Box,Gentleman's Pipe Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5377,1; },{},{} -//13922,Rabbit_Ear_Hat_Box,Bunny Top Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5378,1; },{},{} -//13923,Darkness_Helm_Box,Dark Randgris Helm Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5373,1; },{},{} -//13924,L_Orc_Hero_Helm_Box,Orc Hero Headdress Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5375,1; },{},{} +13912,Pty_Blessing_Box,Party Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14588,10; },{},{} +13913,Pty_Inc_Agi_Box,Party Increase Agi 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14589,10; },{},{} +13914,Pty_Assumptio_Box,Party Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14590,10; },{},{} +13915,Love_Angel_Box,Love Angel Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{} +13916,Squirrel_Box,Squirrel Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{} +13917,Gogo_Box,Gogo Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{} +//13918,Drooping_W_Kitty_Box,Koneko Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5372,1; },{},{} +//13919,L_Magestic_Goat_Box,Baphomet Horns Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5374,1; },{},{} +//13920,Satanic_Chain_P_Box,Flying Evil Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5376,1; },{},{} +//13921,Antique_Pipe_Box,Gentleman's Pipe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5377,1; },{},{} +//13922,Rabbit_Ear_Hat_Box,Bunny Top Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5378,1; },{},{} +//13923,Darkness_Helm_Box,Dark Randgris Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5373,1; },{},{} +//13924,L_Orc_Hero_Helm_Box,Orc Hero Headdress Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5375,1; },{},{} //13925,Year_Of_Mouse_Scroll,... GoodLuck Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13926,Crusader_Card_Box,Crusader Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4371,1; getitem 4311,1; getitem 4319,1; getitem 4331,1; },{},{} -13927,Alchemist_Card_Box,Alchemist Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4281,1; getitem 4233,1; getitem 4343,1; getitem 4186,1; getitem 4036,1; },{},{} -13928,Rogue_Card_Box,Bard Dancer Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4039,1; getitem 4210,1; getitem 4257,1; getitem 4230,1; getitem 4348,1; },{},{} -13929,Bard_Dancer_Card_Box,Rogue Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4297,1; getitem 4234,1; getitem 4178,1; getitem 4381,1; getitem 4252,1; },{},{} -13930,Sage_Card_Box,Sage card box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4382,1; getitem 4258,1; getitem 4325,1; getitem 4208,1; getitem 4327,1; },{},{} -13931,Monk_Card_Box,Monk Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4312,1; getitem 4332,1; getitem 4185,1; getitem 4293,1; },{},{} -13932,Sylph_Box,Sylph Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4345,4; },{},{} -13933,Undine_Box,Undine Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4350,4; },{},{} -13934,Salamander_Box,Salamander Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4380,4; },{},{} -13935,Soul_Box,Soul Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4388,4; },{},{} -13936,Noum_Bpx,Gnome Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4335,4; },{},{} -13937,Robo_Eye_Box,Robo Eye Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5325,1; },{},{} -13938,Twin_Ribbon_Box,Maiden's Twin Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5187,1; },{},{} -//13939,Diadem_Box,Diadem Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5313,1; },{},{} -13940,Siege_Tele_Scroll_Box,WoE Teleport Scroll 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14591,10; },{},{} -13941,TW_Valentine_Scroll,Taiwan Valentine Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13942,Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14009,1; },{},{} -13943,Squirrel_Box_1m,Squirrel Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14010,1; },{},{} -13944,Gogo_Box_1m,Gogo Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14011,1; },{},{} -13945,BRO_SM_Package,Brazil Swordsman Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1; },{},{} -13946,BRO_MG_Package,Brazil Magician Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1; },{},{} -13947,BRO_AC_Package,Brazil Acolyte Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2326,1; getitem 2104,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1; },{},{} -13948,BRO_AR_Package,Brazil Archer package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1; },{},{} -13949,BRO_MC_Package,Brazil Merchant Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1; },{},{} -13950,BRO_TF_Package,Brazil Thief Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1; },{},{} -13951,Wasteland_Outlaw_Box,Western Outlaw Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13107,1; },{},{} -13952,Lever_Action_Rifle_Box,Lever Action Rifle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13170,1; },{},{} -13953,All_In_One_Ring_Box,All In One Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2741,604800; },{},{} -13954,Spiritual_Tunic_Box,Spiritual Tunic Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2384,604800; },{},{} -13955,Recuperative_Armor_Box,Recuvative Armor Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2385,604800; },{},{} -13956,Shelter_Resistance_Box,Shell Of Resistance Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2132,604800; },{},{} -13957,Sylphid_Manteau_Box,Silf Manteau Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2543,604800; },{},{} -13958,Refresh_Shoes_Box,Refresh Shoes Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2439,604800; },{},{} -13959,Toast_Box,Crunch Toast Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5391,604800; },{},{} -13960,Name_Change_Coupon_Box,Identification Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13961,Mojji_Box,Mochi Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13962,Deprotai_Doll_Hat_Box,Defolty Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5340,1; },{},{} -13963,Claris_Doll_Hat_Box,Glaris Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5341,1; },{},{} -13964,Sorin_Doll_Hat_Box,Sorin Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5342,1; },{},{} -13965,Tayelin_Doll_Hat_Box,Tailring Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5343,1; },{},{} -13966,Binit_Doll_Hat_Box,Vinit Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5344,1; },{},{} -13967,Debril_Doll_Hat_Box,W Doll Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5345,1; },{},{} -//13968,Bubblegum_Lower_Box,Bubble Gum Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -//13969,Lucky_Clip_Box,Lucky Clip Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2742,1; },{},{} -13970,Iron_10_Box,Iron Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 998,10; },{},{} -13971,Steel_10_Box,Steel Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 999,10; },{},{} -13972,Coal_10_Box,Coal Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1003,10; },{},{} -13973,Poison_Bottle_30_Box,Poison Bottle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,30; },{},{} +13926,Crusader_Card_Box,Crusader Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4371,1; getitem 4311,1; getitem 4319,1; getitem 4331,1; },{},{} +13927,Alchemist_Card_Box,Alchemist Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4281,1; getitem 4233,1; getitem 4343,1; getitem 4186,1; getitem 4036,1; },{},{} +13928,Rogue_Card_Box,Bard Dancer Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4039,1; getitem 4210,1; getitem 4257,1; getitem 4230,1; getitem 4348,1; },{},{} +13929,Bard_Dancer_Card_Box,Rogue Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4297,1; getitem 4234,1; getitem 4178,1; getitem 4381,1; getitem 4252,1; },{},{} +13930,Sage_Card_Box,Sage card box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4382,1; getitem 4258,1; getitem 4325,1; getitem 4208,1; getitem 4327,1; },{},{} +13931,Monk_Card_Box,Monk Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4312,1; getitem 4332,1; getitem 4185,1; getitem 4293,1; },{},{} +13932,Sylph_Box,Sylph Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4345,4; },{},{} +13933,Undine_Box,Undine Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4350,4; },{},{} +13934,Salamander_Box,Salamander Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4380,4; },{},{} +13935,Soul_Box,Soul Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4388,4; },{},{} +13936,Noum_Bpx,Gnome Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 4335,4; },{},{} +13937,Robo_Eye_Box,Robo Eye Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5325,1; },{},{} +13938,Twin_Ribbon_Box,Maiden's Twin Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5187,1; },{},{} +//13939,Diadem_Box,Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5313,1; },{},{} +13940,Siege_Tele_Scroll_Box,WoE Teleport Scroll 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14591,100; },{},{} +13941,TW_Valentine_Scroll,Taiwan Valentine Scroll,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +13942,Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14009,1; },{},{} +13943,Squirrel_Box_1m,Squirrel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14010,1; },{},{} +13944,Gogo_Box_1m,Gogo Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14011,1; },{},{} +13945,BRO_SM_Package,Brazil Swordsman Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 2106,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 2229,1; getitem 2266,1; },{},{} +13946,BRO_MG_Package,Brazil Magician Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2322,1; getitem 2102,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4077,1; getitem 2607,2; getitem 5027,1; },{},{} +13947,BRO_AC_Package,Brazil Acolyte Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2326,1; getitem 2104,1; getitem 2104,1; getitem 2504,1; getitem 4003,1; getitem 4100,1; getitem 2607,2; getitem 2217,1; },{},{} +13948,BRO_AR_Package,Brazil Archer package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2317,1; getitem 1716,1; getitem 2406,1; getitem 2504,1; getitem 4064,1; getitem 4102,1; getitem 2607,2; getitem 2285,1; },{},{} +13949,BRO_MC_Package,Brazil Merchant Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2315,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4003,1; getitem 4133,1; getitem 2607,2; getitem 5021,1; },{},{} +13950,BRO_TF_Package,Brazil Thief Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2336,1; getitem 2104,1; getitem 2406,1; getitem 2506,1; getitem 4097,1; getitem 4102,1; getitem 2607,2; getitem 2274,1; },{},{} +13951,Wasteland_Outlaw_Box,Western Outlaw Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13107,604800; },{},{} +13952,Lever_Action_Rifle_Box,Lever Action Rifle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13170,604800; },{},{} +13953,All_In_One_Ring_Box,All In One Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2741,604800; },{},{} +13954,Spiritual_Tunic_Box,Spiritual Tunic Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2384,604800; },{},{} +13955,Recuperative_Armor_Box,Recuvative Armor Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2385,604800; },{},{} +13956,Shelter_Resistance_Box,Shell Of Resistance Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2132,604800; },{},{} +13957,Sylphid_Manteau_Box,Silf Manteau Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2543,604800; },{},{} +13958,Refresh_Shoes_Box,Refresh Shoes Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2439,604800; },{},{} +13959,Toast_Box,Crunch Toast Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5391,604800; },{},{} +13960,Name_Change_Coupon_Box,Identification Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7623,1; },{},{} +13961,Mojji_Box,Mochi Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 554,5; },{},{} +13962,Deprotai_Doll_Hat_Box,Defolty Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5340,1; },{},{} +13963,Claris_Doll_Hat_Box,Glaris Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5341,1; },{},{} +13964,Sorin_Doll_Hat_Box,Sorin Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5342,1; },{},{} +13965,Tayelin_Doll_Hat_Box,Tailring Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5343,1; },{},{} +13966,Binit_Doll_Hat_Box,Vinit Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5344,1; },{},{} +13967,Debril_Doll_Hat_Box,W Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5345,1; },{},{} +//13968,Bubblegum_Lower_Box,Bubble Gum Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5394,86400;},{},{} +//13969,Lucky_Clip_Box,Lucky Clip Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2742,86400; },{},{} +13970,Iron_10_Box,Iron Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 998,10; },{},{} +13971,Steel_10_Box,Steel Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 999,10; },{},{} +13972,Coal_10_Box,Coal Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1003,10; },{},{} +13973,Poison_Bottle_30_Box,Poison Bottle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,30; },{},{} 13974,TW_Scroll01,Fisherman Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -13975,Picture_Diary_Box,Diary Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12304,604800; },{},{} -13976,Mini_Heart_Box,Mini Heart Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12305,604800; },{},{} -13977,Newcomer_Box,Freshman Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12306,604800; },{},{} -13978,Kid_Box,Kid Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12307,604800; },{},{} -13979,Magic_Castle_Box,Magic Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12308,604800; },{},{} -13980,Bulging_Head_Box,JJangu Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12309,604800; },{},{} -13981,Picture_Diary_Box_1m,Diary Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12304,1; },{},{} -13982,Mini_Heart_Box_1m,Mini Heart Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12305,1; },{},{} -13983,Newcomer_Box_1m,Freshman Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12306,1; },{},{} -13984,Kid_Box_1m,Kid Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12307,1; },{},{} -13985,Magic_Castle_Box_1m,Magic Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12308,1; },{},{} -13986,Bulging_Head_Box_1m,JJangu Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12309,1; },{},{} -13987,Ori_Stone_5_Box,Rough Oridecon 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 756,5; },{},{} -13988,Ori_Stone_50_Box,Rough Oridecon 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 756,50; },{},{} -13989,Acidbomb_10_Box,Acid Bomb 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7135,10; getitem 7136,10; },{},{} -13990,Job_Manual50_Box,JOB Battle Manual Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14592,10; },{},{} -13991,Tiger_Mask_Box,Tiger Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5098,1; },{},{} -13992,Cat_Hat_Box,Pussy Cat Bell Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5051,1; },{},{} -13993,Alice_Doll_Box,Alice Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5137,1; },{},{} -13994,Speed_Up_Potion_Box5,Speed Potion 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12016,5; },{},{} -13995,Speed_Up_Potion_Box10,Speed Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12016,10; },{},{} -13996,Big_Bun_Box100,Big Bun 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,100; },{},{} -13997,Big_Bun_Box500,Big Bun 500 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,500; },{},{} -13998,Giant_Fly_Wing_Box500,Giant Fly Wing 500 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,500; },{},{} -13999,Pill__Box100,Pill 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,100; },{},{} -14000,Pill__Box500,Pill 500 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,500; },{},{} -14001,Basic_Siege_Supply_Box,Recruit Siege Supply Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,25; getitem 11504,10; },{},{} -14002,Adv_Siege_Supply_Box,Veteran Siege Supply Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,50; getitem 11504,20; },{},{} -14003,Elite_Siege_Supply_Box,Elite Siege Supply Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,100; getitem 11504,50; },{},{} -14004,Poison_Bottle_10_Box,Poison Bottle 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,10; },{},{} -14005,Poison_Bottle_5_Box,Poison Bottle 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,5; },{},{} -14006,F_Drooping_W_Kitty_Box,Evolved Drooping Cat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5219,1; },{},{} -14007,F_Rabbit_Ear_Hat_Box,Evolved Rabbits Headband Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5218,1; },{},{} -14008,F_L_Orc_Hero_Helm_Box,Evolved Helmet Of Orc Hero Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5224,1; },{},{} -14009,F_Love_Angel_Box,Love Angel Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{} -14010,F_Squirrel_Box,Squillroll Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{} -14011,F_Gogo_Box,Gogo Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{} -14012,F_Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13915,1; },{},{} -14013,F_Squirrel_Box_1m,Squillroll Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13916,1; },{},{} -14014,F_Gogo_Box_1m,Gogo Magic Powder Box 30 Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13917,1; },{},{} -14015,F_Wasteland_Outlaw_Box,Western Outlaw Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13107,1; },{},{} -14016,F_Lever_Action_Rifle_Bo,Lever Action Rifle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 13170,1; },{},{} -14017,F_All_In_One_Ring_Box,All In One Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2741,604800; },{},{} -14018,F_Spritual_Tunic_Box,Spiritual Tunic Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2384,604800; },{},{} -14019,F_Recuperative_Box,Recuvative Armor Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2385,604800; },{},{} -14020,F_Shelter_Resist_Box,Shell Of Resistance Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2132,604800; },{},{} -14021,F_Sylphid_Manteau_Box,Silf Manteau Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2543,604800; },{},{} -14022,F_Refresh_Shoes_Box,Refresh Shoes Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2439,604800; },{},{} -14023,F_Toast_Box,Crunch Toast Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5107,604800; },{},{} -14024,F_Robo_Eye_Box,Robo Eye Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5325,1; },{},{} -14025,F_Twin_Ribbon_Box,Maiden's Twin Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5187,1; },{},{} -//14026,F_Diadem_Box,Diadem Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5313,1; },{},{} -14027,F_Fish_Head_Hat_Box,Fish Head Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5380,1; },{},{} -14028,F_Santa_Poring_Hat_Box,SantaPoring Cap Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5381,1; },{},{} -14029,F_Bell_Ribbon_Box,Bell Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5382,1; },{},{} -14030,F_Mimic_Scroll_Box5,Mimic Summoning 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,5; },{},{} -14031,F_Disguise_Scroll_Box5,Disguise Summoning 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,5; },{},{} -14032,F_Alice_Scroll_Box5,Alice Summoning 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,5; },{},{} -14033,F_Mimic_Scroll_Box10,Mimic Summoning 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,10; },{},{} -14034,F_Disguise_Scroll_Box10,Disguise Summoning 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,10; },{},{} -14035,F_Alice_Scroll_Box10,Alice Summoning 10 Box),2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,10; },{},{} -14036,F_New_Style_Coupon_Box,New Style Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7622,1; },{},{} -14037,F_Repair_Scroll_Box,Repair Weapon Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,1; },{},{} -14038,F_Repair_Scroll_Box10,Repair Weapon Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,10; },{},{} -//14039,F_Hockey_Mask_Box,Hockey Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5314,1; },{},{} -//14040,F_Observer_Box,Observer Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5315,1; },{},{} -14041,F_WOB_Rune_Box5,Yellow Butterfly Wing 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,5; },{},{} -14042,F_WOB_Rune_Box10,Yellow Butterfly Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,10; },{},{} -14043,F_WOB_Schwaltz_Box5,Green Butterfly Wing 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,5; },{},{} -14044,F_WOB_Schwaltz_Box10,Green Butterfly Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,10; },{},{} -14045,F_WOB_Rachel_Box5,Red Butterfly Wing 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,5; },{},{} -14046,F_WOB_Rachel_Box10,Red Butterfly Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,10; },{},{} -14047,F_WOB_Local_Box5,Blue Butterfly Wing 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,5; },{},{} -14048,F_WOB_Local_Box10,Blue Butterfly Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,10; },{},{} -14049,F_Spark_Candy_Box5,Candy 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 529,5; },{},{} -14050,F_Spark_Candy_Box10,Candy 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 529,10; },{},{} -14051,F_Dun_Tel_Scroll2_Box5,Dungeon Teleport Scroll II 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,5; },{},{} -14052,F_Dun_Tel_Scroll2_Box10,Dungeon Teleport Scroll II 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,10; },{},{} -14053,F_Little_Angel_Doll_Box,Little Angel Doll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5324,1; },{},{} -14054,F_Triple_Poring_Hat_Box,Poring 3 Hats Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5255,1; },{},{} -14055,F_Nagan_Box,Refined Nagan Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,604800; },{},{} -14056,F_Skewer_Box,Refined Brocca Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,604800; },{},{} -14057,F_Survival_Rod_Box,Refined Survivor's Rod Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,604800; },{},{} -14058,F_Quadrille_Box,Refined Quadrille Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,604800; },{},{} -14059,F_Great_Axe_Box,Refined Great Axe Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,604800; },{},{} -14060,F_Bloody_Roar_Box,Refined Bloody Roar Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,604800; },{},{} -14061,F_Hardback_Box,Refined Hardcover Book Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,604800; },{},{} -14062,F_Fire_Brand_Box,Refined Fireblend Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,604800; },{},{} -14063,F_Immaterial_Sword_Box,Refined Immaterial Sword Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,604800; },{},{} -14064,F_Unholy_Touch_Box,Refined Unholy Touch Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,604800; },{},{} -14065,F_Clack_Of_Servival_Box,Refined Survivor's Manteau Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,1209600; },{},{} -14066,F_Masquerade_Box,Refined Masquerade Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,1209600; },{},{} -14067,F_Orc_Hero_Helm_Box,Refined Helmet of Orc Hero Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,1209600; },{},{} -14068,F_Ear_Of_Devil_Wing_Box,Refined Wing of Diablo Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,1209600; },{},{} -14069,F_Dark_Blindfold_Box,Refined Dark Blinder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,1209600; },{},{} -14070,F_K_Drooping_Kitty_Box,Refined Drooping Cat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,1209600; },{},{} -14071,F_Corsair_Box,Refined Corsair Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,1209600; },{},{} -14072,F_Bloody_Iron_Ball_Box,Refined Bloodied Shackle Ball Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,604800; },{},{} -14073,F_Spiritual_Ring_Box,Refined Spiritual Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,604800; },{},{} -14074,F_G_O_I_Box5,Wine Glass of Illusion 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,5; },{},{} -14075,F_G_O_I_Box10,Glass Of Illusion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,10; },{},{} -14076,F_Shadow_Armor_S_Box5,Scroll of Shadow Armor 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,5; },{},{} -14077,F_Shadow_Armor_S_Box10,Scroll of Shadow Armor 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,10; },{},{} -14078,F_Shadow_Armor_S_Box30,Scroll of Shadow Armor 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,30; },{},{} -14079,F_Holy_Armor_S_Box5,Scroll of Holy Armor 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,5; },{},{} -14080,F_Holy_Armor_S_Box10,Scroll of Holy Armor 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,10; },{},{} -14081,F_Holy_Armor_S_Box30,Scroll of Holy Armor 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,30; },{},{} -14082,FS_Def_Potion_Box10,Small Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,10; },{},{} -14083,FS_Def_Potion_Box30,Small Physical Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,30; },{},{} -14084,FS_Def_Potion_Box50,Small Physical Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,50; },{},{} -14085,FB_Def_Potion_Box10,Big Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,10; },{},{} -14086,FB_Def_Potion_Box30,Large Physical Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,30; },{},{} -14087,FB_Def_Potion_Box50,Large Physical Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,50; },{},{} -14088,FS_Mdef_Potion_Box10,Small Magic Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,10; },{},{} -14089,FS_Mdef_Potion_Box30,Small Magical Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,30; },{},{} -14090,FS_Mdef_Potion_Box50,Small Magical Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,50; },{},{} -14091,FB_Mdef_Potion_Box10,Big Magic Defense Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,10; },{},{} -14092,FB_Mdef_Potion_Box30,Large Magical Defense Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,30; },{},{} -14093,FB_Mdef_Potion_Box50,Large Magical Defense Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,50; },{},{} -14094,F_Flying_Angel_Box,Flying Angel Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5210,1; },{},{} -14095,F_Cat_Hat_Box,Neko Mimi Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5099,1; },{},{} -14096,F_M_F_H_Box,Moonlight Flower Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5214,1; },{},{} -14097,F_Chick_Hat_Box,Baby Chick Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5283,1; },{},{} -14098,F_Pecopeco_Hairband_Box,Peco Peco Hairband Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5286,1; },{},{} -14099,F_Red_Glasses_Box,Red Glasses Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5288,1; },{},{} -14100,F_Whisper_Mask_Box,Whisper Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5294,1; },{},{} -14101,F_Ramen_Hat_Box,Ramen Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5293,1; },{},{} -14102,F_Dun_Tele_Scroll1_Box,Dungeon Teleport Scroll 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,1; },{},{} -14103,F_Max_Weight_Up_Box,Gym Membership Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7776,1; },{},{} -14104,F_S_Life_Potion_Box,Small Life Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,10; },{},{} -14105,F_S_Life_Potion_Box30,Small Life Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,30; },{},{} -14106,F_S_Life_Potion_Box50,Small Life Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,50; },{},{} -14107,F_M_Life_Potion_Box,Medium Life Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,10; },{},{} -14108,F_M_Life_Potion_Box30,Large Life Potion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,30; },{},{} -14109,F_M_Life_Potion_Box50,Large Life Potion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,50; },{},{} -14110,F_Abrasive_Box5,Abrasive 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,5; },{},{} -14111,F_Abrasive_Box10,Abrasive 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,10; },{},{} -14112,F_Regeneration_Box5,Regeneration Potion 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,5; },{},{} -14113,F_Regeneration_Box10,Regeneration Potion 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,10; },{},{} -14114,F_Dun_Tele_Scroll_Box10,Dungeon Teleport Scroll 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,10; },{},{} -14115,F_Infiltrator_Box,Refined Infiltrator Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} -14116,F_Muramasa_Box,Refined Muramasa Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} -14117,F_Excalibur_Box,Refined Excalibur Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} -14118,F_Combat_Knife_Box,Combat Knife Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} -14119,F_Counter_Dagger_Box,Counter Dagger Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} -14120,F_Kaiser_Knuckle_Box,Refined Kaiser Knuckle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} -14121,F_Mighty_Staff_Box,Refined Mighty Staff Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} -14122,F_Right_Epsilon_Box,Light Epsilon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} -14123,F_Balistar_Box,Refined Ballista Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} -14124,F_Diary_Of_Great_Sage,Sage's Diary Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} -14125,F_Asura_Box,Asura Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} -14126,F_Apple_Of_Archer_Box,Apple of Archer Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} -14127,F_Bunny_Band_Box,Bunny Band Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} -14128,F_Sahkkat_Box,Refined Sakkat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} -14129,F_Lord_Circlet_Box,Refined Grand Circlet Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} -14130,F_Elven_Ears_Box,Elven Ears Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,1209600; },{},{} -14131,F_Steel_Flower_Box,Steel Flower Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} -14132,F_Critical_Ring_Box,Critical Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} -14133,F_Earring_Box,Earring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} -14134,F_Ring_Box,Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} -14135,F_Necklace_Box,Necklace Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} -14136,F_Glove_Box,Glove Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} -14137,F_Brooch_Box,Brooch Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} -14138,F_Rosary_Box,Rosary Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} -14139,F_Safety_Ring_Box,Safety Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} -14140,F_Vesper_Core_Box01,Refined Vesper Core 01 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} -14141,F_Vesper_Core_Box02,Refined Vesper Core 02 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} -14142,F_Vesper_Core_Box03,Refined Vesper Core 03 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} -14143,F_Vesper_Core_Box04,Refined Vesper Core 04 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} -14144,F_Vigorgra_Package1,Vigorgra Box1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -14145,F_Vigorgra_Package2,Vigorgra Box2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -14146,F_Vigorgra_Package3,Vigorgra Box3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12253,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -14147,F_Vigorgra_Package4,Vigorgra Box4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -14148,F_Vigorgra_Package5,Vigorgra Box5,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12250,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} -14149,F_Vigorgra_Package6,Vigorgra Box6,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12217,20; getitem 12211,1; getitem 7621,1; },{},{} -14150,F_Vigorgra_Package7,Vigorgra Box7,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -14151,F_Vigorgra_Package8,Vigorgra Box8,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -14152,F_Vigorgra_Package9,Start your Journey Pack,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12253,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -14153,F_Vigorgra_Package10,Siege Mode Pack,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -14154,F_Vigorgra_Package11,1 Hour Survival Pack,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12250,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} -14155,F_Vigorgra_Package12,Weekend Hunting Pack,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12217,40; getitem 12211,2; getitem 7621,2; },{},{} -14156,F_Battle_Manual_Box,Battle Manual Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} -14157,F_Insurance_Package,Insurance Package,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} -14158,F_Bubble_Gum_Box,Bubble Gum Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} -14159,F_Str_Dish_Box,Steamed Tongue Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,10; },{},{} -14160,F_Agi_Dish_Box,Steamed Scorpion Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,10; },{},{} -14161,F_Int_Dish_Box,Dragon Breath Cocktail Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; },{},{} -14162,F_Dex_Dish_Box,Hwergelmir's Tonic Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,10; },{},{} -14163,F_Luk_Dish_Box,Nine Tail Dish Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,10; },{},{} -14164,F_Vit_Dish_Box,Stew Of Immortality Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,10; },{},{} -14165,F_Kafra_Card_Box,Kafra Card Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,10; },{},{} -14166,F_Giant_Fly_Wing_Box,Giant Fly Wing Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,10; },{},{} -14167,F_Neuralizer_Box,Neuralizer Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12213,10; },{},{} -14168,F_Convex_Mirror_Box,Convex Mirror Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,10; },{},{} -14169,F_Blessing_10_Scroll_Bo,Blessing 10 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} -14170,F_Inc_Agi_10_Scroll_Box,Increase AGI 10 scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} -14171,F_Aspersio_5_Scroll_Box,Aspersio 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,10; },{},{} -14172,F_Assumptio_5_Scroll_Bo,Assumptio 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,10; },{},{} -14173,F_Wind_Walk_10_Scroll_B,Wind Walk 10 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} -14174,F_Adrenaline_Scroll_Box,Adrenaline 5 Scroll Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} -14175,F_Megaphone_Box,Megaphone 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,10; },{},{} -14176,F_Enriched_Elunium_Box,Enriched Elunium Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,10; },{},{} -14177,F_Enriched_Oridecon_Box,Enriched Oridecon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,10; },{},{} -14178,F_Token_Of_Siegfried_Bo,Token of Siegfried Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,10; },{},{} -14179,F_Giant_Fly_Wing_Box50,Giant Fly Wing 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,50; },{},{} -14180,F_Giant_Fly_Wing_Box100,Giant Fly Wing 100 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,100; },{},{} -14181,F_Dex_Dish_Box30,Hwergelmir's Tonic 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,30; },{},{} -14182,F_Dex_Dish_Box50,Hwergelmir's Tonic 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,50; },{},{} -14183,F_Luk_Dish_Box30,Nine Tail Dish 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,30; },{},{} -14184,F_Luk_Dish_Box50,Nine Tail Dish 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,50; },{},{} -14185,F_Inc_Agi_10_Box30,Increase Agility Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,30; },{},{} -14186,F_Inc_Agi_10_Box50,Increase Agility Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,50; },{},{} -14187,F_Vit_Dish_Box30,Stew of Immortality 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,30; },{},{} -14188,F_Vit_Dish_Box50,Stew of Immortality 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,50; },{},{} -14189,F_Insurance_Package30,Life Insurrance 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,30; },{},{} -14190,F_Insurance_Package50,Life Insurrance 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,50; },{},{} -14191,F_Convex_Mirror_Box5,Convex Mirror 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,5; },{},{} -14192,F_Convex_Mirror_Box30,Convex Mirror 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,30; },{},{} -14193,F_Blessing10_Box30,Blessing Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,30; },{},{} -14194,F_Blessing10_Box50,Lv10 Blessing Scroll Box 50,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,50; },{},{} -14195,F_Adrenaline10_Box30,Adrenaline Rush Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,30; },{},{} -14196,F_Adrenaline10_Box50,Adrenaline Rush Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,50; },{},{} -14197,F_Assumptio_5_Box30,Assumptio Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,30; },{},{} -14198,F_Assumptio_5_Box50,Lv5 Assumptio Scroll Box 50,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,50; },{},{} -14199,F_Aspersio_5_Box30,Aspersio Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,30; },{},{} -14200,F_Aspersio_5_Box50,Aspersio Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,50; },{},{} -14201,F_Agi_Dish_Box30,Steamed Scorpion 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,30; },{},{} -14202,F_Agi_Dish_Box50,Steamed Scorpion 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,50; },{},{} -14203,F_Wind_Walk10_Box30,Wind Walk Scroll 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,30; },{},{} -14204,F_Wind_Walk10_Box50,Wind Walk Scroll 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,50; },{},{} -14205,F_Int_Dish_Box30,Dragon Breath Cocktail 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,40; },{},{} -14206,F_Int_Dish_Box50,Dragon Breath Cocktail 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,50; },{},{} -14207,F_Battle_Manual_Box1,Field Manual Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,1; },{},{} -14208,F_Battle_Manual_Box5,Battle Manual 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; },{},{} -14209,F_Siegfried_Box5,Token of Siegfried 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,5; },{},{} -14210,F_Siegfried_Box20,Token of Siegfried 20 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,20; },{},{} -14211,F_Kafra_Card_Box30,Kafra Card 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,20; },{},{} -14212,F_Kafra_Card_Box50,Kafra Card 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,50; },{},{} -14213,F_Str_Dish_Box30,Steamed Tongue 30 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,30; },{},{} -14214,F_Str_Dish_Box50,Steamed Tongue 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,50; },{},{} -14215,F_Bubble_Gum_Box1,Bubble Gum Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,1; },{},{} -14216,F_Bubble_Gum_Box5,Bubble Gum 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,5; },{},{} -14217,F_Megaphone_Box1,Megaphone Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,1; },{},{} -14218,F_Megaphone_Box5,Megaphone 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,5; },{},{} -14219,F_Enriched_Elunium_Box5,Enriched Elunium 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,5; },{},{} -14220,FEnriched_Oridecon_Box5,Enriched Oridecon 5 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,5; },{},{} -14221,MP_Scroll_Box,Mystical Amplification Scroll 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,10; },{},{} -14222,MP_Scroll_Box30,Mystical Amplification Scroll 30 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,30; },{},{} -14223,MP_Scroll_Box50,Mystical Amplification Scroll 50 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,50; },{},{} -14224,Quagmire_Scroll_Box,Quagmire Scroll 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,10; },{},{} -14225,Quagmire_Scroll_Box30,Quagmire Scroll 30 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{} -14226,Quagmire_Scroll_Box50,Quagmire Scroll 50 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{} -14227,Healing_Staff_Box,Healing Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1638,1; },{},{} -//14228,Praxinus_Box,Praccsinos Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2752,1; },{},{} +13975,Picture_Diary_Box,Diary Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12304,604800; },{},{} +13976,Mini_Heart_Box,Mini Heart Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12305,604800; },{},{} +13977,Newcomer_Box,Freshman Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12306,604800; },{},{} +13978,Kid_Box,Kid Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12307,604800; },{},{} +13979,Magic_Castle_Box,Magic Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12308,604800; },{},{} +13980,Bulging_Head_Box,JJangu Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12309,604800; },{},{} +13981,Picture_Diary_Box_1m,Diary Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12304,2592000; },{},{} +13982,Mini_Heart_Box_1m,Mini Heart Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12305,2592000; },{},{} +13983,Newcomer_Box_1m,Freshman Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12306,2592000; },{},{} +13984,Kid_Box_1m,Kid Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12307,2592000; },{},{} +13985,Magic_Castle_Box_1m,Magic Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12308,2592000; },{},{} +13986,Bulging_Head_Box_1m,JJangu Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12309,2592000; },{},{} +13987,Ori_Stone_5_Box,Rough Oridecon 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 756,5; },{},{} +13988,Ori_Stone_50_Box,Rough Oridecon 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 756,50; },{},{} +13989,Acidbomb_10_Box,Acid Bomb 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7135,10; getitem 7136,10; },{},{} +13990,Job_Manual50_Box,JOB Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14592,10; },{},{} +13991,Tiger_Mask_Box,Tiger Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5098,1; },{},{} +13992,Cat_Hat_Box,Pussy Cat Bell Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5099,1; },{},{} +13993,Alice_Doll_Box,Alice Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5137,1; },{},{} +13994,Speed_Up_Potion_Box5,Speed Potion 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12016,5; },{},{} +13995,Speed_Up_Potion_Box10,Speed Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12016,10; },{},{} +13996,Big_Bun_Box100,Big Bun 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,100; },{},{} +13997,Big_Bun_Box500,Big Bun 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14522,500; },{},{} +13998,Giant_Flywing_Box500,Giant Fly Wing 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,500; },{},{} +13999,Pill_Box100,Pill 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,100; },{},{} +14000,Pill_Box500,Pill 500 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14523,500; },{},{} +14001,Basic_Siege_Supply_Box,Recruit Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,25; getitem 11504,10; },{},{} +14002,Adv_Siege_Supply_Box,Veteran Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,50; getitem 11504,20; },{},{} +14003,Elite_Siege_Supply_Box,Elite Siege Supply Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 11503,100; getitem 11504,50; },{},{} +14004,Poison_Bottle_10_Box,Poison Bottle 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,10; },{},{} +14005,Poison_Bottle_5_Box,Poison Bottle 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,5; },{},{} +14006,F_Drooping_W_Kitty_Box,Evolved Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5372,1; },{},{} +14007,F_Rabbit_Ear_Hat_Box,Evolved Rabbits Headband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5378,1; },{},{} +14008,F_L_Orc_Hero_Helm_Box,Evolved Helmet Of Orc Hero Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5375,1; },{},{} +14009,F_Love_Angel_Box,Love Angel Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12287,604800; },{},{} +14010,F_Squirrel_Box,Squillroll Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12288,604800; },{},{} +14011,F_Gogo_Box,Gogo Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12289,604800; },{},{} +14012,F_Love_Angel_Box_1m,Love Angel Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13915,2592000; },{},{} +14013,F_Squirrel_Box_1m,Squillroll Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13916,2592000; },{},{} +14014,F_Gogo_Box_1m,Gogo Magic Powder Box 30 Days,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13917,2592000; },{},{} +14015,F_Wasteland_Outlaw_Box,Western Outlaw Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13107,604800; },{},{} +14016,F_Lever_Action_Rifle_Bo,Lever Action Rifle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13170,604800; },{},{} +14017,F_All_In_One_Ring_Box,All In One Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2741,604800; },{},{} +14018,F_Spritual_Tunic_Box,Spiritual Tunic Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2384,604800; },{},{} +14019,F_Recuperative_Box,Recuvative Armor Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2385,604800; },{},{} +14020,F_Shelter_Resist_Box,Shell Of Resistance Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2132,604800; },{},{} +14021,F_Sylphid_Manteau_Box,Silf Manteau Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2543,604800; },{},{} +14022,F_Refresh_Shoes_Box,Refresh Shoes Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2439,604800; },{},{} +14023,F_Toast_Box,Crunch Toast Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5107,604800; },{},{} +14024,F_Robo_Eye_Box,Robo Eye Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5325,1; },{},{} +14025,F_Twin_Ribbon_Box,Maiden's Twin Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5187,1; },{},{} +//14026,F_Diadem_Box,Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5313,1; },{},{} +14027,F_Fish_Head_Hat_Box,Fish Head Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5380,1; },{},{} +14028,F_Santa_Poring_Hat_Box,SantaPoring Cap Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5381,1; },{},{} +14029,F_Bell_Ribbon_Box,Bell Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5382,1; },{},{} +14030,F_Mimic_Scroll_Box5,Mimic Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,5; },{},{} +14031,F_Disguise_Scroll_Box5,Disguise Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,5; },{},{} +14032,F_Alice_Scroll_Box5,Alice Summoning 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,5; },{},{} +14033,F_Mimic_Scroll_Box10,Mimic Summoning 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12276,10; },{},{} +14034,F_Disguise_Scroll_Box10,Disguise Summoning 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12277,10; },{},{} +14035,F_Alice_Scroll_Box10,Alice Summoning 10 Box),18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12278,10; },{},{} +14036,F_New_Style_Coupon_Box,New Style Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7622,1; },{},{} +14037,F_Repair_Scroll_Box,Repair Weapon Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,5; getitem 1002,5; getitem 998,5; getitem 756,5; getitem 999,5; },{},{} +14038,F_Repair_Scroll_Box10,Repair Weapon Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14521,10; getitem 1002,10; getitem 998,10; getitem 756,10; getitem 999,10; },{},{} +//14039,F_Hockey_Mask_Box,Hockey Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5314,604800; },{},{} +//14040,F_Observer_Box,Observer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5315,604800; },{},{} +14041,F_WOB_Rune_Box5,Yellow Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,5; },{},{} +14042,F_WOB_Rune_Box10,Yellow Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14582,10; },{},{} +14043,F_WOB_Schwaltz_Box5,Green Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,5; },{},{} +14044,F_WOB_Schwaltz_Box10,Green Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14583,10; },{},{} +14045,F_WOB_Rachel_Box5,Red Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,5; },{},{} +14046,F_WOB_Rachel_Box10,Red Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14584,10; },{},{} +14047,F_WOB_Local_Box5,Blue Butterfly Wing 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,5; },{},{} +14048,F_WOB_Local_Box10,Blue Butterfly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14585,10; },{},{} +14049,F_Spark_Candy_Box5,Candy 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14586,5; },{},{} +14050,F_Spark_Candy_Box10,Candy 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14586,10; },{},{} +14051,F_Dun_Tel_Scroll2_Box5,Dungeon Teleport Scroll II 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,5; },{},{} +14052,F_Dun_Tel_Scroll2_Box10,Dungeon Teleport Scroll II 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14581,10; },{},{} +14053,F_Little_Angel_Doll_Box,Little Angel Doll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5324,1; },{},{} +14054,F_Triple_Poring_Hat_Box,Poring 3 Hats Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5255,1; },{},{} +14055,F_Nagan_Box,Refined Nagan Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13407,604800; },{},{} +14056,F_Skewer_Box,Refined Brocca Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1424,604800; },{},{} +14057,F_Survival_Rod_Box,Refined Survivor's Rod Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1628,604800; },{},{} +14058,F_Quadrille_Box,Refined Quadrille Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1537,604800; },{},{} +14059,F_Great_Axe_Box,Refined Great Axe Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1378,604800; },{},{} +14060,F_Bloody_Roar_Box,Refined Bloody Roar Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1273,604800; },{},{} +14061,F_Hardback_Box,Refined Hardcover Book Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1567,604800; },{},{} +14062,F_Fire_Brand_Box,Refined Fireblend Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13408,604800; },{},{} +14063,F_Immaterial_Sword_Box,Refined Immaterial Sword Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13409,604800; },{},{} +14064,F_Unholy_Touch_Box,Refined Unholy Touch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1274,604800; },{},{} +14065,F_Clack_Of_Servival_Box,Refined Survivor's Manteau Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2535,1209600; },{},{} +14066,F_Masquerade_Box,Refined Masquerade Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5326,1209600; },{},{} +14067,F_Orc_Hero_Helm_Box,Refined Helmet of Orc Hero Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5327,1209600; },{},{} +14068,F_Ear_Of_Devil_Wing_Box,Refined Wing of Diablo Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5328,1209600; },{},{} +14069,F_Dark_Blindfold_Box,Refined Dark Blinder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5329,1209600; },{},{} +14070,F_K_Drooping_Kitty_Box,Refined Drooping Cat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5330,1209600; },{},{} +14071,F_Corsair_Box,Refined Corsair Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5331,1209600; },{},{} +14072,F_Bloody_Iron_Ball_Box,Refined Bloodied Shackle Ball Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2710,604800; },{},{} +14073,F_Spiritual_Ring_Box,Refined Spiritual Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2711,604800; },{},{} +14074,F_G_O_I_Box5,Wine Glass of Illusion 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,5; },{},{} +14075,F_G_O_I_Box10,Glass Of Illusion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14538,10; },{},{} +14076,F_Shadow_Armor_S_Box5,Scroll of Shadow Armor 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,5; },{},{} +14077,F_Shadow_Armor_S_Box10,Scroll of Shadow Armor 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,10; },{},{} +14078,F_Shadow_Armor_S_Box30,Scroll of Shadow Armor 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14539,30; },{},{} +14079,F_Holy_Armor_S_Box5,Scroll of Holy Armor 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,5; },{},{} +14080,F_Holy_Armor_S_Box10,Scroll of Holy Armor 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,10; },{},{} +14081,F_Holy_Armor_S_Box30,Scroll of Holy Armor 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14540,30; },{},{} +14082,FS_Def_Potion_Box10,Small Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,10; },{},{} +14083,FS_Def_Potion_Box30,Small Physical Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,30; },{},{} +14084,FS_Def_Potion_Box50,Small Physical Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14541,50; },{},{} +14085,FB_Def_Potion_Box10,Big Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,10; },{},{} +14086,FB_Def_Potion_Box30,Large Physical Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,30; },{},{} +14087,FB_Def_Potion_Box50,Large Physical Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14542,50; },{},{} +14088,FS_Mdef_Potion_Box10,Small Magic Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,10; },{},{} +14089,FS_Mdef_Potion_Box30,Small Magical Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,30; },{},{} +14090,FS_Mdef_Potion_Box50,Small Magical Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14543,50; },{},{} +14091,FB_Mdef_Potion_Box10,Big Magic Defense Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,10; },{},{} +14092,FB_Mdef_Potion_Box30,Large Magical Defense Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,30; },{},{} +14093,FB_Mdef_Potion_Box50,Large Magical Defense Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14544,50; },{},{} +14094,F_Flying_Angel_Box,Flying Angel Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5210,1; },{},{} +14095,F_Cat_Hat_Box,Neko Mimi Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5099,1; },{},{} +14096,F_M_F_H_Box,Moonlight Flower Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5214,1; },{},{} +14097,F_Chick_Hat_Box,Baby Chick Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5283,1; },{},{} +14098,F_Pecopeco_Hairband_Box,Peco Peco Hairband Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5286,1209600; },{},{} +14099,F_Red_Glasses_Box,Red Glasses Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5288,1209600; },{},{} +14100,F_Whisper_Mask_Box,Whisper Mask Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5294,1209600; },{},{} +14101,F_Ramen_Hat_Box,Ramen Hat Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5293,1209600; },{},{} +14102,F_Dun_Tele_Scroll1_Box,Dungeon Teleport Scroll 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,5; },{},{} +14103,F_Max_Weight_Up_Box,Gym Membership Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7776,1; },{},{} +14104,F_S_Life_Potion_Box,Small Life Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,10; },{},{} +14105,F_S_Life_Potion_Box30,Small Life Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,30; },{},{} +14106,F_S_Life_Potion_Box50,Small Life Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14534,50; },{},{} +14107,F_M_Life_Potion_Box,Medium Life Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,10; },{},{} +14108,F_M_Life_Potion_Box30,Large Life Potion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,30; },{},{} +14109,F_M_Life_Potion_Box50,Large Life Potion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14535,50; },{},{} +14110,F_Abrasive_Box5,Abrasive 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,5; },{},{} +14111,F_Abrasive_Box10,Abrasive 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14536,10; },{},{} +14112,F_Regeneration_Box5,Regeneration Potion 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,5; },{},{} +14113,F_Regeneration_Box10,Regeneration Potion 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14537,10; },{},{} +14114,F_Dun_Tele_Scroll_Box10,Dungeon Teleport Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14527,10; },{},{} +14115,F_Infiltrator_Box,Refined Infiltrator Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1267,604800; },{},{} +14116,F_Muramasa_Box,Refined Muramasa Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1173,604800; },{},{} +14117,F_Excalibur_Box,Refined Excalibur Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13401,604800; },{},{} +14118,F_Combat_Knife_Box,Combat Knife Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13021,604800; },{},{} +14119,F_Counter_Dagger_Box,Counter Dagger Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13022,604800; },{},{} +14120,F_Kaiser_Knuckle_Box,Refined Kaiser Knuckle Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1817,604800; },{},{} +14121,F_Mighty_Staff_Box,Refined Mighty Staff Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1623,604800; },{},{} +14122,F_Right_Epsilon_Box,Light Epsilon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1372,604800; },{},{} +14123,F_Balistar_Box,Refined Ballista Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1728,604800; },{},{} +14124,F_Diary_Of_Great_Sage,Sage's Diary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1563,604800; },{},{} +14125,F_Asura_Box,Asura Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13023,604800; },{},{} +14126,F_Apple_Of_Archer_Box,Apple of Archer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5265,1209600; },{},{} +14127,F_Bunny_Band_Box,Bunny Band Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5266,1209600; },{},{} +14128,F_Sahkkat_Box,Refined Sakkat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5267,1209600; },{},{} +14129,F_Lord_Circlet_Box,Refined Grand Circlet Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5268,1209600; },{},{} +14130,F_Elven_Ears_Box,Elven Ears Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2686,1209600; },{},{} +14131,F_Steel_Flower_Box,Steel Flower Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2687,1209600; },{},{} +14132,F_Critical_Ring_Box,Critical Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2688,604800; },{},{} +14133,F_Earring_Box,Earring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2689,604800; },{},{} +14134,F_Ring_Box,Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2690,604800; },{},{} +14135,F_Necklace_Box,Necklace Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2691,604800; },{},{} +14136,F_Glove_Box,Glove Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2692,604800; },{},{} +14137,F_Brooch_Box,Brooch Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2693,604800; },{},{} +14138,F_Rosary_Box,Rosary Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2694,604800; },{},{} +14139,F_Safety_Ring_Box,Safety Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2695,604800; },{},{} +14140,F_Vesper_Core_Box01,Refined Vesper Core 01 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2696,604800; },{},{} +14141,F_Vesper_Core_Box02,Refined Vesper Core 02 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2697,604800; },{},{} +14142,F_Vesper_Core_Box03,Refined Vesper Core 03 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2698,604800; },{},{} +14143,F_Vesper_Core_Box04,Refined Vesper Core 04 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2699,604800; },{},{} +14144,F_Vigorgra_Package1,Vigorgra Box1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +14145,F_Vigorgra_Package2,Vigorgra Box2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +14146,F_Vigorgra_Package3,Vigorgra Box3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12253,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +14147,F_Vigorgra_Package4,Vigorgra Box4,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12255,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +14148,F_Vigorgra_Package5,Vigorgra Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,2; getitem 12250,2; getitem 12208,2; getitem 12215,15; getitem 12216,15; getitem 12211,1; getitem 7621,1; },{},{} +14149,F_Vigorgra_Package6,Vigorgra Box6,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,2; getitem 12251,2; getitem 12208,2; getitem 12215,15; getitem 12217,20; getitem 12211,1; getitem 7621,1; },{},{} +14150,F_Vigorgra_Package7,Vigorgra Box7,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +14151,F_Vigorgra_Package8,Vigorgra Box8,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +14152,F_Vigorgra_Package9,Start your Journey Pack,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12253,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +14153,F_Vigorgra_Package10,Siege Mode Pack,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12255,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +14154,F_Vigorgra_Package11,1 Hour Survival Pack,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12252,4; getitem 12250,4; getitem 12208,4; getitem 12215,30; getitem 12216,30; getitem 12211,2; getitem 7621,2; },{},{} +14155,F_Vigorgra_Package12,Weekend Hunting Pack,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12250,4; getitem 12251,4; getitem 12208,4; getitem 12215,30; getitem 12217,40; getitem 12211,2; getitem 7621,2; },{},{} +14156,F_Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} +14157,F_Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} +14158,F_Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} +14159,F_Str_Dish_Box,Steamed Tongue Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,10; },{},{} +14160,F_Agi_Dish_Box,Steamed Scorpion Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,10; },{},{} +14161,F_Int_Dish_Box,Dragon Breath Cocktail Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,10; },{},{} +14162,F_Dex_Dish_Box,Hwergelmir's Tonic Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,10; },{},{} +14163,F_Luk_Dish_Box,Nine Tail Dish Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,10; },{},{} +14164,F_Vit_Dish_Box,Stew Of Immortality Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,10; },{},{} +14165,F_Kafra_Card_Box,Kafra Card Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,10; },{},{} +14166,F_Giant_Fly_Wing_Box,Giant Fly Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,10; },{},{} +14167,F_Neuralizer_Box,Neuralizer Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12213,1; },{},{} +14168,F_Convex_Mirror_Box,Convex Mirror Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,10; },{},{} +14169,F_Blessing_10_Scroll_Box,Blessing 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{} +14170,F_Inc_Agi_10_Scroll_Box,Increase AGI 10 scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{} +14171,F_Aspersio_5_Scroll_Box,Aspersio 5 Scroll Box,18,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,10; getitem 523,10; },{},{} +14172,F_Assumptio_5_Scroll_Box,Assumptio 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,10; },{},{} +14173,F_Wind_Walk_10_Scroll_Box,Wind Walk 10 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{} +14174,F_Adrenaline_Scroll_Box,Adrenaline 5 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{} +14175,F_Megaphone_Box,Megaphone 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,10; },{},{} +14176,F_Enriched_Elunium_Box,Enriched Elunium Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,10; },{},{} +14177,F_Enriched_Oridecon_Box,Enriched Oridecon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,10; },{},{} +14178,F_Token_Of_Siegfried_Box,Token of Siegfried Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,10; },{},{} +14179,F_Giant_Fly_Wing_Box50,Giant Fly Wing 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,50; },{},{} +14180,F_Giant_Fly_Wing_Box100,Giant Fly Wing 100 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12212,100; },{},{} +14181,F_Dex_Dish_Box30,Hwergelmir's Tonic 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,30; },{},{} +14182,F_Dex_Dish_Box50,Hwergelmir's Tonic 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,50; },{},{} +14183,F_Luk_Dish_Box30,Nine Tail Dish 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,30; },{},{} +14184,F_Luk_Dish_Box50,Nine Tail Dish 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,50; },{},{} +14185,F_Inc_Agi_10_Box30,Increase Agility Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,30; },{},{} +14186,F_Inc_Agi_10_Box50,Increase Agility Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,50; },{},{} +14187,F_Vit_Dish_Box30,Stew of Immortality 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,30; },{},{} +14188,F_Vit_Dish_Box50,Stew of Immortality 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,50; },{},{} +14189,F_Insurance_Package30,Life Insurrance 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,30; },{},{} +14190,F_Insurance_Package50,Life Insurrance 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,50; },{},{} +14191,F_Convex_Mirror_Box5,Convex Mirror 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,5; },{},{} +14192,F_Convex_Mirror_Box30,Convex Mirror 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12214,30; },{},{} +14193,F_Blessing10_Box30,Blessing Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,30; },{},{} +14194,F_Blessing10_Box50,Lv10 Blessing Scroll Box 50,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,50; },{},{} +14195,F_Adrenaline10_Box30,Adrenaline Rush Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,30; },{},{} +14196,F_Adrenaline10_Box50,Adrenaline Rush Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,50; },{},{} +14197,F_Assumptio_5_Box30,Assumptio Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,30; },{},{} +14198,F_Assumptio_5_Box50,Lv5 Assumptio Scroll Box 50,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12218,50; },{},{} +14199,F_Aspersio_5_Box30,Aspersio Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,30; getitem 523,30; },{},{} +14200,F_Aspersio_5_Box50,Aspersio Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12217,50; getitem 523,50; },{},{} +14201,F_Agi_Dish_Box30,Steamed Scorpion 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,30; },{},{} +14202,F_Agi_Dish_Box50,Steamed Scorpion 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,50; },{},{} +14203,F_Wind_Walk10_Box30,Wind Walk Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,30; },{},{} +14204,F_Wind_Walk10_Box50,Wind Walk Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,50; },{},{} +14205,F_Int_Dish_Box30,Dragon Breath Cocktail 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,30; },{},{} +14206,F_Int_Dish_Box50,Dragon Breath Cocktail 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,50; },{},{} +14207,F_Battle_Manual_Box1,Field Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,1; },{},{} +14208,F_Battle_Manual_Box5,Battle Manual 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,5; },{},{} +14209,F_Siegfried_Box5,Token of Siegfried 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,5; },{},{} +14210,F_Siegfried_Box20,Token of Siegfried 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7621,20; },{},{} +14211,F_Kafra_Card_Box30,Kafra Card 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,30; },{},{} +14212,F_Kafra_Card_Box50,Kafra Card 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12211,50; },{},{} +14213,F_Str_Dish_Box30,Steamed Tongue 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,30; },{},{} +14214,F_Str_Dish_Box50,Steamed Tongue 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,50; },{},{} +14215,F_Bubble_Gum_Box1,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,1; },{},{} +14216,F_Bubble_Gum_Box5,Bubble Gum 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,5; },{},{} +14217,F_Megaphone_Box1,Megaphone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,1; },{},{} +14218,F_Megaphone_Box5,Megaphone 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12221,5; },{},{} +14219,F_Enriched_Elunium_Box5,Enriched Elunium 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7619,5; },{},{} +14220,FEnriched_Oridecon_Box5,Enriched Oridecon 5 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7620,5; },{},{} +14221,MP_Scroll_Box,Mystical Amplification Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,10; },{},{} +14222,MP_Scroll_Box30,Mystical Amplification Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,30; },{},{} +14223,MP_Scroll_Box50,Mystical Amplification Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,50; },{},{} +14224,Quagmire_Scroll_Box,Quagmire Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,10; },{},{} +14225,Quagmire_Scroll_Box30,Quagmire Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{} +14226,Quagmire_Scroll_Box50,Quagmire Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{} +14227,Healing_Staff_Box,Healing Staff Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1638,604800; },{},{} +//14228,Praxinus_Box,Praccsinos Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2752,604800; },{},{} //14229,Cherry_Blossom_Scroll,Cherry Blossom Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} //14230,Note_Headphones_Box,Note Headphones Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5151,1; },{},{} //14231,Novice_Breastplate_Boxes,Novice Breastplate Boxes,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14232,Yggdrasilberry_Box_,Yggdrasil Berry 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 607,10; },{},{} -14233,Dead_Branch_Box_10,Dead Branch 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,10; },{},{} -14234,Dead_Branch_Box_25,Dead Branch 25 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,25; },{},{} -14235,Field_Manual_Box_2,Field Manual 2 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,2; },{},{} -14236,Steamed_Tongue_Box_20,Steamed Tongue 20 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,20; },{},{} -14237,Steamed_Desert_Scorpions_Box_20,Steamed Desert Scorpions Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,20; },{},{} -14238,Stew_Of_Immortality_Box_20,Immortal Stew 20 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,20; },{},{} -14239,Dragon_Breath_Cocktail_Box_20,Dragon Breath Cocktail 20 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,20; },{},{} -14240,Hwergelmir's_Tonic_Box_20,Hwergelmir's Tonic 20 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,20; },{},{} -14241,Nine_Tail_Dish_Box_20,Nine Tail Dish 20 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,20; },{},{} -14242,Beholder_Ring_Box,Beholder Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2753,1; },{},{} -14243,Hallow_Ring_Box,Hallow Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2754,1; },{},{} -14244,Clamorous_Ring_Box,Clamorous Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2755,1; },{},{} -14245,Chemical_Ring_Box,Chemical Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2756,1; },{},{} -14246,Insecticide_Ring_Box,Insecticide Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2757,1; },{},{} -14247,Fisher_Ring_Box,Fisher Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2758,1; },{},{} -14248,Decussate_Ring_Box,Decussate Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2759,1; },{},{} -14249,Bloody_Ring_Box,Bloody Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2760,1; },{},{} -14250,Satanic_Ring_Box,Satanic Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2761,1; },{},{} -14251,Dragoon_Ring_Box,Dragon Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2762,1; },{},{} -14252,Beholder_Ring_Box2,Beholder Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2753,1; },{},{} -14253,Hallow_Ring_Box2,Hallow Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2754,1; },{},{} -14254,Clamorous_Ring_Box2,Clamorous Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2755,1; },{},{} -14255,Chemical_Ring_Box2,Chemical Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2756,1; },{},{} -14256,Insecticide_Ring_Box2,Insecticide Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2757,1; },{},{} -14257,Fisher_Ring_Box2,Fisher Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2758,1; },{},{} -14258,Decussate_Ring_Box2,Decussate Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2759,1; },{},{} -14259,Bloody_Ring_Box2,Bloody Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2760,1; },{},{} -14260,Satanic_Ring_Box2,Satanic Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2761,1; },{},{} -14261,Dragoon_Ring_Box2,Dragon Ring Box II,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2762,1; },{},{} -14262,Diary_Magic_Powder_Box,Diary Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12304,604800; },{},{} -14263,Mini_Heart_Magic_Powder_Box,Mini Heart Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12305,604800; },{},{} -14264,Freshman_Magic_Powder_Box,Freshman Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12306,604800; },{},{} -14265,Kid_Magic_Powder_Box,Kid Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12307,604800; },{},{} -14266,Magic_Magic_Powder_Box,Magic Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12308,604800; },{},{} -14267,JJangu_Magic_Powder_Box,JJangu Magic Powder Box,2,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12309,604800; },{},{} -14268,Diary_Magic_Powder_Box4,Diary Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14269,Mini_Heart_Magic_Powder_Box4,Mini_Heart_Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14270,Freshman_Magic_Powder_Box4,Freshman Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14271,Kid_Magic_Powder_Box4,Kid Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14272,Magic_Magic_Powder_Box4,Magic Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14273,JJangu_Magic_Powder_Box4,JJangu Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14274,Amplification_10_Scroll_Box2,Mystical Amplification Scroll 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,10; },{},{} -14275,Amplification_30_Scroll_Box2,Mystical Amplification Scroll 30 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,30; },{},{} -14276,Amplification_50_Scroll_Box2,Mystical Amplification Scroll 50 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,50; },{},{} -14277,Quagmire_10_Scroll_Box2,Quagmire Scroll 10 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,10; },{},{} -14278,Quagmire_30_Scroll_Box2,Quagmire Scroll 30 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{} -14279,Quagmire_50_Scroll_Box2,Quagmire Scroll 50 Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{} -14280,Healing_Staff_Box2,Healing Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1638,1; },{},{} -//14281,Praccsinos_Box,Praccsinos_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2752,1; },{},{} -14282,Emperium_Box,Emperium Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 714,1; },{},{} -14283,Marriage_Certificate_Box,Written Oath Of Marriage Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6026,1; },{},{} -//14284,Muffler_Box,Muffler Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2548,1; },{},{} -//14285,Balkiriah_Shield_Box,Balkiriah Shield Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2137,1; },{},{} -//14286,Skull_Ring_Box,Skull Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2763,1; },{},{} -14287,Baricade_Repair_Kit,Barricade Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1019,30; getitem 999,10; getitem 1011,10; getitem 984,5; },{},{} -14288,Guardian_Stone_Repair_Kit,Guardian Stone Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,1; getitem 985,1; getitem 7049,30; getitem 717,5; getitem 716,5; getitem 715,5; },{},{} -14289,Cloth_Dye_Coupon_Box,New Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{} -14290,Cloth_Dye_Coupon2_Box,Original Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{} +14232,Yggdrasilberry_Box_,Yggdrasil Berry 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 607,10; },{},{} +14233,Dead_Branch_Box_10,Dead Branch 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,10; },{},{} +14234,Dead_Branch_Box_25,Dead Branch 25 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,25; },{},{} +14235,Field_Manual_Box_2,Field Manual 2 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,2; },{},{} +14236,Steamed_Tongue_Box_20,Steamed Tongue 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,20; },{},{} +14237,Steamed_Desert_Scorpions_Box_20,Steamed Desert Scorpions Box(20),18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,20; },{},{} +14238,Stew_Of_Immortality_Box_20,Immortal Stew 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,20; },{},{} +14239,Dragon_Breath_Cocktail_Box_20,Dragon Breath Cocktail 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,20; },{},{} +14240,Hwergelmir's_Tonic_Box_20,Hwergelmir's Tonic 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,20; },{},{} +14241,Nine_Tail_Dish_Box_20,Nine Tail Dish 20 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,20; },{},{} +14242,Beholder_Ring_Box,Beholder Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2753,1; },{},{} +14243,Hallow_Ring_Box,Hallow Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2754,1; },{},{} +14244,Clamorous_Ring_Box,Clamorous Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2755,1; },{},{} +14245,Chemical_Ring_Box,Chemical Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2756,1; },{},{} +14246,Insecticide_Ring_Box,Insecticide Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2757,1; },{},{} +14247,Fisher_Ring_Box,Fisher Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2758,1; },{},{} +14248,Decussate_Ring_Box,Decussate Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2759,1; },{},{} +14249,Bloody_Ring_Box,Bloody Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2760,1; },{},{} +14250,Satanic_Ring_Box,Satanic Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2761,1; },{},{} +14251,Dragoon_Ring_Box,Dragon Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2762,1; },{},{} +14252,Beholder_Ring_Box2,Beholder Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2753,1; },{},{} +14253,Hallow_Ring_Box2,Hallow Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2754,1; },{},{} +14254,Clamorous_Ring_Box2,Clamorous Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2755,1; },{},{} +14255,Chemical_Ring_Box2,Chemical Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2756,1; },{},{} +14256,Insecticide_Ring_Box2,Insecticide Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2757,1; },{},{} +14257,Fisher_Ring_Box2,Fisher Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2758,1; },{},{} +14258,Decussate_Ring_Box2,Decussate Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2759,1; },{},{} +14259,Bloody_Ring_Box2,Bloody Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2760,1; },{},{} +14260,Satanic_Ring_Box2,Satanic Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2761,1; },{},{} +14261,Dragoon_Ring_Box2,Dragon Ring Box II,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2762,1; },{},{} +14262,Diary_Magic_Powder_Box,Diary Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12304,604800; },{},{} +14263,Mini_Heart_Magic_Powder_Box,Mini Heart Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12305,604800; },{},{} +14264,Freshman_Magic_Powder_Box,Freshman Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12306,604800; },{},{} +14265,Kid_Magic_Powder_Box,Kid Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12307,604800; },{},{} +14266,Magic_Magic_Powder_Box,Magic Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12308,604800; },{},{} +14267,JJangu_Magic_Powder_Box,JJangu Magic Powder Box,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 12309,604800; },{},{} +14268,Diary_Magic_Powder_Box4,Diary Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14269,Mini_Heart_Magic_Powder_Box4,Mini_Heart_Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14270,Freshman_Magic_Powder_Box4,Freshman Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14271,Kid_Magic_Powder_Box4,Kid Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14272,Magic_Magic_Powder_Box4,Magic Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14273,JJangu_Magic_Powder_Box4,JJangu Magic Powder Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +14274,Amplification_10_Scroll_Box2,Mystical Amplification Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,10; },{},{} +14275,Amplification_30_Scroll_Box2,Mystical Amplification Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,30; },{},{} +14276,Amplification_50_Scroll_Box2,Mystical Amplification Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14593,50; },{},{} +14277,Quagmire_10_Scroll_Box2,Quagmire Scroll 10 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,10; },{},{} +14278,Quagmire_30_Scroll_Box2,Quagmire Scroll 30 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{} +14279,Quagmire_50_Scroll_Box2,Quagmire Scroll 50 Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{} +14280,Healing_Staff_Box2,Healing Staff Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1638,1; },{},{} +//14281,Praccsinos_Box,Praccsinos_Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2752,1; },{},{} +14282,Emperium_Box,Emperium Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 714,1; },{},{} +14283,Marriage_Certificate_Box,Written Oath Of Marriage Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6026,1; },{},{} +//14284,Muffler_Box,Muffler Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2548,1; },{},{} +//14285,Balkiriah_Shield_Box,Balkiriah Shield Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2137,1; },{},{} +//14286,Skull_Ring_Box,Skull Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2763,1; },{},{} +14287,Baricade_Repair_Kit,Barricade Repair Kit,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1019,30; getitem 999,10; getitem 1011,10; getitem 984,5; },{},{} +14288,Guardian_Stone_Repair_Kit,Guardian Stone Repair Kit,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,1; getitem 985,1; getitem 7049,30; getitem 717,5; getitem 716,5; getitem 715,5; },{},{} +14289,Clothing_Dye_Coupon_Box,New Clothing Dye Coupon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{} +14290,Clothing_Dye_Coupon2_Box,Original Clothing Dye Coupon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{} 14291,Cloth_Dye_Coupon3_Box,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{} 14292,Cloth_Dye_Coupon4_Box,Clothing Dye Coupon Box II,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{} //14293,Mercenary_Contract_Box,Mercenary Contract Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6050,1; },{},{} diff --git a/db/item_delay.txt b/db/item_delay.txt index 716d60ebc0..a0b1389bd8 100644 --- a/db/item_delay.txt +++ b/db/item_delay.txt @@ -1,6 +1,5 @@ // Item Delay Database // Max number of entries is defined in itemdb.h as MAX_ITEMDELAYS -// WARNING: Adding/removing/modifying entries here and then using @reloaditemdb will cause problems/inconsistencies! // // Structure: // Item ID,Delay in Milliseconds diff --git a/db/item_misc.txt b/db/item_misc.txt index 63ef67bed5..2063426983 100644 --- a/db/item_misc.txt +++ b/db/item_misc.txt @@ -56,43 +56,65 @@ 17,12120,1 // Earth Resist Potion 17,12121,1 // Thunder Resist Potion // Ores -18,756,1 // Rough Oridecon -18,757,1 // Rough Elunium -18,998,1 // Iron -18,999,1 // Steel -18,1002,1 // Iron Ore -18,1003,1 // Coal -18,1010,1 // Phracon -18,1011,1 // Emveretarcon +18,1002,30 // Iron_Ore +18,998,28 // Iron +18,993,26 // Yellow_Live +18,1003,24 // Coal +18,992,22 // Wind_Of_Verdure +18,1010,20 // Phracon +18,991,18 // Crystal_Blue +18,990,16 // Boody_Red +18,999,14 // Steel +18,1011,12 // Emveretarcon +18,757,10 // Elunium_Stone +18,756,9 // Oridecon_Stone +18,997,8 // Great_Nature +18,996,7 // Rough_Wind +18,995,6 // Mistic_Frozen +18,994,5 // Flame_Heart +18,985,4 // Elunium +18,984,3 // Oridecon +18,969,2 // Gold +18,714,1 // Emperium // Food Types -19,512,1 // Apple -19,513,1 // Banana -19,514,1 // Grape -19,515,1 // Carrot -19,516,1 // Potato -19,517,1 // Meat -19,528,1 // Monster Food -19,529,1 // Candy -19,530,1 // Candy Cane -19,544,1 // Raw Fish -19,551,1 // Sushi +19,526,5 // Royal_Jelly +19,12042,10 // Str_Dish02 +19,12057,10 // Agi_Dish02 +19,12068,10 // Vit_Dish03 +19,12062,10 // Dex_Dish02 +19,12068,10 // Luk_Dish03 +19,12047,10 // Int_Dish02 +19,531,30 // Apple_Juice +19,532,30 // Banana_Juice +19,533,30 // Grape_Juice +19,534,30 // Carrot_Juice +19,538,30 // Well_Baked_Cookie +19,536,50 // Ice_Cream +19,544,50 // Fish_Slice +19,548,50 // Cheese +19,551,50 // Shusi +19,553,50 // Bun +19,554,50 // Mojji +19,535,50 // Pumpkin +19,516,100 // Sweet_Potato +19,513,100 // Banana +19,512,600 // Apple // Recovery Types -20,501,1 // Red Potion -20,502,1 // Orange Potion -20,503,1 // Yellow Potion -20,504,1 // White Potion -20,505,1 // Blue Potion -20,506,1 // Green Potion -20,507,1 // Red Herb -20,508,1 // Yellow Herb -20,509,1 // White Herb -20,510,1 // Blue Herb -20,511,1 // Green Herb -20,531,1 // Apple Juice -20,532,1 // Banana Juice -20,533,1 // Grape Juice -20,534,1 // Carrot Juice -// Minerals +20,522,5 // Fruit_Of_Mastela +20,521,5 // Leaflet_Of_Aloe +20,520,10 // Leaflet_Of_Hinal +20,545,10 // Red_Slim_Potion +20,12118,10 // Resist_Earth +20,508,20 // Yellow_Herb +20,501,20 // Red_Potion +20,511,30 // Green_Herb +20,507,30 // Red_Herb +20,569,50 // Novice_Potion +20,549,50 // Nice_Sweet_Potato +20,529,100 // Candy +20,528,200 // Monster's_Feed +20,550,600 // Popped_Rice +// Minerals - Unused 21,714,1 // Emperium 21,756,1 // Rough Oridecon 21,757,1 // Rough Elunium @@ -255,22 +277,26 @@ 26,2718,1 // Lunatic Brooch 26,2719,1 // Iron Wrist // jewels -27,718,1 // Garnet -27,719,1 // Amethyst -27,720,1 // Aquamarine -27,721,1 // Emerald -27,722,1 // Pearl -27,723,1 // Ruby -27,724,1 // Cursed Ruby -27,725,1 // Sardonyx -27,726,1 // Sapphire -27,727,1 // Opal -27,728,1 // Topaz -27,729,1 // Zircon -27,730,1 // 1carat Diamond -27,731,1 // 2carat Diamond -27,732,1 // 3carat Diamond -27,733,1 // Cracked Diamond +27,715,100 // Yellow_Gemstone +27,716,100 // Red_Gemstone +27,717,100 // Blue_Gemstone +27,718,10 // Dark_Red_Jewel +27,719,10 // Violet_Jewel +27,720,10 // Skyblue_Jewel +27,721,10 // Azure_Jewel +27,722,10 // Scarlet_Jewel +27,723,10 // Cardinal_Jewel +27,724,10 // Cardinal_Jewel_ +27,725,10 // Red_Jewel +27,726,10 // Blue_Jewel +27,727,10 // White_Jewel +27,728,10 // Golden_Jewel +27,729,10 // Bluish_Green_Jewel +27,730,5 // Crystal_Jewel +27,731,4 // Crystal_Jewel_ +27,732,3 // Crystal_Jewel__ +27,733,27 // Crystal_Jewel___ +27,746,50 // Glass_Bead // Egg Boy 32,514,300 // Grape 32,564,522 // Rice Ball diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt index 533fb50048..71462aa796 100644 --- a/db/mercenary_skill_db.txt +++ b/db/mercenary_skill_db.txt @@ -114,8 +114,29 @@ 6046,8201,10 //MS_BASH 6046,8206,1 //MS_BERSERK // Monster Mercenaries -// Wild Rose +// MIMIC +1191,8233,1 //MER_AUTOBERSERK +1191,8220,5 //ML_AUTOGUARD +1191,8201,5 //MS_BASH +// DISGUISE +1506,8223,2 //MER_QUICKEN +1506,8225,5 //MER_CRASH +1506,8236,3 //MER_LEXDIVINA +// ALICE +1275,8232,5 //MER_PROVOKE +1275,8202,5 //MS_MAGNUM +1275,8217,5 //ML_BRANDISH +1275,8226,1 //MER_REGAIN +// M_WILD_ROSE 1965,8201,5 //MS_BASH +// M_DOPPELGANGER +1966,8223,5 //MER_QUICKEN +1966,8201,5 //MS_BASH +1966,8221,3 //ML_DEVOTION +// M_YGNIZEM +1967,8223,5 //MER_QUICKEN +1967,8201,5 //MS_BASH +1967,8221,3 //ML_DEVOTION // M_GAMEMASTER 2000,8226,1 //MER_REGAIN 2000,8227,1 //MER_TENDER diff --git a/db/mob_branch.txt b/db/mob_branch.txt index 72ab913479..2f015d18b4 100644 --- a/db/mob_branch.txt +++ b/db/mob_branch.txt @@ -3,7 +3,7 @@ // Structure of Database: // MobID,DummyName,Rate -0,SCORPION,Scorpion,1001 +0,Scorpion,1001 1001,Scorpion,214285 1002,Poring,1000000 1004,Hornet,357142 diff --git a/db/mob_db.txt b/db/mob_db.txt index ffd97b473d..306da7c1e2 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -1121,13 +1121,13 @@ //2065,E_METALING,Metaling,Metaling,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2066,E_ANOPHELES,Anopheles,Anopheles,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2067,E_ANOPHELES_,Anopheles,Anopheles,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2068,BOITATA,Boitata,Boitata,93,1283990,0,74288,77950,2,1060,2022,32,66,140,99,30,109,100,90,10,12,2,2,63,0x37B5,200,1150,1150,288,37144,10000,0,0,0,0,0,0,7444,5000,985,1000,984,1000,607,500,1377,100,1422,100,1471,100,0,0,0,0,0,0 -2069,IARA,Iara,Iara,79,5890,0,1070,890,1,171,270,0,76,69,14,41,60,69,20,10,12,1,5,61,0x91,200,672,380,288,0,0,0,0,0,0,0,0,950,9000,951,500,747,100,748,50,710,10,995,5,2334,1,0,0,0,0,0,0 -2070,PIRANHA,Piranha,Piranha,75,4522,0,899,1023,1,182,223,7,12,69,45,30,30,66,35,10,12,2,5,61,0x3885,200,768,768,384,0,0,0,0,0,0,0,0,963,9000,956,600,1053,500,1054,500,995,5,1249,5,13027,1,0,0,0,0,0,0 -2071,HEADLESS_MULE,Headless Mule,Headless Mule,80,6620,0,1011,1120,1,210,267,33,44,68,51,50,35,67,20,10,12,2,6,63,0x3985,165,1216,816,432,0,0,0,0,0,0,0,0,7120,4000,7097,1000,7122,1000,2317,5,1255,2,1269,1,2317,1,0,0,0,0,0,0 -2072,JAGUAR,Jaguar,Jaguar,71,3914,0,720,512,1,192,234,44,15,69,30,45,5,59,5,10,12,1,2,42,0x3885,150,1250,580,360,0,0,0,0,0,0,0,0,7171,3000,7172,2000,919,1000,756,40,1810,1,0,0,0,0,0,0,0,0,0,0 -2073,TOUCAN,Toucan,Toucan,70,3640,0,659,544,1,166,201,12,12,54,14,40,35,44,10,10,12,1,2,44,0x3885,155,1450,960,480,0,0,0,0,0,0,0,0,917,3000,7053,1000,2612,200,508,100,510,50,0,0,0,0,0,0,0,0,0,0 -2074,CURUPIRA,Curupira,Curupira,68,3096,0,622,450,1,140,175,42,12,32,23,38,20,45,10,10,12,1,7,22,0x118B,250,530,530,384,0,0,0,0,0,0,0,0,517,3000,7267,500,757,250,1505,100,1011,10,0,0,0,0,0,0,0,0,0,0 +2068,BOITATA,Boitata,Boitata,93,1283990,0,74288,77950,2,1060,2022,7,36,140,99,30,109,100,90,10,12,2,0,63,0x37B5,200,1150,1150,288,37144,10000,0,0,0,0,0,0,7444,5000,985,1000,984,1000,607,500,1377,100,1422,100,1471,100,0,0,0,0,0,0 +2069,IARA,Iara,Iara,79,5890,0,1070,890,1,171,270,0,39,69,14,41,60,69,20,10,12,1,5,61,0x91,200,672,380,288,0,0,0,0,0,0,0,0,950,9000,951,500,747,100,748,50,710,10,995,5,2334,1,0,0,0,0,0,0 +2070,PIRANHA,Piranha,Piranha,75,4522,0,899,1023,1,182,223,2,10,69,45,30,30,66,35,10,12,1,5,61,0x3295,200,768,768,384,0,0,0,0,0,0,0,0,963,9000,956,600,1053,500,1054,500,995,5,1249,5,13027,1,0,0,0,0,0,0 +2071,HEADLESS_MULE,Headless Mule,Headless Mule,80,6620,0,1011,1120,1,210,267,7,27,68,51,50,35,67,20,10,12,2,6,63,0x3985,165,1216,816,432,0,0,0,0,0,0,0,0,7120,4000,7097,1000,7122,1000,2317,5,1255,2,1269,1,2317,1,0,0,0,0,0,0 +2072,JAGUAR,Jaguar,Jaguar,71,3914,0,720,512,1,192,234,9,12,69,30,45,5,59,5,10,12,1,2,42,0x3885,150,1250,580,360,0,0,0,0,0,0,0,0,7171,3000,7172,2000,919,1000,756,40,1810,1,0,0,0,0,0,0,0,0,0,0 +2073,TOUCAN,Toucan,Toucan,70,3640,0,659,544,1,166,201,3,10,54,14,40,35,44,10,10,12,0,2,44,0x3885,155,1450,960,480,0,0,0,0,0,0,0,0,917,3000,7053,1000,2612,200,508,100,510,50,0,0,0,0,0,0,0,0,0,0 +2074,CURUPIRA,Curupira,Curupira,68,3096,0,622,450,1,140,175,9,10,32,23,38,20,45,10,10,12,1,6,22,0x118B,250,530,530,384,0,0,0,0,0,0,0,0,517,3000,7267,500,757,250,1505,100,1011,10,0,0,0,0,0,0,0,0,0,0 //2075,E_VADON_X,Vadon,Vadon,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2076,S_WIND_GHOST,Wind Ghost,Wind Ghost,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2077,S_SKOGUL,Skogul,Skogul,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -1135,7 +1135,7 @@ //2079,CRYSTAL_H,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2080,CRYSTAL_L,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2081,E_HYDRA,Hydra,Hydra,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2082,G_PIRANHA,Piranha,Piranha,75,4522,0,0,0,1,182,223,7,12,69,45,30,30,66,35,10,12,1,5,61,0x3885,200,768,768,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +2082,G_PIRANHA,Piranha,Piranha,75,4522,0,0,0,1,182,223,2,10,69,45,30,30,66,35,10,12,1,5,61,0x3295,200,768,768,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2083,HORN_SCARABA,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2084,HORN_SCARABA2,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2085,ANTLER_SCARABA,Antler Scaraba,Antler Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/packet_db.txt b/db/packet_db.txt index a8f6404193..3be46cf4b4 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1452,9 +1452,9 @@ packet_ver: 25 //2009-12-22aRagexeRE 0x0802,18,bookingregreq,2:4:6 // Booking System -//0x0803,4 +0x0803,4 0x0804,8 // Booking System -//0x0805,-1 +0x0805,-1 0x0806,4,bookingdelreq,2 // Booking System //0x0807,2 0x0808,4 // Booking System @@ -1466,9 +1466,9 @@ packet_ver: 25 //2009-12-29aRagexeRE 0x0804,14,bookingsearchreq,2:4:6:8:12 // Booking System 0x0806,2,bookingdelreq,0 // Booking System -//0x0807,4 +0x0807,4 0x0808,14,bookingupdatereq,2 // Booking System -//0x0809,50 +0x0809,50 0x080A,18 0x080B,6 // Booking System @@ -1581,5 +1581,9 @@ packet_ver: 25 //2010-07-14aRagexeRE //0x841,4 +//2010-08-03aRagexeRE +0x0842,6,recall2,2 +0x0843,6,remove2,2 + //Add new packets here //packet_ver: 26 diff --git a/db/pet_db.txt b/db/pet_db.txt index ce2316c59a..8c69f4acb7 100644 --- a/db/pet_db.txt +++ b/db/pet_db.txt @@ -10,8 +10,8 @@ // 05. EggID Pet Egg ID. // 06. EquipID Pet Accessory ID. // 07. FoodID Pet Food ID. -// 08. Fullness The amount Hunger is decreased every [HungeyDelay] seconds. -// 09. HungeyDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds) +// 08. Fullness The amount Hunger is decreased every [HungryDelay] seconds. +// 09. HungryDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds) // 10. R_Hungry Amount of Intimacy that is increased when fed. // 11. R_Full Amount of Intimacy that is decreased when over-fed. // 12. Intimate Amount of Intimacy the pet starts with. @@ -20,6 +20,11 @@ // 15. Speed Pet's walk speed. (Defaul: 150) // 16. S_Performance Special Performance. (Yes = 1, No = 0) // 17. talk_convert_class Disables pet talk (instead of talking they emote with /!.) +// 18. attack_rate Rate of which the pet will attack (requires at least pet_support_min_friendly intimacy). +// 19. defence_attack_rate Rate of which the pet will retaliate when master is being attacked (requires at least pet_support_min_friendly intimacy). +// 20. change_target_rate Rate of which the pet will change its attack target. +// 21. pet_script Script to execute when the pet is hatched. +// 22. loyal_script Script to execute when the pet is hatched (requires at least pet_equip_min_friendly intimacy, independent of pet_script). //NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. //In theory you can use any valid script, but it is run only once upon pet diff --git a/db/pet_db2.txt b/db/pet_db2.txt new file mode 100644 index 0000000000..b414357133 --- /dev/null +++ b/db/pet_db2.txt @@ -0,0 +1,60 @@ +// Pet Additional Database - Custom Pets +// +// Structure of Database: +// MobID,Name,JName,LureID,EggID,EquipID,FoodID,Fullness,HungryDelay,R_Hungry,R_Full,Intimate,Die,Capture,Speed,S_Performance,talk_convert_class,attack_rate,defence_attack_rate,change_target_rate,pet_script,loyal_script +// +// 01. MobID Monster ID of the pet. +// 02. Name Name of the monster as defined in the database. +// 03. JName The display name of the monster when hatched. +// 04. LureID Pet Tame Item ID. +// 05. EggID Pet Egg ID. +// 06. EquipID Pet Accessory ID. +// 07. FoodID Pet Food ID. +// 08. Fullness The amount Hunger is decreased every [HungryDelay] seconds. +// 09. HungryDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds) +// 10. R_Hungry Amount of Intimacy that is increased when fed. +// 11. R_Full Amount of Intimacy that is decreased when over-fed. +// 12. Intimate Amount of Intimacy the pet starts with. +// 13. Die Amount of Intimacy that is decreased when the pet owner dies. +// 14. Capture Capture succes rate (10000 = 100%) +// 15. Speed Pet's walk speed. (Defaul: 150) +// 16. S_Performance Special Performance. (Yes = 1, No = 0) +// 17. talk_convert_class Disables pet talk (instead of talking they emote with /!.) +// 18. attack_rate Rate of which the pet will attack (requires at least pet_support_min_friendly intimacy). +// 19. defence_attack_rate Rate of which the pet will retaliate when master is being attacked (requires at least pet_support_min_friendly intimacy). +// 20. change_target_rate Rate of which the pet will change its attack target. +// 21. pet_script Script to execute when the pet is hatched. +// 22. loyal_script Script to execute when the pet is hatched (requires at least pet_equip_min_friendly intimacy, independent of pet_script). +//NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. + +//In theory you can use any valid script, but it is run only once upon pet +//loading, so it is recommended you use the specific pet scripts: + +//petskillattack skillid, skilllv, rate, bonusrate +//Skill attack that triggers while the pet is attacking. Rate is the base +//chance of execution per attack. Bonusrate is an additional success rate when +//intimacy reaches max. + +//petskillattack2 skillid, damage, hits, rate, bonusrate +//Same as petskillattack, but the damage and number of hits is fixed +//the damage specified is total, not per hit. + +//petskillsupport skillid, skilllv, delay, hp%, sp% +//Casts a support skill when the health levels are below the specified hp% and +//sp%. Delay is the minimum time in seconds before the skill can be cast again + +//petheal amount, delay, hp%, sp% +//Similar to petskillsupport, but the skill is fixed to heal (28) and the +//heal-amount is fixed to the value given. + +//petrecovery type, delay: Cures the "type" status effect after "delay" seconds + +//petskillbonus type, value, duration, delay +//Gives bonus stats. Type is the stat to increase (bStr, bLuk), value is the +//amount by which it is increased, duration signals how long the bonus lasts +//delay is the time elapsed after the bonus ends and before it starts again. + +//A single pet can have petloot, petskillbonus, petskillattack (or +//petskillattack2) and petskillsupport (or petheal) at the same time, +//but only one of each. + diff --git a/db/skill_tree.txt b/db/skill_tree.txt index 70ac495b8c..d64f1fef73 100644 --- a/db/skill_tree.txt +++ b/db/skill_tree.txt @@ -1,4 +1,4 @@ -//JobNo,Skill-ID,MaxLV,Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name# +//JobNo,Skill-ID,MaxLV{,JobLV},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name# //Novice 0,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill# 0,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid# @@ -853,7 +853,7 @@ 4008,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying# 4008,357,5,4,1,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration# 4008,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax# -4008,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra collumn after "MaxLevel" for Job Level 50 requeriment +4008,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement 4008,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce# 4008,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow# 4008,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike# @@ -1084,7 +1084,7 @@ 4014,356,10,3,10,6,5,60,3,0,0,0,0 //LK_PARRYING#Parrying# 4014,357,5,4,1,55,5,63,1,0,0,0,0 //LK_CONCENTRATION#Concentration# 4014,358,1,4,10,6,5,8,3,0,0,0,0 //LK_TENSIONRELAX#Relax# -4014,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //check this, the last ",0" shouldn't be needed I think +4014,359,1,50,0,0,0,0,0,0,0,0,0,0 //LK_BERSERK#Frenzy# //It has an extra column after "MaxLevel" for Job Level 50 requirement 4014,397,5,55,10,56,5,58,5,63,1,0,0 //LK_SPIRALPIERCE#Spiral Pierce# 4014,398,5,55,9,63,1,0,0,0,0,0,0 //LK_HEADCRUSH#Traumatic Blow# 4014,399,10,55,9,64,3,398,3,0,0,0,0 //LK_JOINTBEAT#Vital Strike# diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index 78e34f2fc8..3f25dc4c5d 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -3,7 +3,7 @@ //===== By ================================================ //= Developers //===== Version =========================================== -//= 1.1.20090524 +//= 1.1.20101205 //========================================================= //= 1.0 - Standardized doc file //= 1.1.20080612 - skill command and bonuses (bAutoSpell, bSkillAtk, @@ -13,6 +13,12 @@ //= 1.1.20090421 - added the correct bonus documentation for bSPDrainValue [Playtester] //= 1.1.20090524 - removed outdated bMatk/bMatk1/bMatk2 doc [ultramage] //= 1.1.20090529 - added documentation for bHealPower, bHealPower2 [Inkfish] +//= 1.1.20101130 - added documentation for bAutoSpellOnSkill [Ai4rei] +//= 1.1.20101205 - added documentation for bAddItemHealRate. [L0ne_W0lf] +//= 1.1.20101207 - added documentation for bUnbreakableGarment, +//= bUnbreakableWeapon, bUnbreakableArmor, bUnbreakableHelm, +//= bUnbreakableShield, bUnbreakableShoes, bBreakWeaponRate and +//= bBreakArmorRate. [Ai4rei] //===== Description ======================================= //= List of script instructions used in item bonuses, //= mainly bonus/bonus2/bonus3/bonus4/bonus5 arguments @@ -76,9 +82,7 @@ bonus bIgnoreDefRace,n; Disregard DEF against enemies of race n 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, 10=Boss monster, 11=Other than (normal monster) boss monster bonus bIgnoreDefEle,n; Disregard DEF against enemies of element n - n: 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, - 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, - 10=Boss monster, 11=Other than (normal monster) boss monster + n: 0=Neutral, 1=Water, 2=Earth, 3=Fire, 4=Wind, 5=Poison, 6=Holy, 7=Dark, 8=Spirit, 9=Undead bonus bIgnoreMDefRace; Disregard MDEF against enemies of race n n: 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, @@ -113,8 +117,8 @@ bonus bNoGemStone,n; Skills requiring Gemstones do no require them (Hocus Pocus will still require 1 Yellow Gemstone | n is meaningless) bonus bIntravision,n; Always see Hiding and Cloaking players/mobs (n is meaningless) -bonus bHealPower,n; Increase heal amount of all heal skills by n% (supports skill names) -bonus bHealPower2,n; Increase heal amount if you are healed by any skills by n% (supports skill names) +bonus bHealPower,n; Increase heal amount of all heal skills by n% +bonus bHealPower2,n; Increase heal amount if you are healed by any skills by n% bonus2 bAddEff,e,x; Adds a x/10000 chance to cause effect e to the target when attacking (e.g. x=100 makes 1% chance, x=10000 makes 100% chance, etc) e: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stan, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding bonus2 bResEff,e,x; Adds a x/10000 tolerance to effect e (e.g. x=100 makes 1% tolerance, x=10000 makes 100% tolerance, etc) @@ -159,7 +163,7 @@ bonus2 bIgnoreMdefRate,n,x; Disregard x% of the target's MDEF if the target bel bonus2 bHPDrainRate,n,x; n/10 % probability to drain x% HP when attacking bonus2 bSPDrainRate,n,x; n/10 % probability to drain x% SP when attacking bonus2 bSPVanishRate,n,x; Add the (n/10)% chance of decreasing enemy's SP (player) amount by x% when attacking -bonus2 bAddMonsterDropItem,n,x; When killing any monsters with physical attack, the probability which drops item n +x% (the item which the monster drops unrelated ones) +bonus2 bAddMonsterDropItem,n,x; Adds a x/100% chance for item n to be dropped, when killing any monster. if 'x' is negative value, then it's a part of formula chance = -x*(killed_mob_level/10)+1 bonus2 bGetZenyNum,n,x; When killing a monster, there is a x% chance of gaining 1~n zeny @@ -167,12 +171,12 @@ bonus2 bGetZenyNum,n,x; When killing a monster, there is a x% chance of gainin If n < 0, the max zeny to gain is -n*monster level. bonus2 bAddGetZenyNum,n,x; Same as bGetZenyNum, but the rates and zeny to gain stack. -bonus3 bAddMonsterDropItem,n,x,y; When killing monsters from race x with physical attack, the probability which drops item n +y% (the item which the monster drops unrelated ones) +bonus3 bAddMonsterDropItem,n,x,y; Adds a y/100% chance for item n to be dropped, when killing any monster of race x. 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, 10=Boss monster, 11=Other than (normal monster) boss monster - if 'x' is negative value, then it's a part of formula - chance = -x*(killed_mob_level/10)+1 + if 'y' is negative value, then it's a part of formula + chance = -y*(killed_mob_level/10)+1 bonus3 bAutoSpell,n,x,y; Auto Spell casting on attack of spell n at level x with y/10% chance. (supports skill names) Skill is casted on target unless it is a self or support (inf = 4/16) skill. @@ -186,15 +190,15 @@ bonus3 bAutoSpell,n,x,y; Auto Spell casting on attack of spell n at level x wit bonus bCritAtkRate,n; Increase critical damage by +n% bonus bNoRegen,n; Stops regeneration for n n: 1=HP, 2=SP -bonus bUnstripableWeapon,n; Weapon cannot be taken off via Strip skills -bonus bUnstripableArmor,n; Armor cannot be taken off via Strip skills -bonus bUnstripableHelm,n; Helm cannot be taken off via Strip skills -bonus bUnstripableShield,n; Shield cannot be taken off via Strip skills +bonus bUnstripableWeapon,n; Weapon cannot be taken off via Strip skills (n is meaningless) +bonus bUnstripableArmor,n; Armor cannot be taken off via Strip skills (n is meaningless) +bonus bUnstripableHelm,n; Helm cannot be taken off via Strip skills (n is meaningless) +bonus bUnstripableShield,n; Shield cannot be taken off via Strip skills (n is meaningless) bonus bSPGainValue,n; When killing a monster by physical attack, you gain n SP bonus bHPGainValue,n; When killing a monster by physical attack, you gain n HP bonus bIgnoreDefMob,n; Ignore monster's DEF when attacking. n: 0=All normal monster except Bosses, 1=All monsters -bonus2 bCriticalAddRace,n,r; Critical + n vs. enemies of race r +bonus2 bCriticalAddRace,r,n; Critical + n vs. enemies of race r r: 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, @@ -288,7 +292,7 @@ bonus2 bSPGainRace,n,x; When killing a monster of race n by physical attack ga bonus2 bSubRace2,n,x; Damage x% reduction from enemies of race n (Check db/mob_race2_db.txt) -bonus2 bAddMonsterDropItemGroup,n,x; x% chance to get an item of group type n when you kill a monster +bonus2 bAddMonsterDropItemGroup,n,x; Adds a x/100% chance to get an item of group type n when you kill a monster (Check db/item_group_db.txt) if 'x' is negative value, then it's a part of formula chance = -x*(killed_mob_level/10)+1 @@ -308,7 +312,7 @@ bonus3 bAddEffWhenHit,n,x,y; x/10000 chance to cause n state to the enemy when b ATF_SHORT: Trigger on melee attacks ATF_LONG: Trigger in ranged attacks (default: trigger on all attacks) -bonus3 bAddMonsterDropItemGroup,n,x,y; y% chance to get an item of group type n when you kill a +bonus3 bAddMonsterDropItemGroup,n,x,y; Adds a y/100% chance to get an item of group type n when you kill a monster of race x (Check db/item_group_db.txt) 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon, @@ -376,3 +380,18 @@ bonus3 bSubEle,n,x,t; x% Damage reduction against element n. i: 1=cast on enemy, not on self 2=use random skill lv in [1..y] 3=1+2 (random lv on enemy) +bonus4 bAutoSpellOnSkill,s,x,l,n Adds a n/10% chance to autospell skill x at level l when using skill s. (supports skill names) + Supportive spells are casted on self, others on target of skill s. +bonus5 bAutoSpellOnSkill,s,x,l,n,i Adds a n/10% chance to autospell skill x at level l when using skill s. (supports skill names) + i: Flags (bitfield) + &1: Forces the skill to be casted on self, rather than on the target of skill s. + &2: Random skill level between 1 and l is chosen. +bonus bAddItemHealRate,x; Increases HP recovered by x% for healing items. +bonus bUnbreakableGarment,n; Garment cannot be damaged/broken by any means (n is meaningless) +bonus bUnbreakableWeapon,n; Weapon cannot be damaged/broken by any means (n is meaningless) +bonus bUnbreakableArmor,n; Armor cannot be damaged/broken by any means (n is meaningless) +bonus bUnbreakableHelm,n; Helm cannot be damaged/broken by any means (n is meaningless) +bonus bUnbreakableShield,n; Shield cannot be damaged/broken by any means (n is meaningless) +bonus bUnbreakableShoes,n; Shoes cannot be damaged/broken by any means (n is meaningless) +bonus bBreakWeaponRate,n; Adds a n/100% chance to break enemy's weapon while attacking (stacks with other break chances). +bonus bBreakArmorRate,n; Adds a n/100% chance to break enemy's armor while attacking (stacks with other break chances). diff --git a/doc/item_db.txt b/doc/item_db.txt index 7f330e8c0d..51bcdf8e42 100644 --- a/doc/item_db.txt +++ b/doc/item_db.txt @@ -21,6 +21,8 @@ Type: 10 Ammo (Arrows/Bullets/etc) 11 Usable with delayed consumption (item is lost from inventory after selecting a target, for use with skills and pet lures) + 18 Another delayed consume that requires user confirmation before + using item. Buy: Default buying price. When not specified, becomes double the sell price. diff --git a/doc/mob_db_mode_list.txt b/doc/mob_db_mode_list.txt index 73f0b2e3a4..9fa403f1d2 100644 --- a/doc/mob_db_mode_list.txt +++ b/doc/mob_db_mode_list.txt @@ -104,6 +104,7 @@ Aegis/eA (description) 19: 0x3095 (aggro, change-target melee/chase, cast sensor idle) 20: 0x3295 (aggro, change-target melee/chase, cast sensor idle/chase) 21: 0x3695 (aggro, change-target melee/chase, cast sensor idle/chase, chase-change target) +25: 0x0001 (passive, can't attack) [Pet] 26: 0xB695 (aggro, change-target melee/chase, cast sensor idle/chase, chase-change target, random target) 27: 0x8084 (aggro, immobile, random target) diff --git a/doc/sample/npc_dynamic_shop.txt b/doc/sample/npc_dynamic_shop.txt index 1a1f174c9a..79d0c4fdbe 100644 --- a/doc/sample/npc_dynamic_shop.txt +++ b/doc/sample/npc_dynamic_shop.txt @@ -7,21 +7,22 @@ end; OnSellItem: for(set @i, 0; @i < getarraysize(@sold_nameid); set @i, @i + 1){ - if(countitem(@sold_nameid[@i]) < @sold_quantity[@i] && @sold_quantity[@i] <= 0){ + if(countitem(@sold_nameid[@i]) < @sold_quantity[@i] || @sold_quantity[@i] <= 0){ mes "omgh4x!"; close; } if(@sold_nameid[@i] == 501){ + delitem 501, @sold_quantity[@i]; set $@rpotsleft, $@rpotsleft + @sold_quantity[@i]; set Zeny, Zeny + @sold_quantity[@i]*20; - delitem 501, @sold_quantity[@i]; } else { if(@sold_nameid[@i] == 502){ + delitem 502, @sold_quantity[@i]; set $@opotsleft, $@opotsleft + @sold_quantity[@i]; set Zeny, Zeny + @sold_quantity[@i]*100; - delitem 502, @sold_quantity[@i]; } else { mes "Sorry, I don't need your items."; + close; } } } @@ -34,7 +35,7 @@ OnBuyItem: for(set @i, 0; @i < getarraysize(@bought_nameid); set @i, @i + 1){ if(@bought_quantity[@i] <= 0){ mes "omgh4x!"; - end; + close; } if(@bought_nameid[@i] == 501){ if(@bought_quantity[@i] > $@rpotsleft){ diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 29e9edee4d..383a3c301c 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -4,7 +4,7 @@ //= A reference manual for the eAthena scripting language. //= Commands are sorted depending on their functionality. //===== Version =========================================== -//= 3.28.20091119 +//= 3.34.20101217 //========================================================= //= 1.0 - First release, filled will as much info as I could //= remember or figure out, most likely there are errors, @@ -137,6 +137,22 @@ //= Added info on strcharinfo(3) [Skotlex] //= 3.29.20101123 //= Added 'pushpc' command. [Ai4rei] +//= 3.30.20101126 +//= Added 'setfont', 'mercenary_create', 'mercenary_heal', +//= 'mercenary_sc_start', 'mercenary_get_calls', 'mercenary_set_calls', +//= 'mercenary_get_faith' and 'mercenary_set_faith' commands. [Ai4rei] +//= 3.31.20101130 +//= Added 'progressbar' command. [Ai4rei] +//= 3.32.20101208 +//= Updated description for commands 'next', 'return', 'attachrid', +//= 'detachrid', 'itemskill', 'openstorage', 'skilleffect', 'donpcevent', +//= 'day', 'night', 'atoi', 'axtoi', 'jump_zero', 'getelementofarray', +//= 'changebase', 'kickwaitingroomall', 'cutin' and 'charcommand'. [Ai4rei] +//= 3.33.20101212 +//= Updated description of 'playBGM' and 'playBGMall' to reflect the actual +//= behavior. [Ai4rei] +//= 3.34.20101217 +//= Spellcheck. [Ai4rei] //========================================================= This document is a reference manual for all the scripting commands and functions @@ -219,7 +235,7 @@ Another configuration file option of relevance is: delnpc: -This will unload a specifiled script filename from memory, which, while +This will unload a specified script filename from memory, which, while seemingly useless, may sometimes be required. Whenever '//' is encountered in a line upon reading, everything beyond this on @@ -299,7 +315,7 @@ the database by adjoining the level after the name with a comma. eg: Event is a script event to be executed when the mob is killed. The event must be in the form "NPCName::OnEventName" to execute, and the event name label -should start with "On". As with all events, if the NPC is an on-touch npc, the +should start with "On". As with all events, if the NPC is an on-touch NPC, the player who triggers the script must be within 'trigger' range for the event to work. @@ -309,21 +325,21 @@ special ai mobs (which by default attack other monsters instead of players). You can add these, so using 10 will spawn small monsters that attack other mobs (if you specify both 2 and 4, the small version takes priority). -** Npc names +** NPC names -/!\ WARNING: this applies to warps, npcs, duplicates and shops /!\ +/!\ WARNING: this applies to warps, NPCs, duplicates and shops /!\ -Npc names are kinda special and are formatted this way: +NPC names are kinda special and are formatted this way: {::} -All npcs need to have a unique name that is used for identification purposes. -When you have to identify a npc by it's name, you should use . +All NPCs need to have a unique name that is used for identification purposes. +When you have to identify a NPC by it's name, you should use . If is not provided, use instead. The client has a special feature when displaying names: if the display name contains a '#' character, it hides that part of the name. -ex: if your npc is named 'Hunter#hunter1', it will be displayed as 'Hunter' +ex: if your NPC is named 'Hunter#hunter1', it will be displayed as 'Hunter' must be at most 24 characters in length. must be at most 24 characters in length. @@ -492,15 +508,16 @@ implemented (but NEVER documented by Lance. Shame on you...). Item and pet scripts -------------------- -Each item in the item database has two special fields - EquipScript and -UseScript. The first is script code run every time a character equips the item, +Each item in the item database has three special fields - Script , OnEquip_Script +and OnUnequip_Script. The first is script code run every time a character equips the item, with the RID of the equipping character. Every time they unequip an item, all temporary bonuses given by the script commands are cleared, and all the scripts are executed once again to rebuild them. This also happens in several other situations (like upon login) but the full list is currently unknown. -UseScript is a piece of script code run whenever the item is used by a character -by doubleclicking on it. +OnEquip_Script is a piece of script code run whenever the item is used by a character +by doubleclicking on it. OnUnequip_Script runs whenever the +equipment is unequip by a character Not all script commands work properly in the item scripts. Where commands and functions are known to be meant specifically for use in item scripts, they are @@ -519,7 +536,7 @@ Numbers Beside the common decimal numbers, which are nothing special whatsoever (though do not expect to use fractions, since ALL numbers are integer in this language), the script engine also handles hexadecimal numbers, which are otherwise -identical. Writing a number like '0x' will make it recognised as a +identical. Writing a number like '0x' will make it recognized as a hexadecimal value. Notice that 0x10 is equal to 16. Also notice that if you try to 'mes 0x10' it will print '16'. @@ -533,7 +550,7 @@ data. Variables are divided into and uniquely identified by the combination of: prefix - determines the scope and extent (or lifetime) of the variable -name - an identifier consisting of '_' and alfanumeric characters +name - an identifier consisting of '_' and alphanumeric characters postfix - determines the type of the variable: integer or string Scope can be: @@ -549,8 +566,10 @@ permanent - They still exist when the server resets. temporary - They cease to exist when the server resets. Prefix: scope and extent -nothing - A permanent variable attached to the character, the default - variable type. +nothing - A permanent variable attached to the character, the default variable + type. They are stored with all the account data in "save\athena.txt" + in TXT versions and in the SQL versions in the `global_reg_value` + table using type 3. "@" - A temporary variable attached to the character. SVN versions before 2094 revision and RC5 version will also treat 'l' as a temporary variable prefix, so beware of having variable @@ -562,8 +581,8 @@ nothing - A permanent variable attached to the character, the default This is important for scripts which are called with no RID attached, that is, not triggered by a specific character object. "." - A NPC variable. - They exist in the NPC and dissapear when the server restarts or the - npc is reloaded. Can be accessed from inside the NPC or by calling + They exist in the NPC and disappear when the server restarts or the + NPC is reloaded. Can be accessed from inside the NPC or by calling 'getvariableofnpc'. ".@" - A scope variable. They are unique to the instance and scope. Each instance has it's @@ -597,8 +616,8 @@ Examples: $name$ - permanent global string variable $@name - temporary global integer variable $@name$ - temporary global string variable - .name - npc integer variable - .name$ - npc string variable + .name - NPC integer variable + .name$ - NPC string variable .@name - scope integer variable .@name$ - scope string variable #name - permanent local account integer variable @@ -623,7 +642,7 @@ BaseLevel - Current base level SkillPoint - Amount of skill points remaining Class - Current job Upper - 1 if the character is an advanced job class. -Zeny - Current amount of zeny +Zeny - Current amount of Zeny Sex - Character's gender, 0 if female, 1 if male. Weight - The weight the character currently carries. MaxWeight - The maximum weight the character can carry. @@ -650,7 +669,7 @@ While these behave as variables, do not always expect to just set them - it is not certain whether this will work for all of them. Whenever there is a command or a function to set something, it's usually preferable to use that instead. The notable exception is Zeny, which you can and often will address directly - -setting it will make the character own this number of zeny. +setting it will make the character own this number of Zeny. If you try to set Zeny to a negative number, the script will be terminated with an error. Strings @@ -686,11 +705,11 @@ This will make @arrayofnumbers[100] equal to 10. Notice that index numbering always starts with 0. Arrays cannot hold more than 128 variables. (So the last one can't have a number higher than 127) -And array indices probably can't be negative. Nobody tested what happens when +And array indexes probably can't be negative. Nobody tested what happens when you try to get a negatively numbered variable from an array, but it's not going to be pretty. :) -Arrays can naturaly store strings: +Arrays can naturally store strings: @menulines$[0] is the 0th element of the @menulines$ array of strings. Notice the '$', normally denoting a string variable, before the square brackets that @@ -747,7 +766,7 @@ common mathematical operations or conditional operators + - will add two numbers. If you try to add two strings, the result will be a string glued together at the +. You can add a number to a string, and the result will be a string. No other math operators work with strings. -- - will subtract two numbers. +- - will subtract two numbers. * - will multiply two numbers. / - will divide two numbers. Note that this is an integer division, i.e. 7/2 is not equal 3.5, it's equal 3. @@ -807,18 +826,18 @@ Logical bitwise operators work only on numbers, and they are the following: The second mes command would display 4, which is the same as 16 / 2 = 8. 8 / 2 = 4. & - And. | - Or. - The bitwise operator AND (&) is used to test two values against eachother, + The bitwise operator AND (&) is used to test two values against each other, and results in setting bits which are active in both arguments. This can be used for a few things, but in eAthena this operator is usually used to - create bitmasks in scripts. + create bit-masks in scripts. The bitwise operator OR (|)sets to 1 a binary position if the binary position of one of the numbers is 1. This way a variable can hold several values we can check, - known as bitmaks. A variable currently can hold up to 32 bitmasks (from position 0 + known as bit-mask. A variable currently can hold up to 32 bit-masks (from position 0 to position 1). This is a cheap(skate) and easy way to avoid using arrays to store several checks that a player can have. - A bitmask basically is (ab)using the variables bits to set various options in + A bit-mask basically is (ab)using the variables bits to set various options in one variable. With the current limit if variables it is possible to store 32 different options in one variable (by using the bits on position 0 to 31). @@ -831,7 +850,7 @@ Logical bitwise operators work only on numbers, and they are the following: The & (AND) operator sets bits which are active (1) in both arguments, so in the example 1010 & 0010, only the 2^1 bit is active (1) in both. Resulting in the bit 0010, which is 2. - - Basic example of creating and using a bit mask: + - Basic example of creating and using a bit-mask: set @options,2|4|16; //(note: this is the same as 2+4+16, or 22) if (@options & 1) mes "Option 1 is activated"; if (@options & 2) mes "Option 2 is activated"; @@ -844,7 +863,7 @@ Logical bitwise operators work only on numbers, and they are the following: The bitwise operator XOR (eXclusive OR) sets a binary position to 0 if both numbers have the same value in the said position. On the other hand, it sets to 1 if they have different values in the said binary position. - This is another way of setting and unsetting bits in bitmasks. + This is another way of setting and unsetting bits in bit-masks. Example: - First let's set the quests that are currently in progress: @@ -860,10 +879,56 @@ Logical bitwise operators work only on numbers, and they are the following: if( inProgress&1 && isComplete ){ // this will unset the bit for quest 1 (inProgress has that bit set to 1) set inProgress,inProgress^1; - mes "Quest 1 complete!! You unlocked the secrets of the Xor dinasty, use them wisely."; + mes "Quest 1 complete!! You unlocked the secrets of the Xor dynasty, use them wisely."; close; } +Unary operators with only with a single number, which follows the operator, and +are following: + + - - Negation. + The sign of the number will be reversed. If the number was positive, it will + become negative and vice versa. + + Example: + set .@myvar,10; + mes "Negative 10 is "+(-.@myvar); + + ! - Logical Not. + Reverses the boolean result of an expression. True will become false and + false will become true. + + Example: + if(!callfunc("F_dosomething")) + { + mes "Doing something failed."; + close; + } + + ~ - Bitwise Not. + Reverses each bit in a number, also known as one's complement. Cleared bits + are set, and set bits are cleared. + + Example: + - Ensure, that quest 2 is disabled, while keeping all other active, if they are. + set inProgress,inProgress&(~2); // same as set inProgress,inProgress&0xfffffffd + +Ternary operators take three expressions (numbers, strings or boolean), and are +following: + + ?: - Conditional operator + Very useful e.g. to replace + + if(Sex) mes "..."; else mes "..."; + + clauses with simple + + mes "Welcome, " + (Sex?"Mr.":"Mrs.") + " " + strcharinfo(0); + + or to replace any other simple if-else clauses. It might be worth + mentioning that ?: has low priority and has to be enclosed with + parenthesis in most (if not all) cases. + Labels ------ @@ -912,12 +977,12 @@ done with @agitstart GM command or with 'AgitStart' script command. OnAgitEnd will do likewise for the end of WoE. OnAgitInit will run when castle data is loaded from the char-server by the map server. -No RID will be attached while any of the abovementioned labels are triggered, so +No RID will be attached while any of the above mentioned labels are triggered, so no character or account-based variables will be accessible, until you attach a RID with 'attachrid' (see below). -The above also applies to, the last three laels, the only difference is that -these labels are used exclusively for WoE SE, and are called independantly. +The above also applies to, the last three labels, the only difference is that +these labels are used exclusively for WoE SE, and are called independently. OnTouch: @@ -953,7 +1018,7 @@ OnPCLoadMapEvent: This special label will trigger once a player steps in a map marked with the 'loadevent' mapflag and attach its RID. The fact that this label requires a mapflag for it to work is because, otherwise, it'd be server-wide and trigger -everytime a player would change maps. Imagine the server load with 1,000 players +every time a player would change maps. Imagine the server load with 1,000 players (oh the pain...) Only the special labels which are not associated with any script command are @@ -963,7 +1028,7 @@ manner, but they are described with their associated commands. On