Browse Source

Added new bonuses bUnbreakableGarment and bUnbreakableShoes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13819 54d463be-8e91-2dee-dedb-b68131a5f0ec
Inkfish 16 years ago
parent
commit
766143d109
4 changed files with 13 additions and 7 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      db/const.txt
  3. 2 5
      src/map/map.h
  4. 8 0
      src/map/pc.c

+ 1 - 0
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.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 
 09/05/29
 09/05/29
+	* Added new bonuses bUnbreakableGarment and bUnbreakableShoes. [Inkfish]
 	* Some more fixes to skill condition issues. [Inkfish]
 	* Some more fixes to skill condition issues. [Inkfish]
 	- Fixed skills fail when MAX_INVENTORY reached.
 	- Fixed skills fail when MAX_INVENTORY reached.
 	- Fixed spiritballs not being removed correctly in some situation.
 	- Fixed spiritballs not being removed correctly in some situation.

+ 2 - 2
db/const.txt

@@ -343,7 +343,7 @@ bAddMdefClass	1046
 bAddMonsterDropItem	1047
 bAddMonsterDropItem	1047
 bDefRatioAtkEle	1048
 bDefRatioAtkEle	1048
 bDefRatioAtkRace	1049
 bDefRatioAtkRace	1049
-bAddSpeed	1050
+bUnbreakableGarment	1050
 bHitRate	1051
 bHitRate	1051
 bFleeRate	1052
 bFleeRate	1052
 bFlee2Rate	1053
 bFlee2Rate	1053
@@ -418,7 +418,7 @@ bSPDrainValueRace	2029
 bExpAddRace	2030
 bExpAddRace	2030
 bSPGainRace	2031
 bSPGainRace	2031
 bSubRace2	2032
 bSubRace2	2032
-
+bUnbreakableShoes	2033
 bUnstripableWeapon	2034
 bUnstripableWeapon	2034
 bUnstripableArmor	2035
 bUnstripableArmor	2035
 bUnstripableHelm	2036
 bUnstripableHelm	2036

+ 2 - 5
src/map/map.h

@@ -297,7 +297,7 @@ enum _sp {
 	SP_MAGIC_ADDELE,SP_MAGIC_ADDRACE,SP_MAGIC_ADDSIZE, // 1035-1037
 	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_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_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_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_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
 	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_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_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_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_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_INTRAVISION, SP_ADD_MONSTER_DROP_ITEMGROUP, SP_SP_LOSS_RATE, // 2038-2040
 	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE //2041
 	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 {
 enum _look {

+ 8 - 0
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)
 		if(sd->state.lr_flag != 2)
 			sd->unbreakable_equip |= EQP_SHIELD;
 			sd->unbreakable_equip |= EQP_SHIELD;
 		break;
 		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]
 	case SP_CLASSCHANGE: // [Valaris]
 		if(sd->state.lr_flag !=2)
 		if(sd->state.lr_flag !=2)
 			sd->classchange=val;
 			sd->classchange=val;