summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-20 15:55:16 +0800
committerJedzkie <jedzkie13@rocketmail.com>2015-12-20 15:55:16 +0800
commitaa9fc88745e8e0956ac1396f385a039973a58ef4 (patch)
tree6fa5d64d3920698d0d6ac20fd911f8d727065cf9 /src
parentce1364f9b51e76b3bfb0fbe3bdccf898cd5ca852 (diff)
downloadhercules-aa9fc88745e8e0956ac1396f385a039973a58ef4.tar.gz
hercules-aa9fc88745e8e0956ac1396f385a039973a58ef4.tar.bz2
hercules-aa9fc88745e8e0956ac1396f385a039973a58ef4.tar.xz
hercules-aa9fc88745e8e0956ac1396f385a039973a58ef4.zip
ItemDB Update:
- Added effects for Inc_Str_Scroll and Inc_Int_Scroll - Update some Statuses in sc_config.txt, removed some duplicate entries.
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c8
-rw-r--r--src/map/status.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c
index c3321799d..1a1c5e2c7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -851,6 +851,8 @@ void initChangeTables(void) {
status->dbs->IconChangeTable[SC_GM_BATTLE] = SI_GM_BATTLE;
status->dbs->IconChangeTable[SC_GM_BATTLE2] = SI_GM_BATTLE2;
status->dbs->IconChangeTable[SC_2011RWC] = SI_2011RWC;
+ status->dbs->IconChangeTable[SC_STR_SCROLL] = SI_STR_SCROLL;
+ status->dbs->IconChangeTable[SC_INT_SCROLL] = SI_INT_SCROLL;
// Eden Crystal Synthesis
status->dbs->IconChangeTable[SC_QUEST_BUFF1] = SI_QUEST_BUFF1;
@@ -1037,6 +1039,8 @@ void initChangeTables(void) {
status->dbs->ChangeFlagTable[SC_GM_BATTLE] |= SCB_BATK | SCB_MATK | SCB_MAXHP | SCB_MAXSP;
status->dbs->ChangeFlagTable[SC_GM_BATTLE2] |= SCB_BATK | SCB_MATK | SCB_MAXHP | SCB_MAXSP;
status->dbs->ChangeFlagTable[SC_2011RWC] |= SCB_STR | SCB_AGI | SCB_VIT | SCB_INT | SCB_DEX | SCB_LUK | SCB_BATK | SCB_MATK;
+ status->dbs->ChangeFlagTable[SC_STR_SCROLL] |= SCB_STR;
+ status->dbs->ChangeFlagTable[SC_INT_SCROLL] |= SCB_INT;
// Cash Items
status->dbs->ChangeFlagTable[SC_FOOD_STR_CASH] = SCB_STR;
@@ -4348,6 +4352,8 @@ unsigned short status_calc_str(struct block_list *bl, struct status_change *sc,
str -= sc->data[SC_KYOUGAKU]->val3;
if (sc->data[SC_2011RWC])
str += sc->data[SC_2011RWC]->val1;
+ if (sc->data[SC_STR_SCROLL])
+ str += sc->data[SC_STR_SCROLL]->val1;
return (unsigned short)cap_value(str,0,USHRT_MAX);
}
@@ -4516,6 +4522,8 @@ unsigned short status_calc_int(struct block_list *bl, struct status_change *sc,
int_ -= sc->data[SC_KYOUGAKU]->val3;
if (sc->data[SC_2011RWC])
int_ += sc->data[SC_2011RWC]->val1;
+ if (sc->data[SC_INT_SCROLL])
+ int_ += sc->data[SC_INT_SCROLL]->val1;
if(bl->type != BL_PC){
if(sc->data[SC_NOEQUIPHELM])
diff --git a/src/map/status.h b/src/map/status.h
index 94731dc17..a45b22adb 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -812,6 +812,8 @@ typedef enum sc_type {
SC_GM_BATTLE,
SC_GM_BATTLE2,
SC_2011RWC,
+ SC_STR_SCROLL,
+ SC_INT_SCROLL, // 630
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;