- Removed bonus 'bAspdAddRate'. bAspdRate now behaves on a stackable matter, so it's no longer needed.

- Reimplemented the bonus 'bAspd'
- Renamed variable aspd_add_rate to aspd_add, since bAspdAddRate was removed, this variable now holds the absolute aspd bonuses.
- Added define status_base_amotion_pc to get the base amotion value.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10107 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 13 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 2c473eec2..6f9a3c4d8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1528,20 +1528,12 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 			sd->speed_add_rate -= val;
 		break;
 	case SP_ASPD:	//Raw increase
-//		if(sd->state.lr_flag != 2)
-//			status->amotion -= val*10;
-		if (battle_config.error_log)			
-			ShowError("pc_bonus: bonus bAspd is no longer supported!\n");
-		break;
-	case SP_ASPD_RATE:	//Non stackable increase
-		if(val >= 0) { //Let negative ASPD bonuses become AddRate ones.
-			if(sd->state.lr_flag != 2 && status->aspd_rate > 1000-val*10)
-				status->aspd_rate = 1000-val*10;
-			break;
-		}
-	case SP_ASPD_ADDRATE:	//Stackable increase - Made it linear as per rodatazone
 		if(sd->state.lr_flag != 2)
-			sd->aspd_add_rate -= val;
+			sd->aspd_add -= 10*val;
+		break;
+	case SP_ASPD_RATE:	//Stackable increase - Made it linear as per rodatazone
+		if(sd->state.lr_flag != 2)
+			status->aspd_rate -= 10*val;
 		break;
 	case SP_HP_RECOV_RATE:
 		if(sd->state.lr_flag != 2)