diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 0ccebd04..de49c757 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -106,7 +106,7 @@ switch($btn) { [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']); $text = "특기 부여!"; - foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){ + foreach($db->query("SELECT `no`,leadership,strength,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){ $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); diff --git a/hwe/_admin5.php b/hwe/_admin5.php index c73b8b81..fc788921 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -181,8 +181,8 @@ switch($type) { case 4: $query .= " order by A.rice desc"; break; case 5: $query .= " order by avg(B.gold) desc"; break; case 6: $query .= " order by avg(B.rice) desc"; break; - case 7: $query .= " order by avg(B.leader) desc"; break; - case 8: $query .= " order by avg(B.power) desc"; break; + case 7: $query .= " order by avg(B.leadership) desc"; break; + case 8: $query .= " order by avg(B.strength) desc"; break; case 9: $query .= " order by avg(B.intel) desc"; break; case 10: $query .= " order by avg(B.explevel) desc"; break; case 11: $query .= " order by avg(B.connect) desc"; break; @@ -201,8 +201,8 @@ for($i=0; $i < $nationCount; $i++) { $query = "select COUNT(*) as cnt, ROUND(AVG(gold)) as avgg, ROUND(AVG(rice)) as avgr, - SUM(leader) as leader, ROUND(AVG(leader), 1) as avgl, - ROUND(AVG(power), 1) as avgp, + SUM(leadership) as leadership, ROUND(AVG(leadership), 1) as avgl, + ROUND(AVG(strength), 1) as avgs, ROUND(AVG(intel), 1) as avgi, ROUND(AVG(explevel), 1) as avge, SUM(crew) as crew @@ -227,7 +227,7 @@ for($i=0; $i < $nationCount; $i++) { {$nation['name']}  {$nation['connect']}   {$nation['con']}  -  {$nation['power']}  +  {$nation['strength']}   {$gen['cnt']}   {$city['cnt']}   {$nation['tech']}  @@ -237,7 +237,7 @@ for($i=0; $i < $nationCount; $i++) {  {$gen['avgg']}   {$gen['avgr']}   {$gen['avgl']}  -  {$gen['avgp']}  +  {$gen['avgs']}   {$gen['avgi']}   {$gen['avge']}   {$nation['dex0']}  @@ -245,7 +245,7 @@ for($i=0; $i < $nationCount; $i++) {  {$nation['dex20']}   {$nation['dex30']}   {$nation['dex40']}  -  {$gen['crew']}/{$gen['leader']}00  +  {$gen['crew']}/{$gen['leadership']}00   {$city['pop']}/{$city['pop2']}   ".round($city['trust'],1)."%   {$city['agri']}%  diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index ae405253..48f085cc 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -127,12 +127,12 @@ $types = [ return $v; }], ["일 기 토 승 률", "percent", function($v){ - $totalCnt = $v['tpw']+$v['tpd']+$v['tpl']; + $totalCnt = $v['tsw']+$v['tsd']+$v['tsl']; if($totalCnt < 50){ $v['value'] = 0; } else{ - $v['value'] = $v['tpw']/max(1, $totalCnt); + $v['value'] = $v['tsw']/max(1, $totalCnt); } return $v; }], diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 114f8197..4b6e8080 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -89,8 +89,8 @@ foreach (getAllNationStaticInfo() as $nation) { [$orderKey, $orderDesc] = [ 1=>['nation', false], - 2=>['leader', true], - 3=>['power', true], + 2=>['leadership', true], + 3=>['strength', true], 4=>['intel', true], 5=>['experience', true], 6=>['dedication', true], @@ -105,7 +105,7 @@ foreach (getAllNationStaticInfo() as $nation) { 15=>['npc', true], ][$type]; -$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by %b %l', $orderKey, $orderDesc?'desc':''); +$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,level,killturn,connect from general order by %b %l', $orderKey, $orderDesc?'desc':''); echo" @@ -137,15 +137,15 @@ foreach($generalList as $general){ } if ($general['injury'] > 0) { - $leader = intdiv($general['leader'] * (100 - $general['injury']), 100); - $power = intdiv($general['power'] * (100 - $general['injury']), 100); + $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100); + $strength = intdiv($general['strength'] * (100 - $general['injury']), 100); $intel = intdiv($general['intel'] * (100 - $general['injury']), 100); - $leader = "{$leader}{$lbonusText}"; - $power = "{$power}"; + $leadership = "{$leadership}{$lbonusText}"; + $strength = "{$strength}"; $intel = "{$intel}"; } else { - $leader = "{$general['leader']}{$lbonusText}"; - $power = "{$general['power']}"; + $leadership = "{$general['leadership']}{$lbonusText}"; + $strength = "{$general['strength']}"; $intel = "{$general['intel']}"; } @@ -169,9 +169,9 @@ foreach($generalList as $general){ echo " =2?'true':'false')."' > @@ -187,8 +187,8 @@ foreach($generalList as $general){ - - + + - - + + diff --git a/hwe/b_betting.php b/hwe/b_betting.php index 13b40dff..64a6df43 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -32,10 +32,10 @@ if ($con >= 2) { switch ($admin['tnmt_type']) { default: throw new \RuntimeException('Invalid tnmt_type');break; -case 0: $tnmt_type = "전력전"; $tp = "tot"; $tp2 = "종합"; $tp3 = "total"; break; -case 1: $tnmt_type = "통솔전"; $tp = "ldr"; $tp2 = "통솔"; $tp3 = "leader"; break; -case 2: $tnmt_type = "일기토"; $tp = "pwr"; $tp2 = "무력"; $tp3 = "power"; break; -case 3: $tnmt_type = "설전"; $tp = "itl"; $tp2 = "지력"; $tp3 = "intel"; break; +case 0: $tnmt_type = "전력전"; $tp = "total"; $tp2 = "종합"; $tp3 = "total"; break; +case 1: $tnmt_type = "통솔전"; $tp = "leadership"; $tp2 = "통솔"; $tp3 = "leadership"; break; +case 2: $tnmt_type = "일기토"; $tp = "strength"; $tp2 = "무력"; $tp3 = "strength"; break; +case 3: $tnmt_type = "설전"; $tp = "intel"; $tp2 = "지력"; $tp3 = "intel"; break; } $str1 = getTournament($admin['tournament']); @@ -401,8 +401,8 @@ if ($admin['tournament'] == 6) { $type1 = array("전 력 전", "통 솔 전", "일 기 토", "설 전"); $type2 = array("종합", "통솔", "무력", "지력"); -$type3 = array("tt", "tl", "tp", "ti"); -$type4 = array("total", "leader", "power", "intel"); +$type3 = array("tt", "tl", "ts", "ti"); +$type4 = array("total", "leadership", "strength", "intel"); for ($i=0; $i < 4; $i++) { $grp = $i; @@ -412,7 +412,7 @@ for ($i=0; $i < 4; $i++) { "; - $query = "select npc,name,leader,power,intel,leader+power+intel as total,{$type3[$i]}p as prize,{$type3[$i]}w+{$type3[$i]}d+{$type3[$i]}l as game,{$type3[$i]}w as win,{$type3[$i]}d as draw,{$type3[$i]}l as lose,{$type3[$i]}g as gl from general order by gl desc, game desc, win desc, draw desc, lose, no limit 0,30"; + $query = "select npc,name,leadership,strength,intel,leadership+strength+intel as total,{$type3[$i]}p as prize,{$type3[$i]}w+{$type3[$i]}d+{$type3[$i]}l as game,{$type3[$i]}w as win,{$type3[$i]}d as draw,{$type3[$i]}l as lose,{$type3[$i]}g as gl from general order by gl desc, game desc, win desc, draw desc, lose, no limit 0,30"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($k=1; $k <= 30; $k++) { $general = MYDB_fetch_array($result); diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index e5eb61bd..63f91e89 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -188,12 +188,12 @@ if($city['trade'] === null) { $city['trade'] = "- "; } -$query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos from general where city='{$city['city']}' order by dedication desc"; // 장수 목록 +$query = "select npc,mode,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city='{$city['city']}' order by dedication desc"; // 장수 목록 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gencount = MYDB_num_rows($genresult); $generals = $db->query( - 'SELECT npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos from general where city=%i order by name', + 'SELECT npc,mode,no,picture,imgsvr,name,injury,leadership,strength,intel,level,nation,crewtype,crew,train,atmos from general where city=%i order by name', $city['city'] ); @@ -244,12 +244,12 @@ for($j=0; $j < $gencount; $j++) { $name = $general['name']; $nameText = formatName($name, $general['npc']); - $leadership = $general['leader']; - $power = $general['power']; + $leadership = $general['leadership']; + $strength = $general['strength']; $intel = $general['intel']; $leadershipText = formatWounded($leadership, $general['injury']); - $powerText = formatWounded($power, $general['injury']); + $strengthText = formatWounded($strength, $general['injury']); $intelText = formatWounded($intel, $general['injury']); $level = $general['level']; @@ -313,8 +313,8 @@ for($j=0; $j < $gencount; $j++) { 'leadershipBonusText'=>$leadershipBonusText, 'level'=>$level, 'levelText'=>$levelText, - 'power'=>$power, - 'powerText'=>$powerText, + 'strength'=>$strength, + 'strengthText'=>$strengthText, 'intel'=>$intel, 'intelText'=>$intelText, 'defenceMode'=>$defenceMode, diff --git a/hwe/b_genList.php b/hwe/b_genList.php index 69b873a2..b3e60444 100644 --- a/hwe/b_genList.php +++ b/hwe/b_genList.php @@ -103,7 +103,7 @@ switch ($type) { } $generals = $db->query( - 'SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l', + 'SELECT npc,mode,no,level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l', $me['nation'], $orderSQL ); @@ -140,20 +140,20 @@ foreach ($generals as &$general) { $general['lbonusText'] = $lbonusText; if ($general['injury'] > 0) { - $leader = intdiv($general['leader'] * (100 - $general['injury']), 100); - $power = intdiv($general['power'] * (100 - $general['injury']), 100); + $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100); + $strength = intdiv($general['strength'] * (100 - $general['injury']), 100); $intel = intdiv($general['intel'] * (100 - $general['injury']), 100); - $leader = "{$leader}{$lbonusText}"; - $power = "{$power}"; + $leadership = "{$leadership}{$lbonusText}"; + $strength = "{$strength}"; $intel = "{$intel}"; } else { - $leader = "{$general['leader']}{$lbonusText}"; - $power = "{$general['power']}"; + $leadership = "{$general['leadership']}{$lbonusText}"; + $strength = "{$general['strength']}"; $intel = "{$general['intel']}"; } - $general['leaderText'] = $leader; - $general['powerText'] = $power; + $general['leadershipText'] = $leadership; + $general['strengthText'] = $strength; $general['intelText'] = $intel; $general['expLevelText'] = getExpLevel($general['experience']); diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php index e87c5453..87417b7c 100644 --- a/hwe/b_myBossInfo.php +++ b/hwe/b_myBossInfo.php @@ -196,7 +196,7 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) { echo "
"; echo getLevel($general['level']); echo "$leader$power$leadership$strength $intel {$general['killturn']} {$general['connect']}"; diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php index 4ff33a0f..64107723 100644 --- a/hwe/a_npcList.php +++ b/hwe/a_npcList.php @@ -62,14 +62,14 @@ foreach (getAllNationStaticInfo() as $nation) { switch ($type) {//FIXME: $query 처리 부실 default: - case 1: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by binary(name)"; break; - case 2: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by nation"; break; - case 3: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by sum desc"; break; - case 4: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by leader"; break; - case 5: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by power"; break; - case 6: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by intel"; break; - case 7: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by experience"; break; - case 8: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by dedication"; break; + case 1: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by binary(name)"; break; + case 2: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by nation"; break; + case 3: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by sum desc"; break; + case 4: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by leadership"; break; + case 5: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by strength"; break; + case 6: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by intel"; break; + case 7: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by experience"; break; + case 8: $query = "select npc,nation,name,name2,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1 order by dedication"; break; } $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $gencount = MYDB_num_rows($genresult); @@ -111,8 +111,8 @@ for ($j=0; $j < $gencount; $j++) { ".displayCharInfo($general['personal'])." ".displaySpecialDomesticInfo($general['special'])." / ".displaySpecialWarInfo($general['special2'])." {$general['sum']}{$general['leader']}{$general['power']}{$general['leadership']}{$general['strength']} {$general['intel']} {$general['experience']} {$general['dedication']}
{$type1[$i]}
순장수{$type2[$i]}경승무패점勝
@@ -130,15 +130,15 @@ foreach($generalList as $general){ } if($general['injury'] > 0) { - $leader = intdiv($general['leader'] * (100 - $general['injury']), 100); - $power = intdiv($general['power'] * (100 - $general['injury']), 100); + $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100); + $strength = intdiv($general['strength'] * (100 - $general['injury']), 100); $intel = intdiv($general['intel'] * (100 - $general['injury']), 100); - $leader = "{$leader}{$lbonus}"; - $power = "{$power}"; + $leadership = "{$leadership}{$lbonus}"; + $strength = "{$strength}"; $intel = "{$intel}"; } else { - $leader = "{$general['leader']}{$lbonus}"; - $power = "{$general['power']}"; + $leadership = "{$general['leadership']}{$lbonus}"; + $strength = "{$general['strength']}"; $intel = "{$general['intel']}"; } @@ -159,8 +159,8 @@ foreach($generalList as $general){ - - + + diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php index d905a88a..f183d468 100644 --- a/hwe/b_myKingdomInfo.php +++ b/hwe/b_myKingdomInfo.php @@ -68,7 +68,7 @@ for($j=0; $j < $citycount; $j++) { $maxpop += $city['pop2']; } -$query = "select sum(crew) as totcrew,sum(leader)*100 as maxcrew from general where nation='{$nation['nation']}'"; +$query = "select sum(crew) as totcrew,sum(leadership)*100 as maxcrew from general where nation='{$nation['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php index 1bad6b0f..24c45491 100644 --- a/hwe/b_tournament.php +++ b/hwe/b_tournament.php @@ -28,10 +28,10 @@ if ($con >= 2) { switch ($admin['tnmt_type']) { default: throw new \RuntimeException('invalid tnmt_type'); -case 0: $tnmt_type = "전력전"; $tp = "tot"; $tp2 = "종합"; $tp3 = "total"; break; -case 1: $tnmt_type = "통솔전"; $tp = "ldr"; $tp2 = "통솔"; $tp3 = "leader"; break; -case 2: $tnmt_type = "일기토"; $tp = "pwr"; $tp2 = "무력"; $tp3 = "power"; break; -case 3: $tnmt_type = "설전"; $tp = "itl"; $tp2 = "지력"; $tp3 = "intel"; break; +case 0: $tnmt_type = "전력전"; $tp = "total"; $tp2 = "종합"; $tp3 = "total"; break; +case 1: $tnmt_type = "통솔전"; $tp = "leadership"; $tp2 = "통솔"; $tp3 = "leadership"; break; +case 2: $tnmt_type = "일기토"; $tp = "strength"; $tp2 = "무력"; $tp3 = "strength"; break; +case 3: $tnmt_type = "설전"; $tp = "intel"; $tp2 = "지력"; $tp3 = "intel"; break; } ?> @@ -115,7 +115,7 @@ if ($session->userGrade >= 5) { case 1: echo ""; - $query = "select npc,name,ldr,pwr,itl,ldr+pwr+itl as tot,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; + $query = "select npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($k=1; $k <= 4; $k++) { $general = MYDB_fetch_array($result); @@ -468,7 +468,7 @@ for ($i=0; $i < 8; $i++) { "; - $query = "select npc,name,ldr,pwr,itl,ldr+pwr+itl as tot,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; + $query = "select npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($k=1; $k <= 8; $k++) { $general = MYDB_fetch_array($result); diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php index c98c5999..a3783412 100644 --- a/hwe/battle_simulator.php +++ b/hwe/battle_simulator.php @@ -280,7 +280,7 @@ var defaultSpecialDomestic = ;
무력
- +
지력
diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php index 8dcccfba..50ca327a 100644 --- a/hwe/c_myBossInfo.php +++ b/hwe/c_myBossInfo.php @@ -41,7 +41,7 @@ if($btn == "임명") { $general = []; } else{ - $general = $db->queryFirstRow('SELECT `no`,nation,`level`,leader,`power`,intel FROM general WHERE no = %i', $genlist); + $general = $db->queryFirstRow('SELECT `no`,nation,`level`,leadership,`strength`,intel FROM general WHERE no = %i', $genlist); } if($genlist != 0 && !$general){ @@ -262,11 +262,11 @@ if($btn == "임명" && $level >= 5 && $level <= 11) { if($genlist != 0) { $valid = 0; switch($level) { - case 10: if($general['power'] >= GameConst::$chiefStatMin) { $valid = 1; } break; + case 10: if($general['strength'] >= GameConst::$chiefStatMin) { $valid = 1; } break; case 9: if($general['intel'] >= GameConst::$chiefStatMin) { $valid = 1; } break; - case 8: if($general['power'] >= GameConst::$chiefStatMin) { $valid = 1; } break; + case 8: if($general['strength'] >= GameConst::$chiefStatMin) { $valid = 1; } break; case 7: if($general['intel'] >= GameConst::$chiefStatMin) { $valid = 1; } break; - case 6: if($general['power'] >= GameConst::$chiefStatMin) { $valid = 1; } break; + case 6: if($general['strength'] >= GameConst::$chiefStatMin) { $valid = 1; } break; case 5: if($general['intel'] >= GameConst::$chiefStatMin) { $valid = 1; } break; default: $valid = 1; break; } @@ -321,7 +321,7 @@ if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) { if($genlist != 0) { $valid = 0; switch($level) { - case 4: if($general['power'] >= GameConst::$chiefStatMin) { $valid = 1; } break; + case 4: if($general['strength'] >= GameConst::$chiefStatMin) { $valid = 1; } break; case 3: if($general['intel'] >= GameConst::$chiefStatMin) { $valid = 1; } break; default: $valid = 1; break; } diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php index f0026034..55b28e27 100644 --- a/hwe/c_tournament.php +++ b/hwe/c_tournament.php @@ -29,9 +29,9 @@ $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"" $me = MYDB_fetch_array($result); switch($admin['tnmt_type']) { -case 0: $tp = "total"; $tp2 = "전력전"; $tp3 = "leader+power+intel"; break; -case 1: $tp = "leader"; $tp2 = "통솔전"; $tp3 = "leader"; break; -case 2: $tp = "power"; $tp2 = "일기토"; $tp3 = "power"; break; +case 0: $tp = "total"; $tp2 = "전력전"; $tp3 = "leadership+strength+intel"; break; +case 1: $tp = "leadership"; $tp2 = "통솔전"; $tp3 = "leadership"; break; +case 2: $tp = "strength"; $tp2 = "일기토"; $tp3 = "strength"; break; case 3: $tp = "intel"; $tp2 = "설전"; $tp3 = "intel"; break; } @@ -42,7 +42,7 @@ if($btn == '참가') { exit(1); } - $general = $db->queryFirstRow('SELECT no,name,npc,leader,power,intel,explevel,gold,horse,weap,book FROM general WHERE `no`=%i', $me['no']); + $general = $db->queryFirstRow('SELECT no,name,npc,leadership,strength,intel,explevel,gold,horse,weap,book FROM general WHERE `no`=%i', $me['no']); //{$admin['develcost']}원 참가비 if($general['gold'] < $admin['develcost']) { @@ -64,9 +64,9 @@ if($btn == '참가') { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['leader'], - 'pwr'=>$general['power'], - 'itl'=>$general['intel'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['explevel'], 'grp'=>$grp, 'grp_no'=>$grpMemberCount, @@ -104,7 +104,7 @@ if($btn == "자동개최설정") { $gameStor->phase = 0; } elseif($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") { if($btn == "투입") { - $query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='$gen'"; + $query = "select no,name,npc,leadership,strength,intel,explevel,gold,horse,weap,book from general where no='$gen'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); $general['gold'] -= $admin['develcost']; @@ -112,14 +112,14 @@ if($btn == "자동개최설정") { $general['no'] = 0; $general['name'] = "무명장수"; $general['npc'] = 2; - $general['leader'] = 10; - $general['power'] = 10; + $general['leadership'] = 10; + $general['strength'] = 10; $general['intel'] = 10; $general['explevel'] = 10; $general['gold'] = 0; } elseif($btn == "쪼렙투입") { $sel = rand() % 32; - $query = "select no,name,npc,leader,power,intel,explevel,gold,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,gold,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} limit {$sel},1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); $general['gold'] -= $admin['develcost']; @@ -136,18 +136,18 @@ if($btn == "자동개최설정") { $sel = rand() % 32 + $genCount - 8; - $query = "select no,name,npc,leader,power,intel,explevel,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); $general['gold'] -= $admin['develcost']; } elseif($btn == "굇수투입") { $sel = rand() % 32; - $query = "select no,name,npc,leader,power,intel,explevel,gold,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,gold,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); $general['gold'] -= $admin['develcost']; } elseif($btn == "랜덤투입") { - $query = "select no,name,npc,leader,power,intel,explevel,gold,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by rand() limit 0,1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,gold,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by rand() limit 0,1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); $general['gold'] -= $admin['develcost']; @@ -167,9 +167,9 @@ if($btn == "자동개최설정") { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['leader'], - 'pwr'=>$general['power'], - 'itl'=>$general['intel'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['explevel'], 'grp'=>$grp, 'grp_no'=>$grpMemberCount, @@ -211,7 +211,7 @@ if($btn == "자동개최설정") { for($i=0; $i < $z; $i++) { $sel = rand() % 32; if($btn == "쪼렙전부투입") { - $query = "select no,name,npc,leader,power,intel,explevel,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} limit {$sel},1"; } elseif($btn == "일반전부투입") { //참가한 사람 평균치 $query = "select AVG({$tp3}) as av from general where tournament=1"; @@ -225,11 +225,11 @@ if($btn == "자동개최설정") { $sel += $genCount - 8; - $query = "select no,name,npc,leader,power,intel,explevel,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; } elseif($btn == "굇수전부투입") { - $query = "select no,name,npc,leader,power,intel,explevel,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by {$tp} desc limit {$sel},1"; } else { - $query = "select no,name,npc,leader,power,intel,explevel,leader+power+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by rand() limit 0,1"; + $query = "select no,name,npc,leadership,strength,intel,explevel,leadership+strength+intel as total,horse,weap,book from general where tournament=0 and gold>='{$admin['develcost']}' and npc>=2 order by rand() limit 0,1"; } $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -240,9 +240,9 @@ if($btn == "자동개최설정") { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['leader'], - 'pwr'=>$general['power'], - 'itl'=>$general['intel'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['explevel'], 'grp'=>$grp, 'grp_no'=>$grp_no, diff --git a/hwe/func.old.php b/hwe/func.old.php index b2bbc5c7..907de555 100644 --- a/hwe/func.old.php +++ b/hwe/func.old.php @@ -274,7 +274,7 @@ function myNationInfo() { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select COUNT(*) as cnt, SUM(crew) as totcrew,SUM(leader)*100 as maxcrew from general where nation='{$nation['nation']}'"; // 장수 목록 + $query = "select COUNT(*) as cnt, SUM(crew) as totcrew,SUM(leadership)*100 as maxcrew from general where nation='{$nation['nation']}'"; // 장수 목록 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -778,7 +778,7 @@ function generalInfo($no) { $show_img_level = $gameStor->show_img_level; - $query = "select block,no,name,picture,imgsvr,injury,nation,city,troop,leader,leader2,power,power2,intel,intel2,explevel,experience,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,killturn,age,personal,special,specage,special2,specage2,mode,con,connect from general where no='$no'"; + $query = "select block,no,name,picture,imgsvr,injury,nation,city,troop,leadership,leadership2,strength,strength2,intel,intel2,explevel,experience,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,killturn,age,personal,special,specage,special2,specage2,mode,con,connect from general where no='$no'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -816,18 +816,18 @@ function generalInfo($no) { $city = MYDB_fetch_array($result); $level = $city['name']." ".$level; } - $call = getCall($general['leader'], $general['power'], $general['intel']); + $call = getCall($general['leadership'], $general['power'], $general['intel']); $typename = GameUnitConst::byId($general['crewtype'])->name; $weapname = getItemName($general['weap']); $bookname = getItemName($general['book']); $horsename = getItemName($general['horse']); $itemname = displayItemInfo($general['item']); if($general['injury'] > 0) { - $leader = intdiv($general['leader'] * (100 - $general['injury']), 100); + $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100); $power = intdiv($general['power'] * (100 - $general['injury']), 100); $intel = intdiv($general['intel'] * (100 - $general['injury']), 100); } else { - $leader = $general['leader']; + $leadership = $general['leadership']; $power = $general['power']; $intel = $general['intel']; } @@ -881,11 +881,11 @@ function generalInfo($no) { - - + + - + @@ -1746,8 +1746,8 @@ function addAge() { $admin = $gameStor->getValues(['startyear', 'year', 'month']); if($admin['year'] >= $admin['startyear']+3) { - foreach($db->query('SELECT no,name,nation,leader,power,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){ - $special = getSpecial($general['leader'], $general['power'], $general['intel']); + foreach($db->query('SELECT no,name,nation,leadership,power,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){ + $special = getSpecial($general['leadership'], $general['power'], $general['intel']); $specialClass = getGeneralSpecialDomesticClass($special); $specialText = $specialClass::$name; $db->update('general', [ @@ -1759,8 +1759,8 @@ function addAge() { pushGenLog($general, "●특기 【{$specialText}】{$josaUl} 익혔습니다!"); } - foreach($db->query('SELECT no,name,nation,leader,power,intel,npc,dex0,dex10,dex20,dex30,dex40 from general where spec2age<=age and special2=%s', GameConst::$defaultSpecialWar) as $general){ - $special2 = getSpecial2($general['leader'], $general['power'], $general['intel'], 0, $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']); + foreach($db->query('SELECT no,name,nation,leadership,power,intel,npc,dex0,dex10,dex20,dex30,dex40 from general where spec2age<=age and special2=%s', GameConst::$defaultSpecialWar) as $general){ + $special2 = getSpecial2($general['leadership'], $general['power'], $general['intel'], 0, $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']); $specialClass = getGeneralSpecialWarClass($special2); $specialText = $specialClass::$name; @@ -2070,7 +2070,7 @@ function updateTurntime($no) { CheckHall($no); } - $query = "update general set leader=leader*0.85,power=power*0.85,intel=intel*0.85,injury=0,experience=experience*0.5,dedication=dedication*0.5,firenum=0,warnum=0,killnum=0,deathnum=0,killcrew=0,deathcrew=0,age=20,specage=0,specage2=0,crew=crew*0.85,dex0=dex0*0.5,dex10=dex10*0.5,dex20=dex20*0.5,dex30=dex30*0.5,dex40=dex40*0.5 where no='$no'"; + $query = "update general set leadership=leadership*0.85,power=power*0.85,intel=intel*0.85,injury=0,experience=experience*0.5,dedication=dedication*0.5,firenum=0,warnum=0,killnum=0,deathnum=0,killcrew=0,deathcrew=0,age=20,specage=0,specage2=0,crew=crew*0.85,dex0=dex0*0.5,dex10=dex10*0.5,dex20=dex20*0.5,dex30=dex30*0.5,dex40=dex40*0.5 where no='$no'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $josaYi = JosaUtil::pick($general['name'], '이'); @@ -2122,7 +2122,7 @@ function CheckHall($no) { dex0,dex10,dex20,dex30,dex40, ttw/(ttw+ttd+ttl) as ttrate, ttw+ttd+ttl as tt, tlw/(tlw+tld+tll) as tlrate, tlw+tld+tll as tl, - tpw/(tpw+tpd+tpl) as tprate, tpw+tpd+tpl as tp, + tsw/(tsw+tsd+tsl) as tprate, tsw+tsd+tsl as ts, tiw/(tiw+tid+til) as tirate, tiw+tid+til as ti, betgold, betwin, betwingold, betwingold/betgold as betrate from general where no=%i', $no); @@ -2148,7 +2148,7 @@ function CheckHall($no) { //토너승률인데 50회 미만시 스킵 if($typeName === 'tlrate' && $general['tl'] < 50) { continue; } //토너승률인데 50회 미만시 스킵 - if($typeName === 'tprate' && $general['tp'] < 50) { continue; } + if($typeName === 'tprate' && $general['ts'] < 50) { continue; } //토너승률인데 50회 미만시 스킵 if($typeName === 'tirate' && $general['ti'] < 50) { continue; } //수익률인데 1000미만시 스킵 @@ -2413,24 +2413,24 @@ function uniqueItem($general, $log, $vote=0) { function checkAbilityEx(int $generalID, ActionLogger $actLog){ $db = DB::db(); - $general = $db->queryFirstRow('SELECT leader,leader2,power,power2,intel,intel2 FROM general WHERE no = %i',$generalID); + $general = $db->queryFirstRow('SELECT leadership,leadership2,strength,strength2,intel,intel2 FROM general WHERE no = %i',$generalID); if(!$general){ return; } - if($general['leader2'] < 0){ + if($general['leadership2'] < 0){ $db->update('general',[ - 'leader2'=>$db->sqleval('leader2 + %i', GameConst::$upgradeLimit), - 'leader'=>$db->sqleval('leader - 1') + 'leadership2'=>$db->sqleval('leadership2 + %i', GameConst::$upgradeLimit), + 'leadership'=>$db->sqleval('leadership - 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('통솔이 1 떨어졌습니다!', ActionLogger::PLAIN); return; } - if($general['power2'] < 0){ + if($general['strength2'] < 0){ $db->update('general',[ - 'power2'=>$db->sqleval('power2 + %i', GameConst::$upgradeLimit), + 'strength2'=>$db->sqleval('strength2 + %i', GameConst::$upgradeLimit), 'power'=>$db->sqleval('power - 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('무력이 1 떨어졌습니다!', ActionLogger::PLAIN); @@ -2446,18 +2446,18 @@ function checkAbilityEx(int $generalID, ActionLogger $actLog){ return; } - if($general['leader2'] >= GameConst::$upgradeLimit){ + if($general['leadership2'] >= GameConst::$upgradeLimit){ $db->update('general',[ - 'leader2'=>$db->sqleval('leader2 - %i', GameConst::$upgradeLimit), - 'leader'=>$db->sqleval('leader + 1') + 'leadership2'=>$db->sqleval('leadership2 - %i', GameConst::$upgradeLimit), + 'leadership'=>$db->sqleval('leadership + 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('통솔이 1 올랐습니다!', ActionLogger::PLAIN); return; } - if($general['power2'] >= GameConst::$upgradeLimit){ + if($general['strength2'] >= GameConst::$upgradeLimit){ $db->update('general',[ - 'power2'=>$db->sqleval('power2 - %i', GameConst::$upgradeLimit), + 'strength2'=>$db->sqleval('strength2 - %i', GameConst::$upgradeLimit), 'power'=>$db->sqleval('power + 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('무력이 1 올랐습니다!', ActionLogger::PLAIN); @@ -2480,29 +2480,29 @@ function checkAbility($general, $log) { $limit = GameConst::$upgradeLimit; - $query = "select no,leader,leader2,power,power2,intel,intel2 from general where no='{$general['no']}'"; + $query = "select no,leadership,leadership2,power,strength2,intel,intel2 from general where no='{$general['no']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); - if($general['leader2'] < 0) { - $query = "update general set leader2='$limit'+leader2,leader=leader-1 where no='{$general['no']}'"; + if($general['leadership2'] < 0) { + $query = "update general set leadership2='$limit'+leadership2,leadership=leadership-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●통솔이 1 떨어졌습니다!"; - } elseif($general['leader2'] >= $limit) { - $query = "update general set leader2=leader2-'$limit',leader=leader+1 where no='{$general['no']}'"; + } elseif($general['leadership2'] >= $limit) { + $query = "update general set leadership2=leadership2-'$limit',leadership=leadership+1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●통솔이 1 올랐습니다!"; } - if($general['power2'] < 0) { - $query = "update general set power2='$limit'+power2,power=power-1 where no='{$general['no']}'"; + if($general['strength2'] < 0) { + $query = "update general set strength2='$limit'+strength2,power=power-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●무력이 1 떨어졌습니다!"; - } elseif($general['power2'] >= $limit) { - $query = "update general set power2=power2-'$limit',power=power+1 where no='{$general['no']}'"; + } elseif($general['strength2'] >= $limit) { + $query = "update general set strength2=strength2-'$limit',power=power+1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●무력이 1 올랐습니다!"; diff --git a/hwe/func.php b/hwe/func.php index 57366ada..29ba5f5e 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -274,7 +274,7 @@ function myNationInfo() { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select COUNT(*) as cnt, SUM(crew) as totcrew,SUM(leader)*100 as maxcrew from general where nation='{$nation['nation']}'"; // 장수 목록 + $query = "select COUNT(*) as cnt, SUM(crew) as totcrew,SUM(leadership)*100 as maxcrew from general where nation='{$nation['nation']}'"; // 장수 목록 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -635,7 +635,7 @@ function generalInfo($no) { $show_img_level = $gameStor->show_img_level; - $query = "select block,no,name,picture,imgsvr,injury,nation,city,troop,leader,leader2,power,power2,intel,intel2,explevel,experience,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,killturn,age,personal,special,specage,special2,specage2,mode,con,connect from general where no='$no'"; + $query = "select block,no,name,picture,imgsvr,injury,nation,city,troop,leadership,leadership2,strength,strength2,intel,intel2,explevel,experience,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,killturn,age,personal,special,specage,special2,specage2,mode,con,connect from general where no='$no'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -684,19 +684,19 @@ function generalInfo($no) { $city = MYDB_fetch_array($result); $level = $city['name']." ".$level; } - $call = getCall($general['leader'], $general['power'], $general['intel']); + $call = getCall($general['leadership'], $general['strength'], $general['intel']); $typename = GameUnitConst::byId($general['crewtype'])->name; $weapname = getItemName($general['weap']); $bookname = getItemName($general['book']); $horsename = getItemName($general['horse']); $itemname = displayItemInfo($general['item']); if($general['injury'] > 0) { - $leader = intdiv($general['leader'] * (100 - $general['injury']), 100); - $power = intdiv($general['power'] * (100 - $general['injury']), 100); + $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100); + $strength = intdiv($general['strength'] * (100 - $general['injury']), 100); $intel = intdiv($general['intel'] * (100 - $general['injury']), 100); } else { - $leader = $general['leader']; - $power = $general['power']; + $leadership = $general['leadership']; + $strength = $general['strength']; $intel = $general['intel']; } if($general['injury'] > 60) { $color = ""; $injury = "위독"; } @@ -748,11 +748,11 @@ function generalInfo($no) { - - + + - - + + @@ -1319,7 +1319,7 @@ function addAge() { $admin = $gameStor->getValues(['startyear', 'year', 'month']); if($admin['year'] >= $admin['startyear']+3) { - foreach($db->query('SELECT no,name,nation,leader,power,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){ + foreach($db->query('SELECT no,name,nation,leadership,strength,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){ $special = SpecialityConst::pickSpecialDomestic($general); $specialClass = getGeneralSpecialDomesticClass($special); $specialText = $specialClass::$name; @@ -1332,7 +1332,7 @@ function addAge() { pushGenLog($general, "●특기 【{$specialText}】{$josaUl} 익혔습니다!"); } - foreach($db->query('SELECT no,name,nation,leader,power,intel,npc,dex0,dex10,dex20,dex30,dex40 from general where specage2<=age and special2=%s', GameConst::$defaultSpecialWar) as $general){ + foreach($db->query('SELECT no,name,nation,leadership,strength,intel,npc,dex0,dex10,dex20,dex30,dex40 from general where specage2<=age and special2=%s', GameConst::$defaultSpecialWar) as $general){ $special2 = SpecialityConst::pickSpecialWar($general); $specialClass = getGeneralSpecialWarClass($special2); $specialText = $specialClass::$name; @@ -1424,7 +1424,7 @@ function CheckHall($no) { dex0,dex10,dex20,dex30,dex40, ttw/(ttw+ttd+ttl) as ttrate, ttw+ttd+ttl as tt, tlw/(tlw+tld+tll) as tlrate, tlw+tld+tll as tl, - tpw/(tpw+tpd+tpl) as tprate, tpw+tpd+tpl as tp, + tsw/(tsw+tsd+tsl) as tprate, tsw+tsd+tsl as ts, tiw/(tiw+tid+til) as tirate, tiw+tid+til as ti, betgold, betwin, betwingold, betwingold/betgold as betrate from general where no=%i', $no); @@ -1455,7 +1455,7 @@ function CheckHall($no) { //토너승률인데 50회 미만시 스킵 if($typeName === 'tlrate' && $general['tl'] < 50) { continue; } //토너승률인데 50회 미만시 스킵 - if($typeName === 'tprate' && $general['tp'] < 50) { continue; } + if($typeName === 'tsrate' && $general['ts'] < 50) { continue; } //토너승률인데 50회 미만시 스킵 if($typeName === 'tirate' && $general['ti'] < 50) { continue; } //수익률인데 1000미만시 스킵 @@ -1752,25 +1752,25 @@ function uniqueItem($general, $log, $vote=0) { function checkAbilityEx(int $generalID, ActionLogger $actLog){ $db = DB::db(); - $general = $db->queryFirstRow('SELECT leader,leader2,power,power2,intel,intel2 FROM general WHERE no = %i',$generalID); + $general = $db->queryFirstRow('SELECT leadership,leadership2,strength,strength2,intel,intel2 FROM general WHERE no = %i',$generalID); if(!$general){ return; } - if($general['leader2'] < 0){ + if($general['leadership2'] < 0){ $db->update('general',[ - 'leader2'=>$db->sqleval('leader2 + %i', GameConst::$upgradeLimit), - 'leader'=>$db->sqleval('leader - 1') + 'leadership2'=>$db->sqleval('leadership2 + %i', GameConst::$upgradeLimit), + 'leadership'=>$db->sqleval('leadership - 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('통솔이 1 떨어졌습니다!', ActionLogger::PLAIN); return; } - if($general['power2'] < 0){ + if($general['strength2'] < 0){ $db->update('general',[ - 'power2'=>$db->sqleval('power2 + %i', GameConst::$upgradeLimit), - 'power'=>$db->sqleval('power - 1') + 'strength2'=>$db->sqleval('strength2 + %i', GameConst::$upgradeLimit), + 'strength'=>$db->sqleval('strength - 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('무력이 1 떨어졌습니다!', ActionLogger::PLAIN); return; @@ -1785,19 +1785,19 @@ function checkAbilityEx(int $generalID, ActionLogger $actLog){ return; } - if($general['leader2'] >= GameConst::$upgradeLimit){ + if($general['leadership2'] >= GameConst::$upgradeLimit){ $db->update('general',[ - 'leader2'=>$db->sqleval('leader2 - %i', GameConst::$upgradeLimit), - 'leader'=>$db->sqleval('leader + 1') + 'leadership2'=>$db->sqleval('leadership2 - %i', GameConst::$upgradeLimit), + 'leadership'=>$db->sqleval('leadership + 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('통솔이 1 올랐습니다!', ActionLogger::PLAIN); return; } - if($general['power2'] >= GameConst::$upgradeLimit){ + if($general['strength2'] >= GameConst::$upgradeLimit){ $db->update('general',[ - 'power2'=>$db->sqleval('power2 - %i', GameConst::$upgradeLimit), - 'power'=>$db->sqleval('power + 1') + 'strength2'=>$db->sqleval('strength2 - %i', GameConst::$upgradeLimit), + 'strength'=>$db->sqleval('strength + 1') ], 'no=%i', $generalID); $actLog->pushGeneralActionLog('무력이 1 올랐습니다!', ActionLogger::PLAIN); return; @@ -1819,29 +1819,29 @@ function checkAbility($general, $log) { $limit = GameConst::$upgradeLimit; - $query = "select no,leader,leader2,power,power2,intel,intel2 from general where no='{$general['no']}'"; + $query = "select no,leadership,leadership2,strength,strength2,intel,intel2 from general where no='{$general['no']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); - if($general['leader2'] < 0) { - $query = "update general set leader2='$limit'+leader2,leader=leader-1 where no='{$general['no']}'"; + if($general['leadership2'] < 0) { + $query = "update general set leadership2='$limit'+leadership2,leadership=leadership-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●통솔이 1 떨어졌습니다!"; - } elseif($general['leader2'] >= $limit) { - $query = "update general set leader2=leader2-'$limit',leader=leader+1 where no='{$general['no']}'"; + } elseif($general['leadership2'] >= $limit) { + $query = "update general set leadership2=leadership2-'$limit',leadership=leadership+1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●통솔이 1 올랐습니다!"; } - if($general['power2'] < 0) { - $query = "update general set power2='$limit'+power2,power=power-1 where no='{$general['no']}'"; + if($general['strength2'] < 0) { + $query = "update general set strength2='$limit'+strength2,strength=strength-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●무력이 1 떨어졌습니다!"; - } elseif($general['power2'] >= $limit) { - $query = "update general set power2=power2-'$limit',power=power+1 where no='{$general['no']}'"; + } elseif($general['strength2'] >= $limit) { + $query = "update general set strength2=strength2-'$limit',strength=strength+1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log[] = "●무력이 1 올랐습니다!"; diff --git a/hwe/func_converter.php b/hwe/func_converter.php index c39c4e86..800ba98d 100644 --- a/hwe/func_converter.php +++ b/hwe/func_converter.php @@ -337,32 +337,32 @@ function getLevel($level, $nlevel=8) { ][$code]??'-'; } -function getCall($leader, $power, $intel) { - if($leader < 40){ - if($power + $intel < 40){ +function getCall($leadership, $strength, $intel) { + if($leadership < 40){ + if($strength + $intel < 40){ return '아둔'; } - if($intel >= GameConst::$chiefStatMin && $power < $intel * 0.8){ + if($intel >= GameConst::$chiefStatMin && $strength < $intel * 0.8){ return '학자'; } - if($power >= GameConst::$chiefStatMin && $intel < $power * 0.8){ + if($strength >= GameConst::$chiefStatMin && $intel < $strength * 0.8){ return '장사'; } return '명사'; } - $maxStat = max($leader, $power, $intel); - $sum2Stat = min($leader+$power, $power+$intel, $intel+$leader); + $maxStat = max($leadership, $strength, $intel); + $sum2Stat = min($leadership+$strength, $strength+$intel, $intel+$leadership); if($maxStat >= GameConst::$chiefStatMin + GameConst::$statGradeLevel && $sum2Stat >= $maxStat * 1.7){ return '만능'; } - if($power >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $intel < $power * 0.8){ + if($strength >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $intel < $strength * 0.8){ return '용장'; } - if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power < $intel * 0.8){ + if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $strength < $intel * 0.8){ return '명장'; } - if($leader >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power + $intel < $leader){ + if($leadership >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $strength + $intel < $leadership){ return '차장'; } return '평범'; diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index f9b122e1..71c76ea6 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -420,7 +420,7 @@ function postUpdateMonthly() { sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop2+agri2+comm2+secu2+wall2+def2)/100 ) from city where nation=A.nation and supply=1 )) - +(select sum(leader+power+intel) from general where nation=A.nation) + +(select sum(leadership+strength+intel) from general where nation=A.nation) +(select round(sum(dex0+dex10+dex20+dex30+dex40)/1000) from general where nation=A.nation) +(select round(sum(experience+dedication)/100) from general where nation=A.nation) +(select round(avg(connect)) from general where nation=A.nation) @@ -1059,7 +1059,7 @@ function checkStatistic() { $nationGeneralInfos = Util::convertArrayToDict( $db->query( - 'SELECT nation, sum(leader+power+intel) as abil,sum(gold+rice) as goldrice, + 'SELECT nation, sum(leadership+strength+intel) as abil,sum(gold+rice) as goldrice, sum(dex0+dex10+dex20+dex30) as dex,sum(experience+dedication) as expded from general GROUP BY nation' ), diff --git a/hwe/func_process.old.php b/hwe/func_process.old.php index 2dba4f3e..c2e4be0f 100644 --- a/hwe/func_process.old.php +++ b/hwe/func_process.old.php @@ -6,7 +6,7 @@ use Constraint\Constraint; /** * 장수의 통솔을 받아옴 * - * @param array $general 장수 정보, leader, injury, lbonus, horse 사용 + * @param array $general 장수 정보, leadership, injury, lbonus, horse 사용 * @param bool $withInjury 부상값 사용 여부 * @param bool $withItem 아이템 적용 여부 * @param bool $withStatAdjust 추가 능력치 보정 사용 여부 @@ -18,7 +18,7 @@ function getGeneralLeadership($general, $withInjury, $withItem, $withStatAdjust, if($general === null){ return 0; } - $leadership = $general['leader']; + $leadership = $general['leadership']; if($withInjury){ $leadership *= (100 - $general['injury']) / 100; } @@ -58,7 +58,7 @@ function getGeneralLeadership($general, $withInjury, $withItem, $withStatAdjust, * * @return int|float 계산된 능력치 */ -function getGeneralPower($general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){ +function getGeneralStrength($general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){ if($general === null){ return 0; } @@ -107,7 +107,7 @@ function getGeneralIntel($general, $withInjury, $withItem, $withStatAdjust, $use } if($withStatAdjust){ - $intel += Util::round(getGeneralPower($general, $withInjury, $withItem, false, false) / 4); + $intel += Util::round(getGeneralStrength($general, $withInjury, $withItem, false, false) / 4); } if($useFloor){ @@ -120,16 +120,16 @@ function getGeneralIntel($general, $withInjury, $withItem, $withStatAdjust, $use * 내정 커맨드 사용시 성공 확률 계산 * * @param array $general 장수 정보 - * @param int|string $type 내정 커맨드 타입, 0|'leader' = 통솔 기반, 1|'power' = 무력 기반, 2|'intel' = 지력 기반 + * @param int|string $type 내정 커맨드 타입, 0|'leadership' = 통솔 기반, 1|'power' = 무력 기반, 2|'intel' = 지력 기반 * * @return array 계산된 실패, 성공 확률 ('success' => 성공 확률, 'fail' => 실패 확률) */ function CriticalRatioDomestic(&$general, $type) { - $leader = getGeneralLeadership($general, false, true, true, false); - $power = getGeneralPower($general, false, true, true, false); + $leadership = getGeneralLeadership($general, false, true, true, false); + $power = getGeneralStrength($general, false, true, true, false); $intel = getGeneralIntel($general, false, true, true, false); - $avg = ($leader+$power+$intel) / 3; + $avg = ($leadership+$power+$intel) / 3; /* * 능력치가 높아질 수록 성공 확률 감소. 실패 확률도 감소 @@ -143,8 +143,8 @@ function CriticalRatioDomestic(&$general, $type) { 505050(50%,50%), 107070(50%,50%) */ switch($type) { - case 'leader': - case 0: $ratio = $avg / $leader; break; + case 'leadership': + case 0: $ratio = $avg / $leadership; break; case 'power': case 1: $ratio = $avg / $power; break; case 'intel': @@ -507,8 +507,8 @@ function process_4(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 군량 하락 내정보다 2배 지력경험 경험, 공헌 상승 $general['rice'] -= $admin['develcost'] * 2; - $general['leader2']++; - $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -558,7 +558,7 @@ function process_5(&$general, $type) { if($city['trust'] < GameConst::$develrate) { $city['trust'] = GameConst::$develrate; } $trust = $city['trust'] / 100; - $score = getGeneralPower($general, true, true, true, false) * $trust; + $score = getGeneralStrength($general, true, true, true, false) * $trust; $score = $score * (100 + $general['explevel']/5)/100; $score = $score * (80 + rand() % 41)/100; // 80 ~ 120% @@ -607,8 +607,8 @@ function process_5(&$general, $type) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 자금 하락, 무력 경험 경험, 공헌 상승 $general['gold'] -= $admin['develcost']; - $general['power2']++; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']++; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',strength2='{$general['strength2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -697,8 +697,8 @@ function process_7(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 군량 하락 내정보다 2배 지력경험 경험, 공헌 상승 $general['rice'] -= $admin['develcost'] * 2; - $general['leader2']++; - $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -747,7 +747,7 @@ function process_8(&$general) { if($city['trust'] < GameConst::$develrate) { $city['trust'] = GameConst::$develrate; } $trust = $city['trust'] / 100; - $score = getGeneralPower($general, true, true, true, false) * $trust; + $score = getGeneralStrength($general, true, true, true, false) * $trust; $score = $score * (100 + $general['explevel']/5)/100; $score = $score * (80 + rand() % 41)/100; // 80 ~ 120% @@ -795,8 +795,8 @@ function process_8(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 자금 하락, 무력 경험 경험, 공헌 상승 $general['gold'] -= $admin['develcost']; - $general['power2']++; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']++; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',strength2='{$general['strength2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -837,7 +837,7 @@ function process_9(&$general) { else { $dtype = 1; $stype = "쌀"; } $score = getGeneralLeadership($general, true, true, true) - + getGeneralPower($general, true, true, true) + + getGeneralStrength($general, true, true, true) + getGeneralIntel($general, true, true, true); $score = $score * (100 + $general['explevel']/5)/100; $score = $score * (80 + rand() % 41)/100; // 80 ~ 120% @@ -874,14 +874,14 @@ function process_9(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) { + switch(Util::choiceRandomUsingWeight([$general['leadership'], $general['power'], $general['intel']])) { case 0: - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; break; case 1: - $general['power2']++; - $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']++; + $query = "update general set resturn='SUCCESS',strength2='{$general['strength2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; break; case 2: $general['intel2']++; @@ -1048,10 +1048,10 @@ function process_11(&$general, $type) { ], 'city = %i', $general['city']); // 통솔경험, 병종 변경, 병사수 변경, 훈련치 변경, 사기치 변경, 자금 군량 하락, 공헌도, 명성 상승 - $general['leader2']++; + $general['leadership2']++; $db->update('general', [ 'resturn'=>'SUCCESS', - 'leader2'=>$general['leader2'], + 'leadership2'=>$general['leadership2'], 'crewtype'=>$crewTypeObj->id, 'crew'=>$general['crew'], 'train'=>$train, @@ -1120,8 +1120,8 @@ function process_13(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 경험치 상승 // 공헌도, 명성 상승 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -1177,8 +1177,8 @@ function process_14(&$general) { // 사기치 변경 // 자금 감소 // 경험치 상승 // 공헌도, 명성 상승 $score += $general['atmos']; if($score > GameConst::$maxAtmosByCommand) { $score = GameConst::$maxAtmosByCommand; } - $general['leader2']++; - $query = "update general set resturn='SUCCESS',atmos='$score',gold='$gold',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',atmos='$score',gold='$gold',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -1249,8 +1249,8 @@ function process_15(&$general) { $ded = CharDedication($ded, $general['personal']); // 훈련,사기치 변경 // 자금 감소 // 경험치 상승 // 공헌도, 명성 상승 - $general['leader2']+=3; - $query = "update general set resturn='SUCCESS',term='0',atmos='95',train='95',gold='$gold',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']+=3; + $query = "update general set resturn='SUCCESS',term='0',atmos='95',train='95',gold='$gold',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -1412,13 +1412,13 @@ function process_21(&$general) { $exp = CharExperience($exp, $general['personal']); // 이동, 경험치 상승, 명성 상승, 사기 감소 - $general['leader2']++; + $general['leadership2']++; $db->update('general',[ 'resturn'=>'SUCCESS', 'gold'=>$db->sqleval('gold - %i',$admin['develcost']), 'city'=>$destCity->id, 'atmos'=>$db->sqleval('atmos*0.95'), - 'leader2'=>$general['leader2'], + 'leadership2'=>$general['leadership2'], 'experience'=>$db->sqleval('experience + %i',$exp) ], 'no = %i', $general['no']); @@ -1497,8 +1497,8 @@ function process_26(&$general) { $query = "update general set city='{$general['city']}' where troop='{$general['troop']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 경험치 명성 공헌 상승 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -1564,8 +1564,8 @@ function process_28(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 경험치 상승 // 명성,공헌 상승 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp',dedication=dedication+'$ded' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',experience=experience+'$exp',dedication=dedication+'$ded' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -1616,8 +1616,8 @@ function process_30(&$general) { $exp = CharExperience($exp, $general['personal']); // 이동, 경험치 상승, 명성 상승, 병력/사기/훈련 감소 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',gold=gold-'$cost',city='$destination',crew=crew*0.95,atmos=atmos*0.9,train=train*0.95,leader2='{$general['leader2']}',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',gold=gold-'$cost',city='$destination',crew=crew*0.95,atmos=atmos*0.9,train=train*0.95,leadership2='{$general['leadership2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($general['level'] == 12) { @@ -1747,10 +1747,10 @@ function process_31(&$general) { $exp = CharExperience($exp, $general['personal']); $ded = CharDedication($ded, $general['personal']); - $general['leader2']++; + $general['leadership2']++; $general['gold'] -= $admin['develcost']*3; $general['rice'] -= $admin['develcost']*3; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -1898,8 +1898,8 @@ function process_42(&$general) { case 5: $log[] = "●{$admin['month']}월:동네 장사와 힘겨루기를 하여 멋지게 이겼습니다. <1>$date"; // 경험치 상승 // 명성 상승 - $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2'] += 2; + $query = "update general set resturn='SUCCESS',strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 6: @@ -1911,8 +1911,8 @@ function process_42(&$general) { case 7: $log[] = "●{$admin['month']}월:산적과 싸워 금 300을 빼앗았습니다. <1>$date"; // 자금 상승 // 경험치 상승 // 명성 상승 - $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',gold=gold+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2'] += 2; + $query = "update general set resturn='SUCCESS',gold=gold+300,strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 8: @@ -1926,31 +1926,31 @@ function process_42(&$general) { case 9: $log[] = "●{$admin['month']}월:호랑이를 잡아 고기 300을 얻었습니다. <1>$date"; // 군량 상승 // 경험치 상승 - $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',rice=rice+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2'] += 2; + $query = "update general set resturn='SUCCESS',rice=rice+300,strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 10: $log[] = "●{$admin['month']}월:호랑이에게 물려 다쳤습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 10 + 10; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 11: $log[] = "●{$admin['month']}월:곰을 잡아 고기 300을 얻었습니다. <1>$date"; // 군량 상승 // 경험치 상승 // 명성 상승 - $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',rice=rice+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2'] += 2; + $query = "update general set resturn='SUCCESS',rice=rice+300,strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 12: $log[] = "●{$admin['month']}월:곰에게 할퀴어 다쳤습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 10 + 10; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 13: @@ -1969,8 +1969,8 @@ function process_42(&$general) { $log[] = "●{$admin['month']}월:위기에 빠진 사람을 구해주다가 다쳤습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 10 + 10; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 16: @@ -2013,46 +2013,46 @@ function process_42(&$general) { case 21: $log[] = "●{$admin['month']}월:백성들에게 현인의 가르침을 설파했습니다. <1>$date"; // 경험치 상승 // 명성 상승 - $general['leader2'] += 2; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['leadership2'] += 2; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 22: $log[] = "●{$admin['month']}월:어느 집의 무너진 울타리를 고쳐주었습니다. <1>$date"; // 경험치 상승 // 명성 상승 - $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2'] += 2; + $query = "update general set resturn='SUCCESS',strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 23: $log[] = "●{$admin['month']}월:어느 집의 도망친 가축을 되찾아 주었습니다. <1>$date"; // 경험치 상승 // 명성 상승 - $general['leader2'] += 2; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['leadership2'] += 2; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 24: $log[] = "●{$admin['month']}월:호랑이에게 물려 크게 다쳤습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 30 + 20; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 25: $log[] = "●{$admin['month']}월:곰에게 할퀴어 크게 다쳤습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 30 + 20; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 26: $log[] = "●{$admin['month']}월:위기에 빠진 사람을 구하다가 죽을뻔 했습니다. <1>$date"; // 경험치 하락 // 명성 상승 $injury = rand() % 50 + 30; - $general['power2']--; - $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; + $general['strength2']--; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',strength2='{$general['strength2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; default: @@ -2147,8 +2147,8 @@ function process_43(&$general) { $ded = CharDedication($ded, $general['personal']); // 경험치 상승 // 공헌도, 명성 상승 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -2236,8 +2236,8 @@ function process_44(&$general) { $ded = CharDedication($ded, $general['personal']); // 경험치 상승 // 공헌도, 명성 상승 - $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set resturn='SUCCESS',leadership2='{$general['leadership2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); @@ -2462,15 +2462,15 @@ function process_49(&$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 경험치 상승 - switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) { + switch(Util::choiceRandomUsingWeight([$general['leadership'], $general['power'], $general['intel']])) { case 0: - $general['leader2']++; - $query = "update general set leader2='{$general['leader2']}' where no='{$general['no']}'"; + $general['leadership2']++; + $query = "update general set leadership2='{$general['leadership2']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 1: - $general['power2']++; - $query = "update general set power2='{$general['power2']}' where no='{$general['no']}'"; + $general['strength2']++; + $query = "update general set strength2='{$general['strength2']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 2: diff --git a/hwe/func_process.php b/hwe/func_process.php index 45491078..24a34e78 100644 --- a/hwe/func_process.php +++ b/hwe/func_process.php @@ -7,16 +7,16 @@ use Constraint\Constraint; * 내정 커맨드 사용시 성공 확률 계산 * * @param array $general 장수 정보 - * @param string $type 내정 커맨드 타입, 'leader' = 통솔 기반, 'power' = 무력 기반, 'intel' = 지력 기반 + * @param string $type 내정 커맨드 타입, 'leadership' = 통솔 기반, 'strength' = 무력 기반, 'intel' = 지력 기반 * * @return array 계산된 실패, 성공 확률 ('success' => 성공 확률, 'fail' => 실패 확률) */ function CriticalRatioDomestic(General $general, string $type) { - $leader = $general->getLeadership(false, true, true, false); - $power = $general->getPower(false, true, true, false); + $leadership = $general->getLeadership(false, true, true, false); + $strength = $general->getStrength(false, true, true, false); $intel = $general->getIntel(false, true, true, false); - $avg = ($leader+$power+$intel) / 3; + $avg = ($leadership+$strength+$intel) / 3; /* * 능력치가 높아질 수록 성공 확률 감소. 실패 확률도 감소 @@ -30,8 +30,8 @@ function CriticalRatioDomestic(General $general, string $type) { 505050(50%,50%), 107070(50%,50%) */ switch($type) { - case 'leader': $ratio = $avg / $leader; break; - case 'power': $ratio = $avg / $power; break; + case 'leadership': $ratio = $avg / $leadership; break; + case 'strength': $ratio = $avg / $strength; break; case 'intel': $ratio = $avg / $intel; break; default: throw new MustNotBeReachedException(); diff --git a/hwe/func_process_chief.old.php b/hwe/func_process_chief.old.php index d1a5b821..b7c9219d 100644 --- a/hwe/func_process_chief.old.php +++ b/hwe/func_process_chief.old.php @@ -1979,7 +1979,7 @@ function process_76(&$general) { $avgGenNum = $db->queryFirstField('SELECT avg(gennum) FROM nation'); $addGenCount = 5 + Util::round($avgGenNum / 10); - $query = "select avg(age) as age, max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'"; + $query = "select avg(age) as age, max(leadership+power+intel) as stat_sum, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $avgGen = MYDB_fetch_array($result); @@ -1991,42 +1991,42 @@ function process_76(&$general) { $type = rand() % 10; switch($type) { case 0: case 1: case 2: case 3: - $leader = GameConst::$defaultStatMax - 10 + rand()%11; + $leadership = GameConst::$defaultStatMax - 10 + rand()%11; $intel = GameConst::$defaultStatMin + rand()%6; - $power = GameConst::$defaultStatTotal - $leader - $intel; + $power = GameConst::$defaultStatTotal - $leadership - $intel; break; case 4: case 5: case 6: case 7: - $leader = GameConst::$defaultStatMax - 10 + rand()%11; + $leadership = GameConst::$defaultStatMax - 10 + rand()%11; $power = GameConst::$defaultStatMin + rand()%6; - $intel = GameConst::$defaultStatTotal - $leader - $power; + $intel = GameConst::$defaultStatTotal - $leadership - $power; break; case 8: case 9: - $leader = GameConst::$defaultStatMin + rand()%6; + $leadership = GameConst::$defaultStatMin + rand()%6; $power = GameConst::$defaultStatMax - 10 + rand()%11; - $intel = GameConst::$defaultStatTotal - $leader - $power; + $intel = GameConst::$defaultStatTotal - $leadership - $power; break; } // 국내 최고능치 기준으로 랜덤성 스케일링 - if($avgGen['lpi'] > 210) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - } elseif($avgGen['lpi'] > 180) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + if($avgGen['stat_sum'] > 210) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + } elseif($avgGen['stat_sum'] > 180) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); } else { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); } $over1 = 0; $over2 = 0; $over3 = 0; // 너무 높은 능치는 다른 능치로 분산 - if($leader > 90) { - $over1 = rand() % ($leader - 90) + 5; - $leader -= $over1; + if($leadership > 90) { + $over1 = rand() % ($leadership - 90) + 5; + $leadership -= $over1; } if($power > 90) { $over2 = rand() % ($power - 90) + 5; @@ -2043,8 +2043,8 @@ function process_76(&$general) { $power = $power + $over1 + $over2 + $over3; } // 너무 높은 능치는 제한 - if($leader > GameConst::$defaultStatNPCMax) { - $leader = GameConst::$defaultStatNPCMax; + if($leadership > GameConst::$defaultStatNPCMax) { + $leadership = GameConst::$defaultStatNPCMax; } if($power > GameConst::$defaultStatNPCMax) { $power = GameConst::$defaultStatNPCMax; @@ -2065,14 +2065,14 @@ function process_76(&$general) { @MYDB_query(" insert into general ( npc,npc_org,affinity,name,picture,nation, - city,leader,power,intel,experience,dedication, + city,leadership,power,intel,experience,dedication, level,gold,rice,crew,crewtype,train,atmos,tnmt, weap,book,horse,turntime,killturn,age,belong,personal,special,specage,special2,specage2,npcmsg, makelimit,bornyear,deadyear, dex0, dex10, dex20, dex30, dex40 ) values ( '$npc','$npc','$affinity','$name','$picture','{$nation['nation']}', - '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', + '{$general['city']}','$leadership','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','', '0','$bornyear','$deadyear', diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 9d7fb1ec..97ae2a79 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -1472,7 +1472,7 @@ function process_76(&$general) { $avgGenNum = $db->queryFirstField('SELECT avg(gennum) FROM nation'); $addGenCount = 5 + Util::round($avgGenNum / 10); - $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + $avgGen = $db->queryFirstRow('SELECT max(leadership+strength+intel) as stat_sum, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); $dexTotal = $avgGen['dex_t']; @@ -1485,86 +1485,86 @@ function process_76(&$general) { $stat_tier3 = GameConst::$defaultStatMin + rand()%6; $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3; $type = Util::choiceRandomUsingWeight([ - 'power0'=>1, - 'power1'=>1, - 'power2'=>1, + 'strength0'=>1, + 'strength1'=>1, + 'strength2'=>1, 'intel'=>3, 'neutral'=>0 ]); switch($type){ - case 'power0': - $leader = $stat_tier1; - $power = $stat_tier2; + case 'strength0': + $leadership = $stat_tier1; + $strength = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8]; break; - case 'power1': - $leader = $stat_tier1; - $power = $stat_tier2; + case 'strength1': + $leadership = $stat_tier1; + $strength = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8]; break; - case 'power2': - $leader = $stat_tier1; - $power = $stat_tier2; + case 'strength2': + $leadership = $stat_tier1; + $strength = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8]; break; case 'intel': - $leader = $stat_tier1; - $power = $stat_tier3; + $leadership = $stat_tier1; + $strength = $stat_tier3; $intel = $stat_tier2; $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8]; break; default: - $leader = $stat_tier3; - $power = $stat_tier1; + $leadership = $stat_tier3; + $strength = $stat_tier1; $intel = $stat_tier2; $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4]; break; } // 국내 최고능치 기준으로 랜덤성 스케일링 - if($avgGen['lpi'] > 210) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - } elseif($avgGen['lpi'] > 180) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + if($avgGen['stat_sum'] > 210) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $strength = Util::round($strength * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + } elseif($avgGen['stat_sum'] > 180) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $strength = Util::round($strength * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); } else { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $strength = Util::round($strength * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); } $over1 = 0; $over2 = 0; $over3 = 0; // 너무 높은 능치는 다른 능치로 분산 - if($leader > 90) { - $over1 = rand() % ($leader - 90) + 5; - $leader -= $over1; + if($leadership > 90) { + $over1 = rand() % ($leadership - 90) + 5; + $leadership -= $over1; } - if($power > 90) { - $over2 = rand() % ($power - 90) + 5; - $power -= $over2; + if($strength > 90) { + $over2 = rand() % ($strength - 90) + 5; + $strength -= $over2; } if($intel > 90) { $over3 = rand() % ($intel - 90) + 5; $intel -= $over3; } // 낮은 능치쪽으로 합산 - if($type == 'power') { + if($type == 'strength') { $intel = $intel + $over1 + $over2 + $over3; } else { - $power = $power + $over1 + $over2 + $over3; + $strength = $strength + $over1 + $over2 + $over3; } // 너무 높은 능치는 제한 - if($leader > GameConst::$defaultStatNPCMax) { - $leader = GameConst::$defaultStatNPCMax; + if($leadership > GameConst::$defaultStatNPCMax) { + $leadership = GameConst::$defaultStatNPCMax; } - if($power > GameConst::$defaultStatNPCMax) { - $power = GameConst::$defaultStatNPCMax; + if($strength > GameConst::$defaultStatNPCMax) { + $strength = GameConst::$defaultStatNPCMax; } if($intel > GameConst::$defaultStatNPCMax) { $intel = GameConst::$defaultStatNPCMax; @@ -1582,14 +1582,14 @@ function process_76(&$general) { @MYDB_query(" insert into general ( npc,npc_org,affinity,name,picture,nation, - city,leader,power,intel,experience,dedication, + city,leadership,strength,intel,experience,dedication, level,gold,rice,crew,crewtype,train,atmos,tnmt, weap,book,horse,turntime,killturn,age,belong,personal,special,specage,special2,specage2,npcmsg, makelimit,bornyear,deadyear, dex0, dex10, dex20, dex30, dex40 ) values ( '$npc','$npc','$affinity','$name','$picture','{$nation['nation']}', - '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', + '{$general['city']}','$leadership','$strength','$intel','{$avgGen['exp']}','{$avgGen['ded']}', '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','', '0','$bornyear','$deadyear', diff --git a/hwe/func_process_personnel.old.php b/hwe/func_process_personnel.old.php index 61695f6c..c7ca95e8 100644 --- a/hwe/func_process_personnel.old.php +++ b/hwe/func_process_personnel.old.php @@ -330,9 +330,9 @@ function process_29(&$general) { if(!$found_npc) { $exp = 100; $ded = 70; - switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) { - case 0: $general['leader2'] += 1; break; - case 1: $general['power2'] += 1; break; + switch(Util::choiceRandomUsingWeight([$general['leadership'], $general['power'], $general['intel']])) { + case 0: $general['leadership2'] += 1; break; + case 1: $general['strength2'] += 1; break; case 2: $general['intel2'] += 1; break; } $log[] = "●{$admin['month']}월:인재를 찾을 수 없었습니다. <1>$date"; @@ -340,9 +340,9 @@ function process_29(&$general) { // 탐색 성공 $exp = 200; $ded = 300; - switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) { - case 0: $general['leader2'] += 3; break; - case 1: $general['power2'] += 3; break; + switch(Util::choiceRandomUsingWeight([$general['leadership'], $general['power'], $general['intel']])) { + case 0: $general['leadership2'] += 3; break; + case 1: $general['strength2'] += 3; break; case 2: $general['intel2'] += 3; break; } @@ -383,7 +383,7 @@ function process_29(&$general) { $alllog[] = "●{$admin['month']}월:{$general['name']}{$josaYi} $name{$josaRa}는 인재를 {$scoutType}하였습니다!"; pushGeneralHistory($general, "●{$admin['year']}년 {$admin['month']}월:$name{$josaRa}는 인재를 {$scoutType}"); - $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); + $avgGen = $db->queryFirstRow('SELECT max(leadership+power+intel) as stat_sum, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']); $dexTotal = $avgGen['dex_t']; @@ -392,39 +392,39 @@ function process_29(&$general) { $stat_tier3 = GameConst::$defaultStatMin + rand()%6; $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3; $type = Util::choiceRandomUsingWeight([ - 'power0'=>2, - 'power1'=>2, - 'power2'=>2, + 'strength0'=>2, + 'strength1'=>2, + 'strength2'=>2, 'intel'=>6, 'neutral'=>3 ]); switch($type){ - case 'power0': - $leader = $stat_tier1; + case 'strength0': + $leadership = $stat_tier1; $power = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8]; break; - case 'power1': - $leader = $stat_tier1; + case 'strength1': + $leadership = $stat_tier1; $power = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8]; break; - case 'power2': - $leader = $stat_tier1; + case 'strength2': + $leadership = $stat_tier1; $power = $stat_tier2; $intel = $stat_tier3; $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8]; break; case 'intel': - $leader = $stat_tier1; + $leadership = $stat_tier1; $power = $stat_tier3; $intel = $stat_tier2; $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8]; break; default: - $leader = $stat_tier3; + $leadership = $stat_tier3; $power = $stat_tier1; $intel = $stat_tier2; $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4]; @@ -432,26 +432,26 @@ function process_29(&$general) { } // 국내 최고능치 기준으로 랜덤성 스케일링 - if($avgGen['lpi'] > 210) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); - } elseif($avgGen['lpi'] > 180) { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + if($avgGen['stat_sum'] > 210) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (60+rand()%31)/100); + } elseif($avgGen['stat_sum'] > 180) { + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (75+rand()%21)/100); } else { - $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $power = Util::round($power * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); - $intel = Util::round($intel * $avgGen['lpi'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $leadership = Util::round($leadership * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $power = Util::round($power * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); + $intel = Util::round($intel * $avgGen['stat_sum'] / GameConst::$defaultStatTotal * (90+rand()%11)/100); } $over1 = 0; $over2 = 0; $over3 = 0; // 너무 높은 능치는 다른 능치로 분산 - if($leader > 90) { - $over1 = rand() % ($leader - 90) + 5; - $leader -= $over1; + if($leadership > 90) { + $over1 = rand() % ($leadership - 90) + 5; + $leadership -= $over1; } if($power > 90) { $over2 = rand() % ($power - 90) + 5; @@ -468,8 +468,8 @@ function process_29(&$general) { $power = $power + $over1 + $over2 + $over3; } // 너무 높은 능치는 제한 - if($leader > 95) { - $leader = 95; + if($leadership > 95) { + $leadership = 95; } if($power > 95) { $power = 95; @@ -499,14 +499,14 @@ function process_29(&$general) { @MYDB_query(" insert into general ( npcid,npc,npc_org,affinity,name,picture,nation, - city,leader,power,intel,experience,dedication, + city,leadership,power,intel,experience,dedication, level,gold,rice,crew,crewtype,train,atmos,tnmt, weap,book,horse,turntime,killturn,age,belong,personal,special,specage,special2,specage2,npcmsg, makelimit,bornyear,deadyear, dex0, dex10, dex20, dex30, dex40 ) values ( '$npccount','$npc','$npc','$affinity','$name','$picture','$scoutNation', - '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', + '{$general['city']}','$leadership','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}', '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0', '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','', '0','$bornyear','$deadyear', @@ -534,7 +534,7 @@ function process_29(&$general) { $ded = CharDedication($ded, $general['personal']); // 자금 감소 // 경험치 상승 // 공헌도, 명성 상승 - $query = "update general set resturn='SUCCESS',term='0',gold='$gold',leader2='{$general['leader2']}',power2='{$general['power2']}',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',term='0',gold='$gold',leadership2='{$general['leadership2']}',strength2='{$general['strength2']}',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($general, $log); diff --git a/hwe/func_process_sabotage.old.php b/hwe/func_process_sabotage.old.php index ed2726c9..720254b3 100644 --- a/hwe/func_process_sabotage.old.php +++ b/hwe/func_process_sabotage.old.php @@ -5,11 +5,11 @@ namespace sammo; function calcSabotageAttackScore(string $statType, array $general, array $nation):array{ setLeadershipBonus($general, $nation['level']); - if($statType === 'leader'){ + if($statType === 'leadership'){ $genScore = getGeneralLeadership($general, true, true, true); } - else if($statType === 'power'){ - $genScore = getGeneralPower($general, true, true, true); + else if($statType === 'strength'){ + $genScore = getGeneralStrength($general, true, true, true); } else if($statType === 'intel'){ $genScore = getGeneralIntel($general, true, true, true); @@ -70,10 +70,10 @@ function calcSabotageDefendScore(string $statType, array $generalList, array $ci foreach ($generalList as $general) { setLeadershipBonus($general, $nation['level']); - if ($statType === 'leader') { + if ($statType === 'leadership') { $maxGenScore = max($maxGenScore, getGeneralLeadership($general, true, true, true)); - } elseif ($statType === 'power') { - $maxGenScore = max($maxGenScore, getGeneralPower($general, true, true, true)); + } elseif ($statType === 'strength') { + $maxGenScore = max($maxGenScore, getGeneralStrength($general, true, true, true)); } elseif ($statType === 'intel') { $maxGenScore = max($maxGenScore, getGeneralIntel($general, true, true, true)); } else { @@ -161,7 +161,7 @@ function process_32(&$general) { $srcNation = getNationStaticInfo($srcNationID); $destNation = getNationStaticInfo($destNationID); - $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); + $generalList = $db->query('SELECT `no`,leadership,horse,strength,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); [ $srcGenScore, @@ -265,7 +265,7 @@ function process_33(&$general) { $date = substr($general['turntime'],11,5); $sabotageName = '탈취'; - $statType = 'power'; + $statType = 'strength'; [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']); $logger = new ActionLogger($general['no'], $general['nation'], $year, $month); @@ -298,7 +298,7 @@ function process_33(&$general) { $srcNation = getNationStaticInfo($srcNationID); $destNation = getNationStaticInfo($destNationID); - $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); + $generalList = $db->query('SELECT `no`,leadership,horse,strength,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); [ $srcGenScore, @@ -436,7 +436,7 @@ function process_34(&$general) { $date = substr($general['turntime'],11,5); $sabotageName = '파괴'; - $statType = 'power'; + $statType = 'strength'; [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']); $logger = new ActionLogger($general['no'], $general['nation'], $year, $month); @@ -467,7 +467,7 @@ function process_34(&$general) { $srcNation = getNationStaticInfo($srcNationID); $destNation = getNationStaticInfo($destNationID); - $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); + $generalList = $db->query('SELECT `no`,leadership,horse,strength,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); [ $srcGenScore, @@ -574,7 +574,7 @@ function process_35(&$general) { $date = substr($general['turntime'],11,5); $sabotageName = '선동'; - $statType = 'leader'; + $statType = 'leadership'; [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']); $logger = new ActionLogger($general['no'], $general['nation'], $year, $month); @@ -607,7 +607,7 @@ function process_35(&$general) { $srcNation = getNationStaticInfo($srcNationID); $destNation = getNationStaticInfo($destNationID); - $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); + $generalList = $db->query('SELECT `no`,leadership,horse,strength,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']); [ $srcGenScore, $srcSpecialScore, diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index e59b1e28..c3735f96 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -309,8 +309,8 @@ function fillLowGenAll() { 'no'=>0, 'npc'=>2, 'name'=>'무명장수', - 'leader'=>10, - 'power'=>10, + 'leadership'=>10, + 'strength'=>10, 'intel'=>10, 'explevel'=>10 ]; @@ -335,7 +335,7 @@ function fillLowGenAll() { //자동신청하고, 돈 있고, 아직 참가 안한 장수 $freeJoiners = $db->query( - 'SELECT no,npc,name,leader,power,intel,explevel,horse,weap,book from general where tnmt=1 and tournament=0 order by rand() limit %d', + 'SELECT no,npc,name,leadership,strength,intel,explevel,horse,weap,book from general where tnmt=1 and tournament=0 order by rand() limit %d', $toBeFilledCnt ); @@ -349,9 +349,9 @@ function fillLowGenAll() { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['leader'], - 'pwr'=>$general['power'], - 'itl'=>$general['intel'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['explevel'], 'grp'=>$grpIdx, 'grp_no'=>$grpCnt, @@ -486,9 +486,9 @@ function selection($tnmt_type, $tnmt, $phase) { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['ldr'], - 'pwr'=>$general['pwr'], - 'itl'=>$general['itl'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['lvl'], 'grp'=>$grp, 'grp_no'=>$grp_no, @@ -573,9 +573,9 @@ function final16set() { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['ldr'], - 'pwr'=>$general['pwr'], - 'itl'=>$general['itl'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['lvl'], 'grp'=>$newGrp, 'grp_no'=>$newGrp_no, @@ -617,9 +617,9 @@ function finalFight($tnmt_type, $tnmt, $phase, $type) { 'no'=>$general['no'], 'npc'=>$general['npc'], 'name'=>$general['name'], - 'ldr'=>$general['ldr'], - 'pwr'=>$general['pwr'], - 'itl'=>$general['itl'], + 'leadership'=>$general['leadership'], + 'strength'=>$general['strength'], + 'intel'=>$general['intel'], 'lvl'=>$general['lvl'], 'grp'=>$newGrp, 'grp_no'=>$newGrp_no, @@ -649,7 +649,7 @@ function setGift($tnmt_type, $tnmt, $phase) { switch($tnmt_type) { case 0: $tp = "전력전"; $tp2 = "tt"; break; case 1: $tp = "통솔전"; $tp2 = "tl"; break; - case 2: $tp = "일기토"; $tp2 = "tp"; break; + case 2: $tp = "일기토"; $tp2 = "ts"; break; case 3: $tp = "설전"; $tp2 = "ti"; break; } @@ -830,11 +830,11 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { eraseTnmtFightLog($group); - $query = "select *,(ldr+pwr+itl)*7/15 as tot,h,w,b from tournament where grp='$group' and grp_no='$g1'"; + $query = "select *,(leadership+strength+intel)*7/15 as total,h,w,b from tournament where grp='$group' and grp_no='$g1'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = MYDB_fetch_array($result); - $query = "select *,(ldr+pwr+itl)*7/15 as tot,h,w,b from tournament where grp='$group' and grp_no='$g2'"; + $query = "select *,(leadership+strength+intel)*7/15 as total,h,w,b from tournament where grp='$group' and grp_no='$g2'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen2 = MYDB_fetch_array($result); @@ -842,10 +842,10 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { else { $turn = 100; } - if($tnmt_type == 1) { $tp = "ldr"; $tp2 = "tl"; } - elseif($tnmt_type == 2) { $tp = "pwr"; $tp2 = "tp"; } - elseif($tnmt_type == 3) { $tp = "itl"; $tp2 = "ti"; } - else /*$tnmt_type == 0*/{ $tp = "tot"; $tp2 = "tt"; } + if($tnmt_type == 1) { $tp = "leadership"; $tp2 = "tl"; } + elseif($tnmt_type == 2) { $tp = "strength"; $tp2 = "ts"; } + elseif($tnmt_type == 3) { $tp = "intel"; $tp2 = "ti"; } + else /*$tnmt_type == 0*/{ $tp = "total"; $tp2 = "tt"; } $e1 = $energy1 = Util::round($gen1[$tp] * getLog($gen1['lvl'], $gen2['lvl']) * 10); $e2 = $energy2 = Util::round($gen2[$tp] * getLog($gen1['lvl'], $gen2['lvl']) * 10); diff --git a/hwe/j_get_general_list.php b/hwe/j_get_general_list.php index 898035ff..1877f67f 100644 --- a/hwe/j_get_general_list.php +++ b/hwe/j_get_general_list.php @@ -42,7 +42,7 @@ else{ $session->setReadOnly(); -$rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,name2,injury,leader,power,intel,experience,dedication,level,killturn,connect from general'); +$rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,name2,injury,leadership,strength,intel,experience,dedication,level,killturn,connect from general'); $ownerNameList = []; if($gameStor->isunited){ @@ -53,7 +53,7 @@ if($gameStor->isunited){ $generalList = []; foreach($rawGeneralList as $rawGeneral){ - [$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$name2,$injury,$leader,$power,$intel,$experience,$dedication,$level,$killturn,$connect] = $rawGeneral; + [$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$name2,$injury,$leadership,$strength,$intel,$experience,$dedication,$level,$killturn,$connect] = $rawGeneral; if(key_exists($owner, $ownerNameList)){ $name2 = $ownerNameList[$owner]; @@ -75,9 +75,9 @@ foreach($rawGeneralList as $rawGeneral){ $name, $npc==1?$name2:null, $injury, - $leader, + $leadership, $lbonus, - $power, + $strength, $intel, getExpLevel($experience), getHonor($experience), diff --git a/hwe/j_get_select_npc_token.php b/hwe/j_get_select_npc_token.php index 53918826..b356ce5f 100644 --- a/hwe/j_get_select_npc_token.php +++ b/hwe/j_get_select_npc_token.php @@ -90,13 +90,13 @@ if($token && !$refresh){ $candidates = []; $weight = []; -foreach($db->query('SELECT `no`, `name`, leader, power, intel, nation, imgsvr, picture, personal, special, special2 FROM general WHERE npc=2') as $general){ +foreach($db->query('SELECT `no`, `name`, leadership, strength, 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']; + $allStat = $general['leadership'] + $general['strength'] + $general['intel']; $weight[$general['no']] = pow($allStat, 1.5); } diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php index 897be47f..75a88fe2 100644 --- a/hwe/j_simulate_battle.php +++ b/hwe/j_simulate_battle.php @@ -82,13 +82,13 @@ $rawDefenderNation = $query['defenderNation']; $generalCheck = [ 'required'=>[ 'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train', - 'intel', 'intel2', 'book', 'power', 'power2', 'weap', 'injury', 'leader', 'leader2', 'horse', 'item', + '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' ], 'integer'=>[ 'no', 'nation', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train', - 'intel', 'intel2', 'book', 'power', 'power2', 'weap', 'injury', 'leader', 'leader2', 'horse', 'item', + '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' ], @@ -97,8 +97,8 @@ $generalCheck = [ ['nation', 1], ['crew', 0], ['intel', 0], - ['power', 0], - ['leader', 0], + ['strength', 0], + ['leadership', 0], ['experience', 0], ['gold', 0], ['rice', 0], diff --git a/hwe/join.php b/hwe/join.php index 4d092f24..d321b254 100644 --- a/hwe/join.php +++ b/hwe/join.php @@ -127,11 +127,11 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture'] - + - + diff --git a/hwe/join_post.php b/hwe/join_post.php index 10698ab8..d4bc73c9 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -8,25 +8,25 @@ $v = new Validator($_POST + $_GET); $v ->rule('required', [ 'name', - 'leader', - 'power', + 'leadership', + 'strength', 'intel' ]) ->rule('integer', [ - 'leader', - 'power', + 'leadership', + 'strength', 'intel', 'character', ]) ->rule('stringWidthBetween', 'name', 1, 18) ->rule('min', [ - 'leader', - 'power', + 'leadership', + 'strength', 'intel' ], GameConst::$defaultStatMin) ->rule('max', [ - 'leader', - 'power', + 'leadership', + 'strength', 'intel' ], GameConst::$defaultStatMax) ->rule('min', 'character', 0) @@ -50,8 +50,8 @@ $name = StringUtil::textStrip($name); $pic = (int)Util::getReq('pic', 'bool', 0); $character = Util::getReq('character', 'int', 0); -$leader = Util::getReq('leader', 'int', 50); -$power = Util::getReq('power', 'int', 50); +$leadership = Util::getReq('leadership', 'int', 50); +$strength = Util::getReq('strength', 'int', 50); $intel = Util::getReq('intel', 'int', 50); $join = Util::getReq('join'); //쓸모 없음 @@ -110,7 +110,7 @@ if (mb_strwidth($name) > 18) { "); exit; } -if ($leader + $power + $intel > GameConst::$defaultStatTotal) { +if ($leadership + $strength + $intel > GameConst::$defaultStatTotal) { echo(""); exit; -} elseif($leader + $power + $intel > 150) { +} elseif($leadership + $power + $intel > 150) { echo(""); exit; -} elseif($leader > 75 || $leader < 10 || $power > 75 || $power < 10 || $intel > 75 || $intel < 10) { +} elseif($leadership > 75 || $leadership < 10 || $power > 75 || $power < 10 || $intel > 75 || $intel < 10) { echo("
".getDed($general['dedication'])." ".getHonor($general['experience'])." ".getBill($general['dedication'])."$leader$power$leadership$strength $intel {$general['gold']} {$general['rice']}
{$num[$i]}조
순장수{$tp2}경승무패점득
{$num[$i]}조
순장수{$tp2}경승무패점득
통솔 {$color}{$leader}{$lbonus} ".bar(expStatus($general['leader2']), 20)." {$color}{$leadership}{$lbonus} ".bar(expStatus($general['leadership2']), 20)." 무력  {$color}{$power} ".bar(expStatus($general['power2']), 20)."".bar(expStatus($general['strength2']), 20)." 지력  {$color}{$intel}  ".bar(expStatus($general['intel2']), 20)."
통솔 {$color}{$leader}{$lbonus} ".bar(expStatus($general['leader2']), 20)." {$color}{$leadership}{$lbonus} ".bar(expStatus($general['leadership2']), 20)." 무력 {$color}{$power} ".bar(expStatus($general['power2']), 20)." {$color}{$strength} ".bar(expStatus($general['strength2']), 20)." 지력  {$color}{$intel}  ".bar(expStatus($general['intel2']), 20)."
통솔
무력
지력