summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-19 22:58:11 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-19 22:58:11 +0000
commit14c2376cab40d580743a8a5d02af6109659d9892 (patch)
tree98e4c497ff4accea6b78a8a876608272b40916ed /npc
parentd277092d10c486f94d159f65a37c7cd492d00652 (diff)
downloadhercules-14c2376cab40d580743a8a5d02af6109659d9892.tar.gz
hercules-14c2376cab40d580743a8a5d02af6109659d9892.tar.bz2
hercules-14c2376cab40d580743a8a5d02af6109659d9892.tar.xz
hercules-14c2376cab40d580743a8a5d02af6109659d9892.zip
- Fixed some script typos (bugreport:4861, bugreport:5028).
- Fixed a typo in Blacksmith Quest (fixes issue 5012). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14936 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/cities/alberta.txt2
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/quests/quests_amatsu.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 7140477ab..5d1b9d82b 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -325,7 +325,7 @@ alberta,190,173,4 script Phelix 85,{
case 2:
mes "[Phelix]";
mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
- mes "Right now, the most you can get is " + gap + " but remember, 100 at most, you want to break my back?.";
+ mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
input .@amount;
next;
mes "[Phelix]";
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 04637210d..bab99664e 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -351,7 +351,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
mes "1. Which one of the following regions is matched incorrectly";
mes "with its specialty item?";
next;
- if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 2)
+ if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4)
set .@black_q,.@black_q+10;
mes "[Geschupenschte]";
mes "2. What status can";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index aa7251446..982477c65 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -367,7 +367,7 @@ OnInit:
OnStartArena:
disablenpc "Coach#ama";
- disablenpc "Am Mut::Onreset";
+ disablenpc "Am Mut#ama";
donpcevent "Dokebi#ez::Onreset";
donpcevent "Dokebi#hd::Onreset";
enablenpc "Grandma#ama1";