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

devel merge

Browse Source
This commit is contained in:
Hide_D
2019-05-05 17:58:27 +09:00
parent 453f5681dd 7d3ec1368f
commit ae02bbcce7
43 changed files with 1714 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/j_get_select_npc_token.php
+3 -1
View File
@@ -90,9 +90,11 @@ if($token && !$refresh){
$candidates = [];
$weight = [];
foreach($db->query('SELECT `no`, `name`, leader, power, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
foreach($db->query('SELECT `no`, `name`, leader, power, intel, nation, imgsvr, picture, personal, special, special2 FROM general WHERE npc=2') as $general){
$general['special'] = (getGeneralSpecialDomesticClass($general['special']))::$name;
$general['special2'] = (getGeneralSpecialWarClass($general['special2']))::$name;
$general['personal'] = (getPersonalityClass($general['personal']));
$general['nation'] = getNationStaticInfo($general['nation'])['name'];
$candidates[$general['no']] = $general + ['keepCnt'=>KEEP_CNT];
$allStat = $general['leader'] + $general['power'] + $general['intel'];
$weight[$general['no']] = pow($allStat, 1.5);