devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

leader->leadership, power->strength

Browse Source
This commit is contained in:
Hide_D
2019-10-04 18:07:42 +09:00
parent 2ff74a2b68
commit 4c3cc8547c
101 changed files with 770 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/process_war.php
+3 -3
View File
@@ -34,7 +34,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
$city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
$defenderList = [];
foreach ($db->query('SELECT no,name,nation,turntime,personal,special2,crew,crewtype,atmos,train,intel,intel2,book,power,power2,weap,injury,leader,leader2,horse,item,explevel,experience,dedication,level,gold,rice,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,mode FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and ((train>=60 and atmos>=60 and mode=1) or (train>=80 and atmos>=80 and mode=2))', $city->getVar('nation'), $city->getVar('city')) as $rawGeneral){
foreach ($db->query('SELECT no,name,nation,turntime,personal,special2,crew,crewtype,atmos,train,intel,intel2,book,strength,strength2,weap,injury,leadership,leadership2,horse,item,explevel,experience,dedication,level,gold,rice,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,mode FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and ((train>=60 and atmos>=60 and mode=1) or (train>=80 and atmos>=80 and mode=2))', $city->getVar('nation'), $city->getVar('city')) as $rawGeneral){
$defenderList[] = new General($rawGeneral, $rawDefenderCity, $year, $month);
}
@@ -198,8 +198,8 @@ function extractBattleOrder(General $general){
return 0;
}
$realStat = $general->getLeadership() + $general->getPower() + $general->getIntel();
$fullStat = $general->getLeadership(false) + $general->getPower(false) + $general->getIntel(false);
$realStat = $general->getLeadership() + $general->getStrength() + $general->getIntel();
$fullStat = $general->getLeadership(false) + $general->getStrength(false) + $general->getIntel(false);
$totalStat = ($realStat + $fullStat) / 2;
$totalCrew = $general->getVar('crew') / 1000000 * (($general->getVar('train') * $general->getVar('atmos')) ** 1.5);