소스 검색

* The Forget-me-not dance now behaves like Decrease AGI
- doesn't cancel Impressive Riff, Wind Walker, True Sight (bugreport:187)
- additionally, it doesn't cancel Cart Boost

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11718 54d463be-8e91-2dee-dedb-b68131a5f0ec

ultramage 17 년 전
부모
커밋
1b56a795b9
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 4 0
      Changelog-Trunk.txt
  2. 4 6
      src/map/status.c

+ 4 - 0
Changelog-Trunk.txt

@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/11/13
+	* The Forget-me-not status now behaves like Decrease AGI [ultramage]
+	- doesn't cancel Impressive Riff, Wind Walker, True Sight (bugreport:187)
+	- additionally, it doesn't cancel Cart Boost
 2007/11/12
 	* Now when job changing to another class tree, status changes from skills
 	  that belong to your previous class are cleared. [Skotlex]

+ 4 - 6
src/map/status.c

@@ -4826,10 +4826,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 		if(sc->data[SC_DECREASEAGI].timer!=-1 )
 			status_change_end(bl,SC_DECREASEAGI,-1);
 		break;
-	case SC_DONTFORGETME:
-		//is this correct? Maybe all three should stop the same subset of SCs...
-		if(sc->data[SC_ASSNCROS].timer!=-1 )
-			status_change_end(bl,SC_ASSNCROS,-1);
 	case SC_QUAGMIRE:
 		if(sc->data[SC_CONCENTRATE].timer!=-1 )
 			status_change_end(bl,SC_CONCENTRATE,-1);
@@ -4839,6 +4835,10 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 			status_change_end(bl,SC_WINDWALK,-1);
 		//Also blocks the ones below...
 	case SC_DECREASEAGI:
+		if(sc->data[SC_CARTBOOST].timer!=-1 )
+			status_change_end(bl,SC_CARTBOOST,-1);
+		//Also blocks the ones below...
+	case SC_DONTFORGETME:
 		if(sc->data[SC_INCREASEAGI].timer!=-1 )
 			status_change_end(bl,SC_INCREASEAGI,-1);
 		if(sc->data[SC_ADRENALINE].timer!=-1 )
@@ -4849,8 +4849,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 			status_change_end(bl,SC_SPEARQUICKEN,-1);
 		if(sc->data[SC_TWOHANDQUICKEN].timer!=-1 )
 			status_change_end(bl,SC_TWOHANDQUICKEN,-1);
-		if(sc->data[SC_CARTBOOST].timer!=-1 )
-			status_change_end(bl,SC_CARTBOOST,-1);
 		if(sc->data[SC_ONEHAND].timer!=-1 )
 			status_change_end(bl,SC_ONEHAND,-1);
 		break;