diff options
author | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-20 13:06:34 +0000 |
---|---|---|
committer | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-20 13:06:34 +0000 |
commit | 1b3bd9ff1725a68d66fd4015c60d6fe28e4b2334 (patch) | |
tree | ae2b21a31c0beb629068355d3e12e659e7ec263d /src/map/pc.h | |
parent | cbd95cc5a9a8c9af49d5d2f096ece46bf4d69071 (diff) | |
download | hercules-1b3bd9ff1725a68d66fd4015c60d6fe28e4b2334.tar.gz hercules-1b3bd9ff1725a68d66fd4015c60d6fe28e4b2334.tar.bz2 hercules-1b3bd9ff1725a68d66fd4015c60d6fe28e4b2334.tar.xz hercules-1b3bd9ff1725a68d66fd4015c60d6fe28e4b2334.zip |
=General
*Added CANNONBALL and THROWWEAPON item types as ammo types.
-IT_THROWWEAPON will be removed soon as all ammo equiptable
-items should be fully treated as ammo type in rAthena and
-not as a item type.
=Jobs
*Added a config to set max stat limit for baby 3rd's. Default is 108.
*Kagerou/Oboro stat limit is now set to whatever the limit is set to for 3rd jobs.
-Which is the default 120.
*Added item job masks for Gangsi, Death Knight, Dark Collector, and Kagerou/Oboro.
-Note: Backwards compatibility was added to allow Kagerou/Oboro to use all the equips
-the Ninja job can use to prevent needing to edit a chunk of the item database.
-The job also has its own exclusive mask which will be used on their exclusive equips soon.
*Kagerou/Oboro jobs can now duel weld daggers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15882 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.h')
-rw-r--r-- | src/map/pc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index ed6695a4f..e74d4a5d0 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -521,7 +521,9 @@ enum ammo_type { A_SHELL, //4 A_GRENADE, //5 A_SHURIKEN, //6 - A_KUNAI //7 + A_KUNAI, //7 + A_CANNONBALL, //8 + A_THROWWEAPON //9 }; //Equip position constants @@ -614,7 +616,7 @@ enum e_pc_permission { #define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE ) #define pc_is50overweight(sd) ( (sd)->weight*100 >= (sd)->max_weight*battle_config.natural_heal_weight_rate ) #define pc_is90overweight(sd) ( (sd)->weight*10 >= (sd)->max_weight*9 ) -#define pc_maxparameter(sd) ( (sd)->class_&JOBL_THIRD ? battle_config.max_third_parameter : (sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter ) +#define pc_maxparameter(sd) ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) ) /** * Ranger **/ |