diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index f5a739f76..a9609e5d7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2389,7 +2389,7 @@ int status_calc_homunculus(struct homun_data *hd, int first) *hd->homunculusDB->baseASPD/1000;
status->amotion = cap_value(skill,battle_config.max_aspd,2000);
- status->adelay = 2*status->amotion;
+ status->adelay = status->amotion; //It seems adelay = amotion for Homunculus.
status_calc_misc(&hd->bl, status, hom->level);
status_calc_bl(&hd->bl, SCB_ALL); //Status related changes.
diff --git a/src/map/unit.c b/src/map/unit.c index 751460c54..b7f42447e 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -393,7 +393,21 @@ int unit_run(struct block_list *bl) clif_status_change(bl, SI_BUMP, 0); return 0; } - unit_walktoxy(bl, to_x, to_y, 1); + if (unit_walktoxy(bl, to_x, to_y, 1)) + return 1; + //There must be an obstacle nearby. Attempt walking one cell at a time. + do { + to_x -= dir_x; + to_y -= dir_y; + } while (--i > 0 && !unit_walktoxy(bl, to_x, to_y, 1)); + if (i==0) { + clif_status_change(bl, SI_BUMP, 1); + status_change_end(bl,SC_RUN,-1); + skill_blown(bl,bl,skill_get_blewcount(TK_RUN,sc->data[SC_RUN].val1)|0x10000); + clif_fixpos(bl); + clif_status_change(bl, SI_BUMP, 0); + return 0; + } return 1; } |