summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-21 11:40:27 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-21 11:40:27 +0000
commit4ef9dcc884c7b27a4f29b932461f76470cb0689a (patch)
tree89c1c372605517fb5165e3c0dca2b31d54ea4d80 /npc/custom
parent0c617be57655cb97288597c7e5d8b7b37fae29fa (diff)
downloadhercules-4ef9dcc884c7b27a4f29b932461f76470cb0689a.tar.gz
hercules-4ef9dcc884c7b27a4f29b932461f76470cb0689a.tar.bz2
hercules-4ef9dcc884c7b27a4f29b932461f76470cb0689a.tar.xz
hercules-4ef9dcc884c7b27a4f29b932461f76470cb0689a.zip
Synchronization of the trunk&stable npc directories
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9683 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/eAAC_Scripts/DonationGirl/donate.txt5
-rw-r--r--npc/custom/quests/kiel_quest.txt2
2 files changed, 4 insertions, 3 deletions
diff --git a/npc/custom/eAAC_Scripts/DonationGirl/donate.txt b/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
index 66e619333..1ecf387c3 100644
--- a/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
+++ b/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
@@ -24,10 +24,11 @@
//= 3.2 - Fixed a problem where eAthena would crash if a
//= query returned NULL.
//= 3.3 - Optimized query speeds by combining a few select
-//= queries into one. Requires Trunk 7975.
+//= queries into one. Requires Trunk 7975 OR
+//= Stable 8637.
//===== Compatible With =====================================
//= eAthena - any version that contains the new query_sql
-//= command (Trunk 7975).
+//= command (Stable 8637 OR Trunk 7975).
//===== Description =========================================
//= A script that lets a player claim an item for donating.
//= Allows a GM to input each donation.
diff --git a/npc/custom/quests/kiel_quest.txt b/npc/custom/quests/kiel_quest.txt
index 7633aaa69..397568bc3 100644
--- a/npc/custom/quests/kiel_quest.txt
+++ b/npc/custom/quests/kiel_quest.txt
@@ -45,7 +45,7 @@ kh_school.gat,119,146,3 script Kiel Carlo 748,{
M_GO:
mes "[Kiel Carlo]";
- mes "I refuse let you enter if you don't meet these conditions:";
+ mes "I refuse to let you enter if you don't meet these conditions:";
mes "1. You have to be 70 Base Level or higher.";
mes "2. You have to donate 10.000 zeny.";
next;