summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/const.txt2
-rw-r--r--db/pre-re/item_db.conf26
-rw-r--r--db/re/item_db.conf26
-rw-r--r--db/sc_config.txt2
-rw-r--r--src/map/status.c4
-rw-r--r--src/map/status.h2
6 files changed, 37 insertions, 25 deletions
diff --git a/db/const.txt b/db/const.txt
index 94bee8bdb..da0293660 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1314,6 +1314,8 @@ SC_FENRIR_CARD 607
SC_ATKER_ASPD 608
SC_ATKER_MOVESPEED 609
+SC_FOOD_CRITICALSUCCESSVALUE 610
+
e_gasp 0
e_what 1
e_ho 2
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index af9acf21d..b116ea8f2 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -62461,7 +62461,7 @@ item_db: (
BuyingStore: true
Script: <"
sc_start SC_FOOD_STR,1200000,10;
- percentheal 20,20;
+ percentheal 20,10;
">
},
{
@@ -62797,6 +62797,7 @@ item_db: (
Buy: 20
Weight: 300
BuyingStore: true
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,180000,30; ">
},
{
Id: 12102
@@ -62806,6 +62807,7 @@ item_db: (
Buy: 20
Weight: 300
BuyingStore: true
+ Script: <" sc_start SC_FOOD_BASICHIT,180000,30; ">
},
{
Id: 12103
@@ -65163,7 +65165,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_INCHIT,600000,33; ">
+ Script: <" sc_start SC_FOOD_BASICHIT,600000,33; ">
},
{
Id: 12273
@@ -65181,7 +65183,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_INCFLEE,600000,33; ">
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,600000,33; ">
},
{
Id: 12274
@@ -65789,7 +65791,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_INCFLEE,600000,10; ">
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,600000,10; ">
},
{
Id: 12311
@@ -65888,8 +65890,8 @@ item_db: (
Buy: 0
Weight: 300
Script: <"
- sc_start SC_INCATKRATE,600000,5;
- sc_start SC_INCMATKRATE,600000,5;
+ sc_start SC_PLUSATTACKPOWER,600000,5;
+ sc_start SC_PLUSMAGICPOWER,600000,5;
">
},
{
@@ -65900,8 +65902,8 @@ item_db: (
Buy: 0
Weight: 300
Script: <"
- sc_start SC_INCHIT,600000,10;
- sc_start SC_PLUSAVOIDVALUE,600000,20;
+ sc_start SC_FOOD_BASICHIT,600000,10;
+ sc_start SC_FOOD_BASICAVOIDANCE,600000,20;
">
},
{
@@ -65911,7 +65913,7 @@ item_db: (
Type: 2
Buy: 0
Weight: 300
- Script: <" sc_start SC_CRITICALPERCENT,600000,7; ">
+ Script: <" sc_start SC_FOOD_CRITICALSUCCESSVALUE,600000,7; ">
},
{
Id: 12322
@@ -66132,9 +66134,9 @@ item_db: (
Buy: 100
Weight: 100
Script: <"
- sc_start SC_CHASEWALK2,180000,2;
- sc_start SC_INCINT,180000,2;
- sc_start SC_INCAGI,180000,2;
+ sc_start SC_FOOD_STR,180000,2;
+ sc_start SC_FOOD_INT,180000,2;
+ sc_start SC_FOOD_AGI,180000,2;
">
},
{
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 8e2231054..47273d21e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -77343,7 +77343,7 @@ item_db: (
BuyingStore: true
Script: <"
sc_start SC_FOOD_STR,1200000,10;
- percentheal 20,20;
+ percentheal 20,10;
">
},
{
@@ -77679,6 +77679,7 @@ item_db: (
Buy: 20
Weight: 300
BuyingStore: true
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,180000,30; ">
},
{
Id: 12102
@@ -77688,6 +77689,7 @@ item_db: (
Buy: 20
Weight: 300
BuyingStore: true
+ Script: <" sc_start SC_FOOD_BASICHIT,180000,30; ">
},
{
Id: 12103
@@ -80056,7 +80058,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_INCHIT,600000,33; ">
+ Script: <" sc_start SC_FOOD_BASICHIT,600000,33; ">
},
{
Id: 12273
@@ -80073,7 +80075,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_INCFLEE,600000,33; ">
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,600000,33; ">
},
{
Id: 12274
@@ -80693,7 +80695,7 @@ item_db: (
Nouse: {
sitting: true
}
- Script: <" sc_start SC_INCFLEE,600000,10; ">
+ Script: <" sc_start SC_FOOD_BASICAVOIDANCE,600000,10; ">
},
{
Id: 12311
@@ -80810,8 +80812,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_INCATKRATE,600000,5;
- sc_start SC_INCMATKRATE,600000,5;
+ sc_start SC_PLUSATTACKPOWER,600000,5;
+ sc_start SC_PLUSMAGICPOWER,600000,5;
">
},
{
@@ -80830,8 +80832,8 @@ item_db: (
noauction: true
}
Script: <"
- sc_start SC_INCHIT,600000,10;
- sc_start SC_PLUSAVOIDVALUE,600000,20;
+ sc_start SC_FOOD_BASICHIT,600000,10;
+ sc_start SC_FOOD_BASICAVOIDANCE,600000,20;
">
},
{
@@ -80849,7 +80851,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" sc_start SC_CRITICALPERCENT,600000,7; ">
+ Script: <" sc_start SC_FOOD_CRITICALSUCCESSVALUE,600000,7; ">
},
{
Id: 12322
@@ -81074,9 +81076,9 @@ item_db: (
Buy: 100
Weight: 100
Script: <"
- sc_start SC_CHASEWALK2,180000,2;
- sc_start SC_INCINT,180000,2;
- sc_start SC_INCAGI,180000,2;
+ sc_start SC_FOOD_STR,180000,2;
+ sc_start SC_FOOD_INT,180000,2;
+ sc_start SC_FOOD_AGI,180000,2;
">
},
{
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 339a5257f..303f8a158 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -158,7 +158,7 @@ SC_FOOD_INT, 92
SC_FOOD_LUK, 92
SC_FOOD_BASICAVOIDANCE, 88
SC_FOOD_BASICHIT, 88
-//SC_FOOD_CRITICALSUCCESSVALUE, 24
+SC_FOOD_CRITICALSUCCESSVALUE, 24
SC_CASH_PLUSEXP, 93
SC_CASH_DEATHPENALTY, 93
SC_CASH_RECEIVEITEM, 93
diff --git a/src/map/status.c b/src/map/status.c
index 5d1e7f4ef..f7c336f55 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -802,6 +802,7 @@ void initChangeTables(void) {
status->dbs->IconChangeTable[SC_SPL_MATK] = SI_SPL_MATK;
status->dbs->IconChangeTable[SC_PLUSATTACKPOWER] = SI_PLUSATTACKPOWER;
status->dbs->IconChangeTable[SC_PLUSMAGICPOWER] = SI_PLUSMAGICPOWER;
+ status->dbs->IconChangeTable[SC_FOOD_CRITICALSUCCESSVALUE] = SI_FOOD_CRITICALSUCCESSVALUE;
// Cash Items
status->dbs->IconChangeTable[SC_FOOD_STR_CASH] = SI_FOOD_STR_CASH;
@@ -993,6 +994,7 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_TARGET_ASPD] |= SCB_MAXSP;
status->dbs->ChangeFlagTable[SC_ATKER_ASPD] |= SCB_MAXHP | SCB_ALL;
status->dbs->ChangeFlagTable[SC_ATKER_MOVESPEED] |= SCB_MAXSP | SCB_ALL;
+ status->dbs->ChangeFlagTable[SC_FOOD_CRITICALSUCCESSVALUE] |= SCB_CRI;
// Cash Items
status->dbs->ChangeFlagTable[SC_FOOD_STR_CASH] = SCB_STR;
@@ -4839,6 +4841,8 @@ signed short status_calc_critical(struct block_list *bl, struct status_change *s
if (sc->data[SC_CRITICALPERCENT])
critical += sc->data[SC_CRITICALPERCENT]->val2;
+ if (sc->data[SC_FOOD_CRITICALSUCCESSVALUE])
+ critical += sc->data[SC_FOOD_CRITICALSUCCESSVALUE]->val1;
if (sc->data[SC_EXPLOSIONSPIRITS])
critical += sc->data[SC_EXPLOSIONSPIRITS]->val2;
if (sc->data[SC_FORTUNE])
diff --git a/src/map/status.h b/src/map/status.h
index e784eade8..99916c291 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -773,6 +773,8 @@ typedef enum sc_type {
SC_ATKER_ASPD,
SC_ATKER_MOVESPEED,
+
+ SC_FOOD_CRITICALSUCCESSVALUE, // 610
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 12:45:25 +0000