summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-28 01:57:47 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-28 01:57:47 +0000
commitd3ba5a04661367e6e6108677e54937f2646786b2 (patch)
tree1cdfec991011293e1a8d0018e3bb83b83e61949a /npc/quests
parent2e5a59f6337ae9629f33d22d38731bc411c8adea (diff)
downloadhercules-d3ba5a04661367e6e6108677e54937f2646786b2.tar.gz
hercules-d3ba5a04661367e6e6108677e54937f2646786b2.tar.bz2
hercules-d3ba5a04661367e6e6108677e54937f2646786b2.tar.xz
hercules-d3ba5a04661367e6e6108677e54937f2646786b2.zip
Fixes to Merchant and Blacksmith skill quests (ran into them by playing on an eA server and using RI's wiki)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9930 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/skills/blacksmith_skills.txt7
-rw-r--r--npc/quests/skills/merchant_skills.txt7
2 files changed, 9 insertions, 5 deletions
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index e46455771..bbe7b830e 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -18,6 +18,7 @@
//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
//= 1.3b Splitted into different files [DracoRPG]
+//= 1.3c Inverted the weight check for Greed [DracoRPG]
//============================================================
@@ -29,7 +30,7 @@ geffen.gat,172,53,7 script Goodday 826,{
mes "[Goodday]";
if(BaseJob!=Job_Blacksmith) goto L_nosmith;
if(getskilllv(1013)) goto L_alreadyhave;
- if(Weight < 5000 || (Weight > MaxWeight-MaxWeight/10)) goto L_notstrong;
+ if(Weight < MaxWeight-5000) goto L_notstrong; // You must carry so much that you cannot add 500 more (weight is x10!)
mes "You look pretty strong, so I'll";
mes "teach you a little trick I found";
@@ -43,8 +44,8 @@ L_notstrong:
mes "Come back when you're strong";
mes "enough to handle the weight";
mes "of my ability. You will need";
- mes "to be able to carry over 5000";
- mes "weight, and not be over 90%.";
+ mes "to carry so much that you won't";
+ mes "be able to add 500 more weight.";
close;
L_nosmith:
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 15e1ba000..b3f3bc61d 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -18,6 +18,7 @@
//= 1.4 Fixed exploits [Lupus]
//= 1.4a Fixed some typos [IVBela] 1.4b Gershaun -> Gershuan
//= changed perm. variables to temp ones [Lupus]
+//= 1.4b Added missing 1 Banana Juice requirement to Cart Revolution [DracoRPG]
//============================================================
@@ -246,7 +247,8 @@ L_Start:
mes "20 Fly wings,";
mes "15 Iron,";
mes "5 Tentacles,";
- mes "2 Grape Juice^000000.";
+ mes "2 Grape Juice,";
+ mes "1 Banana Juice^000000.";
next;
mes "[Gershuan]";
mes "Come back when you have all of these items. Good luck.";
@@ -266,7 +268,8 @@ L_Start:
close;
L_GetSkill:
- if((countitem(533)<2) || (countitem(998)<15) || (countitem(938)<30) || (countitem(601)<20) || (countitem(962)<5)) goto sM_0;
+ if((countitem(532)<1) || (countitem(533)<2) || (countitem(998)<15) || (countitem(938)<30) || (countitem(601)<20) || (countitem(962)<5)) goto sM_0;
+ delitem 532,1;
delitem 533,2;
delitem 998,15;
delitem 938,30;