summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-27 10:24:06 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-27 10:24:06 +0000
commit01f7951c222a06b2cde25fb6a1a95a88a85a634b (patch)
treec6f39ee8b0130f0b0f8286086300b3d1e821fc65
parentc3fe5f43ebce077d8711fe7ba4a30cb78dea2d38 (diff)
downloadhercules-01f7951c222a06b2cde25fb6a1a95a88a85a634b.tar.gz
hercules-01f7951c222a06b2cde25fb6a1a95a88a85a634b.tar.bz2
hercules-01f7951c222a06b2cde25fb6a1a95a88a85a634b.tar.xz
hercules-01f7951c222a06b2cde25fb6a1a95a88a85a634b.zip
My attempt at fixing the zealotus mask npc, now correctly requires a whip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10078 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/quests/newgears/2005_headgears.txt27
2 files changed, 19 insertions, 11 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 1efc17be4..2396434ff 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,6 +26,9 @@ KarLaeda
Date Added
======
+2007/03/28
+ * My attempt at fixing the zealotus mask npc, now correctly requires a whip
+ - it could have been a one-liner, but not possible with current script engine
2007/03/23
* Fixed some misc typos (skill reset npc has horrible engrish btw) [ultramage]
* Reformatted TSQ for easier bug hunt [Lupus]
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index d945a51de..fafedec1f 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
//= 2005 Headgears Official Quest.
//===== Additional Comments: =================================
// 1.0 First version, converted from the official aegis script. [MasterOfMuppets]
+// 1.1 Updated item ids in the zealotus mask npc, now requires a whip [ultramage]
//============================================================
yuno,222,116,3 script Kasis#LhzHat 851,{
@@ -1736,15 +1737,6 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
}
else if(ZLMASKQ == 1)
{
- if(countitem(1164) || isequipped(1164))set @whipcount,@whipcount+1;
- if(countitem(1165) || isequipped(1165))set @whipcount,@whipcount+1;
- if(countitem(1166) || isequipped(1166))set @whipcount,@whipcount+1;
- if(countitem(1167) || isequipped(1167))set @whipcount,@whipcount+1;
- if(countitem(1168) || isequipped(1168))set @whipcount,@whipcount+1;
- if(countitem(1169) || isequipped(1169))set @whipcount,@whipcount+1;
- if(countitem(1170) || isequipped(1170))set @whipcount,@whipcount+1;
- if(countitem(1261) || isequipped(1261))set @whipcount,@whipcount+1;
- if(countitem(1363) || isequipped(1363))set @whipcount,@whipcount+1;
mes "[Phendark]";
mes "Huh? Oh no!";
mes "Another h-human?!";
@@ -1767,7 +1759,20 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
mes "of value! Z-Zealotus, please!";
mes "Zealotus, heeeeeelp me~!";
emotion e_sob;
- if(!@whipcount)close;
+
+
+ if(!(
+ countitem(1950) || countitem(1951) || countitem(1952) ||
+ countitem(1953) || countitem(1954) || countitem(1955) ||
+ countitem(1956) || countitem(1957) || countitem(1958) ||
+ countitem(1959) || countitem(1960) || countitem(1961) ||
+ countitem(1962) || countitem(1963) || countitem(1964) ||
+ countitem(1965) || countitem(1966) || countitem(1967) ||
+ countitem(1968) || countitem(1969) || countitem(1970) ||
+ countitem(1971)
+ ))
+ close; // no whip equipped or in inventory
+
next;
mes "[" + strcharinfo(0) + "]";
mes "You're pathetic!";