summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-16 16:56:43 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-16 16:56:43 +0000
commit3089bee74700694461fdc50bf9e9aa01fe589730 (patch)
treecf330782d4f381fe4caad9915824f51dcdd39648 /src/map/pc.c
parentf3bc6581829e1b0111110c4bd42626cd0886593d (diff)
downloadhercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.gz
hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.bz2
hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.xz
hercules-3089bee74700694461fdc50bf9e9aa01fe589730.zip
Fixed bugreport:5749 Amplify Magic Power should now work properly on multi-hit magical skills.
Fixed bugreport:5748 Masquerade-Groomy now removes Dragon and Warg. Fixed bugreport:5751 Implemented script command in checking/mounting Dragon, Warg and MADO Gear, also made a clean up regarding MADO Gear and Warg conditions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 16ce1e21d..a16befff0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7222,6 +7222,21 @@ int pc_setriding(TBL_PC* sd, int flag)
}
/*==========================================
+ *
+ *------------------------------------------*/
+int pc_setmadogear(TBL_PC* sd, int flag)
+{
+ if( flag ){
+ if( pc_checkskill(sd,NC_MADOLICENCE) > 0 )
+ pc_setoption(sd, sd->sc.option|OPTION_MADOGEAR);
+ } else if( pc_ismadogear(sd) ){
+ pc_setoption(sd, sd->sc.option&~OPTION_MADOGEAR);
+ }
+
+ return 0;
+}
+
+/*==========================================
* アイテムドロップ可不可判定
*------------------------------------------*/
int pc_candrop(struct map_session_data *sd, struct item *item)
@@ -8422,7 +8437,7 @@ void pc_overheat(struct map_session_data *sd, int val) {
int heat = val, skill,
limit[] = { 10, 20, 28, 46, 66 };
- if( !(sd->sc.option&OPTION_MADOGEAR) || sd->sc.data[SC_OVERHEAT] )
+ if( !pc_ismadogear(sd) || sd->sc.data[SC_OVERHEAT] )
return; // already burning
skill = cap_value(pc_checkskill(sd,NC_MAINFRAME),0,4);