summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 18:21:29 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 18:21:29 +0000
commit5686424be85bd3ba4e83eb6718b31eaa2581c2dd (patch)
tree31b217c0799a806181afd946c642489db72d8bf1
parent6c066dc648e82dda2a41c596158adbf58ceda68b (diff)
downloadhercules-5686424be85bd3ba4e83eb6718b31eaa2581c2dd.tar.gz
hercules-5686424be85bd3ba4e83eb6718b31eaa2581c2dd.tar.bz2
hercules-5686424be85bd3ba4e83eb6718b31eaa2581c2dd.tar.xz
hercules-5686424be85bd3ba4e83eb6718b31eaa2581c2dd.zip
- Added 'nopenalty' mapflag to mosk_ship. (bugreport:3109)
- Fixed some strange dialog in President Quest. (bugreport:1755) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15109 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/mapflag/noexp.txt5
-rw-r--r--conf/mapflag/nopenalty.txt3
-rw-r--r--npc/quests/quests_lighthalzen.txt4
3 files changed, 8 insertions, 4 deletions
diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt
index dfe57dfb8..78df18bbc 100644
--- a/conf/mapflag/noexp.txt
+++ b/conf/mapflag/noexp.txt
@@ -7,7 +7,7 @@
//= 1.7 Commented out entries. (Quests are official) [L0ne_W0lf]
//============================================================
-// Location for Job's Quests
+// Job Quests ========================
//job_thief1 mapflag noexp
//job_sword1 mapflag noexp
//in_moc_16 mapflag noexp
@@ -22,3 +22,6 @@
//job_soul mapflag noexp
//job_star mapflag noexp
//que_ng mapflag noexp
+
+// Misc Quests =======================
+// mosk_ship mapflag noexp
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 3c7d781a4..1881ae35c 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -146,6 +146,7 @@ in_rogue mapflag nopenalty
job_sage mapflag nopenalty
// Misc Quests =======================
+mosk_ship mapflag nopenalty
que_sign01 mapflag nopenalty
que_sign02 mapflag nopenalty
@@ -253,4 +254,4 @@ bat_a02 mapflag nopenalty
//evt_zombie mapflag nopenalty
// Poring War ==================
-poring_w02 mapflag nopenalty \ No newline at end of file
+poring_w02 mapflag nopenalty
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 91e07b675..d2f2b00b0 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -8231,8 +8231,8 @@ L_Mission:
mes "[Karl]";
mes "If you keep looking around";
mes "the ^3355FFfields just outside of";
- mes "Lighthalzen^000000, she'll certainly";
- mes "find. I'm sorry that I can't";
+ mes "Lighthalzen^000000, you'll certainly";
+ mes "find her. I'm sorry that I can't";
mes "tell you more, but we've got";
mes "to protect our security...";
next;