summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-12 09:13:29 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-12 09:13:29 +0000
commit62c7a5a3b56f45d22b239009160ca5b4c27a52a8 (patch)
tree9a3ddff3f3621c20a522b9386dfded0eba83f952
parent2f6e6453f6296a6335cf6fccbfe0567584ebdbde (diff)
downloadhercules-62c7a5a3b56f45d22b239009160ca5b4c27a52a8.tar.gz
hercules-62c7a5a3b56f45d22b239009160ca5b4c27a52a8.tar.bz2
hercules-62c7a5a3b56f45d22b239009160ca5b4c27a52a8.tar.xz
hercules-62c7a5a3b56f45d22b239009160ca5b4c27a52a8.zip
- Added SC_INCMDEFRATE, used in Mdef Potions.
- Added the effects of the fireworks items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11722 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/const.txt1
-rw-r--r--db/item_db.txt14
-rw-r--r--src/map/status.c3
-rw-r--r--src/map/status.h1
6 files changed, 14 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4f9cd4f6d..8ddde3a2a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -11,6 +11,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
* Fixed some bugs on mail system. [Zephyrus]
- Added the pc_candrop check (bugreport:305)
- Added picklog to mail.
+ - Added INCMDEFRATE status for Mdef potion.
2007/11/12
* Now when job changing to another class tree, status changes from skills
that belong to your previous class are cleared. [Skotlex]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 406f86069..02fc120c2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -39,6 +39,7 @@
=======================
11/13
* Rev. 11720 Corrected some of the ep. 12 accessory bonuses. [L0ne_W0lf]
+ - Rev. 11722 Added some premium items (fireworks items and MDef Potions) [Zephyrus]
11/12
* Rev. 11711 Fixed an item giving 24 of the 'Gladius' item. :P [L0ne_W0lf]
11/10
diff --git a/db/const.txt b/db/const.txt
index 779db9934..aca00297b 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -762,6 +762,7 @@ SC_INCCRI 261
SC_INCDEF 262
SC_INCBASEATK 263
SC_FASTCAST 264
+SC_INCMDEFRATE 265
e_gasp 0
e_what 1
diff --git a/db/item_db.txt b/db/item_db.txt
index 02e675896..cf1a70507 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3963,14 +3963,14 @@
14540,Holy_Armor_Scroll,Holy Armor Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1800000,Ele_Holy,20,Ele_Shadow,-15; },{},{}
14541,Small_Defense_Potion,Small Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEFRATE,60000,3; },{},{}
14542,Big_Defense_Potion,Big Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEFRATE,180000,3; },{},{}
-14543,Small_Magic_Defense_Potion,Small Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14544,Big_Magic_Defense_Potion,Big Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14543,Small_Magic_Defense_Potion,Small Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMDEFRATE,600000,3; },{},{}
+14544,Big_Magic_Defense_Potion,Big Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMDEFRATE,180000,3; },{},{}
14545,Field_Manual_300%,Field Manual 300%,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,300; },{},{}
-14546,Love_You_Firecracker,Love You Firecracker,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14547,White_Day_Firecracker,White Day Firecracker,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14548,Valentine's_Day_Firecracker,Valentine's Day Firecracker,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14549,Birthday_Firecracker,Birthday Firecracker,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14550,Christmas_Firecracker,Christmas Firecracker,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14546,Love_You_Firecracker,Love You Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(682); },{},{}
+14547,White_Day_Firecracker,White Day Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(683); },{},{}
+14548,Valentine's_Day_Firecracker,Valentine's Day Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(684); },{},{}
+14549,Birthday_Firecracker,Birthday Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(685); },{},{}
+14550,Christmas_Firecracker,Christmas Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(686); },{},{}
14551,Str_Dish01_,Fried Grasshopper Legs,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 1; percentheal 5,0; },{},{}
14552,Str_Dish02_,Seasoned Sticky Webfoot,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 2; percentheal 5,0; },{},{}
14553,Str_Dish03_,Bomber Steak,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood, 1200000, 3; percentheal 5,0; },{},{}
diff --git a/src/map/status.c b/src/map/status.c
index f0c5b0368..9310e1b57 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -487,6 +487,7 @@ void initChangeTables(void)
StatusChangeFlagTable[SC_INCATKRATE] |= SCB_BATK|SCB_WATK;
StatusChangeFlagTable[SC_INCMATKRATE] |= SCB_MATK;
StatusChangeFlagTable[SC_INCDEFRATE] |= SCB_DEF;
+ StatusChangeFlagTable[SC_INCMDEFRATE] |= SCB_MDEF;
StatusChangeFlagTable[SC_INCBASEATK] |= SCB_BATK;
StatusChangeFlagTable[SC_STRFOOD] |= SCB_STR;
StatusChangeFlagTable[SC_AGIFOOD] |= SCB_AGI;
@@ -3662,6 +3663,8 @@ static signed char status_calc_mdef(struct block_list *bl, struct status_change
mdef += 25*mdef/100;
if(sc->data[SC_ENDURE].timer!=-1 && sc->data[SC_ENDURE].val4 == 0)
mdef += sc->data[SC_ENDURE].val1;
+ if(sc->data[SC_INCMDEFRATE].timer!=-1)
+ mdef += mdef * sc->data[SC_INCMDEFRATE].val1/100;
return (char)cap_value(mdef,0,CHAR_MAX);
}
diff --git a/src/map/status.h b/src/map/status.h
index a610ed120..153b7288e 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -280,6 +280,7 @@ enum sc_type {
SC_INCDEF,
SC_INCBASEATK,
SC_FASTCAST,
+ SC_INCMDEFRATE, // Mdef Potion
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
};
int SkillStatusChangeTable(int skill);