summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 18:39:52 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 18:39:52 +0000
commit8e861470ee07937678d89ff05ef39c9a6325a262 (patch)
treecdcb74788cb016ecb4ae6c4e6524ab40c6685d08 /src/map
parent26e86518619958013c1b2bcfc49b1db0a913d865 (diff)
downloadhercules-8e861470ee07937678d89ff05ef39c9a6325a262.tar.gz
hercules-8e861470ee07937678d89ff05ef39c9a6325a262.tar.bz2
hercules-8e861470ee07937678d89ff05ef39c9a6325a262.tar.xz
hercules-8e861470ee07937678d89ff05ef39c9a6325a262.zip
- Some corrections to make Tatami Gaeshi work correctly.
- Fixed SBR44 doing 100% more damage than it should. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8437 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/skill.c20
2 files changed, 13 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index d613b925b..0c417243a 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1555,7 +1555,7 @@ static struct Damage battle_calc_weapon_attack(
skillratio += 10+110*skill_lv;
break;
case HFLI_SBR44: //[orn]
- skillratio += 100 * skill_lv ;
+ skillratio += 100 *(skill_lv-1);
}
ATK_RATE(skillratio);
diff --git a/src/map/skill.c b/src/map/skill.c
index bc8408669..bfc4c15fb 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6774,19 +6774,15 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
unit->bl.x,unit->bl.y,group->bl_flag,&unit->bl,gettick(),1);
}
}
- if (skillid == NJ_TATAMIGAESHI)
- { //Disable it, since it should do instant damage
- //(which was done in the map_foreachincell call up there) [Skotlex]
- group->target_flag=BCT_NOONE;
- group->bl_flag= 0;
- }
if (!group->alive_count)
{ //No cells? Something that was blocked completely by Land Protector?
skill_delunitgroup(src, group);
return NULL;
}
-
+ if (skillid == NJ_TATAMIGAESHI) //Store number of tiles.
+ group->val1 = group->alive_count;
+
return group;
}
@@ -6915,7 +6911,6 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
src->limit = DIFF_TICK(tick+700,sg->tick);
break;
}
-
return skillid;
}
@@ -9997,6 +9992,15 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap)
unit->val1 -= 5;
if(unit->val1 <= 0 && unit->limit + group->tick > tick + 700)
unit->limit = DIFF_TICK(tick+700,group->tick);
+ } else
+ if (group->unit_id == UNT_TATAMIGAESHI && unit->range>=0)
+ { //Disable processed cell.
+ unit->range = -1;
+ if (--group->val1 <= 0)
+ { //All tiles were processed, disable skill.
+ group->target_flag=BCT_NOONE;
+ group->bl_flag= 0;
+ }
}
return 0;