From d2b18c292a3a59f785a1eb27208f7379065f6317 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 14 Aug 2010 16:06:23 +0000 Subject: * Quest log kill count now updated properly. (Added from topic 253813) * More battleground editing, and some bug fixes. - * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING * - Rewrote the Badge Exchange NPC in bg_common.txt, is official now. - Other changes to the bg_common folder, including disabled GM NPC. - Completely rewrote Flavius for the most part, from ground up. - Moved old Flavius battlegrounds to /custom/battleground folder. - Restored original bg_common, and KVM to /custom/battleground - Fixed wall bugs in Tierra Gorge, and added an oninit to the timers. - Other minor tweaks to both Tierra Gorge and KVM scripts. - Fixed the pseudo-cooldown on KVM not working properly, I hope. - Added global time2str function which will be used later in Endless tower. * Applied Epoque's mapflag clean up, which removes flags from scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/battleground.txt | 19 +++++++++++++++++++ conf/mapflag/fireworks.txt | 13 +++++++++++++ conf/mapflag/night.txt | 14 +++++++++----- conf/mapflag/nobranch.txt | 32 ++++++++++++++++++++++---------- conf/mapflag/noloot.txt | 18 +++++++++--------- conf/mapflag/nomemo.txt | 13 +++++++++++++ conf/mapflag/nopenalty.txt | 12 ++++++++++++ conf/mapflag/nopvp.txt | 3 ++- conf/mapflag/noreturn.txt | 11 +++++++++++ conf/mapflag/nosave.txt | 11 +++++++++++ conf/mapflag/noskill.txt | 14 ++++++++++---- conf/mapflag/noteleport.txt | 12 ++++++++++++ conf/mapflag/novending.txt | 14 ++++++++++++++ conf/mapflag/nowarp.txt | 8 ++++++++ conf/mapflag/nowarpto.txt | 10 ++++++++++ conf/mapflag/town.txt | 33 +++++++++++++++++++++++++++++++++ 16 files changed, 208 insertions(+), 29 deletions(-) create mode 100644 conf/mapflag/battleground.txt create mode 100644 conf/mapflag/fireworks.txt create mode 100644 conf/mapflag/novending.txt create mode 100644 conf/mapflag/town.txt (limited to 'conf/mapflag') diff --git a/conf/mapflag/battleground.txt b/conf/mapflag/battleground.txt new file mode 100644 index 000000000..4a1ff0f66 --- /dev/null +++ b/conf/mapflag/battleground.txt @@ -0,0 +1,19 @@ +//===== eAthena Script ======================================= +//= Battleground map setting. '2' shows scoreboard. +//===== By: ================================================== +//= Epoque +//===== Current Version: ===================================== +//= 1.0a [Epoque] +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= +//============================================================ + +bat_c01 mapflag battleground 2 +bat_c02 mapflag battleground 2 +bat_c03 mapflag battleground 2 +bat_b01 mapflag battleground 2 +bat_b02 mapflag battleground +bat_a01 mapflag battleground +bat_a02 mapflag battleground diff --git a/conf/mapflag/fireworks.txt b/conf/mapflag/fireworks.txt new file mode 100644 index 000000000..90d89eb1b --- /dev/null +++ b/conf/mapflag/fireworks.txt @@ -0,0 +1,13 @@ +//===== eAthena Script ======================================= +//= Displays Fireworks effect (Depreciated) +//===== By: ================================================== +//= Epoque +//===== Current Version: ===================================== +//= 1.0a [Epoque] +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= +//============================================================ + +//prontera mapflag fireworks diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt index 70cd1431f..6daaa1b2a 100644 --- a/conf/mapflag/night.txt +++ b/conf/mapflag/night.txt @@ -271,6 +271,14 @@ que_qaru03 mapflag nightenabled que_qaru04 mapflag nightenabled que_qaru05 mapflag nightenabled +// Battle Grounds ============== +bat_c01 mapflag nightenabled +bat_c02 mapflag nightenabled +bat_c03 mapflag nightenabled + +//Endless Tower ================== +e_tower mapflag nightenabled + // Episode 13 ==================== mid_camp mapflag nightenabled man_fild01 mapflag nightenabled @@ -287,9 +295,5 @@ manuk mapflag nightenabled man_fild02 mapflag nightenabled splendide mapflag nightenabled spl_fild01 mapflag nightenabled -bat_c01 mapflag nightenabled -bat_c02 mapflag nightenabled -bat_c03 mapflag nightenabled -//Endless Tower ================== -e_tower mapflag nightenabled +//evt_zombie mapflag nightenabled diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 70018fe2e..014fa0169 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -9,7 +9,7 @@ //= 1.8 Removed restriction on PVP maps. [L0ne_W0lf] //===== Current Version: ===================================== -// Cities ================>\\ +// Cities ====================== ayo_in01 mapflag nobranch ayo_in02 mapflag nobranch alb_ship mapflag nobranch @@ -95,7 +95,7 @@ ve_in mapflag nobranch ve_in02 mapflag nobranch thor_camp mapflag nobranch -// Job Quests ==================== +// Job Quests ================== job_sword1 mapflag nobranch job_thief1 mapflag nobranch // 2-1 @@ -118,7 +118,7 @@ que_ng mapflag nobranch job_soul mapflag nobranch job_star mapflag nobranch -// Special Quests Places ========= +// Special Quests Places ======= que_god01 mapflag nobranch que_god02 mapflag nobranch que_bingo mapflag nobranch @@ -135,7 +135,7 @@ que_rachel mapflag nobranch que_san04 mapflag nobranch que_thor mapflag nobranch -// Guild Castles ================== +// Guild Castles =============== //alde_gld mapflag nobranch aldeg_cas01 mapflag nobranch aldeg_cas02 mapflag nobranch @@ -178,14 +178,14 @@ nguild_gef mapflag nobranch nguild_pay mapflag nobranch nguild_prt mapflag nobranch -// GvG Arenas ===================== +// GvG Arenas ================== guild_vs1 mapflag nobranch guild_vs2 mapflag nobranch guild_vs3 mapflag nobranch guild_vs4 mapflag nobranch guild_vs5 mapflag nobranch -// Arenas ================>\\ +// Arenas ====================== arena_room mapflag nobranch force_1-1 mapflag nobranch force_1-2 mapflag nobranch @@ -219,11 +219,11 @@ prt_are01 mapflag nobranch //wizard_2-1 mapflag nobranch //wizard_3-1 mapflag nobranch -// PvP Arenas ========================= +// PvP Arenas ================== pvp_y_room mapflag nobranch pvp_n_room mapflag nobranch -//Main City maps +// Main City maps ============== alberta mapflag nobranch aldebaran mapflag nobranch amatsu mapflag nobranch @@ -259,11 +259,11 @@ turbo_e_4 mapflag nobranch turbo_e_8 mapflag nobranch turbo_e_16 mapflag nobranch -//Monster Races ================ +// Monster Races =============== p_track01 mapflag nobranch p_track02 mapflag nobranch -//Vision of Okolnir ============ +// Vision of Okolnir =========== que_qsch01 mapflag nobranch que_qsch02 mapflag nobranch que_qsch03 mapflag nobranch @@ -274,3 +274,15 @@ que_qaru02 mapflag nobranch que_qaru03 mapflag nobranch que_qaru04 mapflag nobranch que_qaru05 mapflag nobranch + +// Battle Grounds ============== +bat_c01 mapflag nobranch +bat_c02 mapflag nobranch +bat_c03 mapflag nobranch +bat_room mapflag nobranch +bat_b01 mapflag nobranch +bat_b02 mapflag nobranch +bat_a01 mapflag nobranch +bat_a02 mapflag nobranch + +//evt_zombie mapflag nobranch diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt index e488f8f0a..7c3c0bfa4 100644 --- a/conf/mapflag/noloot.txt +++ b/conf/mapflag/noloot.txt @@ -1,16 +1,16 @@ //===== eAthena Script ======================================= -//= Map flags that disable drop of loot +//= Mapflag from a script in the NPC folder //===== By: ================================================== -//= eAthena Dev Team -//= 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] +//= Epoque +//===== Current Version: ===================================== +//= 1.0a [Epoque] +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= //============================================================ -// Location for Job's Quests -//job_sword1 mapflag noloot -//in_moc_16 mapflag noloot -//job_hunte mapflag noloot +//hunte mapflag noloot //job_knt mapflag noloot //job_prist mapflag noloot //job_wiz mapflag noloot diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index a2ffb46d6..960b790c4 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -1,4 +1,5 @@ //===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= Map flags that disable warp portal memory //===== By: ================================================== //= eAthena Dev Team @@ -637,6 +638,16 @@ que_qaru05 mapflag nomemo 5@tower mapflag nomemo 6@tower mapflag nomemo +// Battle Grounds ================ +bat_c01 mapflag nomemo +bat_c02 mapflag nomemo +bat_c03 mapflag nomemo +bat_room mapflag nomemo +bat_b01 mapflag nomemo +bat_b02 mapflag nomemo +bat_a01 mapflag nomemo +bat_a02 mapflag nomemo + // Episode 13 ==================== mid_campin mapflag nomemo man_fild01 mapflag nomemo @@ -666,3 +677,5 @@ spl_in01 mapflag nomemo // Nidhoggr's Instance =========== 1@nyd mapflag nomemo 2@nyd mapflag nomemo + +//evt_zombie mapflag nomemo diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index ddffc147e..b34c99191 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -238,3 +238,15 @@ que_qaru02 mapflag nopenalty que_qaru03 mapflag nopenalty que_qaru04 mapflag nopenalty que_qaru05 mapflag nopenalty + +// Battle Grounds ============== +bat_c01 mapflag nopenalty +bat_c02 mapflag nopenalty +bat_c03 mapflag nopenalty +bat_room mapflag nopenalty +bat_b01 mapflag nopenalty +bat_b02 mapflag nopenalty +bat_a01 mapflag nopenalty +bat_a02 mapflag nopenalty + +//evt_zombie mapflag nopenalty diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt index 379d0eb90..176c3512d 100644 --- a/conf/mapflag/nopvp.txt +++ b/conf/mapflag/nopvp.txt @@ -79,4 +79,5 @@ ein_in01 mapflag pvp off ayothaya mapflag pvp off veins mapflag pvp off ve_in mapflag pvp off -ve_in02 mapflag pvp off \ No newline at end of file +ve_in02 mapflag pvp off +//evt_zombie mapflag pvp off diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt index 3f9a201e9..f6a31b272 100644 --- a/conf/mapflag/noreturn.txt +++ b/conf/mapflag/noreturn.txt @@ -229,3 +229,14 @@ que_hugel mapflag noreturn //pvp_n_8-4 mapflag noreturn //pvp_n_8-5 mapflag noreturn //pvp_2vs2 mapflag noreturn + +// Battle Grounds ============== +bat_c01 mapflag noreturn +bat_c02 mapflag noreturn +bat_c03 mapflag noreturn +bat_b01 mapflag noreturn +bat_b02 mapflag noreturn +bat_a01 mapflag noreturn +bat_a02 mapflag noreturn + +//evt_zombie mapflag noreturn diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt index c02af5947..7c254eee2 100644 --- a/conf/mapflag/nosave.txt +++ b/conf/mapflag/nosave.txt @@ -239,6 +239,15 @@ e_tower mapflag nosave SavePoint 5@tower mapflag nosave SavePoint 6@tower mapflag nosave SavePoint +// Battle Grounds ============== +bat_c01 mapflag nosave SavePoint +bat_c02 mapflag nosave SavePoint +bat_c03 mapflag nosave SavePoint +bat_b01 mapflag nosave SavePoint +bat_b02 mapflag nosave SavePoint +bat_a01 mapflag nosave SavePoint +bat_a02 mapflag nosave SavePoint + // Episode 13 ==================== moc_fild22b mapflag nosave SavePoint que_dan01 mapflag nosave SavePoint @@ -258,3 +267,5 @@ arug_dun01 mapflag nosave SavePoint arug_dun01 mapflag nosave SavePoint schg_dun01 mapflag nosave SavePoint + +//evt_zombie mapflag nosave SavePoint diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt index 35af4894c..28b1b70b7 100644 --- a/conf/mapflag/noskill.txt +++ b/conf/mapflag/noskill.txt @@ -13,12 +13,18 @@ prt_are_in mapflag noskill himinn mapflag noskill // Quiz Maps =================== -quiz_00 mapflag noskill -quiz_01 mapflag noskill -quiz_02 mapflag noskill -quiz_test mapflag noskill +quiz_00 mapflag noskill + +quiz_01 mapflag noskill + +quiz_02 mapflag noskill + +quiz_test mapflag noskill + //Hugel Minigames ============== que_bingo mapflag noskill p_track01 mapflag noskill p_track02 mapflag noskill + +//evt_zombie mapflag noskill diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index b532732b4..b88cb0188 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -353,6 +353,16 @@ e_tower mapflag noteleport 6@tower mapflag noteleport 6@tower mapflag monster_noteleport +// Battle Grounds ============== +bat_c01 mapflag noteleport +bat_c02 mapflag noteleport +bat_c03 mapflag noteleport +bat_room mapflag noteleport +bat_b01 mapflag noteleport +bat_b02 mapflag noteleport +bat_a01 mapflag noteleport +bat_a02 mapflag noteleport + // Episode 13 ==================== mid_campin mapflag noteleport moc_fild22b mapflag noteleport @@ -377,3 +387,5 @@ nyd_dun02 mapflag noteleport 1@nyd mapflag monster_noteleport 2@nyd mapflag noteleport 2@nyd mapflag monster_noteleport + +//evt_zombie mapflag noteleport diff --git a/conf/mapflag/novending.txt b/conf/mapflag/novending.txt new file mode 100644 index 000000000..34eb4549e --- /dev/null +++ b/conf/mapflag/novending.txt @@ -0,0 +1,14 @@ +//===== eAthena Script ======================================= +//= Mapflag from a script in the NPC folder +//===== By: ================================================== +//= Epoque +//===== Current Version: ===================================== +//= 1.0a [Epoque] +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= +//============================================================ + +//prontera mapflag novending +//prt_in mapflag novending diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt index e7c910326..63c9aaaae 100644 --- a/conf/mapflag/nowarp.txt +++ b/conf/mapflag/nowarp.txt @@ -57,3 +57,11 @@ turbo_e_16 mapflag nowarp //Monster Races ================ p_track01 mapflag nowarp p_track02 mapflag nowarp +// Battle Grounds ============== +bat_c01 mapflag nowarp +bat_c02 mapflag nowarp +bat_c03 mapflag nowarp +bat_b01 mapflag nowarp +bat_b02 mapflag nowarp +bat_a01 mapflag nowarp +bat_a02 mapflag nowarp diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index c37d6e194..01d27eda5 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -99,6 +99,16 @@ e_tower mapflag nowarpto 5@tower mapflag nowarpto 6@tower mapflag nowarpto +// Battle Grounds ============== +bat_c01 mapflag nowarpto +bat_c02 mapflag nowarpto +bat_c03 mapflag nowarpto +bat_room mapflag nowarpto +bat_b01 mapflag nowarpto +bat_b02 mapflag nowarpto +bat_a01 mapflag nowarpto +bat_a02 mapflag nowarpto + // Episode 13 ==================== mid_campin mapflag nowarpto man_fild01 mapflag nowarpto diff --git a/conf/mapflag/town.txt b/conf/mapflag/town.txt new file mode 100644 index 000000000..13ba10939 --- /dev/null +++ b/conf/mapflag/town.txt @@ -0,0 +1,33 @@ +//===== eAthena Script ======================================= +//= Allows Mailbox access +//===== By: ================================================== +//= Epoque +//===== Current Version: ===================================== +//= 1.0a [Epoque] +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= +//============================================================ + +prontera mapflag town +izlude mapflag town +moc_ruins mapflag town +geffen mapflag town +payon mapflag town +pay_arche mapflag town +alberta mapflag town +aldebaran mapflag town +yuno mapflag town +lighthalzen mapflag town +einbroch mapflag town +einbech mapflag town +comodo mapflag town +umbala mapflag town +amatsu mapflag town +gonryun mapflag town +ayothaya mapflag town +louyang mapflag town +hugel mapflag town +rachel mapflag town +veins mapflag town -- cgit v1.2.3-60-g2f50