From 72e838d43e39bc78fc689830da19e7d99cc555d7 Mon Sep 17 00:00:00 2001 From: euphyy Date: Wed, 5 Jun 2013 03:04:33 +0000 Subject: [PATCH] > Mapflag restructuring (tid:83102): * Moved mapflags from conf/mapflag/ to npc/mapflag/. * Split some files into npc/pre-re/mapflag/ and npc/re/mapflag/. * Moved all Renewal maps into the /re/ directory. * Applied Hall of Abyss mapflag changes in the /re/ directory. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17347 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/noexp.txt | 34 ----- doc/script_commands.txt | 2 +- {conf => npc}/mapflag/battleground.txt | 2 +- {conf => npc}/mapflag/gvg.txt | 11 +- {conf => npc}/mapflag/jail.txt | 2 +- {conf => npc}/mapflag/night.txt | 28 +--- {conf => npc}/mapflag/nightmare.txt | 2 +- {conf => npc}/mapflag/nobranch.txt | 84 +----------- {conf => npc}/mapflag/noicewall.txt | 34 +---- {conf => npc}/mapflag/nomemo.txt | 128 ++---------------- {conf => npc}/mapflag/nopenalty.txt | 61 +-------- {conf => npc}/mapflag/nopvp.txt | 75 ++-------- {conf => npc}/mapflag/noreturn.txt | 10 +- {conf => npc}/mapflag/nosave.txt | 87 +----------- {conf => npc}/mapflag/noskill.txt | 2 +- {conf => npc}/mapflag/noteleport.txt | 84 +----------- {conf => npc}/mapflag/nowarp.txt | 2 +- {conf => npc}/mapflag/nowarpto.txt | 51 +------ npc/mapflag/partylock.txt | 36 +++++ {conf => npc}/mapflag/pvp.txt | 2 +- {conf => npc}/mapflag/pvp_noguild.txt | 2 +- {conf => npc}/mapflag/pvp_noparty.txt | 2 +- {conf => npc}/mapflag/reset.txt | 15 +- {conf => npc}/mapflag/restricted.txt | 37 +---- {conf => npc}/mapflag/town.txt | 12 +- npc/pre-re/mapflag/gvg.txt | 23 ++++ npc/pre-re/scripts_main.conf | 1 + npc/pre-re/scripts_mapflags.conf | 4 + npc/re/mapflag/gvg.txt | 23 ++++ npc/re/mapflag/night.txt | 36 +++++ npc/re/mapflag/nobranch.txt | 86 ++++++++++++ npc/re/mapflag/noicewall.txt | 38 ++++++ npc/re/mapflag/nomemo.txt | 127 +++++++++++++++++ npc/re/mapflag/nopenalty.txt | 67 +++++++++ npc/re/mapflag/nopvp.txt | 68 ++++++++++ npc/re/mapflag/nosave.txt | 99 ++++++++++++++ npc/re/mapflag/noteleport.txt | 98 ++++++++++++++ npc/re/mapflag/nowarpto.txt | 59 ++++++++ {conf => npc/re}/mapflag/partylock.txt | 25 +--- .../noloot.txt => npc/re/mapflag/reset.txt | 30 ++-- npc/re/mapflag/restricted.txt | 39 ++++++ .../novending.txt => npc/re/mapflag/town.txt | 17 ++- npc/re/scripts_main.conf | 1 + npc/re/scripts_mapflags.conf | 17 +++ npc/scripts_mapflags.conf | 49 ++++--- 45 files changed, 956 insertions(+), 756 deletions(-) delete mode 100644 conf/mapflag/noexp.txt rename {conf => npc}/mapflag/battleground.txt (96%) rename {conf => npc}/mapflag/gvg.txt (94%) rename {conf => npc}/mapflag/jail.txt (98%) rename {conf => npc}/mapflag/night.txt (93%) rename {conf => npc}/mapflag/nightmare.txt (99%) rename {conf => npc}/mapflag/nobranch.txt (81%) rename {conf => npc}/mapflag/noicewall.txt (87%) rename {conf => npc}/mapflag/nomemo.txt (85%) rename {conf => npc}/mapflag/nopenalty.txt (82%) rename {conf => npc}/mapflag/nopvp.txt (72%) rename {conf => npc}/mapflag/noreturn.txt (96%) rename {conf => npc}/mapflag/nosave.txt (79%) rename {conf => npc}/mapflag/noskill.txt (95%) rename {conf => npc}/mapflag/noteleport.txt (84%) rename {conf => npc}/mapflag/nowarp.txt (98%) rename {conf => npc}/mapflag/nowarpto.txt (81%) create mode 100644 npc/mapflag/partylock.txt rename {conf => npc}/mapflag/pvp.txt (98%) rename {conf => npc}/mapflag/pvp_noguild.txt (99%) rename {conf => npc}/mapflag/pvp_noparty.txt (96%) rename {conf => npc}/mapflag/reset.txt (83%) rename {conf => npc}/mapflag/restricted.txt (79%) rename {conf => npc}/mapflag/town.txt (84%) create mode 100644 npc/pre-re/mapflag/gvg.txt create mode 100644 npc/pre-re/scripts_mapflags.conf create mode 100644 npc/re/mapflag/gvg.txt create mode 100644 npc/re/mapflag/night.txt create mode 100644 npc/re/mapflag/nobranch.txt create mode 100644 npc/re/mapflag/noicewall.txt create mode 100644 npc/re/mapflag/nomemo.txt create mode 100644 npc/re/mapflag/nopenalty.txt create mode 100644 npc/re/mapflag/nopvp.txt create mode 100644 npc/re/mapflag/nosave.txt create mode 100644 npc/re/mapflag/noteleport.txt create mode 100644 npc/re/mapflag/nowarpto.txt rename {conf => npc/re}/mapflag/partylock.txt (73%) rename conf/mapflag/noloot.txt => npc/re/mapflag/reset.txt (51%) create mode 100644 npc/re/mapflag/restricted.txt rename conf/mapflag/novending.txt => npc/re/mapflag/town.txt (64%) create mode 100644 npc/re/scripts_mapflags.conf diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt deleted file mode 100644 index 4161a923c2..0000000000 --- a/conf/mapflag/noexp.txt +++ /dev/null @@ -1,34 +0,0 @@ -//===== rAthena Script ======================================= -//= Mapflag: Disable EXP gain. -//===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= -//= Same as 'nobaseexp' and 'nojobexp' combined. -//===== Additional Comments: ================================= -//= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky -//= 1.6 - Added Lighthalzen (due to quests) [Lupus] -//= 1.7 - Commented out entries. (Quests are official) [L0ne_W0lf] -//============================================================ - -// Job Quests ======================== -//job_thief1 mapflag noexp -//job_sword1 mapflag noexp -//in_moc_16 mapflag noexp -//job_hunte mapflag noexp -//job_knt mapflag noexp -//job_prist mapflag noexp -//job_wiz mapflag noexp -//job_cru mapflag noexp -//monk_test mapflag noexp -//in_rogue mapflag noexp -//job_sage mapflag noexp -//job_soul mapflag noexp -//job_star mapflag noexp -//que_ng mapflag noexp - -// Misc Quests ======================= -// mosk_ship mapflag noexp diff --git a/doc/script_commands.txt b/doc/script_commands.txt index b4b02c9abb..e9d5d0d754 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -134,7 +134,7 @@ Here is a list of valid top-level commands: %TAB%mapflag%TAB% This will, upon loading, set a specified map flag on a map you like. These are -normally in files inside 'conf/mapflag' and are loaded first, so by the time the +normally in files inside 'npc/mapflag' and are loaded first, so by the time the server's up, all the maps have the flags they should have. Map flags determine the behavior of the map in various situations. For more details, see 'setmapflag' and 'doc/mapflags.txt'. diff --git a/conf/mapflag/battleground.txt b/npc/mapflag/battleground.txt similarity index 96% rename from conf/mapflag/battleground.txt rename to npc/mapflag/battleground.txt index 86dcf95f07..d74795c442 100644 --- a/conf/mapflag/battleground.txt +++ b/npc/mapflag/battleground.txt @@ -10,7 +10,7 @@ //= Defines a Battleground map. //= Additional parameter '2' shows scoreboard. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ bat_c01 mapflag battleground 2 diff --git a/conf/mapflag/gvg.txt b/npc/mapflag/gvg.txt similarity index 94% rename from conf/mapflag/gvg.txt rename to npc/mapflag/gvg.txt index 389178d145..5f6aef91a8 100644 --- a/conf/mapflag/gvg.txt +++ b/npc/mapflag/gvg.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -13,8 +13,9 @@ //= gvg_castle: Describes castle maps for WoE. //= gvg_dungeon: Describes dungeon maps for WoE. //===== Additional Comments: ================================= -//= 1.1 - Added Novice Guild Castles. -//= 1.2 - Updated with new meanings of gvg and gvg_castle. +//= 1.1 Added Novice Guild Castles. +//= 1.2 Updated with new meanings of gvg and gvg_castle. +//= 1.3 Renewal split. [Euphy] //============================================================ // GvG Arenas ============= @@ -101,9 +102,5 @@ nguild_prt mapflag gvg_castle //nguild_prt mapflag monster_noteleport // Guild Dungeons ========= -gld_dun01 mapflag gvg_dungeon -gld_dun02 mapflag gvg_dungeon -gld_dun03 mapflag gvg_dungeon -gld_dun04 mapflag gvg_dungeon arug_dun01 mapflag gvg_dungeon schg_dun01 mapflag gvg_dungeon diff --git a/conf/mapflag/jail.txt b/npc/mapflag/jail.txt similarity index 98% rename from conf/mapflag/jail.txt rename to npc/mapflag/jail.txt index 024a5cd6f3..54da85a6b7 100644 --- a/conf/mapflag/jail.txt +++ b/npc/mapflag/jail.txt @@ -16,7 +16,7 @@ //= players previous savepoint, or choose one manually. //= noteleport: No Teleporting allowed. No fly wings or butterfly wings. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ // No Memory ============================= diff --git a/conf/mapflag/night.txt b/npc/mapflag/night.txt similarity index 93% rename from conf/mapflag/night.txt rename to npc/mapflag/night.txt index 4584f068f7..136030f594 100644 --- a/conf/mapflag/night.txt +++ b/npc/mapflag/night.txt @@ -1,15 +1,16 @@ //===== rAthena Script ======================================= //= Mapflag: Night mode. //===== By: ================================================== -//= Skotlex +//= rAthena Dev Team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Enables night mode effects. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. [Skotlex] +//= 1.1 Renewal split. [Euphy] //============================================================ alb2trea mapflag nightenabled @@ -297,26 +298,5 @@ manuk mapflag nightenabled man_fild02 mapflag nightenabled splendide mapflag nightenabled spl_fild01 mapflag nightenabled -brasilis mapflag nightenabled -bra_fild01 mapflag nightenabled -dicastes01 mapflag nightenabled -dicastes02 mapflag nightenabled -dic_fild01 mapflag nightenabled -dic_fild02 mapflag nightenabled - -// Episode 14 ==================== -bif_fild01 mapflag nightenabled -bif_fild02 mapflag nightenabled -dewata mapflag nightenabled -dew_fild01 mapflag nightenabled -dew_dun02 mapflag nightenabled -malangdo mapflag nightenabled -malaya mapflag nightenabled -ma_fild01 mapflag nightenabled -ma_fild02 mapflag nightenabled -ma_scene01 mapflag nightenabled -eclage mapflag nightenabled -ecl_fild01 mapflag nightenabled -ecl_hub01 mapflag nightenabled //evt_zombie mapflag nightenabled diff --git a/conf/mapflag/nightmare.txt b/npc/mapflag/nightmare.txt similarity index 99% rename from conf/mapflag/nightmare.txt rename to npc/mapflag/nightmare.txt index 9c7d3f8f7b..0d5fbcb82c 100644 --- a/conf/mapflag/nightmare.txt +++ b/npc/mapflag/nightmare.txt @@ -13,7 +13,7 @@ //= type: "inventory", "equip", or "all" //= percent: Rate of item drop. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ pvp_n_1-1 mapflag pvp_nightmaredrop random,equip,300 diff --git a/conf/mapflag/nobranch.txt b/npc/mapflag/nobranch.txt similarity index 81% rename from conf/mapflag/nobranch.txt rename to npc/mapflag/nobranch.txt index cb2dbd2299..25c56873b1 100644 --- a/conf/mapflag/nobranch.txt +++ b/npc/mapflag/nobranch.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,11 +11,12 @@ //= Dead Branch (604), Bloody Branch (12103), //= Red Pouch (12024), Poring Box (12109) //===== Additional Comments: ================================= -//= 1.3 - Updated. [massdriller] -//= 1.6a - Updated. [Lupus] -//= 1.7 - Added all novice maps. [L0ne_W0lf] -//= 1.8 - Removed restriction on PVP maps. [L0ne_W0lf] -//= 1.9 - Updated. [L0ne_W0lf] +//= 1.3 Updated. [massdriller] +//= 1.6a Updated. [Lupus] +//= 1.7 Added all novice maps. [L0ne_W0lf] +//= 1.8 Removed restriction on PVP maps. [L0ne_W0lf] +//= 1.9 Updated. [L0ne_W0lf] +//= 2.0 Renewal split. [Euphy] //============================================================ // Cities ====================== @@ -332,75 +333,4 @@ splendide mapflag nobranch spl_in01 mapflag nobranch spl_in02 mapflag nobranch -// 3rd Class Job Maps & Paradise =========== -moc_para01 mapflag nobranch -job3_arch01 mapflag nobranch -job3_arch02 mapflag nobranch -job3_arch03 mapflag nobranch -job3_gen01 mapflag nobranch -job3_guil01 mapflag nobranch -job3_guil02 mapflag nobranch -job3_guil03 mapflag nobranch -job_ko mapflag nobranch -job3_rang01 mapflag nobranch -job3_rang02 mapflag nobranch -job3_rune01 mapflag nobranch -job3_rune02 mapflag nobranch -job3_rune03 mapflag nobranch -job3_sha01 mapflag nobranch -job3_war01 mapflag nobranch -job3_war02 mapflag nobranch -jupe_core2 mapflag nobranch - -// Brasilis =========== -brasilis mapflag nobranch -bra_in01 mapflag nobranch - -// Episode 13.3 =========== -dicastes01 mapflag nobranch -dicastes02 mapflag nobranch -dic_in01 mapflag nobranch -s_atelier mapflag nobranch - -// Episode 14.1 & Dewata =========== -mora mapflag nobranch -1@mist mapflag nobranch -dewata mapflag nobranch -dew_in01 mapflag nobranch - -// Episode Zero & Malaya Port =========== -malangdo mapflag nobranch -mal_in01 mapflag nobranch -mal_in02 mapflag nobranch -1@cash mapflag nobranch -1@pump mapflag nobranch -2@pump mapflag nobranch -1@lhz mapflag nobranch -que_lhz mapflag nobranch -malaya mapflag nobranch -ma_scene01 mapflag nobranch -ma_in01 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 -1@ma_h mapflag nobranch -1@ma_c mapflag nobranch -1@ma_b mapflag nobranch - -// Episode 14.2 =========== -eclage mapflag nobranch -ecl_in01 mapflag nobranch -ecl_in02 mapflag nobranch -ecl_in03 mapflag nobranch -ecl_in04 mapflag nobranch -1@ecl mapflag nobranch -ecl_hub01 mapflag nobranch -que_avan01 mapflag nobranch - //evt_zombie mapflag nobranch diff --git a/conf/mapflag/noicewall.txt b/npc/mapflag/noicewall.txt similarity index 87% rename from conf/mapflag/noicewall.txt rename to npc/mapflag/noicewall.txt index 392bf16e09..4c3e51127b 100644 --- a/conf/mapflag/noicewall.txt +++ b/npc/mapflag/noicewall.txt @@ -3,15 +3,16 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Blocks usage of WZ_ICEWALL. //===== Additional Comments: ================================= -//= 1.6a - Re-enabled icewalls for cities [Lupus] -//= 1.7 - Officially icewall is allowed on interiors. [L0ne_w0lf] -//= 1.8 - Fixed arug_cas map names. +//= 1.6a Re-enabled icewalls for cities [Lupus] +//= 1.7 Officially icewall is allowed on interiors. [L0ne_w0lf] +//= 1.8 Fixed arug_cas map names. +//= 1.9 Renewal split. [Euphy] //============================================================ //ayo_in01 mapflag noicewall @@ -154,31 +155,6 @@ nguild_prt mapflag noicewall 1@nyd mapflag noicewall 2@nyd mapflag noicewall -// Misty Forest Labyrinth =========== -1@mist mapflag noicewall - -// Octopus Cave =========== -1@cash mapflag noicewall - -// Drain =========== -1@pump mapflag noicewall -2@pump mapflag noicewall - -// Somatology Laboratory =========== -1@lhz mapflag noicewall - -// Bangungot Hospital F2 =========== -1@ma_h mapflag noicewall - -// Buwaya Cave =========== -1@ma_c mapflag noicewall - -// Bakonawa Hideout =========== -1@ma_b mapflag noicewall - -// Inside Eclage =========== -1@ecl mapflag noicewall - // Poring War ==================== poring_w01 mapflag noicewall poring_w02 mapflag noicewall diff --git a/conf/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt similarity index 85% rename from conf/mapflag/nomemo.txt rename to npc/mapflag/nomemo.txt index 3b4f80cb5a..28c6ad8a41 100644 --- a/conf/mapflag/nomemo.txt +++ b/npc/mapflag/nomemo.txt @@ -3,20 +3,21 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Prevents players from using /memo on a map. //= Also disables marriage warp skills. //===== Additional Comments: ================================= -//= 1.6a - Added up to Hugel maps. [Lupus] -//= 1.6b - Added job_knt map. [Samuray22] -//= 1.7 - Added all novice maps. [L0ne_W0lf] -//= 1.8 - Added nameless_i location. [Lupus] -//= 1.8a - Removed duplicate gef_cas nomemo mapflags. [Yommy] -//= 1.8b - Removed duplicate arug_dun01 & schg_dun01 entries. [Gepard] -//= 1.9 - Updated. [L0ne_W0lf] +//= 1.6a Added up to Hugel maps. [Lupus] +//= 1.6b Added job_knt map. [Samuray22] +//= 1.7 Added all novice maps. [L0ne_W0lf] +//= 1.8 Added nameless_i location. [Lupus] +//= 1.8a Removed duplicate gef_cas nomemo mapflags. [Yommy] +//= 1.8b Removed duplicate arug_dun01 & schg_dun01 entries. [Gepard] +//= 1.9 Updated. [L0ne_W0lf] +//= 2.0 Renewal split. [Euphy] //============================================================ // Towns ==================== @@ -684,117 +685,6 @@ splendide mapflag nomemo spl_fild01 mapflag nomemo spl_in01 mapflag nomemo spl_in02 mapflag nomemo -job3_arch01 mapflag nomemo -job3_arch02 mapflag nomemo -job3_arch03 mapflag nomemo -job3_guil01 mapflag nomemo -job3_guil02 mapflag nomemo -job3_guil03 mapflag nomemo -job3_rang01 mapflag nomemo -job3_rang02 mapflag nomemo -job3_rune01 mapflag nomemo -job3_rune02 mapflag nomemo -job3_rune03 mapflag nomemo -job3_war01 mapflag nomemo -job3_war02 mapflag nomemo -job3_gen01 mapflag nomemo -job3_sha01 mapflag nomemo -jupe_core2 mapflag nomemo -s_atelier mapflag nomemo -bra_in01 mapflag nomemo -bra_dun01 mapflag nomemo -bra_dun02 mapflag nomemo -dicastes01 mapflag nomemo -dicastes02 mapflag nomemo -dic_in01 mapflag nomemo -dic_fild01 mapflag nomemo -dic_fild02 mapflag nomemo -dic_dun01 mapflag nomemo -dic_dun02 mapflag nomemo - -// Episode 14 ==================== -bif_fild01 mapflag nomemo -bif_fild02 mapflag nomemo -1@mist mapflag nomemo -mora mapflag nomemo -dew_dun01 mapflag nomemo -dew_dun02 mapflag nomemo -dew_in01 mapflag nomemo -dic_dun03 mapflag nomemo -mal_in01 mapflag nomemo -mal_in02 mapflag nomemo -mal_dun01 mapflag nomemo -1@cash mapflag nomemo -1@pump mapflag nomemo -2@pump mapflag nomemo -iz_dun05 mapflag nomemo -lhz_dun04 mapflag nomemo -que_lhz mapflag nomemo -1@lhz mapflag nomemo -gld_dun01_2 mapflag nomemo -gld_dun02_2 mapflag nomemo -gld_dun03_2 mapflag nomemo -gld_dun04_2 mapflag nomemo -gld2_ald mapflag nomemo -gld2_gef mapflag nomemo -gld2_pay mapflag nomemo -gld2_prt mapflag nomemo -job_ko mapflag nomemo -ma_scene01 mapflag nomemo -ma_in01 mapflag nomemo -ma_dun01 mapflag nomemo -1@ma_h mapflag nomemo -1@ma_c mapflag nomemo -1@ma_b 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 -eclage mapflag nomemo -ecl_fild01 mapflag nomemo -ecl_in01 mapflag nomemo -ecl_in02 mapflag nomemo -ecl_in03 mapflag nomemo -ecl_in04 mapflag nomemo -1@ecl mapflag nomemo -ecl_tdun01 mapflag nomemo -ecl_tdun02 mapflag nomemo -ecl_tdun03 mapflag nomemo -ecl_tdun04 mapflag nomemo -ecl_hub01 mapflag nomemo -moc_prydn1 mapflag nomemo -moc_prydn2 mapflag nomemo - -//Orc's Memory =================== -1@orcs mapflag nomemo -2@orcs mapflag nomemo - -// Nidhoggr's Instance =========== -1@nyd mapflag nomemo -2@nyd mapflag nomemo - -// Glast Heim Memorial Dungeon === -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 //evt_zombie mapflag nomemo diff --git a/conf/mapflag/nopenalty.txt b/npc/mapflag/nopenalty.txt similarity index 82% rename from conf/mapflag/nopenalty.txt rename to npc/mapflag/nopenalty.txt index 464ca0870f..c741af62aa 100644 --- a/conf/mapflag/nopenalty.txt +++ b/npc/mapflag/nopenalty.txt @@ -3,16 +3,17 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Same as 'noexppenalty' and 'nozenypenalty' combined. //===== Additional Comments: ================================= -//= 1.2 - Updated. [Lupus] -//= 1.3 - Added all novice maps. [L0ne_W0lf] -//= 1.4 - Removed Nightmare PVP maps. [L0ne_W0lf] -//= 1.5 - Updated. [L0ne_Wolf] +//= 1.2 Updated. [Lupus] +//= 1.3 Added all novice maps. [L0ne_W0lf] +//= 1.4 Removed Nightmare PVP maps. [L0ne_W0lf] +//= 1.5 Updated. [L0ne_Wolf] +//= 1.6 Renewal split. [Euphy] //============================================================ // Towns ==================== @@ -140,37 +141,6 @@ man_in01 mapflag nopenalty splendide mapflag nopenalty spl_in01 mapflag nopenalty spl_in02 mapflag nopenalty -brasilis mapflag nopenalty -bra_in01 mapflag nopenalty -dicastes01 mapflag nopenalty -dicastes02 mapflag nopenalty -dic_in01 mapflag nopenalty -s_atelier mapflag nopenalty -mora mapflag nopenalty -dewata mapflag nopenalty -dew_in01 mapflag nopenalty -malangdo mapflag nopenalty -mal_in01 mapflag nopenalty -mal_in02 mapflag nopenalty -malaya 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 -eclage mapflag nopenalty -ecl_in01 mapflag nopenalty -ecl_in02 mapflag nopenalty -ecl_in03 mapflag nopenalty -ecl_in04 mapflag nopenalty -ecl_hub01 mapflag nopenalty -que_avan01 mapflag nopenalty // Job Quests ======================== job_sword1 mapflag nopenalty @@ -190,25 +160,6 @@ monk_test mapflag nopenalty monk_in mapflag nopenalty in_rogue mapflag nopenalty job_sage mapflag nopenalty -// 3-1 -------------------- -job3_arch01 mapflag nopenalty -job3_arch02 mapflag nopenalty -job3_arch03 mapflag nopenalty -job3_guil01 mapflag nopenalty -job3_guil02 mapflag nopenalty -job3_guil03 mapflag nopenalty -job3_rang01 mapflag nopenalty -job3_rang02 mapflag nopenalty -job3_rune01 mapflag nopenalty -job3_rune02 mapflag nopenalty -job3_rune03 mapflag nopenalty -job3_war01 mapflag nopenalty -job3_war02 mapflag nopenalty -// 3-2 -------------------- -job3_gen01 mapflag nopenalty -// Ext -------------------- -job3_sha01 mapflag nopenalty -job_ko mapflag nopenalty // Misc Quests ======================= mosk_ship mapflag nopenalty diff --git a/conf/mapflag/nopvp.txt b/npc/mapflag/nopvp.txt similarity index 72% rename from conf/mapflag/nopvp.txt rename to npc/mapflag/nopvp.txt index ef09420af1..62bd4a3820 100644 --- a/conf/mapflag/nopvp.txt +++ b/npc/mapflag/nopvp.txt @@ -3,16 +3,18 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Prevents PvP mode on a map. //===== Additional Comments: ================================= -//= 1.0 - Initial script. -//= 1.2 - Updated. [L0ne_W0lf] +//= 1.0 Initial script. +//= 1.2 Updated. [L0ne_W0lf] +//= 1.3 Renewal split. [Euphy] //============================================================ +// Instances =================== 1@cata mapflag pvp off 2@cata mapflag pvp off 1@nyd mapflag pvp off @@ -25,25 +27,9 @@ 4@tower mapflag pvp off 5@tower mapflag pvp off 6@tower mapflag pvp off -1@mist mapflag pvp off -1@cash mapflag pvp off -1@pump mapflag pvp off -2@pump mapflag pvp off -1@lhz mapflag pvp off -1@ma_h mapflag pvp off -1@ma_c mapflag pvp off -1@ma_b mapflag pvp off -1@ecl mapflag pvp off -1@gl_k mapflag pvp off -2@gl_k mapflag pvp off -1@def01 mapflag pvp off -1@def02 mapflag pvp off -1@def03 mapflag pvp off -1@gef mapflag pvp off -1@face mapflag pvp off -1@sara mapflag pvp off -1@gef_in mapflag pvp off +// Battle Grounds ============== +bat_room mapflag pvp off bat_a01 mapflag pvp off bat_a02 mapflag pvp off bat_b01 mapflag pvp off @@ -52,12 +38,14 @@ bat_c01 mapflag pvp off bat_c02 mapflag pvp off bat_c03 mapflag pvp off +// GvG Arenas =================== guild_vs1 mapflag pvp off guild_vs2 mapflag pvp off guild_vs3 mapflag pvp off guild_vs4 mapflag pvp off guild_vs5 mapflag pvp off +// Cities ======================== ayo_in01 mapflag pvp off ayo_in02 mapflag pvp off alberta_in mapflag pvp off @@ -147,55 +135,10 @@ 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 - -dicastes01 mapflag pvp off -dicastes02 mapflag pvp off -dic_in01 mapflag pvp off - -s_atelier mapflag pvp off - -mora mapflag pvp off - -dewata mapflag pvp off -dew_in01 mapflag pvp off - -malangdo mapflag pvp off -mal_in01 mapflag pvp off -mal_in02 mapflag pvp off - -malaya mapflag pvp off -ma_scene01 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 - -eclage 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 -que_avan01 mapflag pvp off - -dali mapflag pvp off - //evt_zombie mapflag pvp off diff --git a/conf/mapflag/noreturn.txt b/npc/mapflag/noreturn.txt similarity index 96% rename from conf/mapflag/noreturn.txt rename to npc/mapflag/noreturn.txt index da694de914..440910ecd2 100644 --- a/conf/mapflag/noreturn.txt +++ b/npc/mapflag/noreturn.txt @@ -13,11 +13,11 @@ //= Dungeon Teleport Scrolls (14527/14581) //= Also restricts "warpparty" and "warpguild" script commands. //===== Additional Comments: ================================= -//= 1.3 - According to the patch, enabled Butterfly wings in the Castles. [Lupus] -//= 1.4 - Enabled Butterfly wings on PvP maps. [Skotlex] -//= 1.4a - Added job_knt. [Samuray22] -//= 1.5 - Commented out new_zone entries. [L0ne_W0lf] -//= 1.6 - Enabled B. wings on all maps but que_hugel. [L0ne_W0lf] +//= 1.3 According to the patch, enabled Butterfly wings in the Castles. [Lupus] +//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex] +//= 1.4a Added job_knt. [Samuray22] +//= 1.5 Commented out new_zone entries. [L0ne_W0lf] +//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf] //============================================================ // Cities ======================== diff --git a/conf/mapflag/nosave.txt b/npc/mapflag/nosave.txt similarity index 79% rename from conf/mapflag/nosave.txt rename to npc/mapflag/nosave.txt index 01f72e910c..26c0251665 100644 --- a/conf/mapflag/nosave.txt +++ b/npc/mapflag/nosave.txt @@ -3,15 +3,16 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Characters logging out on the specified map will be warped //= to the map specified in the last field, or "SavePoint". //===== Additional Comments: ================================= -//= 1.7 - Updated. [Lupus] -//= 1.8 - Updated. [L0ne_W0lf] +//= 1.7 Updated. [Lupus] +//= 1.8 Updated. [L0ne_W0lf] +//= 1.9 Renewal split. [Euphy] //============================================================ // Job Quests ==================== @@ -36,24 +37,6 @@ job_sage mapflag nosave SavePoint // Ext job_star mapflag nosave SavePoint job_soul mapflag nosave SavePoint -job3_sha01 mapflag nosave SavePoint -job_ko mapflag nosave SavePoint -// 3-1 -job3_arch01 mapflag nosave SavePoint -job3_arch02 mapflag nosave SavePoint -job3_arch03 mapflag nosave SavePoint -job3_guil01 mapflag nosave SavePoint -job3_guil02 mapflag nosave SavePoint -job3_guil03 mapflag nosave SavePoint -job3_rang01 mapflag nosave SavePoint -job3_rang02 mapflag nosave SavePoint -job3_rune01 mapflag nosave SavePoint -job3_rune02 mapflag nosave SavePoint -job3_rune03 mapflag nosave SavePoint -job3_war01 mapflag nosave SavePoint -job3_war02 mapflag nosave SavePoint -// 3-2 -job3_gen01 mapflag nosave SavePoint // Special Quests Places ===== ama_test mapflag nosave SavePoint @@ -223,14 +206,6 @@ gld_dun01 mapflag nosave SavePoint gld_dun02 mapflag nosave SavePoint gld_dun03 mapflag nosave SavePoint gld_dun04 mapflag nosave SavePoint -gld_dun01_2 mapflag nosave SavePoint -gld_dun02_2 mapflag nosave SavePoint -gld_dun03_2 mapflag nosave SavePoint -gld_dun04_2 mapflag nosave SavePoint -gld2_ald mapflag nosave SavePoint -gld2_gef mapflag nosave SavePoint -gld2_pay mapflag nosave SavePoint -gld2_prt mapflag nosave SavePoint //Normal Maps ================================= yggdrasil01 mapflag nosave SavePoint @@ -304,59 +279,5 @@ arug_dun01 mapflag nosave SavePoint 1@nyd mapflag nosave SavePoint 2@nyd mapflag nosave SavePoint -// Misty Forest Labyrinth ========= -1@mist mapflag nosave SavePoint - -// Octopus Cave =================== -1@cash mapflag nosave SavePoint - -// Drain ========================== -1@pump mapflag nosave SavePoint -2@pump mapflag nosave SavePoint - -// Somatology Laboratory ========== -que_lhz mapflag nosave SavePoint -1@lhz mapflag nosave SavePoint - -// Port Malaya ==================== -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 - -// Bangungot Hospital F2 ========== -1@ma_h mapflag nosave SavePoint - -// Buwaya Cave ==================== -1@ma_c mapflag nosave SavePoint - -// Bakonawa Hideout =============== -1@ma_b mapflag nosave SavePoint - -// Inside Eclage ================== -que_avan01 mapflag nosave SavePoint -1@ecl mapflag nosave SavePoint - -// Glast Heim Memorial Dungeon ==== -1@gl_k mapflag nosave SavePoint -2@gl_k 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 - evt_bomb mapflag nosave SavePoint //evt_zombie mapflag nosave SavePoint diff --git a/conf/mapflag/noskill.txt b/npc/mapflag/noskill.txt similarity index 95% rename from conf/mapflag/noskill.txt rename to npc/mapflag/noskill.txt index 8a25aa1376..7c068f7a27 100644 --- a/conf/mapflag/noskill.txt +++ b/npc/mapflag/noskill.txt @@ -9,7 +9,7 @@ //===== Description: ========================================= //= Disables all skills on the map. //===== Additional Comments: ================================= -//= 1.1 - Added additional maps. [L0ne_W0lf] +//= 1.1 Added additional maps. [L0ne_W0lf] //============================================================ //Prontera Arena =============== diff --git a/conf/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt similarity index 84% rename from conf/mapflag/noteleport.txt rename to npc/mapflag/noteleport.txt index f76100c601..6f348cd004 100644 --- a/conf/mapflag/noteleport.txt +++ b/npc/mapflag/noteleport.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,8 +15,9 @@ //= Disables the following items: //= Fly Wing (601), Giant Fly Wing (12212) //===== Additional Comments: ================================= -//= 1.6a - Updated. [Lupus] -//= 1.7 - Updated. [L0ne_W0lf] +//= 1.6a Updated. [Lupus] +//= 1.7 Updated. [L0ne_W0lf] +//= 1.8 Renewal split. [Euphy] //============================================================ // Cities ======================== @@ -129,7 +130,6 @@ 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 @@ -213,7 +213,7 @@ guild_vs3 mapflag noteleport guild_vs4 mapflag noteleport guild_vs5 mapflag noteleport -// Arenas =====================>\\ +// Arenas ===================== arena_room mapflag noteleport force_1-1 mapflag noteleport force_2-1 mapflag noteleport @@ -391,53 +391,6 @@ schg_que01 mapflag noteleport arug_que01 mapflag noteleport man_in01 mapflag noteleport spl_in01 mapflag noteleport -s_atelier mapflag noteleport -bra_in01 mapflag noteleport -dic_in01 mapflag noteleport -job3_gen01 mapflag noteleport -job3_sha01 mapflag noteleport - -// Episode 14 ==================== -1@mist mapflag noteleport -1@mist mapflag monster_noteleport -dew_in01 mapflag noteleport -mal_in01 mapflag noteleport -mal_in02 mapflag noteleport -1@cash mapflag noteleport -1@cash mapflag monster_noteleport -1@pump mapflag noteleport -1@pump mapflag monster_noteleport -2@pump mapflag noteleport -2@pump mapflag monster_noteleport -que_lhz mapflag noteleport -que_lhz mapflag monster_noteleport -1@lhz mapflag noteleport -1@lhz mapflag monster_noteleport -ma_scene01 mapflag noteleport -ma_in01 mapflag noteleport -1@ma_h mapflag noteleport -1@ma_h mapflag monster_noteleport -1@ma_c mapflag noteleport -1@ma_c mapflag monster_noteleport -1@ma_b mapflag noteleport -1@ma_b mapflag monster_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 -job_ko mapflag noteleport -ecl_in01 mapflag noteleport -ecl_in02 mapflag noteleport -ecl_in03 mapflag noteleport -ecl_in04 mapflag noteleport -1@ecl mapflag noteleport -1@ecl mapflag monster_noteleport -ecl_hub01 mapflag noteleport //Orc's Memory =================== 1@orcs mapflag noteleport @@ -454,31 +407,4 @@ nyd_dun02 mapflag noteleport 2@nyd mapflag noteleport 2@nyd mapflag monster_noteleport -// Glast Heim Memorial Dungeon === -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 - //evt_zombie mapflag noteleport diff --git a/conf/mapflag/nowarp.txt b/npc/mapflag/nowarp.txt similarity index 98% rename from conf/mapflag/nowarp.txt rename to npc/mapflag/nowarp.txt index 6e8b05a2c2..144a8c32c1 100644 --- a/conf/mapflag/nowarp.txt +++ b/npc/mapflag/nowarp.txt @@ -14,7 +14,7 @@ //= @guildrecall, and @recallall will not warp players. //= GD_EMERGENCYCALL and UNT_CALLFAMILY will not warp players. //===== Additional Comments: ================================= -//= 1.3 - Added WoE SE maps. +//= 1.3 Added WoE SE maps. //============================================================ // Special Quests Places ===== diff --git a/conf/mapflag/nowarpto.txt b/npc/mapflag/nowarpto.txt similarity index 81% rename from conf/mapflag/nowarpto.txt rename to npc/mapflag/nowarpto.txt index 76bde7d7db..baa625557f 100644 --- a/conf/mapflag/nowarpto.txt +++ b/npc/mapflag/nowarpto.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,8 +12,9 @@ //= @guildrecall, and @recallall are disabled. //= Command /memo is disabled. //===== Additional Comments: ================================= -//= 1.0 - Initial script. -//= 1.4 - Updated. [L0ne_W0lf] +//= 1.0 Initial script. +//= 1.4 Updated. [L0ne_W0lf] +//= 1.5 Renewal split. [Euphy] //============================================================ // Guild Castles ======================== @@ -155,50 +156,6 @@ spl_in01 mapflag nowarpto 1@nyd mapflag nowarpto 2@nyd mapflag nowarpto -// 14.1 Bifrost ================== -1@mist mapflag nowarpto - -que_house_s mapflag nowarpto - -// Malangdo Maps ================= -1@pump mapflag nowarpto -2@pump mapflag nowarpto -1@cash mapflag nowarpto - -// Lighthalzen Dungeon F4 ======== -1@lhz mapflag nowarpto -lhz_dun04 mapflag nowarpto -que_lhz mapflag nowarpto - -// Port Malaya =================== -1@ma_b mapflag nowarpto -1@ma_c mapflag nowarpto -1@ma_h mapflag nowarpto - -// 14.2 Eclage =================== -1@ecl mapflag nowarpto - -// Pyramids Basement Nightmare Mode -moc_prydn1 mapflag nowarpto -moc_prydn2 mapflag nowarpto - -// Glast Heim Memorial Dungeon === -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 - // Bossnia (custom) ============== bossnia_01 mapflag nowarpto bossnia_02 mapflag nowarpto diff --git a/npc/mapflag/partylock.txt b/npc/mapflag/partylock.txt new file mode 100644 index 0000000000..a62ea4b603 --- /dev/null +++ b/npc/mapflag/partylock.txt @@ -0,0 +1,36 @@ +//===== rAthena Script ======================================= +//= Mapflag: Party lock. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.2 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Blocks all party modifications on a map: +//= /organize, /leave, /invite, @changeleader +//===== Additional Comments: ================================= +//= 1.0 Initial script. +//= 1.1 Updated. [L0ne_W0lf] +//= 1.2 Renewal split. [Euphy] +//============================================================ + +// Sealed Shrine ================== +1@cata mapflag partylock +2@cata mapflag partylock + +// Endless Tower ================== +1@tower mapflag partylock +2@tower mapflag partylock +3@tower mapflag partylock +4@tower mapflag partylock +5@tower mapflag partylock +6@tower mapflag partylock + +// Orc's Memory =================== +1@orcs mapflag partylock +2@orcs mapflag partylock + +// Nidhoggr's Instance ============ +1@nyd mapflag partylock +2@nyd mapflag partylock diff --git a/conf/mapflag/pvp.txt b/npc/mapflag/pvp.txt similarity index 98% rename from conf/mapflag/pvp.txt rename to npc/mapflag/pvp.txt index 8463b8923b..3dd3a0eb94 100644 --- a/conf/mapflag/pvp.txt +++ b/npc/mapflag/pvp.txt @@ -9,7 +9,7 @@ //===== Description: ========================================= //= Enables PvP on a map. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ // PvP ======================== diff --git a/conf/mapflag/pvp_noguild.txt b/npc/mapflag/pvp_noguild.txt similarity index 99% rename from conf/mapflag/pvp_noguild.txt rename to npc/mapflag/pvp_noguild.txt index 731739dd18..256c773ea0 100644 --- a/conf/mapflag/pvp_noguild.txt +++ b/npc/mapflag/pvp_noguild.txt @@ -9,7 +9,7 @@ //===== Description: ========================================= //= Ignores guild alliances on GvG-enabled maps. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ // PvP Arenas ================= diff --git a/conf/mapflag/pvp_noparty.txt b/npc/mapflag/pvp_noparty.txt similarity index 96% rename from conf/mapflag/pvp_noparty.txt rename to npc/mapflag/pvp_noparty.txt index abc9529d2f..a19fed4175 100644 --- a/conf/mapflag/pvp_noparty.txt +++ b/npc/mapflag/pvp_noparty.txt @@ -9,7 +9,7 @@ //===== Description: ========================================= //= Ignores party alliances on PvP-enabled maps. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. //============================================================ // GvG Arenas ================= diff --git a/conf/mapflag/reset.txt b/npc/mapflag/reset.txt similarity index 83% rename from conf/mapflag/reset.txt rename to npc/mapflag/reset.txt index 24adf9f3ac..e7948c609f 100644 --- a/conf/mapflag/reset.txt +++ b/npc/mapflag/reset.txt @@ -1,27 +1,23 @@ //===== rAthena Script ======================================= //= Mapflag: Enable Neuralizer use. //===== By: ================================================== -//= Daegaladh +//= rAthena Dev Team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Maps where Neuralizer (12213) can be used. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. [Daegaladh] +//= 1.1 Renewal split. [Euphy] //============================================================ alberta mapflag reset aldebaran mapflag reset amatsu mapflag reset ayothaya mapflag reset -brasilis mapflag reset comodo mapflag reset -dewata mapflag reset -dicastes01 mapflag reset -dicastes02 mapflag reset -eclage mapflag reset einbroch mapflag reset einbech mapflag reset geffen mapflag reset @@ -31,12 +27,9 @@ jawaii mapflag reset hugel mapflag reset lighthalzen mapflag reset louyang mapflag reset -malangdo mapflag reset -malaya mapflag reset manuk mapflag reset mid_camp mapflag reset moc_ruins mapflag reset -mora mapflag reset morocc mapflag reset moscovia mapflag reset niflheim mapflag reset diff --git a/conf/mapflag/restricted.txt b/npc/mapflag/restricted.txt similarity index 79% rename from conf/mapflag/restricted.txt rename to npc/mapflag/restricted.txt index f4bd6d1755..5b3e30cc27 100644 --- a/conf/mapflag/restricted.txt +++ b/npc/mapflag/restricted.txt @@ -1,18 +1,20 @@ //===== rAthena Script ======================================= //= Mapflag: Restricted. //===== By: ================================================== -//= Komurka +//= rAthena Dev Team //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Disables items configured in item_noequip.txt //= and skills configured in skill_nocast_db.txt. //===== Additional Comments: ================================= -//= 1.1 - Added WoE:SE Map restrictions. [L0ne_W0lf] -//= 1.2 - Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf] -//= 1.3 - Added Orc's Memory, Nidhoggur's Nest and towns restrictions. [Daegaladh] +//= 1.0 Initial script. [Komurka] +//= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf] +//= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf] +//= 1.3 Added Orc's Memory, Nidhoggur's Nest and towns restrictions. [Daegaladh] +//= 1.4 Renewal split. [Euphy] //============================================================ //Aldebaran Turbo Track @@ -70,31 +72,6 @@ arug_cas05 mapflag restricted 4 1@nyd mapflag restricted 6 2@nyd mapflag restricted 6 -// Misty Forest Labyrinth =========== -1@mist mapflag restricted 6 - -// Octopus Cave =========== -1@cash mapflag restricted 6 - -// Drain =========== -1@pump mapflag restricted 6 -2@pump mapflag restricted 6 - -// Somatology Laboratory =========== -1@lhz mapflag restricted 6 - -// Bangungot Hospital F2 =========== -1@ma_h mapflag restricted 6 - -// Buwaya Cave =========== -1@ma_c mapflag restricted 6 - -// Bakonawa Hideout =========== -1@ma_b mapflag restricted 6 - -// Inside Eclage =========== -1@ecl mapflag restricted 6 - //Towns alberta mapflag restricted 7 aldebaran mapflag restricted 7 diff --git a/conf/mapflag/town.txt b/npc/mapflag/town.txt similarity index 84% rename from conf/mapflag/town.txt rename to npc/mapflag/town.txt index 8dabb2c4a6..f158a5781a 100644 --- a/conf/mapflag/town.txt +++ b/npc/mapflag/town.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Epoque //===== Current Version: ===================================== -//= 1.0a +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Designates a map as a town, granting mailbox access. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Initial script. +//= 1.1 Renewal split. [Euphy] //============================================================ prontera mapflag town @@ -33,10 +34,3 @@ louyang mapflag town hugel mapflag town rachel mapflag town veins mapflag town -brasilis mapflag town -dicastes01 mapflag town -mora mapflag town -dewata mapflag town -malangdo mapflag town -malaya mapflag town -eclage mapflag town \ No newline at end of file diff --git a/npc/pre-re/mapflag/gvg.txt b/npc/pre-re/mapflag/gvg.txt new file mode 100644 index 0000000000..626c70448d --- /dev/null +++ b/npc/pre-re/mapflag/gvg.txt @@ -0,0 +1,23 @@ +//===== rAthena Script ======================================= +//= Mapflag: Guild versus Guild mode. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Players can attack other guilds, and will have their guild +//= icons shown. WoE damage reductions will also take place. +//= gvg: Turns on GvG mode. +//= gvg_castle: Describes castle maps for WoE. +//= gvg_dungeon: Describes dungeon maps for WoE. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Guild Dungeons ========= +gld_dun01 mapflag gvg_dungeon +gld_dun02 mapflag gvg_dungeon +gld_dun03 mapflag gvg_dungeon +gld_dun04 mapflag gvg_dungeon diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index e029447b54..cf11957933 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -36,6 +36,7 @@ import: npc/scripts_warps.conf // ----------------- Pre-Renewal Script Files ------------------- import: npc/pre-re/scripts_athena.conf import: npc/pre-re/scripts_jobs.conf +import: npc/pre-re/scripts_mapflags.conf import: npc/pre-re/scripts_monsters.conf import: npc/pre-re/scripts_warps.conf diff --git a/npc/pre-re/scripts_mapflags.conf b/npc/pre-re/scripts_mapflags.conf new file mode 100644 index 0000000000..0cd377b090 --- /dev/null +++ b/npc/pre-re/scripts_mapflags.conf @@ -0,0 +1,4 @@ +// -------------------------------------------------------------- +// - Pre-Renewal Map Flags - +// -------------------------------------------------------------- +npc: npc/pre-re/mapflag/gvg.txt diff --git a/npc/re/mapflag/gvg.txt b/npc/re/mapflag/gvg.txt new file mode 100644 index 0000000000..85b4d83b4a --- /dev/null +++ b/npc/re/mapflag/gvg.txt @@ -0,0 +1,23 @@ +//===== rAthena Script ======================================= +//= Mapflag: Guild versus Guild mode. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Players can attack other guilds, and will have their guild +//= icons shown. WoE damage reductions will also take place. +//= gvg: Turns on GvG mode. +//= gvg_castle: Describes castle maps for WoE. +//= gvg_dungeon: Describes dungeon maps for WoE. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Guild Dungeons ========= +gld2_ald mapflag gvg_dungeon +gld2_gef mapflag gvg_dungeon +gld2_pay mapflag gvg_dungeon +gld2_prt mapflag gvg_dungeon diff --git a/npc/re/mapflag/night.txt b/npc/re/mapflag/night.txt new file mode 100644 index 0000000000..c2bfacfa78 --- /dev/null +++ b/npc/re/mapflag/night.txt @@ -0,0 +1,36 @@ +//===== rAthena Script ======================================= +//= Mapflag: Night mode. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Enables night mode effects. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Episode 13 ==================== +brasilis mapflag nightenabled +bra_fild01 mapflag nightenabled +dicastes01 mapflag nightenabled +dicastes02 mapflag nightenabled +dic_fild01 mapflag nightenabled +dic_fild02 mapflag nightenabled + +// Episode 14 ==================== +bif_fild01 mapflag nightenabled +bif_fild02 mapflag nightenabled +dewata mapflag nightenabled +dew_fild01 mapflag nightenabled +dew_dun02 mapflag nightenabled +malangdo mapflag nightenabled +malaya mapflag nightenabled +ma_fild01 mapflag nightenabled +ma_fild02 mapflag nightenabled +ma_scene01 mapflag nightenabled +eclage mapflag nightenabled +ecl_fild01 mapflag nightenabled +ecl_hub01 mapflag nightenabled diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt new file mode 100644 index 0000000000..fa3068f306 --- /dev/null +++ b/npc/re/mapflag/nobranch.txt @@ -0,0 +1,86 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable Dead Branch use. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Disables the following items: +//= Dead Branch (604), Bloody Branch (12103), +//= Red Pouch (12024), Poring Box (12109) +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// 3rd Class Job Maps & Paradise =========== +moc_para01 mapflag nobranch +job3_arch01 mapflag nobranch +job3_arch02 mapflag nobranch +job3_arch03 mapflag nobranch +job3_gen01 mapflag nobranch +job3_guil01 mapflag nobranch +job3_guil02 mapflag nobranch +job3_guil03 mapflag nobranch +job_ko mapflag nobranch +job3_rang01 mapflag nobranch +job3_rang02 mapflag nobranch +job3_rune01 mapflag nobranch +job3_rune02 mapflag nobranch +job3_rune03 mapflag nobranch +job3_sha01 mapflag nobranch +job3_war01 mapflag nobranch +job3_war02 mapflag nobranch +jupe_core2 mapflag nobranch + +// Brasilis =========== +brasilis mapflag nobranch +bra_in01 mapflag nobranch + +// Episode 13.3 =========== +dicastes01 mapflag nobranch +dicastes02 mapflag nobranch +dic_in01 mapflag nobranch +s_atelier mapflag nobranch + +// Episode 14.1 & Dewata =========== +mora mapflag nobranch +1@mist mapflag nobranch +dewata mapflag nobranch +dew_in01 mapflag nobranch + +// Episode Zero & Malaya Port =========== +malangdo mapflag nobranch +mal_in01 mapflag nobranch +mal_in02 mapflag nobranch +1@cash mapflag nobranch +1@pump mapflag nobranch +2@pump mapflag nobranch +1@lhz mapflag nobranch +que_lhz mapflag nobranch +malaya mapflag nobranch +ma_scene01 mapflag nobranch +ma_in01 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 +1@ma_h mapflag nobranch +1@ma_c mapflag nobranch +1@ma_b mapflag nobranch + +// Episode 14.2 =========== +eclage mapflag nobranch +ecl_in01 mapflag nobranch +ecl_in02 mapflag nobranch +ecl_in03 mapflag nobranch +ecl_in04 mapflag nobranch +1@ecl mapflag nobranch +ecl_hub01 mapflag nobranch +que_avan01 mapflag nobranch diff --git a/npc/re/mapflag/noicewall.txt b/npc/re/mapflag/noicewall.txt new file mode 100644 index 0000000000..605bc99ab7 --- /dev/null +++ b/npc/re/mapflag/noicewall.txt @@ -0,0 +1,38 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable Ice Wall. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Blocks usage of WZ_ICEWALL. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Misty Forest Labyrinth =========== +1@mist mapflag noicewall + +// Octopus Cave =========== +1@cash mapflag noicewall + +// Drain =========== +1@pump mapflag noicewall +2@pump mapflag noicewall + +// Somatology Laboratory =========== +1@lhz mapflag noicewall + +// Bangungot Hospital F2 =========== +1@ma_h mapflag noicewall + +// Buwaya Cave =========== +1@ma_c mapflag noicewall + +// Bakonawa Hideout =========== +1@ma_b mapflag noicewall + +// Inside Eclage =========== +1@ecl mapflag noicewall diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt new file mode 100644 index 0000000000..751f41a272 --- /dev/null +++ b/npc/re/mapflag/nomemo.txt @@ -0,0 +1,127 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable Warp Portal memory. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Prevents players from using /memo on a map. +//= Also disables marriage warp skills. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Episode 13 ==================== +job3_arch01 mapflag nomemo +job3_arch02 mapflag nomemo +job3_arch03 mapflag nomemo +job3_guil01 mapflag nomemo +job3_guil02 mapflag nomemo +job3_guil03 mapflag nomemo +job3_rang01 mapflag nomemo +job3_rang02 mapflag nomemo +job3_rune01 mapflag nomemo +job3_rune02 mapflag nomemo +job3_rune03 mapflag nomemo +job3_war01 mapflag nomemo +job3_war02 mapflag nomemo +job3_gen01 mapflag nomemo +job3_sha01 mapflag nomemo +jupe_core2 mapflag nomemo +s_atelier mapflag nomemo +bra_in01 mapflag nomemo +bra_dun01 mapflag nomemo +bra_dun02 mapflag nomemo +dicastes01 mapflag nomemo +dicastes02 mapflag nomemo +dic_in01 mapflag nomemo +dic_fild01 mapflag nomemo +dic_fild02 mapflag nomemo +dic_dun01 mapflag nomemo +dic_dun02 mapflag nomemo + +// Episode 14 ==================== +bif_fild01 mapflag nomemo +bif_fild02 mapflag nomemo +1@mist mapflag nomemo +mora mapflag nomemo +dew_dun01 mapflag nomemo +dew_dun02 mapflag nomemo +dew_in01 mapflag nomemo +dic_dun03 mapflag nomemo +mal_in01 mapflag nomemo +mal_in02 mapflag nomemo +mal_dun01 mapflag nomemo +1@cash mapflag nomemo +1@pump mapflag nomemo +2@pump mapflag nomemo +iz_dun05 mapflag nomemo +lhz_dun04 mapflag nomemo +que_lhz mapflag nomemo +1@lhz mapflag nomemo +gld_dun01_2 mapflag nomemo +gld_dun02_2 mapflag nomemo +gld_dun03_2 mapflag nomemo +gld_dun04_2 mapflag nomemo +gld2_ald mapflag nomemo +gld2_gef mapflag nomemo +gld2_pay mapflag nomemo +gld2_prt mapflag nomemo +job_ko mapflag nomemo +ma_scene01 mapflag nomemo +ma_in01 mapflag nomemo +ma_dun01 mapflag nomemo +1@ma_h mapflag nomemo +1@ma_c mapflag nomemo +1@ma_b 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 +eclage mapflag nomemo +ecl_fild01 mapflag nomemo +ecl_in01 mapflag nomemo +ecl_in02 mapflag nomemo +ecl_in03 mapflag nomemo +ecl_in04 mapflag nomemo +1@ecl mapflag nomemo +ecl_tdun01 mapflag nomemo +ecl_tdun02 mapflag nomemo +ecl_tdun03 mapflag nomemo +ecl_tdun04 mapflag nomemo +ecl_hub01 mapflag nomemo +moc_prydn1 mapflag nomemo +moc_prydn2 mapflag nomemo + +//Orc's Memory =================== +1@orcs mapflag nomemo +2@orcs mapflag nomemo + +// Nidhoggr's Instance =========== +1@nyd mapflag nomemo +2@nyd mapflag nomemo + +// Glast Heim Memorial Dungeon === +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 diff --git a/npc/re/mapflag/nopenalty.txt b/npc/re/mapflag/nopenalty.txt new file mode 100644 index 0000000000..09b1cbddcb --- /dev/null +++ b/npc/re/mapflag/nopenalty.txt @@ -0,0 +1,67 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable death penalty. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Same as 'noexppenalty' and 'nozenypenalty' combined. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Towns ==================== +brasilis mapflag nopenalty +bra_in01 mapflag nopenalty +dicastes01 mapflag nopenalty +dicastes02 mapflag nopenalty +dic_in01 mapflag nopenalty +s_atelier mapflag nopenalty +mora mapflag nopenalty +dewata mapflag nopenalty +dew_in01 mapflag nopenalty +malangdo mapflag nopenalty +mal_in01 mapflag nopenalty +mal_in02 mapflag nopenalty +malaya 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 +eclage mapflag nopenalty +ecl_in01 mapflag nopenalty +ecl_in02 mapflag nopenalty +ecl_in03 mapflag nopenalty +ecl_in04 mapflag nopenalty +ecl_hub01 mapflag nopenalty +que_avan01 mapflag nopenalty + +// Job Quests ======================== +// 3-1 -------------------- +job3_arch01 mapflag nopenalty +job3_arch02 mapflag nopenalty +job3_arch03 mapflag nopenalty +job3_guil01 mapflag nopenalty +job3_guil02 mapflag nopenalty +job3_guil03 mapflag nopenalty +job3_rang01 mapflag nopenalty +job3_rang02 mapflag nopenalty +job3_rune01 mapflag nopenalty +job3_rune02 mapflag nopenalty +job3_rune03 mapflag nopenalty +job3_war01 mapflag nopenalty +job3_war02 mapflag nopenalty +// 3-2 -------------------- +job3_gen01 mapflag nopenalty +// Ext -------------------- +job3_sha01 mapflag nopenalty +job_ko mapflag nopenalty diff --git a/npc/re/mapflag/nopvp.txt b/npc/re/mapflag/nopvp.txt new file mode 100644 index 0000000000..4e77f0d1be --- /dev/null +++ b/npc/re/mapflag/nopvp.txt @@ -0,0 +1,68 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable Player versus Player mode. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Prevents PvP mode on a map. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Instances =================== +1@mist mapflag pvp off +1@cash mapflag pvp off +1@pump mapflag pvp off +2@pump mapflag pvp off +1@lhz mapflag pvp off +1@ma_h mapflag pvp off +1@ma_c mapflag pvp off +1@ma_b mapflag pvp off +1@ecl mapflag pvp off +1@gl_k mapflag pvp off +2@gl_k mapflag pvp off +1@def01 mapflag pvp off +1@def02 mapflag pvp off +1@def03 mapflag pvp off +1@gef mapflag pvp off +1@face mapflag pvp off +1@sara mapflag pvp off +1@gef_in mapflag pvp off + +// Cities ======================== +moc_para01 mapflag pvp off +brasilis mapflag pvp off +bra_in01 mapflag pvp off +dicastes01 mapflag pvp off +dicastes02 mapflag pvp off +dic_in01 mapflag pvp off +s_atelier mapflag pvp off +mora mapflag pvp off +dewata mapflag pvp off +dew_in01 mapflag pvp off +malangdo mapflag pvp off +mal_in01 mapflag pvp off +mal_in02 mapflag pvp off +malaya mapflag pvp off +ma_scene01 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 +eclage 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 +que_avan01 mapflag pvp off +dali mapflag pvp off diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt new file mode 100644 index 0000000000..37fe28909a --- /dev/null +++ b/npc/re/mapflag/nosave.txt @@ -0,0 +1,99 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable auto-save. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Characters logging out on the specified map will be warped +//= to the map specified in the last field, or "SavePoint". +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Job Quests ==================== +// 3-1 +job3_arch01 mapflag nosave SavePoint +job3_arch02 mapflag nosave SavePoint +job3_arch03 mapflag nosave SavePoint +job3_guil01 mapflag nosave SavePoint +job3_guil02 mapflag nosave SavePoint +job3_guil03 mapflag nosave SavePoint +job3_rang01 mapflag nosave SavePoint +job3_rang02 mapflag nosave SavePoint +job3_rune01 mapflag nosave SavePoint +job3_rune02 mapflag nosave SavePoint +job3_rune03 mapflag nosave SavePoint +job3_war01 mapflag nosave SavePoint +job3_war02 mapflag nosave SavePoint +// 3-2 +job3_gen01 mapflag nosave SavePoint +// Ext +job3_sha01 mapflag nosave SavePoint +job_ko mapflag nosave SavePoint + +//Guild Dungeons ============================== +gld_dun01_2 mapflag nosave SavePoint +gld_dun02_2 mapflag nosave SavePoint +gld_dun03_2 mapflag nosave SavePoint +gld_dun04_2 mapflag nosave SavePoint +gld2_ald mapflag nosave SavePoint +gld2_gef mapflag nosave SavePoint +gld2_pay mapflag nosave SavePoint +gld2_prt mapflag nosave SavePoint + +// Misty Forest Labyrinth ========= +1@mist mapflag nosave SavePoint + +// Octopus Cave =================== +1@cash mapflag nosave SavePoint + +// Drain ========================== +1@pump mapflag nosave SavePoint +2@pump mapflag nosave SavePoint + +// Somatology Laboratory ========== +que_lhz mapflag nosave SavePoint +1@lhz mapflag nosave SavePoint + +// Port Malaya ==================== +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 + +// Bangungot Hospital F2 ========== +1@ma_h mapflag nosave SavePoint + +// Buwaya Cave ==================== +1@ma_c mapflag nosave SavePoint + +// Bakonawa Hideout =============== +1@ma_b mapflag nosave SavePoint + +// Inside Eclage ================== +que_avan01 mapflag nosave SavePoint +1@ecl mapflag nosave SavePoint + +// Glast Heim Memorial Dungeon ==== +1@gl_k mapflag nosave SavePoint +2@gl_k 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 diff --git a/npc/re/mapflag/noteleport.txt b/npc/re/mapflag/noteleport.txt new file mode 100644 index 0000000000..59fbdff0dc --- /dev/null +++ b/npc/re/mapflag/noteleport.txt @@ -0,0 +1,98 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable teleportation. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Disables all means of teleportation within a map. +//= Script commands 'warp', 'areawarp', 'warpchar', +//= 'warpparty', 'warpguild', 'warpwaitingpc' will not +//= work with "Random" destination. +//= Disables skills AL_TELEPORT and TK_HIGHJUMP. +//= Disables the following items: +//= Fly Wing (601), Giant Fly Wing (12212) +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Cities ======================== +moc_para01 mapflag noteleport + +// Episode 13 ==================== +s_atelier mapflag noteleport +bra_in01 mapflag noteleport +dic_in01 mapflag noteleport +job3_gen01 mapflag noteleport +job3_sha01 mapflag noteleport + +// Episode 14 ==================== +1@mist mapflag noteleport +1@mist mapflag monster_noteleport +dew_in01 mapflag noteleport +mal_in01 mapflag noteleport +mal_in02 mapflag noteleport +1@cash mapflag noteleport +1@cash mapflag monster_noteleport +1@pump mapflag noteleport +1@pump mapflag monster_noteleport +2@pump mapflag noteleport +2@pump mapflag monster_noteleport +que_lhz mapflag noteleport +que_lhz mapflag monster_noteleport +1@lhz mapflag noteleport +1@lhz mapflag monster_noteleport +ma_scene01 mapflag noteleport +ma_in01 mapflag noteleport +1@ma_h mapflag noteleport +1@ma_h mapflag monster_noteleport +1@ma_c mapflag noteleport +1@ma_c mapflag monster_noteleport +1@ma_b mapflag noteleport +1@ma_b mapflag monster_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 +job_ko mapflag noteleport +ecl_in01 mapflag noteleport +ecl_in02 mapflag noteleport +ecl_in03 mapflag noteleport +ecl_in04 mapflag noteleport +1@ecl mapflag noteleport +1@ecl mapflag monster_noteleport +ecl_hub01 mapflag noteleport + +// Glast Heim Memorial Dungeon === +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 diff --git a/npc/re/mapflag/nowarpto.txt b/npc/re/mapflag/nowarpto.txt new file mode 100644 index 0000000000..7de129de9d --- /dev/null +++ b/npc/re/mapflag/nowarpto.txt @@ -0,0 +1,59 @@ +//===== rAthena Script ======================================= +//= Mapflag: Disable warpto. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Disables warping to a map. +//= Atcommands @warp, @go, @load, @jump, @partyrecall, +//= @guildrecall, and @recallall are disabled. +//= Command /memo is disabled. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// 14.1 Bifrost ================== +1@mist mapflag nowarpto +que_house_s mapflag nowarpto + +// Malangdo Maps ================= +1@pump mapflag nowarpto +2@pump mapflag nowarpto +1@cash mapflag nowarpto + +// Lighthalzen Dungeon F4 ======== +1@lhz mapflag nowarpto +lhz_dun04 mapflag nowarpto +que_lhz mapflag nowarpto + +// Port Malaya =================== +1@ma_b mapflag nowarpto +1@ma_c mapflag nowarpto +1@ma_h mapflag nowarpto + +// 14.2 Eclage =================== +1@ecl mapflag nowarpto + +// Pyramids Basement Nightmare Mode +moc_prydn1 mapflag nowarpto +moc_prydn2 mapflag nowarpto + +// Glast Heim Memorial Dungeon === +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 diff --git a/conf/mapflag/partylock.txt b/npc/re/mapflag/partylock.txt similarity index 73% rename from conf/mapflag/partylock.txt rename to npc/re/mapflag/partylock.txt index f01595f815..26997c134d 100644 --- a/conf/mapflag/partylock.txt +++ b/npc/re/mapflag/partylock.txt @@ -3,37 +3,16 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.1 +//= 1.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Blocks all party modifications on a map: //= /organize, /leave, /invite, @changeleader //===== Additional Comments: ================================= -//= 1.0 - Initial script. -//= 1.1 - Updated. [L0ne_W0lf] +//= 1.0 Renewal split. [Euphy] //============================================================ -// Sealed Shrine ================== -1@cata mapflag partylock -2@cata mapflag partylock - -// Endless Tower ================== -1@tower mapflag partylock -2@tower mapflag partylock -3@tower mapflag partylock -4@tower mapflag partylock -5@tower mapflag partylock -6@tower mapflag partylock - -// Orc's Memory =================== -1@orcs mapflag partylock -2@orcs mapflag partylock - -// Nidhoggr's Instance ============ -1@nyd mapflag partylock -2@nyd mapflag partylock - // Misty Forest Labyrinth ========= 1@mist mapflag partylock diff --git a/conf/mapflag/noloot.txt b/npc/re/mapflag/reset.txt similarity index 51% rename from conf/mapflag/noloot.txt rename to npc/re/mapflag/reset.txt index adab17a5da..f95cd81d57 100644 --- a/conf/mapflag/noloot.txt +++ b/npc/re/mapflag/reset.txt @@ -1,26 +1,22 @@ //===== rAthena Script ======================================= -//= Mapflag: Disable monster drops. +//= Mapflag: Enable Neuralizer use. //===== By: ================================================== -//= Epoque +//= rAthena Dev Team //===== Current Version: ===================================== -//= 1.0a +//= 1.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= Same as 'nomobloot' and 'nomvploot' combined. +//= Maps where Neuralizer (12213) can be used. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Renewal split. [Euphy] //============================================================ -//hunte mapflag noloot -//job_knt mapflag noloot -//job_prist mapflag noloot -//job_wiz mapflag noloot -//job_cru mapflag noloot -//monk_test mapflag noloot -//in_rogue mapflag noloot -//job_sage mapflag noloot -//job_soul mapflag noloot -//job_star mapflag noloot -//que_ng mapflag noloot -//job_thief1 mapflag noloot +brasilis mapflag reset +dewata mapflag reset +dicastes01 mapflag reset +dicastes02 mapflag reset +eclage mapflag reset +malangdo mapflag reset +malaya mapflag reset +mora mapflag reset \ No newline at end of file diff --git a/npc/re/mapflag/restricted.txt b/npc/re/mapflag/restricted.txt new file mode 100644 index 0000000000..ea82abb918 --- /dev/null +++ b/npc/re/mapflag/restricted.txt @@ -0,0 +1,39 @@ +//===== rAthena Script ======================================= +//= Mapflag: Restricted. +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena SVN +//===== Description: ========================================= +//= Disables items configured in item_noequip.txt +//= and skills configured in skill_nocast_db.txt. +//===== Additional Comments: ================================= +//= 1.0 Renewal split. [Euphy] +//============================================================ + +// Misty Forest Labyrinth =========== +1@mist mapflag restricted 6 + +// Octopus Cave =========== +1@cash mapflag restricted 6 + +// Drain =========== +1@pump mapflag restricted 6 +2@pump mapflag restricted 6 + +// Somatology Laboratory =========== +1@lhz mapflag restricted 6 + +// Bangungot Hospital F2 =========== +1@ma_h mapflag restricted 6 + +// Buwaya Cave =========== +1@ma_c mapflag restricted 6 + +// Bakonawa Hideout =========== +1@ma_b mapflag restricted 6 + +// Inside Eclage =========== +1@ecl mapflag restricted 6 diff --git a/conf/mapflag/novending.txt b/npc/re/mapflag/town.txt similarity index 64% rename from conf/mapflag/novending.txt rename to npc/re/mapflag/town.txt index 816d52252a..5c9685527c 100644 --- a/conf/mapflag/novending.txt +++ b/npc/re/mapflag/town.txt @@ -1,16 +1,21 @@ //===== rAthena Script ======================================= -//= Mapflag: Disable vending. +//= Mapflag: Town. //===== By: ================================================== //= Epoque //===== Current Version: ===================================== -//= 1.0a +//= 1.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= Disables skill MC_VENDING on a map. +//= Designates a map as a town, granting mailbox access. //===== Additional Comments: ================================= -//= 1.0 - Initial script. +//= 1.0 Renewal split. [Euphy] //============================================================ -//prontera mapflag novending -//prt_in mapflag novending +brasilis mapflag town +dewata mapflag town +dicastes01 mapflag town +eclage mapflag town +malangdo mapflag town +malaya mapflag town +mora mapflag town diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 2bca123249..9ac3af7f08 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -36,6 +36,7 @@ import: npc/scripts_warps.conf // ------------------- Renewal Script Files --------------------- import: npc/re/scripts_athena.conf import: npc/re/scripts_jobs.conf +import: npc/re/scripts_mapflags.conf import: npc/re/scripts_monsters.conf import: npc/re/scripts_warps.conf diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf new file mode 100644 index 0000000000..3c4bfedaea --- /dev/null +++ b/npc/re/scripts_mapflags.conf @@ -0,0 +1,17 @@ +// -------------------------------------------------------------- +// - Renewal Map Flags - +// -------------------------------------------------------------- +npc: npc/re/mapflag/nopvp.txt +npc: npc/re/mapflag/gvg.txt +npc: npc/re/mapflag/nobranch.txt +npc: npc/re/mapflag/noicewall.txt +npc: npc/re/mapflag/nomemo.txt +npc: npc/re/mapflag/nopenalty.txt +npc: npc/re/mapflag/nosave.txt +npc: npc/re/mapflag/noteleport.txt +npc: npc/re/mapflag/nowarpto.txt +//npc: npc/re/mapflag/partylock.txt +npc: npc/re/mapflag/night.txt +npc: npc/re/mapflag/restricted.txt +npc: npc/re/mapflag/town.txt +npc: npc/re/mapflag/reset.txt diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index ee6bd74e5a..25ac0476d4 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -1,29 +1,26 @@ // -------------------------------------------------------------- // - Map Flags - // -------------------------------------------------------------- -npc: conf/mapflag/nopvp.txt -npc: conf/mapflag/gvg.txt -npc: conf/mapflag/jail.txt -npc: conf/mapflag/nightmare.txt -npc: conf/mapflag/nobranch.txt -npc: conf/mapflag/noexp.txt -npc: conf/mapflag/noicewall.txt -npc: conf/mapflag/noloot.txt -npc: conf/mapflag/nomemo.txt -npc: conf/mapflag/nopenalty.txt -npc: conf/mapflag/nosave.txt -npc: conf/mapflag/noteleport.txt -npc: conf/mapflag/noreturn.txt -npc: conf/mapflag/noskill.txt -npc: conf/mapflag/nowarp.txt -npc: conf/mapflag/nowarpto.txt -//npc: conf/mapflag/partylock.txt -npc: conf/mapflag/pvp.txt -npc: conf/mapflag/pvp_noparty.txt -npc: conf/mapflag/pvp_noguild.txt -npc: conf/mapflag/night.txt -npc: conf/mapflag/restricted.txt -npc: conf/mapflag/battleground.txt -npc: conf/mapflag/novending.txt -npc: conf/mapflag/town.txt -npc: conf/mapflag/reset.txt +npc: npc/mapflag/nopvp.txt +npc: npc/mapflag/gvg.txt +npc: npc/mapflag/jail.txt +npc: npc/mapflag/nightmare.txt +npc: npc/mapflag/nobranch.txt +npc: npc/mapflag/noicewall.txt +npc: npc/mapflag/nomemo.txt +npc: npc/mapflag/nopenalty.txt +npc: npc/mapflag/nosave.txt +npc: npc/mapflag/noteleport.txt +npc: npc/mapflag/noreturn.txt +npc: npc/mapflag/noskill.txt +npc: npc/mapflag/nowarp.txt +npc: npc/mapflag/nowarpto.txt +//npc: npc/mapflag/partylock.txt +npc: npc/mapflag/pvp.txt +npc: npc/mapflag/pvp_noparty.txt +npc: npc/mapflag/pvp_noguild.txt +npc: npc/mapflag/night.txt +npc: npc/mapflag/restricted.txt +npc: npc/mapflag/battleground.txt +npc: npc/mapflag/town.txt +npc: npc/mapflag/reset.txt