summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-13 22:44:51 +0800
committerHaru <haru@dotalux.com>2015-12-13 16:17:19 +0100
commit6476db2cd11bab086c903297f4efcb5ec0a1962f (patch)
tree091ec3b8b8823dbd442a2a308ebefb733ad6b7c3
parent3b1df6196b38c95140e43bd462888d3d570821a3 (diff)
downloadhercules-6476db2cd11bab086c903297f4efcb5ec0a1962f.tar.gz
hercules-6476db2cd11bab086c903297f4efcb5ec0a1962f.tar.bz2
hercules-6476db2cd11bab086c903297f4efcb5ec0a1962f.tar.xz
hercules-6476db2cd11bab086c903297f4efcb5ec0a1962f.zip
Fix SC_STOMACHACHE to its official behavior.
-rw-r--r--db/pre-re/item_db.conf4
-rw-r--r--db/re/item_db.conf4
-rw-r--r--src/map/status.c12
3 files changed, 10 insertions, 10 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index d9a716c1c..20f30dc4a 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -67434,7 +67434,7 @@ item_db: (
Name: "Black Mass"
Type: 2
Weight: 50
- Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10); ">
+ Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
},
{
Id: 12436
@@ -74112,7 +74112,7 @@ item_db: (
Loc: 32768
EquipLv: 99
View: 9
- Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10); ">
+ Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
},
// Ninja Fuuma Shurikens
{
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 3b26c6ad3..f6d140d0b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -82374,7 +82374,7 @@ item_db: (
Type: 2
Buy: 1000
Weight: 50
- Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10);">
+ Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
},
{
Id: 12436
@@ -92688,7 +92688,7 @@ item_db: (
Loc: 32768
EquipLv: 99
View: 9
- Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10); ">
+ Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
},
// More Shurikens & Kunais
diff --git a/src/map/status.c b/src/map/status.c
index da2892f98..951615fb2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5416,7 +5416,7 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
if( sc->data[SC_MELON_BOMB] )
val = max( val, sc->data[SC_MELON_BOMB]->val1 );
if (sc->data[SC_STOMACHACHE])
- val = max(val, 50);
+ val = max(val, sc->data[SC_STOMACHACHE]->val2);
if( sc->data[SC_MARSHOFABYSS] ) // It stacks to other statuses so always put this at the end.
val = max( 50, val + 10 * sc->data[SC_MARSHOFABYSS]->val1 );
@@ -9089,7 +9089,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
val1 = 15;
break;
case SC_STOMACHACHE:
- val2 = 8; // SP consume.
+ val3 = 8; // SP consume.
val4 = tick / 10000;
tick_time = 10000; // [GodLesZ] tick time
break;
@@ -11429,10 +11429,10 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
break;
case SC_STOMACHACHE:
- if( --(sce->val4) > 0 ) {
- status->charge(bl,0,sce->val2); // Reduce 8 every 10 seconds.
- if( sd && !pc_issit(sd) ) { // Force to sit every 10 seconds.
- pc_stop_walking(sd, STOPWALKING_FLAG_FIXPOS|STOPWALKING_FLAG_NEXTCELL);
+ if (--(sce->val4) > 0) {
+ status->charge(bl, 0, sce->val3); // Reduce 8 every 10 seconds.
+ if (sd && !pc_issit(sd)) { // Force to sit every 10 seconds.
+ pc_stop_walking(sd, STOPWALKING_FLAG_FIXPOS | STOPWALKING_FLAG_NEXTCELL);
pc_stop_attack(sd);
pc_setsit(sd);
clif->sitting(bl);