Procházet zdrojové kódy

Fixed bugreport:5344 break fall's dodge combo may be only be used with fly kick now

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15765 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind před 13 roky
rodič
revize
6dd6182ddb
2 změnil soubory, kde provedl 15 přidání a 17 odebrání
  1. 1 1
      src/map/skill.c
  2. 14 16
      src/map/status.c

+ 1 - 1
src/map/skill.c

@@ -11111,7 +11111,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh
 	case TK_COUNTER:
 		if ((sd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER)
 			return 0; //Anti-Soul Linker check in case you job-changed with Stances active.
-		if(!(sc && sc->data[SC_COMBO]))
+		if(!(sc && sc->data[SC_COMBO]) || sc->data[SC_COMBO]->val1 == TK_JUMPKICK)
 			return 0; //Combo needs to be ready
 
 		if (sc->data[SC_COMBO]->val3) {	//Kick chain

+ 14 - 16
src/map/status.c

@@ -6970,23 +6970,21 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 			}
 			break;
 
-		case SC_COMBO:
-		{
-			//val1: Skill ID
-			//val2: When given, target (for autotargetting skills)
-			//val3: When set, this combo time should NOT delay attack/movement
-			//val3: TK: Last used kick
-			//val4: TK: Combo time
-			struct unit_data *ud = unit_bl2ud(bl);
-			if (ud && !val3) 
-			{
-				tick += 300 * battle_config.combo_delay_rate/100;
-				ud->attackabletime = gettick()+tick;
-				unit_set_walkdelay(bl, gettick(), tick, 1);
+		case SC_COMBO: {
+				//val1: Skill ID
+				//val2: When given, target (for autotargetting skills)
+				//val3: When set, this combo time should NOT delay attack/movement
+				//val3: TK: Last used kick
+				//val4: TK: Combo time
+				struct unit_data *ud = unit_bl2ud(bl);
+				if (ud && !val3) {
+					tick += 300 * battle_config.combo_delay_rate/100;
+					ud->attackabletime = gettick()+tick;
+					unit_set_walkdelay(bl, gettick(), tick, 1);
+				}
+				val3 = 0;
+				val4 = tick;
 			}
-			val3 = 0;
-			val4 = tick;
-		}
 			break;
 		case SC_EARTHSCROLL:
 			val2 = 11-val1; //Chance to consume: 11-skilllv%