summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-03 02:08:49 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-03 02:08:49 +0000
commit2365342722228a79ff93cad0aca66fdaa061f880 (patch)
tree330f1116a234553dbe650167f28e0f9880ecefc5 /src/map
parent00354ac69bcc6bd70c9a0110236664875958dd1e (diff)
downloadhercules-2365342722228a79ff93cad0aca66fdaa061f880.tar.gz
hercules-2365342722228a79ff93cad0aca66fdaa061f880.tar.bz2
hercules-2365342722228a79ff93cad0aca66fdaa061f880.tar.xz
hercules-2365342722228a79ff93cad0aca66fdaa061f880.zip
Fixed bugreport:5681 Sorcerer Striking may now only be cast on self or party members, SP upkeep updated.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16058 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c6
-rw-r--r--src/map/status.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 484fb2915..f75fda59b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5137,7 +5137,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if (sd) {
int bonus = 25 + 10 * skilllv;
bonus += (pc_checkskill(sd, SA_FLAMELAUNCHER)+pc_checkskill(sd, SA_FROSTWEAPON)+pc_checkskill(sd, SA_LIGHTNINGLOADER)+pc_checkskill(sd, SA_SEISMICWEAPON))*5;
- clif_skill_nodamage( src, bl, skillid, skilllv, sc_start2(bl, type, 100, skilllv, bonus, skill_get_time(skillid,skilllv)) );
+ clif_skill_nodamage( src, bl, skillid, skilllv,
+ battle_check_target(src,bl,BCT_PARTY) ?
+ sc_start2(bl, type, 100, skilllv, bonus, skill_get_time(skillid,skilllv)) :
+ 0
+ );
}
break;
diff --git a/src/map/status.c b/src/map/status.c
index 7277a7f1d..623a39dce 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7543,6 +7543,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
status_change_end(bl, SC_CRYSTALIZE, INVALID_TIMER);
break;
case SC_STRIKING:
+ val1 = 6 - val1;//spcost = 6 - level (lvl1:5 ... lvl 5: 1)
val4 = tick / 1000;
tick_time = 1000; // [GodLesZ] tick time
break;