From 5a8ab2d29c73a31252046a4eb5a4c7ed4c68df7a Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 19 Aug 2018 02:33:42 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=ED=88=AC=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/process_war.ng.php | 30 +++-- hwe/sammo/WarUnit.php | 80 +++++++++++- hwe/sammo/WarUnitCity.php | 49 +++---- hwe/sammo/WarUnitGeneral.php | 240 ++++++++++++++++++----------------- 4 files changed, 239 insertions(+), 160 deletions(-) diff --git a/hwe/process_war.ng.php b/hwe/process_war.ng.php index 41d5fb1f..3886f97a 100644 --- a/hwe/process_war.ng.php +++ b/hwe/process_war.ng.php @@ -26,15 +26,17 @@ function processWar_NG( $josaRo = JosaUtil::pick($city->name, '로'); $josaYi = JosaUtil::pick($attacker->name, '이'); - $logger->pushGlobalActionLog("{$attacker->getRawNation()['name']}의 {$attacker->name}{$josaYi} {$city->name}{$josaRo} 진격합니다."); + $logger->pushGlobalActionLog("{$attacker->getNationVar('name')}의 {$attacker->name}{$josaYi} {$city->name}{$josaRo} 진격합니다."); $logger->pushGeneralActionLog("{$city->name}{$josaRo} 진격합니다. <1>$date"); - for($currPhase = 0; $currPhase < $maxPhase; $currPhase+=1){ + $battleBegin = false; + for($currPhase = 0; $currPhase < $maxPhase; $currPhase+=1){ + $battleBegin = true; if($defender === null){ $defender = $city; - if($city->getRawNation()['rice'] <= 0 && $city->getRaw()['supply'] == 1){ + if($city->getNationVar('rice') <= 0 && $city->getVar('supply') == 1){ //병량 패퇴 $attacker->setOppose($defender); $defender->setOppose($attacker); @@ -175,6 +177,8 @@ function processWar_NG( } if(!$defender->continueWar($noRice)){ + $battleBegin = false; + $attacker->logBattleResult(); $defender->logBattleResult(); @@ -213,21 +217,28 @@ function processWar_NG( } + $attacker->finishBattle(); + + if(!$battleBegin){ + // 마지막 페이즈까지 갔지만, '갱신된 수비자'와 전투하지 않았다. + return false; + } + if($currPhase == $maxPhase){ + //마지막 페이즈의 전투 마무리 $attacker->tryWound(); $defender->tryWound(); $attacker->logBattleResult(); $defender->logBattleResult(); } - - $attacker->finishBattle(); + $defender->finishBattle(); if($defender instanceof WarUnitCity){ $newConflict = $defender->addConflict(); if($newConflict){ - $nationName = $attacker->getRawNation()['name']; + $nationName = $attacker->getNationVar('name'); $josaYi = JosaUtil::pick($nationName, '이'); $logger->pushGlobalHistoryLog("【분쟁】{$nationName}{$josaYi} {$defender->getName()} 공략에 가담하여 분쟁이 발생하고 있습니다."); } @@ -236,12 +247,7 @@ function processWar_NG( ($getNextDefender)($defender, false); //NOTE: 공격자의 applyDB는 함수 호출자가 실행 - if(!$conquerCity){ - return false; - } - - return true; - + return $conquerCity; } function DeleteConflict($nation) { diff --git a/hwe/sammo/WarUnit.php b/hwe/sammo/WarUnit.php index a900a682..648d27ab 100644 --- a/hwe/sammo/WarUnit.php +++ b/hwe/sammo/WarUnit.php @@ -2,6 +2,7 @@ namespace sammo; class WarUnit{ + protected $raw; protected $rawNation; protected $logger; @@ -30,13 +31,79 @@ class WarUnit{ } function getRaw():array{ - return []; + return $this->raw; } function getRawNation():array{ return $this->rawNation; } + function getVar(string $key){ + return $this->raw[$key]; + } + + function updateVar(string $key, $value){ + if($this->raw[$key] === $value){ + return; + } + $this->raw[$key] = $value; + $this->updatedVar[$key] = true; + } + + function updateVarWithLimit(string $key, $value, $min = null, $max = null){ + if($min !== null && $value < $min){ + $value = $min; + } + if($max !== null && $value > $max){ + $value = $max; + } + $this->updateVar($key, $value); + } + + function increaseVar(string $key, $value) + { + if($value === 0){ + return; + } + $this->raw[$key] += $value; + $this->updatedVar[$key] = true; + } + + function increaseVarWithLimit(string $key, $value, $min = null, $max = null){ + $targetValue = $this->raw[$key] + $value; + if($min !== null && $targetValue < $min){ + $value = $min; + } + if($max !== null && $targetValue > $max){ + $value = $max; + } + $this->updateVar($key, $targetValue); + } + + function multiplyVar(string $key, $value) + { + if($value === 1){ + return; + } + $this->raw[$key] *= $value; + $this->updatedVar[$key] = true; + } + + function multiplyVarWithLimit(string $key, $value, $min = null, $max = null){ + $targetValue = $this->raw[$key] * $value; + if($min !== null && $targetValue < $min){ + $value = $min; + } + if($max !== null && $targetValue > $max){ + $value = $max; + } + $this->updateVar($key, $targetValue); + } + + function getNationVar(string $key):array{ + return $this->rawNation[$key]; + } + function getPhase():int{ return $this->currPhase; } @@ -103,6 +170,7 @@ class WarUnit{ function setOppose(?WarUnit $oppose){ $this->oppose = $oppose; + $this->activatedSkill = []; } function getOppose():?WarUnit{ @@ -128,8 +196,8 @@ class WarUnit{ function computeWarPower(){ $oppose = $this->oppose; - $myAtt = $this->getCrewType()->getComputedAttack($this->getRaw(), $this->getRawNation()['tech']); - $opDef = $oppose->getCrewType()->getComputedDefence($oppose->getRaw(), $oppose->getRawNation()['tech']); + $myAtt = $this->getCrewType()->getComputedAttack($this->getRaw(), $this->getNationVar('tech')); + $opDef = $oppose->getCrewType()->getComputedDefence($oppose->getRaw(), $oppose->getNationVar('tech')); // 감소할 병사 수 $warPower = GameConst::$armperphase + $myAtt - $opDef; $opposeWarPowerMultiply = 1.0; @@ -238,6 +306,10 @@ class WarUnit{ return $this->activatedSkill[$skillName] ?? false; } + function activateSkill(string $skillName):bool{ + $this->activatedSkill[$skillName] = true; + } + function deactivateSkill(string $skillName):bool{ $this->activatedSkill[$skillName] = false; } @@ -291,7 +363,7 @@ class WarUnit{ } function applyDB($db):bool{ - return false; + throw new NotInheritedMethodException(); } diff --git a/hwe/sammo/WarUnitCity.php b/hwe/sammo/WarUnitCity.php index d0a593bf..17550ddf 100644 --- a/hwe/sammo/WarUnitCity.php +++ b/hwe/sammo/WarUnitCity.php @@ -2,8 +2,6 @@ namespace sammo; class WarUnitCity extends WarUnit{ - protected $raw; - protected $logger; protected $crewType; @@ -30,11 +28,11 @@ class WarUnitCity extends WarUnit{ $this->logger = new ActionLogger(0, $raw['nation'], $year, $month, false); $this->crewType = GameUnitConst::byID($raw['crewtype']); - $this->rice = $this->rawNation['rice']; + $this->rice = $this->getNationVar('rice'); $this->crewType = GameUnitConst::byID(GameUnitConst::T_CASTLE); - $this->hp = $this->raw['def'] * 10; + $this->hp = $this->getVar('def') * 10; //수비자 보정 if($raw['level'] == 1){ @@ -45,17 +43,14 @@ class WarUnitCity extends WarUnit{ } } - function getRaw():array{ - return $this->raw; - } - function getName():string{ - return $this->raw['name']; + return $this->getVar('name'); } function calcDamage():int{ $warPower = $this->getWarPower(); $warPower *= Util::randRange(0.9, 1.1); + return Util::round($warPower); } function increaseKilled(int $damage):int{ @@ -79,7 +74,8 @@ class WarUnitCity extends WarUnit{ $damage = min($damage, $this->hp); $this->dead += $damage; $this->hp -= $damage; - $this->raw['wall'] = max(0, $this->raw['wall'] - $damage / 20); + $this->increaseVarWithLimit('wall', -$damage/20, 0); + return $this->hp; } @@ -101,36 +97,28 @@ class WarUnitCity extends WarUnit{ } function heavyDecreseWealth(){ - $this->raw['agri'] *= 0.5; - $this->updatedVar['agri'] = true; - $this->raw['comm'] *= 0.5; - $this->updatedVar['comm'] = true; - $this->raw['secu'] *= 0.5; - $this->updatedVar['secu'] = true; + $this->multiplyVar('agri', 0.5); + $this->multiplyVar('comm', 0.5); + $this->multiplyVar('secu', 0.5); } function finishBattle(){ - $this->raw['def'] = Util::round($this->hp / 10); - $this->updatedVar['def'] = true; - Util::setRound($this->raw['wall']); - $this->updatedVar['wall'] = true; + $this->updateVar('def', Util::round($this->hp / 10)); + $this->updateVar('wall', Util::round($this->getVar('wall'))); //NOTE: 전투로 인한 사망자는 여기서 처리하지 않음 $decWealth = $this->dead / 10; - $this->raw['agri'] = max(0, Util::round($this->raw['agri'] - $decWealth)); - $this->updatedVar['agri'] = true; - $this->raw['comm'] = max(0, Util::round($this->raw['comm'] - $decWealth)); - $this->updatedVar['comm'] = true; - $this->raw['secu'] = max(0, Util::round($this->raw['secu'] - $decWealth)); - $this->updatedVar['secu'] = true; + $this->increaseVarWithLimit('agri', -$decWealth, 0); + $this->increaseVarWithLimit('comm', -$decWealth, 0); + $this->increaseVarWithLimit('secu', -$decWealth, 0); } function addConflict():bool{ - $conflict = Json::decode($this->raw['conflict']); - $opposeNation = $this->getOppose()->getRawNation(); + $conflict = Json::decode($this->getVar('conflict')); + $oppose = $this->getOppose(); - $nationID = $opposeNation['nation']; + $nationID = $oppose->getNationVar('nation'); $newConflict = false; $dead = $this->dead; @@ -152,8 +140,7 @@ class WarUnitCity extends WarUnit{ $newConflict = true; } - $this->raw['conflict'] = Json::encode($conflict); - $this->updatedVar['conflict'] = true; + $this->updateVar('conflict', Json::encode($conflict)); return $newConflict; } diff --git a/hwe/sammo/WarUnitGeneral.php b/hwe/sammo/WarUnitGeneral.php index 288b4a33..42a94ead 100644 --- a/hwe/sammo/WarUnitGeneral.php +++ b/hwe/sammo/WarUnitGeneral.php @@ -2,9 +2,7 @@ namespace sammo; class WarUnitGeneral extends WarUnit{ - protected $raw; protected $rawCity; - protected $rawNation; protected $logger; protected $crewType; @@ -13,9 +11,6 @@ class WarUnitGeneral extends WarUnit{ protected $updatedVar = []; - protected $sniped = false; - - function __construct($raw, $rawCity, $rawNation, $isAttacker, $year, $month){ setLeadershipBonus($raw, $rawNation['level']); @@ -24,53 +19,68 @@ class WarUnitGeneral extends WarUnit{ $this->rawNation = $rawNation; //read-only $this->isAttacker = $isAttacker; - $this->logger = new ActionLogger($this->raw['no'], $this->raw['nation'], $year, $month); - $this->crewType = GameUnitConst::byID($this->raw['crewtype']); + $this->logger = new ActionLogger( + $this->getVar('no'), + $this->getVar('nation'), + $year, + $month + ); + $this->crewType = GameUnitConst::byID($this->getVar('crewtype')); + + $cityLevel = $this->getCityVar('level'); if($isAttacker){ //공격자 보정 - if($rawCity['level'] == 2){ + if($cityLevel == 2){ $this->atmosBonus += 5; } - if($rawNation['capital'] == $rawCity['city']){ + if($rawNation['capital'] == $this->getCityVar('city')){ $this->atmosBonus += 5; } } else{ //수비자 보정 - if($rawCity['level'] == 1){ + if($cityLevel == 1){ $this->trainBonus += 5; } - else if($rawCity['level'] == 3){ + else if($cityLevel == 3){ $this->trainBonus += 5; } } } - function getRaw():array{ - return $this->raw; + function getName():string{ + return $this->getVar('name'); } - function getName():string{ - return $this->raw['name']; + function getCityVar(string $key):array{ + return $this->rawCity[$key]; } function getSpecialDomestic():int{ - return $this->raw['special']; + return $this->getVar('special'); } function setOppose(?WarUnit $oppose){ $this->oppose = $oppose; - $this->raw['warnum'] += 1; - $this->updatedVar['warnum'] = true; + $this->increaseVar('warnum', 1); + + if($this->isAttacker){ + $this->updateVar('recwar', $this->getVar('turntime')); + } + else if($oppose !== null){ + $this->updateVar('recwar', $oppose->getVar('turntime')); + } + + $this->activatedSkill = []; } function getSpecialWar():int{ - return $this->raw['special2']; + return $this->getVar('special2'); } function getItem():int{ - return $this->raw['item']; + return $this->getVar('item'); } function getMaxPhase():int{ @@ -82,17 +92,15 @@ class WarUnitGeneral extends WarUnit{ } function addTrain(int $train){ - $this->raw['train'] += $train; - $this->updatedVar['train'] = true; + $this->increaseVarWithLimit('train', $train, 0, GameConst::$maxTrainByWar); } function addAtmos(int $atmos){ - $this->raw['atmos'] += $atmos; - $this->updatedVar['atmos'] = true; + $this->increaseVarWithLimit('atmos', $train, 0, GameConst::$maxAtmosByWar); } function getComputedTrain(){ - $train = $this->raw['train']; + $train = $this->getVar('train'); $train += $this->trainBonus; return $train; @@ -108,44 +116,38 @@ class WarUnitGeneral extends WarUnit{ function addWin(){ $this->win += 1; - $this->raw['killnum'] += 1; - $this->updatedVar['killnum'] = true; + $this->increaseVar('killnum', 1); - $this->raw['atmos'] = min($this->raw['atmos'] * 1.1, GameConst::$maxAtmosByWar); - $this->updatedVar['atmos'] = true; + $this->multiplyVarWithLimit('atmos', 1.1, null, GameConst::$maxAtmosByWar); $this->addStatExp(1); } function addStatExp(int $value = 1){ if($this->crewType->armType == GameUnitConst::T_WIZARD) { // 귀병 - $this->raw['intel2'] += $value; - $this->updatedVar['intel2'] = true; + $this->increaseVar('intel2', $value); } elseif($this->crewType->armType == GameUnitConst::T_SIEGE) { // 차병 - $this->raw['leader2'] += $value; - $this->updatedVar['leader2'] = true; + $this->increaseVar('leader2', $value); } else { - $this->raw['power2'] += $value; - $this->updatedVar['power2'] = true; + $this->increaseVar('power2', $value); } } function addLevelExp(float $value){ + if(!$this->isAttacker){ + $value *= 0.8; + } $value *= getCharExpMultiplier($this->getCharacter()); - $this->raw['experience'] += $value; - $this->updatedVar['experience'] = true; + $this->increaseVar('experience', $value); } function addDedication(float $value){ $value *= getCharDedMultiplier($this->getCharacter()); - $this->raw['dedication'] += $value; - $this->updatedVar['dedication'] = true; + $this->increaseVar('dedication', $value); } function addLose(){ - $this->raw['deathnum'] += 1; - $this->updatedVar['deathnum'] = true; - + $this->increaseVar('deathnum', 1); $this->addStatExp(1); } @@ -188,7 +190,8 @@ class WarUnitGeneral extends WarUnit{ function computeWarPower(){ [$warPower,$opposeWarPowerMultiply] = parent::computeWarPower(); - $genLevel = $this->raw['level']; + $generalNo = $this->getVar('no'); + $genLevel = $this->getVar('level'); if($this->isAttacker){ if($genLevel == 12){ @@ -205,18 +208,18 @@ class WarUnitGeneral extends WarUnit{ else if($genLevel == 11 || $genLevel == 9 || $genLevel == 7 || $genLevel == 5){ $opposeWarPowerMultiply *= 0.95; } - else if($genLevel == 4 && $this->raw['no'] == $this->rawCity['gen1']){ + else if($genLevel == 4 && $generalNo == $this->getCityVar('gen1')){ $opposeWarPowerMultiply *= 0.95; } - else if($genLevel == 3 && $this->raw['no'] == $this->rawCity['gen2']){ + else if($genLevel == 3 && $generalNo == $this->getCityVar('gen2')){ $opposeWarPowerMultiply *= 0.95; } - else if($genLevel == 2 && $this->raw['no'] == $this->rawCity['gen3']){ + else if($genLevel == 2 && $generalNo == $this->getCityVar('gen3')){ $opposeWarPowerMultiply *= 0.95; } } - $expLevel = $this->raw['explevel']; + $expLevel = $this->getVar('explevel'); $warPower /= max(0.01, 1 - $expLevel / 300); $opposeWarPowerMultiply *= max(0.01, 1 - $expLevel / 300); @@ -275,8 +278,7 @@ class WarUnitGeneral extends WarUnit{ } if($itemConsumed){ - $this->raw['item'] = 0; - $this->updatedVar['item'] = true; + $this->updateVar('item', 0); $josaUl = JosaUtil::pick($itemName, '을'); $this->getLogger()->pushGeneralActionLog("{$itemName}{$josaUl} 사용!", ActionLogger::PLAIN); } @@ -287,22 +289,26 @@ class WarUnitGeneral extends WarUnit{ ///전투 개시 시에 작동하여 매 장수마다 작동하는 스킬 function checkBattleBeginSkill():bool{ $skillResult = false; - if (!$this->sniped && $this->oppose instanceof WarUnitGeneral) { - if($this->raw['special2'] == 70 && Util::randBool(1/3)){ - $snipe = true; - } + $oppose = $this->getOppose(); - if($snipe){ - $this->sniped = true; - $skillResult = true; - } + $specialWar = $this->getSpecialWar(); + if ( + $specialWar == 70 && + $this->oppose instanceof WarUnitGeneral && + !$this->hasActivateSkill('저격') && + Util::randBool(1/3) + ) { + $oppose->activateSkill('저격'); + $skillResult = true; } + return $skillResult; } ///전투 개시 시에 작동하여 매 장수마다 작동하는 아이템 function checkBattleBeginItem():bool{ $item = $this->getItem(); + $oppose = $this->getOppose(); if(!$item){ return false; } @@ -311,17 +317,20 @@ class WarUnitGeneral extends WarUnit{ $itemConsumed = false; $itemName = getItemName($item); - if($item == 2){ - if(!$this->sniped && $this->oppose instanceof WarUnitGeneral && Util::randBool(1/5)){ + if( + $item == 2 && + $this->oppose instanceof WarUnitGeneral && + !$this->hasActivateSkill('저격') && + Util::randBool(1/5) + ){ $itemActivated = true; $itemConsumed = true; - $this->sniped = true; - } + $this->activateSkill('저격'); } if($itemConsumed){ - $this->raw['item'] = 0; - $this->updatedVar['item'] = true; + //NOTE: 소비 아이템은 하나인가?, 1회용인가? + $this->updateVar('item', 0); $josaUl = JosaUtil::pick($itemName, '을'); $this->getLogger()->pushGeneralActionLog("{$itemName}{$josaUl} 사용!", ActionLogger::PLAIN); } @@ -329,8 +338,26 @@ class WarUnitGeneral extends WarUnit{ return $itemActivated; } + function applyBattleBeginSkillAndItem():bool{ + $result = false; + $oppose = $this->getOppose(); + + if($this->hasActivatedSkill('저격')){ + $result = true; + + $oppose->getLogger()->pushGeneralActionLog("상대를 저격했다!", ActionLogger::PLAIN); + $oppose->getLogger()->pushGeneralBattleDetailLog("상대를 저격했다!", ActionLogger::PLAIN); + $this->getLogger()->pushGeneralActionLog("상대에게 저격당했다!", ActionLogger::PLAIN); + $this->getLogger()->pushGeneralBattleDetailLog("상대에게 저격당했다!", ActionLogger::PLAIN); + + $oppose->increaseVarWithLimit('injury', Util::randRangeInt(20, 60), null, 80); + } + + return $result; + } + function getHP():int{ - return $this->raw['crew']; + return $this->getVar('crew'); } function addDex(GameUnitDetail $crewType, float $exp){ @@ -355,15 +382,14 @@ class WarUnitGeneral extends WarUnit{ $ntype = $armType*10; $dexType = "dex{$ntype}"; - $this->raw[$dexType] += $exp; - $this->updatedVar[$dexType] = true; + $this->increaseVar($dexType, $exp); } function decreaseHP(int $damage):int{ - $damage = min($damage, $this->raw['crew']); + $damage = min($damage, $this->getVar('crew')); $this->dead += $damage; - $this->raw['crew'] -= $damage; + $this->increaseVar('crew', -$damage); $addDex = $damage; if(!$this->isAttacker){ @@ -371,7 +397,7 @@ class WarUnitGeneral extends WarUnit{ } $this->addDex($this->oppose->getCrewType(), $addDex); - return $this->raw['crew']; + return $this->getVar('crew'); } function increaseKilled(int $damage):int{ @@ -384,11 +410,9 @@ class WarUnitGeneral extends WarUnit{ $rice *= getCharExpMultiplier($this->getCharacter()); $rice *= $this->crewType->rice; - $rice *= getTechCost($this->rawNation['tech']); + $rice *= getTechCost($this->getNationVar('tech')); - $rice = min($this->raw['rice'], $rice); - $this->raw['rice'] -= $rice; - $this->updatedVar['rice'] = true; + $this->increaseVarWithLimit('rice', -$rice, 0); $addDex = $damage; if(!$this->isAttacker){ @@ -400,34 +424,39 @@ class WarUnitGeneral extends WarUnit{ return $this->killed; } - function calcDamage():int{ - //TODO - return 0; + function checkPreActiveSkill():bool{ + return false; + } + + function checkActiveSkill():bool{ + return false; + } + + function checkPostActiveSkill():bool{ + return false; + } + + function applyActiveSkill():bool{ + return false; } function tryWound():bool{ - if(Util::randBool(0.95)){ + if(!Util::randBool(0.05)){ return false; } - $wound = min(80, $this->raw['injury'] + Util::randRangeInt(10, 80)); - if($wound < $this->raw['injury']){ - return false; - } - - $this->raw['injury'] = $wound; - $this->updatedVar['injury'] = true; + $this->increaseVarWithLimit('injury', Util::randRangeInt(10, 80), null, 80); $this->getLogger()->pushGeneralActionLog("전투중 부상당했다!", ActionLogger::PLAIN); return true; } function continueWar(&$noRice):bool{ - if($this->raw['crew'] <= 0){ + if($this->getVar('crew') <= 0){ $noRice = false; return false; } - if($this->raw['rice'] <= $this->getHP() / 100){ + if($this->getVar('rice') <= $this->getHP() / 100){ $noRice = true; return false; } @@ -451,20 +480,16 @@ class WarUnitGeneral extends WarUnit{ foreach($table as [$statNickName, $statName]){ $statExpName = $statName.'2'; - if($this->raw[$statExpName] < 0){ + if($this->getVar($statExpName) < 0){ $logger->pushGeneralActionLog("{$statNickName}이 1 떨어졌습니다!", ActionLogger::PLAIN); - $this->raw[$statExpName] += $limit; - $this->updatedVar[$statExpName] = true; - $this->raw[$statName] -= 1; - $this->updatedVar[$statName] = true; + $this->increaseVar($statExpName, $limit); + $this->increaseVar($statName, -1); $result = true; } - else if($this->raw[$statExpName] >= $limit){ + else if($this->getVar($statExpName) >= $limit){ $logger->pushGeneralActionLog("{$statNickName}이 1 올랐습니다!", ActionLogger::PLAIN); - $this->raw[$statExpName] -= $limit; - $this->updatedVar[$statExpName] = true; - $this->raw[$statName] += 1; - $this->updatedVar[$statName] = true; + $this->increaseVar($statExpName, -$limit); + $this->increaseVar($statName, 1); $result = true; } } @@ -472,24 +497,13 @@ class WarUnitGeneral extends WarUnit{ return $result; } - function finishBattle(){ - if($this->isAttacker){ - $this->raw['recwar'] = $this->raw['turntime']; - } - else{ - $this->raw['recwar'] = $this->oppose->getRaw()['turntime']; - } - $this->updatedVar['recwar'] = true; + function finishBattle(){ + $this->increaseVar('killcrew', $this->killed); + $this->increaseVar('deathcrew', $this->dead); - - $this->raw['killcrew'] += $this->killed; - $this->updatedVar['killcrew'] = true; - $this->raw['deathcrew'] += $this->dead; - $this->updatedVar['deathcrew'] = true; - - Util::setRound($this->raw['rice']); - Util::setRound($this->raw['experience']); - Util::setRound($this->raw['dedication']); + $this->updateVar('rice', Util::round($this->getVar('rice'))); + $this->updateVar('experience', Util::round($this->getVar('experience'))); + $this->updateVar('dedication', Util::round($this->getVar('dedication'))); $this->checkStatChange(); }