From 850914b13de64b47dc82107457db38b746ef857f Mon Sep 17 00:00:00 2001
From: radiskull <radiskull@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Tue, 10 Dec 2013 18:02:05 +0000
Subject: [PATCH] =?UTF-8?q?SSJ=20zieht=20HP=20ab=20Majin=20hat=20allgemein?=
 =?UTF-8?q?en=20Multiplikator=20bekommen=20(einstellbar=20=C3=BCber=20St?=
 =?UTF-8?q?=C3=A4rke)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ag/include/kampf/SSJ.php   |  2 +
 ag/include/kampf/majin.php | 83 ++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/ag/include/kampf/SSJ.php b/ag/include/kampf/SSJ.php
index e47c88b..531313d 100644
--- a/ag/include/kampf/SSJ.php
+++ b/ag/include/kampf/SSJ.php
@@ -10,6 +10,7 @@
 
 if ($technick1['type'] == 'SSJ') {
 	$k_mp[0] = $k_mp[0] - $technick1['mp'];
+	$k_hp[0] = $k_hp[0] - $technick1['hp'];
 	if ($k_mp[0] < 0) {
 		$schaden_1 = 'SSJ Verwandlung fehlgeschlagen';
 		$aktion_AV1[$x] = 'nein';
@@ -34,6 +35,7 @@ if ($technick1['type'] == 'SSJ') {
 
 if ($technick2['type'] == 'SSJ') {
 	$k_mp[1] = $k_mp[1] - $technick2['mp'];
+	$k_hp[1] = $k_hp[1] - $technick2['hp'];
 	if ($k_mp[1] < 0) {
 		$schaden_2 = 'SSJ Verwandlung fehlgeschlagen';
 		$aktion_AV2[$x] = 'nein';
diff --git a/ag/include/kampf/majin.php b/ag/include/kampf/majin.php
index f5baecf..b69fac6 100644
--- a/ag/include/kampf/majin.php
+++ b/ag/include/kampf/majin.php
@@ -9,55 +9,58 @@
 ####################Majin SPIELER 1
 
 if($technick1['type'] == "majin") {
-$k_mp[0] = $k_mp[0] - $technick1['mp'];
-if($k_mp[0] < 0) {
-$schaden_1 = "Majin Verwandlung fehlgeschlagen";
-$aktion_AV1[$x] = "nein";
-$k_mp[0] = 0;
-} else {
+	$k_mp[0] = $k_mp[0] - $technick1['mp'];
+	if($k_mp[0] < 0) {
+		$schaden_1 = "Majin Verwandlung fehlgeschlagen";
+		$aktion_AV1[$x] = "nein";
+		$k_mp[0] = 0;
+	} else {
+		
+		$multiplikator = $technick1['starke'] / 10;
 
-$k_starke[1] = $k_starke[1] * ($technick1['starke']-0.5);
-$k_speed[1] = $k_speed[1] * ($technick1['speed']-0.5);
-$k_ver[1] = $k_ver[1] * ($technick1['verteidigung']-0.5);
+		$k_starke[1] = $k_starke[1] * $multiplikator;
+		$k_speed[1] = $k_speed[1] * $multiplikator;
+		$k_ver[1] = $k_ver[1] * $multiplikator;
 
-$alt_hp = $k_hp[1];
+		$alt_hp = $k_hp[1];
 
-$k_hp[1] = round($k_hp[1] - ($k_starke[1] / 2));
-$schaden_1 = "$technick1[name]";
-$schaden_2 = $alt_hp - $k_hp[1];
+		$k_hp[1] = round($k_hp[1] - ($k_starke[1] / 2));
+		$schaden_1 = "$technick1[name]";
+		$schaden_2 = $alt_hp - $k_hp[1];
 
-if($alt_hp < $k_hp[1]) { $k_hp[1] = $alt_hp; $schaden_2 = 0; }
+		if($alt_hp < $k_hp[1]) { $k_hp[1] = $alt_hp; $schaden_2 = 0; }
 
-$aktion_AV1[$x] = "nein";
-$aktion_AV2[$x] = "nein";
-$aussetzten_runde = 1;
-}}
+		$aktion_AV1[$x] = "nein";
+		$aktion_AV2[$x] = "nein";
+		$aussetzten_runde = 1;
+	}}
 
-####################Majin SPIELER 2
+	####################Majin SPIELER 2
 
-if($technick2['type'] == "majin") {
-$k_mp[1] = $k_mp[1] - $technick2['mp'];
-if($k_mp[1] < 0) {
-$schaden_2 = "Majin Verwandlung fehlgeschlagen";
-$aktion_AV2[$x] = "nein";
-$k_mp[1] = 0;
-} else {
+	if($technick2['type'] == "majin") {
+		$k_mp[1] = $k_mp[1] - $technick2['mp'];
+		if($k_mp[1] < 0) {
+			$schaden_2 = "Majin Verwandlung fehlgeschlagen";
+			$aktion_AV2[$x] = "nein";
+			$k_mp[1] = 0;
+		} else {
+			$multiplikator = $technick2['starke'] / 10;
+			
+			$k_starke[0] = $k_starke[0] * $multiplikator;
+			$k_speed[0] = $k_speed[0] * $multiplikator;
+			$k_ver[0] = $k_ver[0] * $multiplikator;
 
-$k_starke[0] = $k_starke[0] * ($technick2['starke']-0.5);
-$k_speed[0] = $k_speed[0] * ($technick2['speed']-0.5);
-$k_ver[0] = $k_ver[0] * ($technick2['verteidigung']-0.5);
+			$alt_hp = $k_hp[0];
 
-$alt_hp = $k_hp[0];
+			$k_hp[0] = round($k_hp[0] - ($k_starke[0] / 2));
+			$schaden_2 = "$technick2[name]";
+			$schaden_1 = $alt_hp - $k_hp[0];
 
-$k_hp[0] = round($k_hp[0] - ($k_starke[0] / 2));
-$schaden_2 = "$technick2[name]";
-$schaden_1 = $alt_hp - $k_hp[0];
+			if($alt_hp < $k_hp[0]) { $k_hp[0] = $alt_hp; $schaden_1 = 0; }
 
-if($alt_hp < $k_hp[0]) { $k_hp[0] = $alt_hp; $schaden_1 = 0; }
+			$aktion_AV1[$x] = "nein";
+			$aktion_AV2[$x] = "nein";
+			$aussetzten_runde = 1;
+		}}
 
-$aktion_AV1[$x] = "nein";
-$aktion_AV2[$x] = "nein";
-$aussetzten_runde = 1;
-}}
-
-?>
\ No newline at end of file
+		?>
\ No newline at end of file