From 177dd0421d3f33a33cb64f99bb279f16b837b73c Mon Sep 17 00:00:00 2001
From: elfenland <elfenland@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Mon, 16 Jan 2012 16:15:41 +0000
Subject: [PATCH] =?UTF-8?q?char=5Foverview.php=20->=20Buffs=20der=20Items?=
 =?UTF-8?q?=20hinzugef=C3=BCgt=20(HP,MP)=20char.inc.php=20->=20Buffs=20f?=
 =?UTF-8?q?=C3=BCr=20die=20K=C3=A4mpfe=20hinzugef=C3=BCgt=20(HP,MP)=20clan?=
 =?UTF-8?q?=5Ffights.inc.php=20->=20getChar=20in=20getCharWithBuffs=20ge?=
 =?UTF-8?q?=C3=A4ndert,=20somit=20sind=20nun=20auch=20die=20Items=20im=20C?=
 =?UTF-8?q?F=20verf=C3=BCgbar.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ag/char_overview.php           | 4 ++--
 ag/include/char.inc.php        | 4 ++++
 ag/include/clan_fights.inc.php | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ag/char_overview.php b/ag/char_overview.php
index 9e9643d..1172f73 100644
--- a/ag/char_overview.php
+++ b/ag/char_overview.php
@@ -52,7 +52,7 @@ foreach($chars as $my_charz){
 
 	$temproom="<br><a href=index.php?as=clan/c_ware&char_id=$my_charz[id] id=popup> Trainingsraum: ".$clanroom['name']."</a>";
 
-	$hp = "HP: ".$hptemp['0']." / ".$hptemp['1'];
+	$hp = "HP: ".$hptemp['0']." / ".$hptemp['1'].' (+'.$char1_buffs['hp'].')';;
 	if($my_charz['status'] == "Schatz Suche")
 	$statustemp = "Schatz%20Suche";
 	else
@@ -69,7 +69,7 @@ foreach($chars as $my_charz){
 	$c_ausdauer = $char1_buffs['ausdauer']==0?$my_charz['ausdauer']:($my_charz['ausdauer']).' (+'.$char1_buffs['ausdauer'].')';
 	$c_glueck = $char1_buffs['glueck']==0?$my_charz['glueck']:($my_charz['glueck']).' (+'.$char1_buffs['glueck'].')';
 
-	$mp = "MP: ".$mptemp['0']." / ".$mptemp['1'];
+	$mp = "MP: ".$mptemp['0']." / ".$mptemp['1'].' (+'.$char1_buffs['mp'].')';;
 	$exp = "Exp: ".$exptemp['0']." / ".$exptemp['1'];
 	if($my_charz['status'] == 'Frei' ){
 		$temp = 'Status: '.$my_charz['status'];
diff --git a/ag/include/char.inc.php b/ag/include/char.inc.php
index 30a8f35..4b0ba1d 100644
--- a/ag/include/char.inc.php
+++ b/ag/include/char.inc.php
@@ -130,6 +130,10 @@ function getChar2($charid) {
 function getCharWithBuffs($charid, $buffer_enabled = true){
 	$char = getChar($charid, $buffer_enabled);
 	$char_buffs = getCharBuffs($char['kampf_item']);
+	$valueshp = explode(',', $char['hp']);
+	$char['hp'] = ($valueshp[0] + $char_buffs['hp']). ','.($valueshp[1] + $char_buffs['hp']);
+	$valuesmp = explode(',', $char['mp']);
+	$char['mp'] = ($valuesmp[0] + $char_buffs['mp']). ','.($valuesmp[1] + $char_buffs['mp']);
 	$char['starke'] += $char_buffs['starke'];
 	$char['verteidigung'] += $char_buffs['verteidigung'];
 	$char['speed'] += $char_buffs['speed'];
diff --git a/ag/include/clan_fights.inc.php b/ag/include/clan_fights.inc.php
index cb4d8f6..61f4469 100644
--- a/ag/include/clan_fights.inc.php
+++ b/ag/include/clan_fights.inc.php
@@ -788,8 +788,8 @@ function calculateChallenge($clan_challenge_id) {
 		echo 'Could not execute QUERY : ' .$sql .'<br>';
 
 		foreach ($clan_char_ids as $slot => $char_id) {
-			addParticipant($event_id, getChar($char_id));
-			$clan_chars[$clan_id][$slot] = getChar($char_id);
+			addParticipant($event_id, getCharWithBuffs($char_id));
+			$clan_chars[$clan_id][$slot] = getCharWithBuffs($char_id);
 		}
 	}