summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-08-10 13:38:08 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-08-10 13:38:08 +0800
commitd8b2eb622f14e10e4da0e521deb5dee6e849affa (patch)
treee9a19fee9cff67b79ad50224d821d6cf6e51f650 /src
parent1197e46b6ca1f399edc18fbd60a3e2c4adf6c32f (diff)
downloadhercules-d8b2eb622f14e10e4da0e521deb5dee6e849affa.tar.gz
hercules-d8b2eb622f14e10e4da0e521deb5dee6e849affa.tar.bz2
hercules-d8b2eb622f14e10e4da0e521deb5dee6e849affa.tar.xz
hercules-d8b2eb622f14e10e4da0e521deb5dee6e849affa.zip
Fixed Bug#7643
-Fixed SC_ZANGETSU glitch formula. Fixed Bug#7582 -Where quest log's monster counter is not displaying properly. -Fixed renewal atk having wrong parenthesis for variance atk formula. Special Thanks to: Michieru and CottonCandy Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/map/quest.c3
-rw-r--r--src/map/status.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/map/quest.c b/src/map/quest.c
index e1e180786..78902fedf 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -97,7 +97,7 @@ int quest_add(TBL_PC * sd, int quest_id)
sd->save_quest = true;
clif->quest_add(sd, &sd->quest_log[i], sd->quest_index[i]);
-
+ clif->quest_update_objective(sd, &sd->quest_log[i], sd->quest_index[i]);
if( iMap->save_settings&64 )
chrif->save(sd,0);
@@ -145,6 +145,7 @@ int quest_change(TBL_PC * sd, int qid1, int qid2)
clif->quest_delete(sd, qid1);
clif->quest_add(sd, &sd->quest_log[i], sd->quest_index[i]);
+ clif->quest_update_objective(sd, &sd->quest_log[i], sd->quest_index[i]);
if( iMap->save_settings&64 )
chrif->save(sd,0);
diff --git a/src/map/status.c b/src/map/status.c
index 5928e9550..e7c3eaece 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -8680,10 +8680,10 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
tick_time = 1000;
break;
case SC_ZANGETSU:
- val2 = iStatus->get_lv(bl) / 3 + 20 * val1;
+ val2 = val4 = iStatus->get_lv(bl) / 3 + 20 * val1;
val3 = iStatus->get_lv(bl) / 2 + 30 * val1;
val2 = (!(status_get_hp(bl)%2) ? val2 : -val3);
- val3 = (!(status_get_sp(bl)%2) ? val2 : -val3);
+ val3 = (!(status_get_sp(bl)%2) ? val4 : -val3);
break;
case SC_GENSOU:
{
@@ -10932,8 +10932,8 @@ int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int fl
variance = 5.0f * watk->atk * watk->wlv / 100.0f;
strdex_bonus = watk->atk * dstr / 200.0f;
- min = (watk->atk - (int)(variance + strdex_bonus)) + watk->atk2;
- max = (watk->atk + (int)(variance + strdex_bonus)) + watk->atk2;
+ min = (int)(watk->atk - variance + strdex_bonus) + watk->atk2;
+ max = (int)(watk->atk + variance + strdex_bonus) + watk->atk2;
}else if( watk->atk ){
min = watk->atk * 80 / 100;
max = watk->atk * 120 / 100;