Tausch2 now has a defined behavior in case SSJ was already castet.

ag/include/kampf/SSJ.php

@@ -24,9 +24,9 @@ if ($technick1['type'] == 'SSJ') {
 			$k_ver[0] = $k_ver[0] * (($technick1['verteidigung'] + 1) / 2);
 
 			$schaden_1 = $technick1['name'].'!!!';
-			$aktion_AV1[$x] = 'nein';
 			$ssj_tech_1 = $technick1['level'];
 		}
+		$aktion_AV1[$x] = 'nein';
 
 	}
 }
@@ -43,15 +43,15 @@ if ($technick2['type'] == 'SSJ') {
 	} else {
 
 		if (!$ssj_tech_2) {
+
 			$k_starke[1] = $k_starke[1] * (($technick2['starke'] + 1) / 2);
 			$k_speed[1] = $k_speed[1] * (($technick2['speed'] + 1) / 2);
 			$k_ver[1] = $k_ver[1] * (($technick2['verteidigung'] + 1) / 2);
 
 			$schaden_2 = $technick2['name'].'!!!';
-
-			$aktion_AV2[$x] = 'nein';
 			$ssj_tech_2 = $technick2['level'];
 		}
+		$aktion_AV2[$x] = 'nein';
 	}
 }
 ?>

ag/include/kampf/tausch2.php

@@ -12,6 +12,14 @@ if ($technick1['type'] == 'tausch2') {
 	$k_mp[0] = $k_mp[0] - $technick1['mp'];
 	if ($k_mp[0] >= 0) {
 		$prozent_technik1 = 0;
+		if ($technick2['type'] == 'SSJ' && $ssj_tech_1) {
+			// Gegner setzt SSJ ein ... der aktuelle char hat aber schon eine SSJ eingesetzt!
+			$schaden_1 = 'Doppelte SSJ (+10%)';
+			$k_starke[0] = round($k_starke[0] * 1.1);
+		        $k_speed[0] = round($k_speed[0] * 1.1);
+	            	$k_ver[0] = round($k_ver[0] * 1.1);
+			$aktion_AV1[$x] = 'nein';
+		} else {
 			$technick1 = mysql_fetch_array(mysql_query("SELECT * FROM attacken WHERE id='$technick2[id]' LIMIT 10"));
 			$technick1['speed'] = $technick1['speed'] + (($technick1['speed'] / 100) * $prozent_technik1);
 			$technick1['verteidigung'] = $technick1['verteidigung'] + (($technick1['verteidigung'] / 100) * $prozent_technik1);
@@ -22,6 +30,7 @@ if ($technick1['type'] == 'tausch2') {
 				$speeds_char1_4 = 1;
 			}
 			$speeds_char1 = mt_rand($speeds_char1_4, $speeds_char1);
+		}
 
 	} else {
 		$k_mp[0] = 0;
@@ -36,8 +45,15 @@ if ($technick1['type'] == 'tausch2') {
 if ($technick2['type'] == 'tausch2') {
 	$k_mp[1] = $k_mp[1] - $technick2['mp'];
 	if ($k_mp[1] >= 0) {
-
 		$prozent_technik2 = 0;
+		if ($technick1['type'] == 'SSJ' && $ssj_tech_2) {
+			// Gegner setzt SSJ ein ... der aktuelle char hat aber schon eine SSJ eingesetzt!
+			$schaden_2 = 'Doppelte SSJ (+10%)';
+			$k_starke[1] = round($k_starke[1] * 1.1);
+		        $k_speed[1] = round($k_speed[1] * 1.1);
+	            	$k_ver[1] = round($k_ver[1] * 1.1);
+			$aktion_AV2[$x] = 'nein';
+		} else {
 			$technick2 = mysql_fetch_array(mysql_query("SELECT * FROM attacken WHERE id='$technick1[id]' LIMIT 10"));
 
 			$technick2['speed'] = $technick2['speed'] + (($technick2['speed'] / 100) * $prozent_technik2);
@@ -49,7 +65,7 @@ if ($technick2['type'] == 'tausch2') {
 				$speeds_char2_4 = 1;
 			}
 			$speeds_char2 = mt_rand($speeds_char2_4, $speeds_char2);
-
+		}
 	} else {
 		$k_mp[1] = 0;
 		$schaden_2 = 'Techniktausch Fehlgeschlagen';