- Changed the default of skill_delay_attack_enable to no.

- Modified Magnum break's delay to 0, time1 to 2 secs, time2 to 10 secs. Time 1 is for the skill reuse delay, and time2 the weapon fire bonus time.


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

Changelog-Trunk.txt

@@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR
 
 
 2006/02/09
+	* Changed the default of skill_delay_attack_enable to no. [Skotlex]
 	* Code rewrites in mob_damage and party_exp_even_share for correctly
 	  handling overflow issues. Now uses UINT_MAX for range comparisons, as it
 	  should be. [Skotlex]

conf-tmpl/battle/skill.conf

@@ -45,7 +45,7 @@ min_skill_delay_limit: 100
 castrate_dex_scale: 150
 
 // Will normal attacks be able to ignore the delay after skills? (Note 1)
-skill_delay_attack_enable: yes
+skill_delay_attack_enable: no 
 
 // Range added to player skills after their cast time finishes.
 // Decides how far away the target can walk away after the skill began casting before the skill fails.

db/Changelog.txt

@@ -29,6 +29,10 @@
 
 =========================
 
+02/09
+	* Modified Magnum break's delay to 0, time1 to 2 secs, time2 to 10 secs.
+	  Time 1 is for the skill reuse delay, and time2 the weapon fire bonus time.
+	  [Skotlex]
 02/06
 	* Changed Serin's Gold Ring Weight to 0 [Poki#3]
 

db/skill_cast_db.txt

@@ -34,7 +34,7 @@
 //-- SM_PROVOKE
 6,0,0,30000,0
 //-- SM_MAGNUM
-7,0,2000,0,0
+7,0,0,2000,10000
 //-- SM_ENDURE
 8,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0
 //==========================================

src/map/skill.c

@@ -2819,8 +2819,9 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 				src->m,src->x-2,src->y-2,src->x+2,src->y+2,BL_CHAR,
 				src,skillid,skilllv,tick, flag|BCT_ENEMY|1,
 				skill_castend_damage_id);
-			status_change_start (src,SC_WATK_ELEMENT,100,3,20,0,0,10000,0); //Initiate 10% of your damage becomes fire element.
+			status_change_start (src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skillid, skilllv),0); //Initiate 10% of your damage becomes fire element.
 			clif_skill_nodamage (src,src,skillid,skilllv,1);
+			if (sd) pc_blockskill_start (sd, skillid, skill_get_time(skillid, skilllv));
 		}
 		break;