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="
Trainingsraum: ".$clanroom['name'].""; - $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 .'
'; 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); } }