summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-01 17:57:42 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-01 17:57:42 +0000
commita88aee47d252975ad8f6264c6fbde0e4f0c42836 (patch)
tree71411721aaca019b8e1ab3bfc8f25b21e532a3ce
parent947c855e7498124fbfffb061f23de01b2811a287 (diff)
downloadhercules-a88aee47d252975ad8f6264c6fbde0e4f0c42836.tar.gz
hercules-a88aee47d252975ad8f6264c6fbde0e4f0c42836.tar.bz2
hercules-a88aee47d252975ad8f6264c6fbde0e4f0c42836.tar.xz
hercules-a88aee47d252975ad8f6264c6fbde0e4f0c42836.zip
fixed exploit in HW2009 evnt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14114 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/mob_db2.txt4
-rw-r--r--db/mob_skill_db2.txt8
-rw-r--r--npc/events/halloween_2009.txt2
3 files changed, 7 insertions, 7 deletions
diff --git a/db/mob_db2.txt b/db/mob_db2.txt
index a97448bde..24d0b5771 100644
--- a/db/mob_db2.txt
+++ b/db/mob_db2.txt
@@ -34,8 +34,8 @@
//iRO Halloween 2009 Event
//Uncomment if event is enabled. Uncomment the skills for Halloween Whisper in mob_skill_db2.
-//3000,HALLOWEEN_WHISPER,Halloween Whisper,Halloween Whisper,1,800,0,0,0,1,10,13,0,45,1,51,14,0,60,0,10,12,0,6,68,0x81,150,1960,960,504,0,0,0,0,0,0,0,0,12396,150,6299,5335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//3001,HALLOWEEN_DARK_LORD,Halloween Dark Lord,Halloween Dark Lord,1,45,0,0,0,1,10,13,0,45,1,51,14,0,60,0,10,12,2,6,89,0x81,100,868,768,480,0,0,0,0,0,0,0,0,12396,800,12397,5335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//3014,HALLOWEEN_WHISPER,Halloween Whisper,Halloween Whisper,1,800,0,0,0,1,10,13,0,45,1,51,14,0,60,0,10,12,0,6,68,0x81,150,1960,960,504,0,0,0,0,0,0,0,0,12396,150,6299,5335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//3015,HALLOWEEN_DARK_LORD,Halloween Dark Lord,Halloween Dark Lord,1,45,0,0,0,1,10,13,0,45,1,51,14,0,60,0,10,12,2,6,89,0x81,100,868,768,480,0,0,0,0,0,0,0,0,12396,800,12397,5335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//iRO Halloween 2008 Event
//Uncomment if event is enabled.
diff --git a/db/mob_skill_db2.txt b/db/mob_skill_db2.txt
index 7cfd56a4e..7860e6076 100644
--- a/db/mob_skill_db2.txt
+++ b/db/mob_skill_db2.txt
@@ -132,9 +132,9 @@
//1239,Fire Poring@RG_STRIPWEAPON,attack,215,5,2000,0,3000,yes,target,always,0,,,,,,
//iRO Halloween Event 2009
-//3000,Halloween Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,
-//3000,Halloween Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,
-//3000,Halloween Whisper@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,,,,,,
-//3000,Halloween Whisper@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,
+//3014,Halloween Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,
+//3014,Halloween Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,
+//3014,Halloween Whisper@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,,,,,,
+//3014,Halloween Whisper@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,
// Here you can place your custom mob skills
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index 1e1f7ef9b..ff21373d1 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -379,7 +379,7 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 706,2,2
}
if(.@worn > 0 && .@input != 0) {
if(.@worn >= .@input) {
- delitem 6299,.@fabric;
+ delitem 6299,.@input;
set .@whispers,.@whispers+.@input;
set .@input,0;
}