Merge branch 'master' of https://github.com/rathena/rathena

db/re/skill_cast_db.txt

@@ -1768,17 +1768,17 @@
 //-- SU_HIDE
 5020,0,1000,0,-1,0,15000,0
 //-- SU_SCRATCH
-5021,0,1000,0,10000,0,3000:2000:1000,0
+5021,0,1000,0,0,120000,3000:2000:1000,0
 //-- SU_STOOP
 5022,0,1000,0,6000,0,15000,0
 //-- SU_LOPE
 5023,500,1000,0,0,0,2000:4000:6000,0
 //-- SU_SV_STEMSPEAR
-5026,2500,1000,0,10000,0,0,0
+5026,2500,1000,0,0,120000,0,0
 //-- SU_CN_POWDERING
 5027,1500,1000,0,3000:4000:5000:6000:7000,0,0,0
 //-- SU_CN_METEOR
-5028,6000,1000,0,1500:2000:2500:3000:3500,20000,2000:3000:4000:5000:6000,0
+5028,7500,1000,0,1500:2000:2500:3000:3500,20000,5000,0
 //-- SU_SV_ROOTTWIST
 5029,0,1000,0,7000:9000:11000:13000:15000,0,3000,0
 //-- SU_SV_ROOTTWIST_ATK
@@ -1792,7 +1792,7 @@
 //-- SU_ARCLOUSEDASH
 5035,2500,1000,0,60000:70000:80000:90000:100000,0,10000,0
 //-- SU_LUNATICCARROTBEAT
-5036,3000,1000,0,1000,0,8000,0
+5036,3000,1000,0,0,5000,8000,0
 //-- SU_TUNABELLY
 5038,2000,1000,0,0,0,8000:10000:12000:14000:16000,0
 //-- SU_TUNAPARTY

db/re/skill_db.txt

@@ -1339,7 +1339,7 @@
 5025,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,		SU_POWEROFLAND,Power of Land
 5026,9,6,1,2:3:1:4:8,0x0,0,5,1,yes,0,0,0,magic,0,0x0,		SU_SV_STEMSPEAR,Silvervine Stem Spear
 5027,9,6,1,0,0x3,0,5,1,yes,0,0,1,none,0,0x0,		SU_CN_POWDERING,Catnip Powdering
-5028,9,8,2,0,0,1:1:2:2:3,5,1:2:3:4:5,yes,0,0,0,magic,0,0x0,		SU_CN_METEOR,Catnip Meteor
+5028,9,8,2,0,0,1:1:2:2:3,5,5,yes,0,0,0,magic,0,0x0,		SU_CN_METEOR,Catnip Meteor
 5029,9,6,1,0,0x1,0,5,1,yes,0,0,1,none,0,0x0,		SU_SV_ROOTTWIST,Silvervine Root Twist
 5030,0,6,1,5,0x30,0,5,1,no,0,0,1,magic,0,0x0,	SU_SV_ROOTTWIST_ATK,Silver Vine Root Twist Attack
 5031,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0,		SU_POWEROFLIFE,Power of Life

db/re/skill_unit_db.txt

@@ -178,7 +178,7 @@
 5013,0x102,   ,  3, 0,  -1,all,   0x2002	//LG_KINGS_GRACE
 
 5027,0x106,   ,  1:1:2:2:3, 0,  -1,enemy, 0x2010 // SU_CN_POWDERING
-5028,0x86,    ,  0, 1, 500,enemy, 0x10 // SU_CN_METEOR
+5028,0x86,    ,  0, 3, 500,enemy, 0x10 // SU_CN_METEOR
 5029,0x107,   ,  0, 0,1000,enemy, 0x10 // SU_SV_ROOTTWIST
 
 8020,0xf5,    ,  3, 0,2300:2100:1900:1700:1500,enemy,   0x018	//MH_POISON_MIST

src/map/battle.c

@@ -6084,7 +6084,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 						skillratio += 600;
 						break;
 					case SU_CN_METEOR:
-						skillratio += 100 + 100 * skill_lv;
+						skillratio += -60 + 20 * skill_lv;
 						break;
 				}
 

src/map/skill.c

@@ -1850,21 +1850,21 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 		status_change_end(bl, SC_C_MARKER, INVALID_TIMER);
 		break;
 	case SU_SCRATCH:
-		sc_start2(src, bl, SC_BLEEDING, (skill_lv * 3), skill_lv, src->id, skill_get_time(skill_id, skill_lv)); // TODO: What's the chance/time?
+		sc_start2(src, bl, SC_BLEEDING, (skill_lv * 3), skill_lv, src->id, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
 		break;
 	case SU_SV_STEMSPEAR:
-		sc_start2(src, bl, SC_BLEEDING, 10, skill_lv, src->id, skill_get_time(skill_id, skill_lv));
+		sc_start2(src, bl, SC_BLEEDING, 10, skill_lv, src->id, skill_get_time2(skill_id, skill_lv));
 		break;
 	case SU_CN_METEOR:
 		if (skill_area_temp[3] == 1)
-				sc_start(src, bl, SC_CURSE, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
+			sc_start(src, bl, SC_CURSE, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
 		break;
 	//case SU_SCAROFTAROU:
 	//	sc_start(src, bl, SC_STUN, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
 	//	break;
 	case SU_LUNATICCARROTBEAT:
 		if (skill_area_temp[3] == 1)
-			sc_start(src, bl, SC_STUN, 10, skill_lv, skill_get_time(skill_id, skill_lv)); // TODO: What's the chance/time?
+			sc_start(src, bl, SC_STUN, 10, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: What's the chance/time?
 		break;
 	} //end switch skill_id