From 228fb34bfaa18f1de0ab909f8d2df4819a6018e9 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 29 May 2009 06:45:58 +0000 Subject: Added new bonuses bUnbreakableGarment and bUnbreakableShoes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13819 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + db/const.txt | 4 ++-- src/map/map.h | 7 ++----- src/map/pc.c | 8 ++++++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5ffc34fe5..d6f9dc958 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 09/05/29 + * Added new bonuses bUnbreakableGarment and bUnbreakableShoes. [Inkfish] * Some more fixes to skill condition issues. [Inkfish] - Fixed skills fail when MAX_INVENTORY reached. - Fixed spiritballs not being removed correctly in some situation. diff --git a/db/const.txt b/db/const.txt index bc54919bf..fb336a477 100644 --- a/db/const.txt +++ b/db/const.txt @@ -343,7 +343,7 @@ bAddMdefClass 1046 bAddMonsterDropItem 1047 bDefRatioAtkEle 1048 bDefRatioAtkRace 1049 -bAddSpeed 1050 +bUnbreakableGarment 1050 bHitRate 1051 bFleeRate 1052 bFlee2Rate 1053 @@ -418,7 +418,7 @@ bSPDrainValueRace 2029 bExpAddRace 2030 bSPGainRace 2031 bSubRace2 2032 - +bUnbreakableShoes 2033 bUnstripableWeapon 2034 bUnstripableArmor 2035 bUnstripableHelm 2036 diff --git a/src/map/map.h b/src/map/map.h index a2740bf56..6f1703167 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -297,7 +297,7 @@ enum _sp { SP_MAGIC_ADDELE,SP_MAGIC_ADDRACE,SP_MAGIC_ADDSIZE, // 1035-1037 SP_PERFECT_HIT_RATE,SP_PERFECT_HIT_ADD_RATE,SP_CRITICAL_RATE,SP_GET_ZENY_NUM,SP_ADD_GET_ZENY_NUM, // 1038-1042 SP_ADD_DAMAGE_CLASS,SP_ADD_MAGIC_DAMAGE_CLASS,SP_ADD_DEF_CLASS,SP_ADD_MDEF_CLASS, // 1043-1046 - SP_ADD_MONSTER_DROP_ITEM,SP_DEF_RATIO_ATK_ELE,SP_DEF_RATIO_ATK_RACE,SP_FREE3, // 1047-1050 + SP_ADD_MONSTER_DROP_ITEM,SP_DEF_RATIO_ATK_ELE,SP_DEF_RATIO_ATK_RACE,SP_UNBREAKABLE_GARMENT, // 1047-1050 SP_HIT_RATE,SP_FLEE_RATE,SP_FLEE2_RATE,SP_DEF_RATE,SP_DEF2_RATE,SP_MDEF_RATE,SP_MDEF2_RATE, // 1051-1057 SP_SPLASH_RANGE,SP_SPLASH_ADD_RANGE,SP_AUTOSPELL,SP_HP_DRAIN_RATE,SP_SP_DRAIN_RATE, // 1058-1062 SP_SHORT_WEAPON_DAMAGE_RETURN,SP_LONG_WEAPON_DAMAGE_RETURN,SP_WEAPON_COMA_ELE,SP_WEAPON_COMA_RACE, // 1063-1066 @@ -317,13 +317,10 @@ enum _sp { SP_SKILL_ATK, SP_UNSTRIPABLE, SP_AUTOSPELL_ONSKILL, // 2018-2020 SP_SP_GAIN_VALUE, SP_HP_REGEN_RATE, SP_HP_LOSS_RATE, SP_ADDRACE2, SP_HP_GAIN_VALUE, // 2021-2025 SP_SUBSIZE, SP_HP_DRAIN_VALUE_RACE, SP_ADD_ITEM_HEAL_RATE, SP_SP_DRAIN_VALUE_RACE, SP_EXP_ADDRACE, // 2026-2030 - SP_SP_GAIN_RACE, SP_SUBRACE2, SP_FREE2, // 2031-2033 + SP_SP_GAIN_RACE, SP_SUBRACE2, SP_UNBREAKABLE_SHOES, // 2031-2033 SP_UNSTRIPABLE_WEAPON,SP_UNSTRIPABLE_ARMOR,SP_UNSTRIPABLE_HELM,SP_UNSTRIPABLE_SHIELD, // 2034-2037 SP_INTRAVISION, SP_ADD_MONSTER_DROP_ITEMGROUP, SP_SP_LOSS_RATE, // 2038-2040 SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE //2041 - //Before adding new bonuses, reuse the currently free slots: - //2033 (SP_FREE2) (previously SP_ADDEFF_WHENHIT_SHORT) - //1050 (SP_FREE3) (previously SP_ADD_SPEED) }; enum _look { diff --git a/src/map/pc.c b/src/map/pc.c index ec2c4b30e..720c252d8 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2094,6 +2094,14 @@ int pc_bonus(struct map_session_data *sd,int type,int val) if(sd->state.lr_flag != 2) sd->unbreakable_equip |= EQP_SHIELD; break; + case SP_UNBREAKABLE_GARMENT: + if(sd->state.lr_flag != 2) + sd->unbreakable_equip |= EQP_GARMENT; + break; + case SP_UNBREAKABLE_SHOES: + if(sd->state.lr_flag != 2) + sd->unbreakable_equip |= EQP_SHOES; + break; case SP_CLASSCHANGE: // [Valaris] if(sd->state.lr_flag !=2) sd->classchange=val; -- cgit v1.2.3-70-g09d2