diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2015-11-22 18:44:30 +0800 |
|---|---|---|
| committer | Jedzkie <jedzkie13@rocketmail.com> | 2015-11-22 18:44:30 +0800 |
| commit | ce33936de2fcb9c565437cb80e6329ab76626500 (patch) | |
| tree | a44580083a55eaf306a35452fc4fa1b872e3a8a6 | |
| parent | 5f8edc6c450ddc44b9a16dbbb9d5910b51cc3a62 (diff) | |
| download | hercules-ce33936de2fcb9c565437cb80e6329ab76626500.tar.gz hercules-ce33936de2fcb9c565437cb80e6329ab76626500.tar.bz2 hercules-ce33936de2fcb9c565437cb80e6329ab76626500.tar.xz hercules-ce33936de2fcb9c565437cb80e6329ab76626500.zip | |
ItemDB Update:
- Fixed 'Black Thing' not decreasing Stats and Movement Speed.
- Fixed 'Enriched White Potion Z' no HP regeneration.
| -rw-r--r-- | db/pre-re/item_db.conf | 4 | ||||
| -rw-r--r-- | db/re/item_db.conf | 9 | ||||
| -rw-r--r-- | src/map/status.c | 10 |
3 files changed, 15 insertions, 8 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index ca182e2f7..389498ac0 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -67425,7 +67425,7 @@ item_db: ( Weight: 10 BuyingStore: true Script: <" - sc_start SC_EXTRACT_WHITE_POTION_Z,500000,0; + sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; "> }, @@ -67489,7 +67489,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),25; "> }, { Id: 12436 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 6620ba919..e7c2f3c61 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -82037,6 +82037,11 @@ item_db: ( nomail: true noauction: true } + Script: <" + percentheal 30,30; + skilleffect AL_BLESSING,0; + sc_start SC_BLESSING,140000,5; + "> }, { Id: 12406 @@ -82308,7 +82313,7 @@ item_db: ( Weight: 70 BuyingStore: true Script: <" - sc_start SC_EXTRACT_WHITE_POTION_Z,500000,0; + sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; heal 1000,0; "> }, @@ -82379,7 +82384,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),25; "> }, { Id: 12436 diff --git a/src/map/status.c b/src/map/status.c index acd31aefd..5d1e7f4ef 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1038,11 +1038,12 @@ void initChangeTables(void) { status->dbs->ChangeFlagTable[SC_EXTRACT_WHITE_POTION_Z] |= SCB_REGEN; status->dbs->ChangeFlagTable[SC_VITATA_500] |= SCB_REGEN | SCB_MAXSP; status->dbs->ChangeFlagTable[SC_EXTRACT_SALAMINE_JUICE] |= SCB_ASPD; - status->dbs->ChangeFlagTable[SC_REBOUND] |= SCB_SPEED|SCB_REGEN; - status->dbs->ChangeFlagTable[SC_DEFSET] |= SCB_DEF|SCB_DEF2; - status->dbs->ChangeFlagTable[SC_MDEFSET] |= SCB_MDEF|SCB_MDEF2; + status->dbs->ChangeFlagTable[SC_REBOUND] |= SCB_SPEED | SCB_REGEN; + status->dbs->ChangeFlagTable[SC_DEFSET] |= SCB_DEF | SCB_DEF2; + status->dbs->ChangeFlagTable[SC_MDEFSET] |= SCB_MDEF | SCB_MDEF2; status->dbs->ChangeFlagTable[SC_MYSTERIOUS_POWDER] |= SCB_MAXHP; status->dbs->ChangeFlagTable[SC_ACARAJE] |= SCB_HIT | SCB_ASPD; + status->dbs->ChangeFlagTable[SC_STOMACHACHE] |= SCB_STR | SCB_AGI | SCB_VIT | SCB_INT | SCB_DEX | SCB_LUK | SCB_SPEED; // Geffen Scrolls status->dbs->ChangeFlagTable[SC_SKELSCROLL] |= SCB_ALL; @@ -5404,9 +5405,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc val = max( val, sc->data[SC_POWER_OF_GAIA]->val2 ); if( sc->data[SC_MELON_BOMB] ) val = max( val, sc->data[SC_MELON_BOMB]->val1 ); - 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 ); + if (sc->data[SC_STOMACHACHE]) + val = max(val, sc->data[SC_STOMACHACHE]->val2); if( sd && sd->bonus.speed_rate + sd->bonus.speed_add_rate > 0 ) // permanent item-based speedup val = max( val, sd->bonus.speed_rate + sd->bonus.speed_add_rate ); |