summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-05 02:02:53 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-05 02:02:53 +0000
commit4bb10e3bb76bc657f2add443f0eb4f02a9f906ad (patch)
treeddfd825d71cfa73819c57060c17074894efdc99f
parent0e81284a51989912cdac6fa822c3f875aac455ed (diff)
downloadhercules-4bb10e3bb76bc657f2add443f0eb4f02a9f906ad.tar.gz
hercules-4bb10e3bb76bc657f2add443f0eb4f02a9f906ad.tar.bz2
hercules-4bb10e3bb76bc657f2add443f0eb4f02a9f906ad.tar.xz
hercules-4bb10e3bb76bc657f2add443f0eb4f02a9f906ad.zip
* Just a couple Bug fixes. :P
- Added a missing close in quests_13_2.txt. (bugreport:4520) - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/mapflag/nobranch.txt53
-rw-r--r--conf/mapflag/nopvp.txt25
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/quests/quests_13_2.txt4
-rw-r--r--npc/quests/quests_prontera.txt5
5 files changed, 86 insertions, 5 deletions
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 8013e2635..3e91263da 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -94,7 +94,7 @@ ra_temsky mapflag nobranch
ve_in mapflag nobranch
ve_in02 mapflag nobranch
thor_camp mapflag nobranch
-cave mapflag nobanch
+cave mapflag nobranch
// Job Quests ==================
job_sword1 mapflag nobranch
@@ -276,6 +276,27 @@ que_qaru03 mapflag nobranch
que_qaru04 mapflag nobranch
que_qaru05 mapflag nobranch
+1@cata mapflag nobranch
+2@cata mapflag nobranch
+e_tower mapflag nobranch
+1@tower mapflag nobranch
+2@tower mapflag nobranch
+3@tower mapflag nobranch
+4@tower mapflag nobranch
+5@tower mapflag nobranch
+6@tower mapflag nobranch
+
+mid_camp mapflag nobranch
+mid_campin mapflag nobranch
+man_fild01 mapflag nobranch
+moc_fild22b mapflag nobranch
+que_dan01 mapflag nobranch
+que_dan02 mapflag nobranch
+schg_que01 mapflag nobranch
+arug_que01 mapflag nobranch
+1@orcs mapflag nobranch
+2@orcs mapflag nobranch
+
// Battle Grounds ==============
bat_c01 mapflag nobranch
bat_c02 mapflag nobranch
@@ -286,4 +307,32 @@ bat_b02 mapflag nobranch
bat_a01 mapflag nobranch
bat_a02 mapflag nobranch
-//evt_zombie mapflag nobranch
+1@nyd mapflag nobranch
+2@nyd mapflag nobranch
+manuk mapflag nobranch
+man_fild02 mapflag nobranch
+man_in01 mapflag nobranch
+splendide mapflag nobranch
+spl_in01 mapflag nobranch
+spl_in02 mapflag nobranch
+
+moc_para01 mapflag nobranch
+job3_arch01 mapflag nobranch
+job3_arch02 mapflag nobranch
+job3_arch03 mapflag nobranch
+job3_guil01 mapflag nobranch
+job3_guil02 mapflag nobranch
+job3_guil03 mapflag nobranch
+job3_rang01 mapflag nobranch
+job3_rang02 mapflag nobranch
+job3_rune01 mapflag nobranch
+job3_rune02 mapflag nobranch
+job3_rune03 mapflag nobranch
+job3_war01 mapflag nobranch
+job3_war02 mapflag nobranch
+jupe_core2 mapflag nobranch
+
+brasilis mapflag nobranch
+bra_in01 mapflag nobranch
+
+//evt_zombie mapflag nobranch \ No newline at end of file
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
index f982a1285..70c29e6a1 100644
--- a/conf/mapflag/nopvp.txt
+++ b/conf/mapflag/nopvp.txt
@@ -108,4 +108,29 @@ veins mapflag pvp off
ve_in mapflag pvp off
ve_in02 mapflag pvp off
cave mapflag pvp off
+
+e_tower mapflag pvp off
+
+mid_camp mapflag pvp off
+mid_campin mapflag pvp off
+man_fild01 mapflag pvp off
+moc_fild22b mapflag pvp off
+que_dan01 mapflag pvp off
+que_dan02 mapflag pvp off
+schg_que01 mapflag pvp off
+arug_que01 mapflag pvp off
+
+bat_room mapflag pvp off
+
+manuk mapflag pvp off
+man_in01 mapflag pvp off
+splendide mapflag pvp off
+spl_in01 mapflag pvp off
+spl_in02 mapflag pvp off
+
+moc_para01 mapflag pvp off
+
+brasilis mapflag pvp off
+bra_in01 mapflag pvp off
+
//evt_zombie mapflag pvp off
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cb351350f..d37f991d8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2010/11/04
+ * Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf]
+ - Added a missing close in quests_13_2.txt. (bugreport:4520)
+ - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522)
2010/10/23
* Rev. 14435 Updated spawns for Geffen fields to Rewnewal. [L0ne_W0lf]
2010/10/20
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index a3f3d8f4e..3d2e10f66 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -38,6 +38,7 @@
//= floor 2 puzzle. Fixed a typo. Commented out untranslated
//= line. [Gepard]
//= 2.1 Fixed Myterious Rock 31, and Cart Hand Agents.
+//= 2.2 Added a missing close. (bugreport:4520) [L0ne_W0lf]
//============================================================
// Cat Hand Addition.
@@ -5018,6 +5019,7 @@ manuk,252,116,3 script Manuk Galtun#ep13_2day 450,{
mes "EW pisdn psa?";
mes "We psis?";
}
+ close;
}
// Daily Quests
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 77365cae5..cbd25ee36 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.6
+//= 2.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -46,6 +46,7 @@
//= 2.5 Fixed requirements for PH D. Hat. [L0ne_W0lf]
//= 2.5a Fixed requirements for PH D. Hat agian lol. [L0ne_W0lf]
//= 2.6 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 2.7 Corrected 'IProntera' typo. (bugreport:4522) [L0ne_W0lf]
//============================================================
// Prontera Culvert
@@ -1316,7 +1317,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{
mes "Rodafrian can offer you";
mes "any more information. For";
mes "now, it would be best to";
- mes "go to ^3355FFIProntera Church.^000000";
+ mes "go to ^3355FFProntera Church.^000000";
close;
}
else {