summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-20 18:07:23 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-20 18:07:23 +0000
commit87e712cf0293ed4ffc8d117c69316c8facb69a02 (patch)
tree972078d85cb09713b760385bbf298ccc94713e42
parentc6ef4ba85df1bd56851c25e8f39ad69b9c6615c8 (diff)
downloadhercules-87e712cf0293ed4ffc8d117c69316c8facb69a02.tar.gz
hercules-87e712cf0293ed4ffc8d117c69316c8facb69a02.tar.bz2
hercules-87e712cf0293ed4ffc8d117c69316c8facb69a02.tar.xz
hercules-87e712cf0293ed4ffc8d117c69316c8facb69a02.zip
- Fixed Earthquake not clearing out the target-count before counting targets.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11052 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/item_db.txt2
-rw-r--r--src/map/skill.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index eae882c37..ec444a48e 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1987,7 +1987,7 @@
5283,Baby_Chick,Baby_Chick,5,,10,100,,1,,0,0xFFFFFFFF,7,2,256,,10,0,311,{ bonus bLuk,2; bonus bMaxHP,50; bonus bMaxSP,50; bonus bDoubleRate,10; bonus2 bSubRace,RC_Demon,5; },{},{}
5284,Water_Lily_Crown,Water_Lily_Crown,5,,10,200,,0,,0,0xFFFFFFFF,7,2,256,,20,0,312,{ bonus bDex,1; bonus bAgi,1; bonus bHPrecovRate,5; bonus bSPrecovRate,3; },{},{}
5285,Pinwheel_Hairpin,Pinwheel_Hairpin,5,,10,300,,3,,0,0xFFFFFFFF,7,2,256,,30,0,313,{ bonus bAgi,2; },{},{}
-5286,Peco_Peco_Hairband,Peco_Peco_Hairband,5,,10,0,,3,,0,0xFFFFFFFF,7,2,256,,0,1,314,{ bonus bAspdRate,-10; bonus bAspdRate,5; bonus bCastrate,5; },{},{},
+5286,Peco_Peco_Hairband,Peco_Peco_Hairband,5,,10,0,,3,,0,0xFFFFFFFF,7,2,256,,0,1,314,{ bonus bAspdRate,-10; bonus bAspdRate,5; bonus bCastrate,5; },{},{}
5287,Summer_Hat,Summer_Hat,5,,10,200,,1,,0,0xFFFFFFFF,7,2,256,,30,0,315,{ bonus bVit,1; },{},{}
5288,Red_Glasses,Red_Glasses,5,,10,0,,1,,0,0xFFFFFFFF,7,2,512,,0,1,316,{ bonus bInt,1; },{},{}
5289,Vanilmirth_Hat,Vanilmirth_Hat,5,,10,100,,0,,0,0xFFFFFFFF,7,2,256,,30,0,317,{ bonus bUnbreakableArmor,0; bonus4 bAutoSpell,19,1,100,1; bonus4 bAutoSpell,14,1,100,1; bonus4 bAutoSpell,20,1,100,1; bonus4 bAutoSpell,90,1,100,1; bonus bMdef,5; },{},{}
diff --git a/src/map/skill.c b/src/map/skill.c
index b8abc15c8..a67eb9d70 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4125,14 +4125,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
case NPC_EARTHQUAKE:
+ case ASC_METEORASSAULT:
+ case GS_SPREADATTACK:
+ skill_area_temp[0] = 0;
if (skill_get_nk(skillid)&NK_SPLASHSPLIT)
map_foreachinrange(skill_area_sub, bl,
skill_get_splash(skillid, skilllv), BL_CHAR,
src, skillid, skilllv, tick, BCT_ENEMY, skill_area_sub_count);
- else
- skill_area_temp[0] = 0;
- case ASC_METEORASSAULT:
- case GS_SPREADATTACK:
clif_skill_nodamage(src,bl,skillid,skilllv,1);
case NPC_HELLJUDGEMENT:
case NPC_PULSESTRIKE: