- Fixed warmth skills draining SP of the target, not the caster.

- If val3 for a combo is set, then the combo will no longer delay attack/movement.
- When TK_DODGE triggers, it will no longer delay your attack or movement.


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

Changelog-Trunk.txt

@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/09/14
+	* Fixed warmth skills draining SP of the target, not the caster. [Skotlex]
+	* When TK_DODGE triggers, it will no longer delay your attack or movement.
+	  [Skotlex]
 	* Estimation /Sense/ whatever will no longer hide the vit bonus to mdef2,
 	  as reported by Playtester. [Skotlex]
 	* Updated Summon Flora to summon the max number of possible plants on one

src/map/battle.c

@@ -302,7 +302,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
 			&& rand()%100 < 20) {
 			clif_skill_nodamage(bl,bl,TK_DODGE,1,1);
 			if (sc->data[SC_COMBO].timer == -1)
-				sc_start4(bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 0, 0, 2000);
+				sc_start4(bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 1, 0, 2000);
 			return 0;
 		}
 

src/map/skill.c

@@ -7069,7 +7069,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 					if(bl->type==BL_PC)
 						//Only damage SP [Skotlex]
 						status_zap(bl, 0, 60);
-					else if(status_charge(bl, 0, 2))
+					else if(status_charge(ss, 0, 2))
 						//Otherwise, Knockback attack.
 						skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
 				break;

src/map/status.c

@@ -5394,8 +5394,12 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 
 		case SC_COMBO:
 		{
+			//val1: Skill ID
+			//val2: When given, target (for autotargetting skills)
+			//val3: When set, this combo time should NOT delay attack/movement
+			//val4: Combo time
 			struct unit_data *ud = unit_bl2ud(bl);
-			switch (val1) { //Val1 contains the skill id
+			switch (val1) {
 				case TK_STORMKICK:
 					clif_skill_nodamage(bl,bl,TK_READYSTORM,1,1);
 					break;
@@ -5409,7 +5413,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 					clif_skill_nodamage(bl,bl,TK_READYCOUNTER,1,1);
 					break;
 			}
-			if (ud) {
+			if (ud && !val3) 
+			{
 				ud->attackabletime = gettick()+tick;
 				unit_set_walkdelay(bl, gettick(), tick, 1);
 			}