diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-09 05:50:43 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-09 05:50:43 +0000 |
| commit | 1cd7372c0812c1316bd9fc7f04f9c454b87a5ef5 (patch) | |
| tree | 4842d5699aa9c0112e144ce6696836c28c215b80 /src/map/skill.c | |
| parent | 215674c27bd3ba99de23c81356a77c94bc967b6a (diff) | |
| download | hercules-1cd7372c0812c1316bd9fc7f04f9c454b87a5ef5.tar.gz hercules-1cd7372c0812c1316bd9fc7f04f9c454b87a5ef5.tar.bz2 hercules-1cd7372c0812c1316bd9fc7f04f9c454b87a5ef5.tar.xz hercules-1cd7372c0812c1316bd9fc7f04f9c454b87a5ef5.zip | |
- Changed the default of multi_hit_delay from 230 to 80 which seems more official.
- Wedding recall skills are now blocked by the nomemo mapflag.
- Skill delay for weapon types is now based on adelay (ASPD) rather than amotion (ASPD/2)
- Removed ending Endure when casting Berserk, may fix the timer mismatch issues.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5963 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 34605d016..88308c33d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6476,7 +6476,7 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid, case WE_CALLPARTNER:
if (!sd)
return NULL;
- if (map[src->m].flag.nowarpto) {
+ if (map[src->m].flag.nomemo) {
clif_skill_teleportmessage(sd,1);
return NULL;
}
@@ -6485,7 +6485,7 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid, case WE_CALLPARENT:
if (!sd)
return NULL;
- if (map[src->m].flag.nowarpto) {
+ if (map[src->m].flag.nomemo) {
clif_skill_teleportmessage(sd,1);
return NULL;
}
@@ -6495,7 +6495,7 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid, case WE_CALLBABY:
if (!sd)
return NULL;
- if (map[src->m].flag.nowarpto) {
+ if (map[src->m].flag.nomemo) {
clif_skill_teleportmessage(sd,1);
return NULL;
}
@@ -8334,11 +8334,11 @@ int skill_delayfix(struct block_list *bl, int skill_id, int skill_lv) // instant cast attack skills depend on aspd as delay [celest]
if (time == 0) {
if (skill_get_type(skill_id) == BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_DAMAGE))
- time = status_get_amotion(bl); //Use attack animation as default delay.
+ time = status_get_adelay(bl); //Use attack delay as default delay.
else
time = 300; // default delay, according to official servers
} else if (time < 0)
- time = -time + status_get_amotion(bl); // if set to <0, the attack motion is added.
+ time = -time + status_get_adelay(bl); // if set to <0, the attack delay is added.
if (battle_config.delay_dependon_dex && !(delaynodex&1))
{ // if skill casttime is allowed to be reduced by dex
|