Index: char_athena.conf =================================================================== --- char_athena.conf (revision 17327) +++ char_athena.conf (working copy) @@ -5,23 +5,23 @@ // only as information/reference. // Server name, use alternative character such as ASCII 160 for spaces. // NOTE: Do not use spaces or any of these characters which are not allowed in // Windows filenames \/:*?"<>| // ... or else guild emblems won't work client-side! -server_name: rAthena +server_name: Cloud-Online // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters) -wisp_server_name: Server +wisp_server_name: Cloud // Login Server IP // The character server connects to the login server using this IP address. // NOTE: This is useful when you are running behind a firewall or are on // a machine with multiple interfaces. -//login_ip: 127.0.0.1 +login_ip: 5.39.83.217 // The character server listens on the interface with this IP address. // NOTE: This allows you to run multiple servers on multiple interfaces @@ -29,15 +29,15 @@ //bind_ip: 127.0.0.1 // Login Server Port -login_port: 6900 +login_port: 6924 // Character Server IP // The IP address which clients will use to connect. // Set this to what your server's public IP address is. -//char_ip: 127.0.0.1 +char_ip: 5.39.83.217 // Character Server Port -char_port: 6121 +char_port: 6124 //Time-stamp format which will be printed before all messages. //Can at most be 20 characters long. @@ -166,7 +166,7 @@ // NOTE: Requires client 2011-03-09aragexeRE or newer. // A window is opened before you can select your character and you will have to enter a pincode by using only your mouse. // Default: yes -pincode_enabled: yes +pincode_enabled: no // How often does a user have to change his pincode? // 0: never (default) Index: map_athena.conf =================================================================== --- map_athena.conf (revision 17327) +++ map_athena.conf (working copy) @@ -10,14 +10,14 @@ // Character Server IP // The map server connects to the character server using this IP address. // NOTE: This is useful when you are running behind a firewall or are on // a machine with multiple interfaces. -//char_ip: 127.0.0.1 +char_ip: 5.39.83.217 // The map server listens on the interface with this IP address. // NOTE: This allows you to run multiple servers on multiple interfaces @@ -25,15 +25,15 @@ //bind_ip: 127.0.0.1 // Character Server Port -char_port: 6121 +char_port: 6124 // Map Server IP // The IP address which clients will use to connect. // Set this to what your server's public IP address is. -//map_ip: 127.0.0.1 +map_ip: 5.39.83.217 // Map Server Port -map_port: 5121 +map_port: 5124 //Time-stamp format which will be printed before all messages. //Can at most be 20 characters long. Property changes on: map_athena.conf ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /branches/renewal/conf/map_athena.conf:r14415-15057 Reverse-merged /branches/goodbye_txt/conf/map_athena.conf:r15236,15294,15399,15485,15496,15499-15501 Index: log_athena.conf =================================================================== --- log_athena.conf (revision 17327) +++ log_athena.conf (working copy) @@ -63,10 +63,10 @@ log_filter: 1 // Log Items which Refine >= refine_items_log -refine_items_log: 5 +refine_items_log: 7 // Log Items whith min drop rate <= rare_items_log // 1 = 0.01%, 100 = 1% drop chance, etc -rare_items_log: 100 +rare_items_log: 500 // don't log it if the current item buy price < price_items_log price_items_log: 1000 // don't log it if the current item amount < amount_items_log @@ -111,7 +111,7 @@ // log_chat: 5 = logs both Whisper & Party messages // log_chat: 8 = logs only Guild messages // log_chat: 31 = logs everything -log_chat: 0 +log_chat: 31 // Disable chat logging when WoE is running? (Note 1) log_chat_woe_disable: no Index: groups.conf =================================================================== --- groups.conf (revision 17327) +++ groups.conf (working copy) @@ -86,7 +86,33 @@ level: 0 inherit: ( /*empty list*/ ) commands: { - /* no commands by default */ + commands: true + charcommands: true + channel: true + help: true + rates: true + showdelay: true + exp: true + mobinfo: true + iteminfo: true + whodrops: true + time: true + jailtime: true + hominfo: true + homstats: true + showexp: true + showzeny: true + whereis: true + /* feature commands */ + refresh: true + noask: true + noks: true + autoloot: true + alootid: true + autotrade: true + request: true + go: true + breakguild: true } permissions: { /* without this basic permissions regular players could not @@ -221,9 +247,17 @@ { id: 10 name: "Law Enforcement" - inherit: ( "Support" ) + inherit: ( /*empty list*/ ) level: 2 commands: { + monster: true + monstersmall: true + monsterbig: true + killmonster2: true + cleanarea: true + cleanmap: true + item: [true, true] + zeny: [true, true] hide: true follow: true kick: true @@ -234,8 +268,6 @@ warp: true kill: true recall: true - ban: true - block: true jail: true jailfor: true mute: true Index: mapflag/nomemo.txt =================================================================== --- mapflag/nomemo.txt (revision 17327) +++ mapflag/nomemo.txt (working copy) @@ -622,6 +622,10 @@ p_track01 mapflag nomemo p_track02 mapflag nomemo +// Poring War ==================== +poring_w01 mapflag nomemo +poring_w02 mapflag nomemo + //Vision of Okolnir ========== que_qsch01 mapflag nomemo que_qsch02 mapflag nomemo @@ -772,11 +776,94 @@ 1@nyd mapflag nomemo 2@nyd mapflag nomemo +// 13.3 El Discastes +dic_in01 mapflag nomemo +dic_dun01 mapflag nomemo +dic_dun02 mapflag nomemo +job3_gen01 mapflag nomemo +job3_sha01 mapflag nomemo + //evt_zombie mapflag nomemo + +// 14.1 Bifrost +1@mist mapflag nomemo -// Poring War ==================== -poring_w01 mapflag nomemo -poring_w02 mapflag nomemo +// Dewata Maps +dewata mapflag nomemo +dew_in01 mapflag nomemo +dew_dun01 mapflag nomemo +dew_dun02 mapflag nomemo + +// Malangdo Maps +mal_in01 mapflag nomemo +mal_in02 mapflag nomemo +mal_dun01 mapflag nomemo +1@pump mapflag nomemo +2@pump mapflag nomemo +1@cash mapflag nomemo + +// Undersea Tunnel Expansion +iz_dun05 mapflag nomemo + +dic_dun03 mapflag nomemo + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag nomemo +lhz_dun04 mapflag nomemo +que_lhz mapflag nomemo + +// Port Malaya +job_ko mapflag nomemo +ma_scene01 mapflag nomemo +1@ma_b mapflag nomemo +1@ma_c mapflag nomemo +1@ma_h mapflag nomemo +ma_in01 mapflag nomemo +ma_dun01 mapflag nomemo +ma_zif01 mapflag nomemo +ma_zif02 mapflag nomemo +ma_zif03 mapflag nomemo +ma_zif04 mapflag nomemo +ma_zif05 mapflag nomemo +ma_zif06 mapflag nomemo +ma_zif07 mapflag nomemo +ma_zif08 mapflag nomemo +ma_zif09 mapflag nomemo + +// 14.2 Eclage +ecl_tdun01 mapflag nomemo +ecl_tdun02 mapflag nomemo +ecl_tdun03 mapflag nomemo +ecl_tdun04 mapflag nomemo +que_avan01 mapflag nomemo +1@ecl mapflag nomemo +ecl_in01 mapflag nomemo +ecl_in02 mapflag nomemo +ecl_in03 mapflag nomemo +ecl_in04 mapflag nomemo +ecl_hub01 mapflag nomemo + +// Pyramids Basement Nightmare Mode +moc_prydn1 mapflag nomemo +moc_prydn2 mapflag nomemo + +// Glast Heim Memorial Dungeon / Nightmare Mode +1@gl_k mapflag nomemo +2@gl_k mapflag nomemo +gl_chyard_ mapflag nomemo +gl_cas02_ mapflag nomemo + +// Wave Mode Memorial Dungeon +1@def01 mapflag nomemo +1@def02 mapflag nomemo +1@def03 mapflag nomemo + +// Heroes' Trails - Part 1 +1@gef mapflag nomemo +1@face mapflag nomemo +1@sara mapflag nomemo +1@gef_in mapflag nomemo +dali mapflag nomemo // Bossnia (custom) ============== bossnia_01 mapflag nomemo Index: mapflag/nobranch.txt =================================================================== --- mapflag/nobranch.txt (revision 17327) +++ mapflag/nobranch.txt (working copy) @@ -211,7 +211,7 @@ pvp_2vs2 mapflag nobranch pvp_c_room mapflag nobranch quiz_00 mapflag nobranch -quiz_01 mapflag nobranch +//quiz_01 mapflag nobranch sec_in01 mapflag nobranch //hunter_1-1 mapflag nobranch //hunter_2-1 mapflag nobranch @@ -353,6 +353,8 @@ dicastes02 mapflag nobranch dic_in01 mapflag nobranch s_atelier mapflag nobranch +job3_gen01 mapflag nobranch +job3_sha01 mapflag nobranch // Episode 14.1 & Dewata =========== mora mapflag nobranch @@ -360,6 +362,9 @@ dewata mapflag nobranch dew_in01 mapflag nobranch +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +que_lhz mapflag nobranch + // Episode Zero & Malaya Port =========== malangdo mapflag nobranch mal_in01 mapflag nobranch @@ -369,11 +374,21 @@ 2@pump mapflag nobranch 1@lhz mapflag nobranch malaya mapflag nobranch +job_ko mapflag nobranch ma_scene01 mapflag nobranch ma_in01 mapflag nobranch 1@ma_h mapflag nobranch 1@ma_c mapflag nobranch 1@ma_b mapflag nobranch +ma_zif01 mapflag nobranch +ma_zif02 mapflag nobranch +ma_zif03 mapflag nobranch +ma_zif04 mapflag nobranch +ma_zif05 mapflag nobranch +ma_zif06 mapflag nobranch +ma_zif07 mapflag nobranch +ma_zif08 mapflag nobranch +ma_zif09 mapflag nobranch // Episode 14.2 =========== eclage mapflag nobranch @@ -383,6 +398,7 @@ ecl_in04 mapflag nobranch 1@ecl mapflag nobranch ecl_hub01 mapflag nobranch +que_avan01 mapflag nobranch //evt_zombie mapflag nobranch Index: mapflag/noteleport.txt =================================================================== --- mapflag/noteleport.txt (revision 17327) +++ mapflag/noteleport.txt (working copy) @@ -323,6 +323,11 @@ p_track01 mapflag noteleport p_track02 mapflag noteleport +// Poring War ==================== +poring_w01 mapflag noteleport +poring_w02 mapflag noteleport +poring_w02 mapflag monster_noteleport + //Vision of Okolnir ============== que_qsch01 mapflag noteleport que_qsch01 mapflag monster_noteleport @@ -445,9 +450,89 @@ 2@nyd mapflag noteleport 2@nyd mapflag monster_noteleport +// 13.3 El Discastes +dic_in01 mapflag noteleport +job3_gen01 mapflag noteleport +job3_sha01 mapflag noteleport + //evt_zombie mapflag noteleport -// Poring War ==================== -poring_w01 mapflag noteleport -poring_w02 mapflag noteleport -poring_w02 mapflag monster_noteleport +// 14.1 Bifrost +1@mist mapflag noteleport +1@mist mapflag monster_noteleport + +// Dewata Maps +dew_in01 mapflag noteleport + +// Malangdo Maps +mal_in01 mapflag noteleport +mal_in02 mapflag noteleport +1@pump mapflag noteleport +1@pump mapflag monster_noteleport +2@pump mapflag noteleport +2@pump mapflag monster_noteleport +1@cash mapflag noteleport +1@cash mapflag monster_noteleport + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag noteleport +1@lhz mapflag monster_noteleport +que_lhz mapflag noteleport + +// Port Malaya +job_ko mapflag noteleport +ma_scene01 mapflag noteleport +1@ma_b mapflag noteleport +1@ma_b mapflag monster_noteleport +1@ma_c mapflag noteleport +1@ma_c mapflag monster_noteleport +1@ma_h mapflag noteleport +1@ma_h mapflag monster_noteleport +ma_in01 mapflag noteleport +ma_zif01 mapflag noteleport +ma_zif02 mapflag noteleport +ma_zif03 mapflag noteleport +ma_zif04 mapflag noteleport +ma_zif05 mapflag noteleport +ma_zif06 mapflag noteleport +ma_zif07 mapflag noteleport +ma_zif08 mapflag noteleport +ma_zif09 mapflag noteleport + +// 14.2 Eclage +1@ecl mapflag noteleport +1@ecl mapflag monster_noteleport +ecl_in01 mapflag noteleport +ecl_in02 mapflag noteleport +ecl_in03 mapflag noteleport +ecl_in04 mapflag noteleport +ecl_hub01 mapflag noteleport + +// Glast Heim Memorial Dungeon / Nightmare Mode +1@gl_k mapflag noteleport +1@gl_k mapflag monster_noteleport +2@gl_k mapflag noteleport +2@gl_k mapflag monster_noteleport +gl_chyard_ mapflag noteleport +gl_cas02_ mapflag noteleport + +// Wave Mode Memorial Dungeon +1@def01 mapflag noteleport +1@def01 mapflag monster_noteleport +1@def02 mapflag noteleport +1@def02 mapflag monster_noteleport +1@def03 mapflag noteleport +1@def03 mapflag monster_noteleport + +// Heroes' Trails - Part 1 +1@gef mapflag noteleport +1@gef mapflag monster_noteleport +1@face mapflag noteleport +1@face mapflag monster_noteleport +1@sara mapflag noteleport +1@sara mapflag monster_noteleport +1@gef_in mapflag noteleport +1@gef_in mapflag monster_noteleport +dali mapflag noteleport + +quiz_01 mapflag noteleport \ No newline at end of file Index: mapflag/nopenalty.txt =================================================================== --- mapflag/nopenalty.txt (revision 17327) +++ mapflag/nopenalty.txt (working copy) @@ -292,6 +292,9 @@ p_track01 mapflag nopenalty p_track02 mapflag nopenalty +// Poring War ================== +poring_w02 mapflag nopenalty + //Vision of Okolnir ============= que_qsch01 mapflag nopenalty que_qsch02 mapflag nopenalty @@ -314,7 +317,45 @@ bat_a01 mapflag nopenalty bat_a02 mapflag nopenalty +// 13.3 El Discastes +dicastes01 mapflag nopenalty +dicastes02 mapflag nopenalty +dic_in01 mapflag nopenalty + //evt_zombie mapflag nopenalty - -// Poring War ================== -poring_w02 mapflag nopenalty + +// 14.1 Bifrost +mora mapflag nopenalty + +// Dewata Maps +dewata mapflag nopenalty +dew_in01 mapflag nopenalty + +// Malangdo Maps +malangdo mapflag nopenalty +mal_in01 mapflag nopenalty +mal_in02 mapflag nopenalty + +// Port Malaya +malaya mapflag nopenalty +job_ko mapflag nopenalty +ma_scene01 mapflag nopenalty +ma_in01 mapflag nopenalty +ma_zif01 mapflag nopenalty +ma_zif02 mapflag nopenalty +ma_zif03 mapflag nopenalty +ma_zif04 mapflag nopenalty +ma_zif05 mapflag nopenalty +ma_zif06 mapflag nopenalty +ma_zif07 mapflag nopenalty +ma_zif08 mapflag nopenalty +ma_zif09 mapflag nopenalty + +// 14.2 Eclage +eclage mapflag nopenalty +que_avan01 mapflag nopenalty +ecl_in01 mapflag nopenalty +ecl_in02 mapflag nopenalty +ecl_in03 mapflag nopenalty +ecl_in04 mapflag nopenalty +ecl_hub01 mapflag nopenalty \ No newline at end of file Index: mapflag/nowarpto.txt =================================================================== --- mapflag/nowarpto.txt (revision 17327) +++ mapflag/nowarpto.txt (working copy) @@ -82,6 +82,10 @@ p_track01 mapflag nowarpto p_track02 mapflag nowarpto +// Poring War ==================== +poring_w01 mapflag nowarpto +poring_w02 mapflag nowarpto + //Vision of Okolnir ============ que_qsch01 mapflag nowarpto que_qsch02 mapflag nowarpto @@ -147,10 +151,93 @@ 1@nyd mapflag nowarpto 2@nyd mapflag nowarpto -// Poring War ==================== -poring_w01 mapflag nowarpto -poring_w02 mapflag nowarpto +// 13.3 El Discastes +dicastes01 mapflag nowarpto +dicastes02 mapflag nowarpto +dic_in01 mapflag nowarpto +dic_fild01 mapflag nowarpto +dic_fild02 mapflag nowarpto +dic_dun01 mapflag nowarpto +dic_dun02 mapflag nowarpto +job3_gen01 mapflag nowarpto +job3_sha01 mapflag nowarpto + +// 14.1 Bifrost +mora mapflag nowarpto +bif_fild01 mapflag nowarpto +bif_fild02 mapflag nowarpto +1@mist mapflag nowarpto + +que_house_s mapflag nowarpto +// Malangdo Maps +1@pump mapflag nowarpto +2@pump mapflag nowarpto +1@cash mapflag nowarpto + +// Undersea Tunnel Expansion +iz_dun05 mapflag nowarpto + +dic_dun03 mapflag nowarpto + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag nowarpto +lhz_dun04 mapflag nowarpto +que_lhz mapflag nowarpto + +// Port Malaya +job_ko mapflag nowarpto +ma_scene01 mapflag nowarpto +1@ma_b mapflag nowarpto +1@ma_c mapflag nowarpto +1@ma_h mapflag nowarpto +ma_zif01 mapflag nowarpto +ma_zif02 mapflag nowarpto +ma_zif03 mapflag nowarpto +ma_zif04 mapflag nowarpto +ma_zif05 mapflag nowarpto +ma_zif06 mapflag nowarpto +ma_zif07 mapflag nowarpto +ma_zif08 mapflag nowarpto +ma_zif09 mapflag nowarpto + +// 14.2 Eclage +eclage mapflag nowarpto +ecl_fild01 mapflag nowarpto +ecl_tdun01 mapflag nowarpto +ecl_tdun02 mapflag nowarpto +ecl_tdun03 mapflag nowarpto +ecl_tdun04 mapflag nowarpto +que_avan01 mapflag nowarpto +1@ecl mapflag nowarpto +ecl_in01 mapflag nowarpto +ecl_in02 mapflag nowarpto +ecl_in03 mapflag nowarpto +ecl_in04 mapflag nowarpto +ecl_hub01 mapflag nowarpto + +// Pyramids Basement Nightmare Mode +moc_prydn1 mapflag nowarpto +moc_prydn2 mapflag nowarpto + +// Glast Heim Memorial Dungeon / Nightmare Mode +1@gl_k mapflag nowarpto +2@gl_k mapflag nowarpto +gl_chyard_ mapflag nowarpto +gl_cas02_ mapflag nowarpto + +// Wave Mode Memorial Dungeon +1@def01 mapflag nowarpto +1@def02 mapflag nowarpto +1@def03 mapflag nowarpto + +// Heroes' Trails - Part 1 +1@gef mapflag nowarpto +1@face mapflag nowarpto +1@sara mapflag nowarpto +1@gef_in mapflag nowarpto +dali mapflag nowarpto + // Bossnia (custom) ============== bossnia_01 mapflag nowarpto bossnia_02 mapflag nowarpto Index: mapflag/gvg.txt =================================================================== --- mapflag/gvg.txt (revision 17327) +++ mapflag/gvg.txt (working copy) @@ -88,7 +88,7 @@ //arug_cas05 mapflag monster_noteleport // Novice Guild Castles === -//n_castle mapflag gvg_castle +n_castle mapflag gvg_castle nguild_alde mapflag gvg_castle nguild_gef mapflag gvg_castle nguild_pay mapflag gvg_castle Index: mapflag/novending.txt =================================================================== --- mapflag/novending.txt (revision 17327) +++ mapflag/novending.txt (working copy) @@ -14,3 +14,31 @@ //prontera mapflag novending //prt_in mapflag novending + +prontera mapflag novending +izlude mapflag novending +moc_ruins mapflag novending +geffen mapflag novending +pay_arche mapflag novending +alberta mapflag novending +aldebaran mapflag novending +yuno mapflag novending +lighthalzen mapflag novending +einbroch mapflag novending +einbech mapflag novending +comodo mapflag novending +umbala mapflag novending +amatsu mapflag novending +gonryun mapflag novending +ayothaya mapflag novending +louyang mapflag novending +hugel mapflag novending +rachel mapflag novending +veins mapflag novending +brasilis mapflag novending +dicastes01 mapflag novending +mora mapflag novending +dewata mapflag novending +malangdo mapflag novending +malaya mapflag novending +eclage mapflag novending \ No newline at end of file Index: mapflag/nosave.txt =================================================================== --- mapflag/nosave.txt (revision 17327) +++ mapflag/nosave.txt (working copy) @@ -248,6 +248,10 @@ p_track01 mapflag nosave SavePoint p_track02 mapflag nosave SavePoint +// Poring War ==================== +poring_w01 mapflag nosave SavePoint +poring_w02 mapflag nosave SavePoint + //Vision of Okolnir =========================== que_qsch01 mapflag nosave SavePoint que_qsch02 mapflag nosave SavePoint @@ -325,8 +329,57 @@ // Inside Eclage =========== 1@ecl mapflag nosave SavePoint +//13.3 El Discastes +job3_gen01 mapflag nosave SavePoint +job3_sha01 mapflag nosave SavePoint + //evt_zombie mapflag nosave SavePoint -// Poring War ==================== -poring_w01 mapflag nosave SavePoint -poring_w02 mapflag nosave SavePoint +// 14.1 Bifrost +1@mist mapflag nosave SavePoint + +// Malangdo Maps +1@pump mapflag nosave SavePoint +2@pump mapflag nosave SavePoint +1@cash mapflag nosave SavePoint + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag nosave SavePoint +que_lhz mapflag nosave SavePoint + +// Port Malaya +job_ko mapflag nosave SavePoint +1@ma_b mapflag nosave SavePoint +1@ma_c mapflag nosave SavePoint +1@ma_h mapflag nosave SavePoint +ma_zif01 mapflag nosave SavePoint +ma_zif02 mapflag nosave SavePoint +ma_zif03 mapflag nosave SavePoint +ma_zif04 mapflag nosave SavePoint +ma_zif05 mapflag nosave SavePoint +ma_zif06 mapflag nosave SavePoint +ma_zif07 mapflag nosave SavePoint +ma_zif08 mapflag nosave SavePoint +ma_zif09 mapflag nosave SavePoint + +// 14.2 Eclage +que_avan01 mapflag nosave SavePoint +1@ecl mapflag nosave SavePoint + +// Glast Heim Memorial Dungeon / Nightmare Mode +1@gl_k mapflag nosave SavePoint +2@gl_k mapflag nosave SavePoint + +evt_bomb mapflag nosave SavePoint + +// Wave Mode Memorial Dungeon +1@def01 mapflag nosave SavePoint +1@def02 mapflag nosave SavePoint +1@def03 mapflag nosave SavePoint + +// Heroes' Trails - Part 1 +1@gef mapflag nosave SavePoint +1@face mapflag nosave SavePoint +1@sara mapflag nosave SavePoint +1@gef_in mapflag nosave SavePoint +dali mapflag nosave SavePoint Index: mapflag/nopvp.txt =================================================================== --- mapflag/nopvp.txt (revision 17327) +++ mapflag/nopvp.txt (working copy) @@ -176,4 +176,75 @@ ecl_in04 mapflag pvp off ecl_hub01 mapflag pvp off +// 13.3 El Discastes +dicastes01 mapflag pvp off +dicastes02 mapflag pvp off +dic_in01 mapflag pvp off +job3_gen01 mapflag pvp off +job3_sha01 mapflag pvp off + //evt_zombie mapflag pvp off + +// 14.1 Bifrost +mora mapflag pvp off +1@mist mapflag pvp off + +// Dewata Maps +dewata mapflag pvp off +dew_in01 mapflag pvp off + +// Malangdo Maps +malangdo mapflag pvp off +mal_in01 mapflag pvp off +mal_in02 mapflag pvp off +1@pump mapflag pvp off +2@pump mapflag pvp off +1@cash mapflag pvp off + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag pvp off +que_lhz mapflag pvp off + +// Port Malaya +malaya mapflag pvp off +job_ko mapflag pvp off +ma_scene01 mapflag pvp off +1@ma_b mapflag pvp off +1@ma_c mapflag pvp off +1@ma_h mapflag pvp off +ma_in01 mapflag pvp off +ma_zif01 mapflag pvp off +ma_zif02 mapflag pvp off +ma_zif03 mapflag pvp off +ma_zif04 mapflag pvp off +ma_zif05 mapflag pvp off +ma_zif06 mapflag pvp off +ma_zif07 mapflag pvp off +ma_zif08 mapflag pvp off +ma_zif09 mapflag pvp off + +// 14.2 Eclage +eclage mapflag pvp off +que_avan01 mapflag pvp off +1@ecl mapflag pvp off +ecl_in01 mapflag pvp off +ecl_in02 mapflag pvp off +ecl_in03 mapflag pvp off +ecl_in04 mapflag pvp off +ecl_hub01 mapflag pvp off + +// Glast Heim Memorial Dungeon +1@gl_k mapflag pvp off +2@gl_k mapflag pvp off + +// Wave Mode Memorial Dungeon +1@def01 mapflag pvp off +1@def02 mapflag pvp off +1@def03 mapflag pvp off + +// Heroes' Trails - Part 1 +1@gef mapflag pvp off +1@face mapflag pvp off +1@sara mapflag pvp off +1@gef_in mapflag pvp off +dali mapflag pvp off Index: mapflag/partylock.txt =================================================================== --- mapflag/partylock.txt (revision 17327) +++ mapflag/partylock.txt (working copy) @@ -55,5 +55,36 @@ // Bakonawa Hideout =========== 1@ma_b mapflag partylock +// 14.1 Bifrost +1@mist mapflag partylock + // Inside Eclage =========== 1@ecl mapflag partylock + +// Glast Heim Memorial Dungeon / Nightmare Mode +1@gl_k mapflag partylock +2@gl_k mapflag partylock + +// Malangdo Maps +1@pump mapflag partylock +2@pump mapflag partylock +1@cash mapflag partylock + +// Lighthalzen Dungeon F4, Wolfchev's Laboratory +1@lhz mapflag partylock + +//Port Malaya +1@ma_b mapflag partylock +1@ma_c mapflag partylock +1@ma_h mapflag partylock + +// Wave Mode Memorial Dungeon +1@def01 mapflag partylock +1@def02 mapflag partylock +1@def03 mapflag partylock + +// Heroes' Trails - Part 1 +1@gef mapflag partylock +1@face mapflag partylock +1@sara mapflag partylock +1@gef_in mapflag partylock Index: mapflag/noloot.txt =================================================================== --- mapflag/noloot.txt (revision 17327) +++ mapflag/noloot.txt (working copy) @@ -24,3 +24,46 @@ //job_star mapflag noloot //que_ng mapflag noloot //job_thief1 mapflag noloot + + //===== rAthena Script ======================================= +//= Mapflag: nodrop. +//===== By: ================================================== +//= Epoque +//===== Current Version: ===================================== +//= 1.0a +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Designates a map as a nodrop, granting mailbox access. +//===== Additional Comments: ================================= +//= 1.0 - Initial script. +//============================================================ + +prontera mapflag nodrop +izlude mapflag nodrop +moc_ruins mapflag nodrop +geffen mapflag nodrop +payon mapflag nodrop +pay_arche mapflag nodrop +alberta mapflag nodrop +aldebaran mapflag nodrop +yuno mapflag nodrop +lighthalzen mapflag nodrop +einbroch mapflag nodrop +einbech mapflag nodrop +comodo mapflag nodrop +umbala mapflag nodrop +amatsu mapflag nodrop +gonryun mapflag nodrop +ayothaya mapflag nodrop +louyang mapflag nodrop +hugel mapflag nodrop +rachel mapflag nodrop +veins mapflag nodrop +brasilis mapflag nodrop +dicastes01 mapflag nodrop +mora mapflag nodrop +dewata mapflag nodrop +malangdo mapflag nodrop +malaya mapflag nodrop +eclage mapflag nodrop Index: packet_athena.conf =================================================================== --- packet_athena.conf (revision 17327) +++ packet_athena.conf (working copy) @@ -58,7 +58,7 @@ // The time interval after which the threat of DDoS is assumed to be gone. (msec) // After this amount of time, the DDoS restrictions are lifted. // (default is 600000 msecs, 10 minutes) -ddos_autoreset: 600000 +ddos_autoreset: 1800000 import: conf/import/packet_conf.txt Index: motd.txt =================================================================== --- motd.txt (revision 17327) +++ motd.txt (working copy) @@ -1,2 +1,2 @@ // Internal default is limited to 128 lines. If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c -Welcome to rAthena SVN! Enjoy! Please report any bugs you find. +Bienvenue et bon jeu sur Cloud-Online Index: msg_conf/map_msg.conf =================================================================== --- msg_conf/map_msg.conf (revision 17327) +++ msg_conf/map_msg.conf (working copy) @@ -653,6 +653,18 @@ 694: Hanbok +// Extended Vending system [Lilith] +700: You do not have enough CashPoint +701: You do not have enough items +702: Seller has not enough space in your inventory +703: Seller can not take all the item +704: You have selected: %s +705: You've opened %s's shop. Sale is carried out: %s +706: Current Currency: %s +707: %s has bought '%s' in the amount of %d. Revenue: %d %s +708: Full revenue from %s is %d %s + + //------------------------------------ // More atcommands message //------------------------------------ Index: msg_conf/map_msg_frn.conf =================================================================== --- msg_conf/map_msg_frn.conf (revision 17327) +++ msg_conf/map_msg_frn.conf (working copy) @@ -651,6 +651,16 @@ 693: Shadow Chaser T 694: Hanbok +// Extended Vending system [Lilith] +700: Vous n'avez pas assez de cash point +701: Vous n'avez pas assez d'objet +702: Le vendeur n'a pas assez d'espace dans son inventaire +703: Le vendeur ne peut pas porter tout ces objets +704: Vous avez sélectionné : %s +705: Vous avez ouvert le shop de %s. Monnaie : %s +706: Monnaie courante: %s +707: %s acheté '%s'. Nombre %d. Montant: %d %s +708: Le revenue total de la vente de l'objet %s est de %d %s //------------------------------------ // More atcommands message Index: grf-files.txt =================================================================== --- grf-files.txt (revision 17327) +++ grf-files.txt (working copy) @@ -9,4 +9,4 @@ // Data Directory // Use the base folder, not the data\ path. //----------------------------------------- -//data_dir: C:\Program Files\Gravity\RO\ +data_dir: /home/cloud/ragnarok/grf Index: maps_athena.conf =================================================================== --- maps_athena.conf (revision 17327) +++ maps_athena.conf (working copy) @@ -1131,6 +1131,25 @@ map: 1@gef_in map: dali +map: 1@spa +map: 1@ge_st +map: 1@tnm1 +map: 1@tnm2 +map: 1@tnm3 +map: dali02 +map: 1@jtb +map: 1@eom +map: 1@xm_d +map: 1@rev +map: 1@dth3 +map: 1@dth2 +map: 1@dth1 +map: moro_cav +map: moro_vol +map: silk_lair +map: c_tower2_ +map: c_tower3_ + //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- @@ -1206,3 +1225,239 @@ //map: tank_test //map: tank_test2 //map: test + +//Customs maps +map: brasilis_e +map: bra_dun01_e +map: comodo_e +map: gl_prison_e +map: lightha_e +map: morocc_e +map: niflheim_e +map: prontera_e +map: ra_san05_e +map: tha_t02_e +map: tha_t03_e + +//Continent Aeries +map: ars_fild01 +map: ars_fild02 +map: ars_fild03 +map: ars_fild04 +map: ars_fild05 +map: ars_fild06 +map: ars_fild07 +map: ars_fild08 +map: ars_fild09 +map: ars_fild10 +map: ars_fild11 +map: ars_fild12 +map: ars_fild13 +map: ars_fild14 +map: ars_fild15 +map: ars_fild16 +map: ars_fild17 +map: ars_fild18 +map: ars_fild19 +map: ars_fild20 +map: ars_fild21 +map: ars_fild22 +map: ars_fild23 +map: ars_fild24 +map: ars_fild25 +map: ars_fild26 +map: ars_fild27 +map: ars_fild28 +map: ars_fild29 +map: ars_fild30 +map: ars_fild31 +map: ars_fild32 +map: ars_fild33 +map: ars_fild34 +map: ars_fild35 +map: ars_fild36 +map: ars_fild37 +map: ars_fild38 +map: ars_fild39 +map: ars_fild40 +map: ars_fild41 +map: ars_fild42 +map: ars_fild43 +map: ars_fild44 +map: ars_fild45 +map: ars_fild46 +map: ars_fild47 +map: ars_fild48 +map: ars_fild49 +map: ars_fild50 +map: ars_fild51 +map: ars_fild52 +map: ars_fild53 +map: ars_fild54 +map: ars_fild55 +map: ars_fild56 +map: ars_fild57 +map: ars_fild58 +map: ars_fild59 +map: ars_fild60 +map: ars_fild61 +map: ars_fild62 +map: coppa +map: tantale_ile +map: ars_dun01 +map: ars_dun02 +map: ars_dun03 +map: ars_dun04 +map: ars_dun05 +map: ars_dun06 +map: ars_dun07 +map: ars_dun08 +map: ars_dun09 +map: ars_dun10 +map: ars_dun11 +map: ars_dun12 +map: ars_dun13 +map: ars_dun14 +map: ars_dun15 +map: ars_dun16 +map: ars_dun17 +map: ars_dun18 +map: ars_dun19 +map: ars_dun20 +map: ars_dun21 +map: ars_dun22 +map: ars_dun23 +map: ars_dun24 +map: ars_dun25 +map: ars_dun26 +map: ars_dun27 +map: ars_dun28 +map: ars_dun29 +map: ars_dun30 +map: ars_dun31 +map: ars_dun32 +map: ars_dun33 +map: ars_dun34 +map: ars_dun35 +map: ars_dun36 +map: ars_dun37 +map: ars_dun38 +map: ars_dun39 +map: ars_dun40 +map: ars_in01 +map: ars_in02 +map: ars_in03 +map: ars_in04 +map: ars_in05 +map: ars_in06 +map: ars_in07 +map: ars_in08 +map: ars_in09 +map: ars_in10 +map: ars_in11 +map: ars_in12 +map: ars_in13 +map: ars_in14 +map: ars_in15 +map: ars_in16 +map: ars_in17 +map: ars_phare + +map: ars_dun41 +map: ars_dun42 +map: ars_dun43 +map: ars_dun44 +map: ars_dun45 +map: ars_dun46 +map: ars_dun47 +map: ars_dun48 +map: ars_dun49 +map: ars_dun50 +map: ars_dun51 +map: ars_dun52 +map: ars_dun53 +map: ars_dun54 +map: ars_dun55 +map: ars_dun56 +map: ars_dun57 +map: ars_dun58 +map: ars_dun59 +map: ars_dun60 +map: ars_dun61 +map: ars_dun62 +map: ars_dun63 +map: ars_dun64 +map: ars_dun65 +map: ars_dun66 +map: ars_dun67 +map: ars_dun68 +map: ars_dun69 +map: ars_dun70 +map: ars_dun71 +map: ars_dun72 +map: ars_dun73 +map: ars_dun74 +map: ars_dun75 +map: ars_dun76 +map: ars_dun77 +map: ars_dun78 +map: ars_dun79 +map: ars_dun80 +map: ars_dun81 +map: ars_dun82 +map: ars_dun83 +map: ars_dun84 +map: ars_dun85 +map: ars_dun86 +map: ars_dun87 +map: ars_dun88 +map: ars_dun89 +map: ars_dun90 +map: ars_dun91 +map: ars_dun92 +map: ars_dun93 +map: ars_dun94 +map: ars_dun95 +map: ars_dun96 + +map: ars_fild63 +map: ars_fild64 +map: ars_fild65 +map: ars_fild66 +map: ars_fild67 +map: ars_fild68 +map: ars_fild69 +map: ars_fild70 +map: ars_fild71 +map: ars_fild72 +map: ars_fild73 +map: ars_fild74 +map: ars_fild75 +map: ars_fild76 + +map: AQUAF_G +map: AQUAF_T +map: Coliseum +map: courtyard //crash +map: dellar +map: event_01 +map: Farebury +map: home_r01 +map: hun_vil +map: Hyrule // Capitale +map: ilyo_kwan //Capitale GM +map: lun_in01 +map: lunar01 +map: novicefield //Course +map: revencia +map: shroom_map //Event jungle +map: zhakastia + +map: Altzibar +map: crystilia +map: Flaris +map: Jazeera +map: Lunette +map: Welgaia + +map: Capital \ No newline at end of file Index: battle/items.conf =================================================================== --- battle/items.conf (revision 17327) +++ battle/items.conf (working copy) @@ -19,7 +19,7 @@ // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%) // When a tax is applied, the item's full price is charged to the buyer, but // the vender will not get the whole price paid (they get 100% - this tax). -vending_tax: 200 +vending_tax: 0 // Show the buyer's name when successfully vended an item buyer_name: yes Index: battle/pet.conf =================================================================== --- battle/pet.conf (revision 17327) +++ battle/pet.conf (working copy) @@ -13,7 +13,7 @@ pet_catch_rate: 100 // Can you name a pet more then once? (Note 1) -pet_rename: no +pet_rename: yes // The rate a pet will get friendly by feeding it. (Note 2) pet_friendly_rate: 100 @@ -45,7 +45,7 @@ // Whether or not the pet's will use skills. (Note 1) // Note: Offensive pet skills need at least pet_attack_support or // pet_damage_support to work (they trigger while the pet is attacking). -pet_status_support: no +pet_status_support: yes // Rate at which a pet will support it's owner in battle. (Note 2) // Affects pet_attack_support & pet_damage_support. @@ -74,4 +74,4 @@ // Are pets disabled during Guild Wars? // If set to yes, pets are automatically returned to egg when entering castles during WoE times // and hatching is forbidden within as well. -pet_disable_in_gvg: no +pet_disable_in_gvg: yes Index: battle/feature.conf =================================================================== --- battle/feature.conf (revision 17327) +++ battle/feature.conf (working copy) @@ -17,4 +17,16 @@ // Atcommand suggestions (Note 1) // If one type incomplete atcommand, it will suggest the complete ones. -feature.atcommand_suggestions: off \ No newline at end of file +feature.atcommand_suggestions: off + +// Extended Vending System [Lilith] +// Enable or disable extended vending system? (Note 1) +extended_vending: yes +// Show currency's name in vending board? (Note 1) +show_item_vending: yes +// Show more info about buying? (Note 1) +ex_vending_info: yes +// Item ID for Zeny. Set to 0 if you don't want use Zeny. +item_zeny: 30001 +// Item ID for Cash. Set to 0 if you don't want use Cash. +//item_cash: 30000 \ No newline at end of file Index: battle/party.conf =================================================================== --- battle/party.conf (revision 17327) +++ battle/party.conf (working copy) @@ -16,7 +16,7 @@ // Method used to update party-mate hp-bars: // 0: Aegis - bar is updated every time HP changes (bandwidth intensive) // 1: rAthena - bar is updated with the party map dots (up to 1 second delay) -party_hp_mode: 0 +party_hp_mode: 1 // NOTE: // The level range for sharing within a party is set in conf/inter_athena.conf @@ -51,8 +51,8 @@ // Give additional experience bonus per party-member involved on even-share parties (excluding youself)? // ex. If set to 10, an even-share party of 5 people will receive +40% exp (4 members * 10% exp): // 140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%). -party_even_share_bonus: 0 +party_even_share_bonus: 1 // Display party name regardless if player is in a guild. // Official servers do not display party name unless the user is in a guild. (Note 1) -display_party_name: no +display_party_name: yes Index: battle/client.conf =================================================================== --- battle/client.conf (revision 17327) +++ battle/client.conf (working copy) @@ -40,14 +40,14 @@ min_hair_style: 0 max_hair_style: 27 min_hair_color: 0 -max_hair_color: 8 +max_hair_color: 263 min_cloth_color: 0 -max_cloth_color: 4 +max_cloth_color: 553 // When set to yes, the damage field in packets sent from woe maps will be set // to -1, making it impossible for GMs, Bots and Hexed clients to know the // actual damage caused by attacks. (Note 1) -hide_woe_damage: no +hide_woe_damage: yes // "hair style" number that identifies pet. // NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs. @@ -86,7 +86,7 @@ client_limit_unit_lv: 0 // Will tuxedo and wedding dresses be shown when worn? (Note 1) -wedding_modifydisplay: no +wedding_modifydisplay: yes // Save Clothes color. (This will degrade performance) (Note 1) save_clothcolor: yes @@ -131,3 +131,6 @@ // Official servers do not sort storage. (Note 1) // NOTE: Enabling this option degrades performance. client_sort_storage: no + +//Ignorer le changement de palette de hanbok +hanbok_ignorepalette: no \ No newline at end of file Index: battle/skill.conf =================================================================== --- battle/skill.conf (revision 17327) +++ battle/skill.conf (working copy) @@ -240,7 +240,7 @@ // Allows players to skip menu when casting Teleport level 1 // Menu contains two options. "Random" and "Cancel" -skip_teleport_lv1_menu: no +skip_teleport_lv1_menu: yes // Allow use of SG skills without proper day (Sun/Moon/Star) ? allow_skill_without_day: no Index: battle/monster.conf =================================================================== --- battle/monster.conf (revision 17327) +++ battle/monster.conf (working copy) @@ -79,7 +79,7 @@ // 0: No // 1: always use the mob_db Name column (english mob name) // 2: always use the mob_db JName column (original Kro mob name) -override_mob_names: 0 +override_mob_names: 1 // Monster damage delay rate (Note 1) // Setting to no/0 is like they always have endure. @@ -162,7 +162,7 @@ // 1: Display mob HP (Hp/MaxHp format) // 2: Display mob HP (Percent of full life format) // 4: Display mob's level -show_mob_info: 0 +show_mob_info: 1 // Zeny from mobs zeny_from_mobs: no Index: battle/drops.conf =================================================================== --- battle/drops.conf (revision 17327) +++ battle/drops.conf (working copy) @@ -38,32 +38,32 @@ // Item drop rates (Note 2) // The rate the common items are dropped (Items that are in the ETC tab, besides card) -item_rate_common: 100 -item_rate_common_boss: 100 +item_rate_common: 5000 +item_rate_common_boss: 5000 item_drop_common_min: 1 item_drop_common_max: 10000 // The rate healing items are dropped (items that restore HP or SP) -item_rate_heal: 100 -item_rate_heal_boss: 100 +item_rate_heal: 5000 +item_rate_heal_boss: 5000 item_drop_heal_min: 1 item_drop_heal_max: 10000 // The rate at which usable items (in the item tab) other then healing items are dropped. -item_rate_use: 100 -item_rate_use_boss: 100 +item_rate_use: 5000 +item_rate_use_boss: 5000 item_drop_use_min: 1 item_drop_use_max: 10000 // The rate at which equipment is dropped. -item_rate_equip: 100 -item_rate_equip_boss: 100 +item_rate_equip: 5000 +item_rate_equip_boss: 300 item_drop_equip_min: 1 item_drop_equip_max: 10000 // The rate at which cards are dropped -item_rate_card: 100 -item_rate_card_boss: 100 +item_rate_card: 3000 +item_rate_card_boss: 1000 item_drop_card_min: 1 item_drop_card_max: 10000 @@ -125,7 +125,7 @@ // 0: Nothing drops. // 1: Only marine spheres drop items. // 2: All alchemist summons drop items. -alchemist_summon_reward: 1 +alchemist_summon_reward: 2 // Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) *** // This can be set to any value between 0~10000. Index: battle/homunc.conf =================================================================== --- battle/homunc.conf (revision 17327) +++ battle/homunc.conf (working copy) @@ -24,7 +24,7 @@ homunculus_friendly_rate: 100 // Can you name a homunculus more then once? (Note 1) -hom_rename: no +hom_rename: yes // Intimacy needed to use Evolved Vanilmirth's Bio Explosion hvan_explosion_intimate: 45000 Index: battle/misc.conf =================================================================== --- battle/misc.conf (revision 17327) +++ battle/misc.conf (working copy) @@ -83,10 +83,10 @@ duel_autoleave_when_die: yes // Delay between using @duel in minutes -duel_time_interval: 60 +duel_time_interval: 10 // Restrict duel usage to same map -duel_only_on_same_map: no +duel_only_on_same_map: yes // Determines max number of characters that can stack within a single cell. // NOTE: For this setting to make effect you have to use a server compiled with @@ -123,4 +123,4 @@ // 0 = No // 1 = Yes // 2 = Yes, when there are unread mails -mail_show_status: 0 +mail_show_status: 2 Index: battle/player.conf =================================================================== --- battle/player.conf (revision 17327) +++ battle/player.conf (working copy) @@ -132,7 +132,7 @@ // 2 = only Baby Classes on Peco have Medium Size // 3 = both Normal Classes on Peco have Big Size // and Baby Classes on Peco have Medium Size -character_size: 0 +character_size: 3 // Idle characters can receive autoloot? // Set to the time in seconds where an idle character will stop receiving Index: battle/exp.conf =================================================================== --- battle/exp.conf (revision 17327) +++ battle/exp.conf (working copy) @@ -10,13 +10,13 @@ //-------------------------------------------------------------- // Rate at which exp. is given. (Note 2) -base_exp_rate: 100 +base_exp_rate: 5000 // Rate at which job exp. is given. (Note 2) -job_exp_rate: 100 +job_exp_rate: 5000 // Turn this on to allow a player to level up more than once from a kill. (Note 1) -multi_level_up: no +multi_level_up: yes // Setting this can cap the max experience one can get per kill specified as a // % of the current exp bar. (Every 10 = 1.0%) @@ -41,10 +41,10 @@ exp_bonus_max_attacker: 12 // MVP bonus exp rate. (Note 2) -mvp_exp_rate: 100 +mvp_exp_rate: 5000 // Rate of base/job exp given by NPCs. (Note 2) -quest_exp_rate: 100 +quest_exp_rate: 5000 // The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double. // The balance of the exp. rate is best used with 5 to 10) Index: battle/gm.conf =================================================================== --- battle/gm.conf (revision 17327) +++ battle/gm.conf (working copy) @@ -20,7 +20,7 @@ // (@) @allstats/@str/@agi/@vit/@int/@dex/@luk // allow gms to bypass the maximum stat parameter? ( if yes gm stats can go up to 32k ) default: no -atcommand_max_stat_bypass: no +atcommand_max_stat_bypass: yes // Ban people that try trade dupe. // Duration of the ban, in minutes (default: 5). To disable the ban, set 0. Index: login_athena.conf =================================================================== --- login_athena.conf (revision 17327) +++ login_athena.conf (working copy) @@ -11,7 +11,7 @@ //bind_ip: 127.0.0.1 // Login Server Port -login_port: 6900 +login_port: 6924 //Time-stamp format which will be printed before all messages. //Can at most be 20 characters long. @@ -86,7 +86,7 @@ // Store passwords as MD5 hashes instead of plaintext ? // NOTE: Will not work with clients that use -use_MD5_passwords: no +use_MD5_passwords: yes // Ipban features (SQL only) ipban.enable: yes @@ -106,7 +106,7 @@ // Interval (in seconds) to clean up expired IP bans. 0 = disabled. default = 60. // NOTE: Even if this is disabled, expired IP bans will be cleaned up on login server start/stop. // Players will still be able to login if an ipban entry exists but the expiration time has already passed. -ipban_cleanup_interval: 60 +ipban_cleanup_interval: 30 // Interval (in minutes) to execute a DNS/IP update. Disabled by default. // Enable it if your server uses a dynamic IP which changes with time.