diff options
| -rw-r--r-- | db/pre-re/item_db.conf | 24 | ||||
| -rw-r--r-- | db/re/item_db.conf | 27 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 34 insertions, 19 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index b116ea8f2..3ccacf035 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -64020,7 +64020,7 @@ item_db: ( Buy: 20 Weight: 100 BuyingStore: true - Script: <" sc_start SC_INCLUK,1200000,21; "> + Script: <" sc_start SC_FOOD_LUK,1200000,21; "> }, { Id: 12199 @@ -66002,6 +66002,7 @@ item_db: ( Type: 2 Buy: 1000 Weight: 50 + Script: <" sc_start SC_FOOD_LUK,3600000,20; "> }, { Id: 12328 @@ -66010,7 +66011,14 @@ item_db: ( Type: 2 Buy: 1800 Weight: 100 - Script: <" sc_start SC_INCLUK,3600000,20; "> + Script: <" + sc_start SC_FOOD_STR,20000,10; + sc_start SC_FOOD_DEX,20000,10; + sc_start SC_FOOD_AGI,20000,10; + sc_start SC_FOOD_INT,20000,10; + sc_start SC_FOOD_VIT,20000,10; + sc_start SC_FOOD_LUK,20000,10; + "> }, { Id: 12329 @@ -67125,7 +67133,7 @@ item_db: ( Name: "Rune Kn Test Int" Type: 2 Buy: 0 - Script: <" sc_start SC_INCINT,300000,40; "> + Script: <" sc_start SC_FOOD_INT,300000,40; "> }, { Id: 12402 @@ -67496,7 +67504,7 @@ item_db: ( Name: "Black Mass" Type: 2 Weight: 50 - Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),25; "> + Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10); "> }, { Id: 12436 @@ -76145,7 +76153,7 @@ item_db: ( Type: 18 Buy: 20 Weight: 10 - Script: <" getitem 14530,1; "> + Script: <" getitem Flee_30_Scroll,1; "> }, { Id: 13625 @@ -76154,7 +76162,7 @@ item_db: ( Type: 18 Buy: 20 Weight: 10 - Script: <" getitem 14531,1; "> + Script: <" getitem Accuracy_30_Scroll,1; "> }, { Id: 13626 @@ -86934,7 +86942,7 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 - Script: <" sc_start SC_INCFLEE,1800000,30; "> + Script: <" sc_start SC_FOOD_BASICAVOIDANCE,1800000,30; "> }, { Id: 14531 @@ -86943,7 +86951,7 @@ item_db: ( Type: 2 Buy: 0 Weight: 10 - Script: <" sc_start SC_INCHIT,1800000,30; "> + Script: <" sc_start SC_FOOD_BASICHIT,1800000,30; "> }, { Id: 14532 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 47273d21e..7fc71e5d8 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -78905,7 +78905,7 @@ item_db: ( Buy: 20 Weight: 100 BuyingStore: true - Script: <" sc_start SC_INCLUK,1200000,21; "> + Script: <" sc_start SC_FOOD_LUK,1200000,21; "> }, { Id: 12199 @@ -80946,6 +80946,7 @@ item_db: ( Type: 2 Buy: 1000 Weight: 50 + Script: <" sc_start SC_FOOD_LUK,3600000,20; "> }, { Id: 12328 @@ -80954,7 +80955,14 @@ item_db: ( Type: 2 Buy: 1800 Weight: 100 - Script: <" sc_start SC_INCLUK,3600000,20; "> + Script: <" + sc_start SC_FOOD_STR,20000,10; + sc_start SC_FOOD_DEX,20000,10; + sc_start SC_FOOD_AGI,20000,10; + sc_start SC_FOOD_INT,20000,10; + sc_start SC_FOOD_VIT,20000,10; + sc_start SC_FOOD_LUK,20000,10; + "> }, { Id: 12329 @@ -81975,7 +81983,7 @@ item_db: ( Name: "Rune Kn Test Int" Type: 2 Buy: 0 - Script: <" sc_start SC_INCINT,300000,40; "> + Script: <" sc_start SC_FOOD_INT,300000,40; "> }, { Id: 12402 @@ -82391,7 +82399,7 @@ item_db: ( Type: 2 Buy: 1000 Weight: 50 - Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),25; "> + Script: <" sc_start SC_STOMACHACHE,60000,rand(5,10);"> }, { Id: 12436 @@ -84775,8 +84783,7 @@ item_db: ( Buy: 20 Weight: 30 Script:<" - percentheal 5,5; - sc_start SC_INCLUK,6000,9; + sc_start SC_FOOD_LUK,6000,10; sc_start SC_PLUSATTACKPOWER,6000,20; sc_start SC_PLUSMAGICPOWER,6000,20; "> @@ -96406,7 +96413,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 14530,1; "> + Script: <" getitem Flee_30_Scroll,1; "> }, { Id: 13625 @@ -96424,7 +96431,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem 14531,1; "> + Script: <" getitem Accuracy_30_Scroll,1; "> }, { Id: 13626 @@ -110165,7 +110172,7 @@ item_db: ( nomail: true noauction: true } - Script: <" sc_start SC_INCFLEE,1800000,30; "> + Script: <" sc_start SC_FOOD_BASICAVOIDANCE,1800000,30; "> }, { Id: 14531 @@ -110183,7 +110190,7 @@ item_db: ( nomail: true noauction: true } - Script: <" sc_start SC_INCHIT,1800000,30; "> + Script: <" sc_start SC_FOOD_BASICHIT,1800000,30; "> }, { Id: 14532 diff --git a/src/map/status.c b/src/map/status.c index f7c336f55..a9ae112df 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5412,7 +5412,7 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc 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); + val = max(val, 50); 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 ); |