diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-28 23:32:31 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-08-28 23:32:31 +0000 |
| commit | c16d2c8445d40e1966b12353054df33e9de6897a (patch) | |
| tree | 7104ea4c3cfd8543d83dd40c950b3aef746d4237 /src/map/status.c | |
| parent | 9e05523b11ddbe2a03a1c452d53262c0bf8264e1 (diff) | |
| download | hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.gz hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.bz2 hercules-c16d2c8445d40e1966b12353054df33e9de6897a.tar.xz hercules-c16d2c8445d40e1966b12353054df33e9de6897a.zip | |
*Fixed Blessing crashing the server when used on monsters, monster weapon attack mechanics are currently unknown. * Updated conditions for UNT_EPICLESIS and AB_ADORAMUS (two cases of || to &&.)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14948 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/status.c b/src/map/status.c index b1df18ee6..bfa6be76d 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3015,19 +3015,19 @@ void status_calc_bl_main(struct block_list *bl, enum scb_flag flag) if(flag&SCB_MATK) { int wlv = 1, wmatk = 0; - short index = sd->equip_index[EQI_HAND_R]; //New matk status->matk_min = status_base_matk_min(status); status->matk_max = status_base_matk_max(status); + // iRO Wiki states as of 2011/02/24: + // Status MATK = floor(Base Level/4 + INT + INT/2 + DEX/5 + LUK/3) + status->status_matk = status_get_lv(bl)/4 + status->int_ + status->int_/2 + status->dex/5 + status->luk/3; + if( sd ) { - // iRO Wiki states as of 2011/02/24: - // Status MATK = floor(Base Level/4 + INT + INT/2 + DEX/5 + LUK/3) - status->status_matk = status_get_lv(bl)/4 + status->int_ + status->int_/2 + status->dex/5 + status->luk/3; + short index = sd->equip_index[EQI_HAND_R]; wmatk = sd->weapon_matk + sd->battle_status.rhw.atk2 + sd->equipment_matk; - if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON ) wlv = sd->inventory_data[index]->wlv; } @@ -7867,7 +7867,7 @@ static bool status_readdb_job1(char* fields[], int columns, int current) { aspd_base[idx][i] = atoi(fields[i+5]); } - shield_aspd_base[idx] = atoi(fields[29]); // Won't take 5+MAX_WEAPON_TYPE+1 + shield_aspd_base[idx] = atoi(fields[MAX_WEAPON_TYPE+5]); return true; } |