- Fixed a comparison whn doing item searches

- Fixed hom_setting&0x2 conflicting with the 'view-range' limit check.
- Stone curse now uses status_percent_damage instead of a precalculated value.
- Merged the SA_MONOCELL and SA_CLASSCHANGE code. After changing class all the status changes that cannot be triggered on bosses are dispelled. 
- SA_CLASSCHANGE now uses the bloody branch list to pick a target MVP class.


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

1 files changed, 1 insertions, 10 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 32d8bfacb..a05c4611b 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5220,8 +5220,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 			break;
 
 		case SC_STONE:
-			val2 = status->max_hp/100; //Petrified damage per second: 1%
-			if (!val2) val2 = 1;
 			val3 = tick/1000; //Petrified HP-damage iterations.
 			if(val3 < 1) val3 = 1; 
 			tick = val4; //Petrifying time.
@@ -6780,14 +6778,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
 		}
 		if(--(sce->val3) > 0) {
 			if(++(sce->val4)%5 == 0 && status->hp > status->max_hp/4)
-			{
-				bool flag;
-				map_freeblock_lock();
-				status_zap(bl, sce->val2, 0);
-				flag = !sc->data[type];
-				map_freeblock_unlock();
-				if (flag) return 0; //target died, SC cancelled already.
-			}
+				status_percent_damage(NULL, bl, 1, 0, false);
 			sc_timer_next(1000+tick,status_change_timer, bl->id, data );
 			return 0;
 		}