summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-17 04:59:48 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-17 04:59:48 +0000
commit5140b06dfa8554077fb9a698d2bf9c280b0954a4 (patch)
treeb986bbf63db74398e2c8148ab6e1cc890eeb3e1a /npc
parentf87190a594fd8ac0746ec1bed9ff06847ea701bc (diff)
downloadhercules-5140b06dfa8554077fb9a698d2bf9c280b0954a4.tar.gz
hercules-5140b06dfa8554077fb9a698d2bf9c280b0954a4.tar.bz2
hercules-5140b06dfa8554077fb9a698d2bf9c280b0954a4.tar.xz
hercules-5140b06dfa8554077fb9a698d2bf9c280b0954a4.zip
- Delete their Gym Pass before giving them the skill. (bugreport:3592)
- Fixed 2 typos and a cutin that didn't go away in Kiel Quest. (bugreport:3597) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14063 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/other/gympass.txt2
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt5
2 files changed, 4 insertions, 3 deletions
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index f5bf8a320..a4fa17d08 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -84,8 +84,8 @@ payon,173,141,4 script Ripped Cabus#GymPass 899,{
next;
specialeffect2 EF_SIGHTRASHER;
next;
- skill "ALL_INCCARRY",getskilllv("ALL_INCCARRY")+1,0;
delitem 7776,1;
+ skill "ALL_INCCARRY",getskilllv("ALL_INCCARRY")+1,0;
set gympassmemory,gympassmemory+1;
mes "[Ripped]";
mes "There, you should be able";
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 42da8f8f7..04ee73837 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3581,7 +3581,7 @@ kh_school,122,186,4 script Beautiful Lady#kh6 894,{
case 2:
mes "[Allysia]";
mes "^3355FFKiehl^000000 has proceeded to";
- mes "proform abnormal modifications";
+ mes "perform abnormal modifications";
mes "to the humanoid robots. This";
mes "has been reported to Kiel Hyre,";
mes "who has left to stop Kiehl.";
@@ -4683,6 +4683,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 903,{
close2;
enablenpc "Kiehl_Room_Warp";
donpcevent "Kiehl_Room_Warp::OnEnable";
+ cutin "",255;
end;
break;
case 2:
@@ -5156,7 +5157,7 @@ OnTouch:
next;
mes "[Mitchell]";
mes "This is too much of a";
- mes "coincidense. I want you to";
+ mes "coincidence. I want you to";
mes "go to Juno and investigate.";
mes "When you're done, talk to";
mes "Kiel Hyre's steward, and";