diff --git a/.gitignore b/.gitignore index 3cde3ffd..ea970be3 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,5 @@ set.php config.php sess_* */logs/*.txt -d_setting/set.php \ No newline at end of file +d_setting/set.php +conf.php \ No newline at end of file diff --git a/twe/_admin4.php b/twe/_admin4.php index 98ee02c6..46712c41 100644 --- a/twe/_admin4.php +++ b/twe/_admin4.php @@ -109,7 +109,7 @@ $conMsg = ""; for($i=0; $i < $ipCount; $i++) { $ip = MYDB_fetch_array($result); - $query = "select name,ip,lastconnect,user_id,block,conmsg from general where ip like '$ip[ip2]%' and npc<2 order by ip"; + $query = "select name,ip,lastconnect,user_id,block,conmsg from general where ip like '{$ip['ip2']}%' and npc<2 order by ip"; $genResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $genCount = MYDB_num_rows($genResult); for($k=0; $k < $genCount; $k++) { diff --git a/twe/_admin5.php b/twe/_admin5.php index 5492267f..ab036395 100644 --- a/twe/_admin5.php +++ b/twe/_admin5.php @@ -230,13 +230,13 @@ for($i=0; $i < $nationCount; $i++) {  {$gen['avgp']}   {$gen['avgi']}   {$gen['avge']}  -  {$nation[dex0]}  -  {$nation[dex10]}  -  {$nation[dex20]}  -  {$nation[dex30]}  -  {$nation[dex40]}  +  {$nation['dex0']}  +  {$nation['dex10']}  +  {$nation['dex20']}  +  {$nation['dex30']}  +  {$nation['dex40']}   {$gen['crew']}/{$gen['leader']}00  -  {$city['pop']}/{$city[pop2]}  +  {$city['pop']}/{$city['pop2']}   {$city['rate']}%   {$city['agri']}%   {$city['comm']}%  diff --git a/twe/_simul.php b/twe/_simul.php index e22d2eae..2ec1a276 100644 --- a/twe/_simul.php +++ b/twe/_simul.php @@ -590,11 +590,11 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평 //군주, 참모, 모사 방어 보정 5% if($oppose['level'] == 12 || $oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) { $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 4 && $oppose['no'] == $city[gen1]) { // 태수 보정 + } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정 $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 3 && $oppose['no'] == $city[gen2]) { // 군사 보정 + } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정 $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 2 && $oppose['no'] == $city[gen3]) { // 시중 보정 + } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정 $opCrew = $opCrew * 0.95; } diff --git a/twe/a_npcList.php b/twe/a_npcList.php index 0668c376..a165626e 100644 --- a/twe/a_npcList.php +++ b/twe/a_npcList.php @@ -87,11 +87,11 @@ for($j=0; $j < $gencount; $j++) { echo " {$name} - {$general[name2]} + {$general['name2']} Lv {$general['explevel']} {$nation} ".getGenChar($general['personal'])." - ".getGenSpecial($general['special'])." / ".getGenSpecial($general[special2])." + ".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])." {$general['sum']} {$general['leader']} {$general['power']} diff --git a/twe/a_vote.php b/twe/a_vote.php index 16524b01..c2b1fe73 100644 --- a/twe/a_vote.php +++ b/twe/a_vote.php @@ -92,7 +92,7 @@ for($i=1; $i < $voteTypeCount; $i++) { } else { echo "추후공개"; } - $vote[i] = Tag2Code($vote[i]); + $vote[$i] = Tag2Code($vote[$i]); echo "  {$vote[$i]} diff --git a/twe/b_auction.php b/twe/b_auction.php index 538a8452..3d4a185d 100644 --- a/twe/b_auction.php +++ b/twe/b_auction.php @@ -79,9 +79,9 @@ for($i=0; $i < $count; $i++) { $auction = MYDB_fetch_array($result); $itemname = GetStuffName($auction['stuff']); $radio = ""; $alert = ""; $alert2 = ""; - if($auction[no1] == $me['no']) { $radio = " disabled"; } - elseif($auction[no2] > 0 && $auction['amount'] * 2 <= $auction['value'] && $auction['stuff'] == 0) { $radio = " disabled"; $alert = ""; $alert2 = ""; } - elseif($auction[no2] > 0 && $auction['topv'] <= $auction['value']) { $radio = " disabled"; $alert = ""; $alert2 = ""; } + if($auction['no1'] == $me['no']) { $radio = " disabled"; } + elseif($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value'] && $auction['stuff'] == 0) { $radio = " disabled"; $alert = ""; $alert2 = ""; } + elseif($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) { $radio = " disabled"; $alert = ""; $alert2 = ""; } elseif($chk == 0) { $radio = " checked"; $chk = 1; } $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001; $pv = substr($pv, 0, 4); @@ -90,14 +90,14 @@ for($i=0; $i < $count; $i++) { {$auction['no']} - {$auction[name1]} + {$auction['name1']} {$itemname} {$auction['amount']} 금 {$auction['cost']} {$alert}금 {$auction['value']}{$alert2} {$alert}금 {$auction['topv']}{$alert2} {$alert}{$pv}{$alert2} - {$alert}{$auction[name2]}{$alert2} + {$alert}{$auction['name2']}{$alert2} {$auction['expire']} "; @@ -163,9 +163,9 @@ for($i=0; $i < $count; $i++) { $auction = MYDB_fetch_array($result); $itemname = GetStuffName($auction['stuff']); $radio = ""; $alert = ""; $alert2 = ""; - if($auction[no1] == $me['no']) { $radio = " disabled"; } - elseif($auction[no2] > 0 && $auction['amount'] >= $auction['value'] * 2 && $auction['stuff'] == 0) { $radio = " disabled"; $alert = ""; $alert2 = ""; } - elseif($auction[no2] > 0 && $auction['topv'] >= $auction['value']) { $radio = " disabled"; $alert = ""; $alert2 = ""; } + if($auction['no1'] == $me['no']) { $radio = " disabled"; } + elseif($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2 && $auction['stuff'] == 0) { $radio = " disabled"; $alert = ""; $alert2 = ""; } + elseif($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) { $radio = " disabled"; $alert = ""; $alert2 = ""; } elseif($chk == 0) { $radio = " checked"; $chk = 1; } $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001; $pv = substr($pv, 0, 4); @@ -174,14 +174,14 @@ for($i=0; $i < $count; $i++) { {$auction['no']} - {$auction[name1]} + {$auction['name1']} {$itemname} {$auction['amount']} 금 {$auction['cost']} {$alert}금 {$auction['value']}{$alert2} {$alert}금 {$auction['topv']}{$alert2} {$alert}{$pv}{$alert2} - {$alert}{$auction[name2]}{$alert2} + {$alert}{$auction['name2']}{$alert2} {$auction['expire']} "; diff --git a/twe/b_chiefcenter.php b/twe/b_chiefcenter.php index b24353d9..ed5b3732 100644 --- a/twe/b_chiefcenter.php +++ b/twe/b_chiefcenter.php @@ -91,29 +91,29 @@ $year = $admin['year']; $month = $admin['month']; $date = substr(date('Y-m-d H:i:s'), 14); for($i=12; $i >= $lv; $i--) { - $totaldate[$i] = $gen[$i][turntime]; - $turntime[$i] = substr($gen[$i][turntime], 14); + $totaldate[$i] = $gen[$i]['turntime']; + $turntime[$i] = substr($gen[$i]['turntime'], 14); } for($k=0; $k < 2; $k++) { $l4 = 12 - $k; $l3 = 10 - $k; $l2 = 8 - $k; $l1 = 6 - $k; - if ($gen[$l4][npc] >= 2) { $gen[$l4][name] = "".$gen[$l4][name].""; } - elseif($gen[$l4][npc] == 1) { $gen[$l4][name] = "".$gen[$l4][name].""; } - if ($gen[$l3][npc] >= 2) { $gen[$l3][name] = "".$gen[$l3][name].""; } - elseif($gen[$l3][npc] == 1) { $gen[$l3][name] = "".$gen[$l3][name].""; } - if ($gen[$l2][npc] >= 2) { $gen[$l2][name] = "".$gen[$l2][name].""; } - elseif($gen[$l2][npc] == 1) { $gen[$l2][name] = "".$gen[$l2][name].""; } - if ($gen[$l1][npc] >= 2) { $gen[$l1][name] = "".$gen[$l1][name].""; } - elseif($gen[$l1][npc] == 1) { $gen[$l1][name] = "".$gen[$l1][name].""; } + if ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "".$gen[$l4]['name'].""; } + elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "".$gen[$l4]['name'].""; } + if ($gen[$l3]['npc'] >= 2) { $gen[$l3]['name'] = "".$gen[$l3]['name'].""; } + elseif($gen[$l3]['npc'] == 1) { $gen[$l3]['name'] = "".$gen[$l3]['name'].""; } + if ($gen[$l2]['npc'] >= 2) { $gen[$l2]['name'] = "".$gen[$l2]['name'].""; } + elseif($gen[$l2]['npc'] == 1) { $gen[$l2]['name'] = "".$gen[$l2]['name'].""; } + if ($gen[$l1]['npc'] >= 2) { $gen[$l1]['name'] = "".$gen[$l1]['name'].""; } + elseif($gen[$l1]['npc'] == 1) { $gen[$l1]['name'] = "".$gen[$l1]['name'].""; } echo " . - ".getLevel($l4, $nation['level'])." : {$gen[$l4][name]} - ".getLevel($l3, $nation['level'])." : {$gen[$l3][name]} - ".getLevel($l2, $nation['level'])." : {$gen[$l2][name]} - ".getLevel($l1, $nation['level'])." : {$gen[$l1][name]} + ".getLevel($l4, $nation['level'])." : {$gen[$l4]['name']} + ".getLevel($l3, $nation['level'])." : {$gen[$l3]['name']} + ".getLevel($l2, $nation['level'])." : {$gen[$l2]['name']} + ".getLevel($l1, $nation['level'])." : {$gen[$l1]['name']} . "; diff --git a/twe/b_currentCity.php b/twe/b_currentCity.php index 97a06673..f4073549 100644 --- a/twe/b_currentCity.php +++ b/twe/b_currentCity.php @@ -141,15 +141,15 @@ $query = "select nation,name,color from nation where nation='{$city['nation']}'" $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); -$query = "select name from general where no='$city[gen1]'"; // 태수 이름 +$query = "select name from general where no='{$city['gen1']}'"; // 태수 이름 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = MYDB_fetch_array($genresult); -$query = "select name from general where no='$city[gen2]'"; // 군사 이름 +$query = "select name from general where no='{$city['gen2']}'"; // 군사 이름 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen2 = MYDB_fetch_array($genresult); -$query = "select name from general where no='$city[gen3]'"; // 시중 이름 +$query = "select name from general where no='{$city['gen3']}'"; // 시중 이름 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen3 = MYDB_fetch_array($genresult); @@ -170,17 +170,17 @@ echo " 주민 - {$city['pop']}/$city[pop2] + {$city['pop']}/{$city['pop2']} 농업 - {$city['agri']}/$city[agri2] + {$city['agri']}/{$city['agri2']} 상업 - {$city['comm']}/$city[comm2] + {$city['comm']}/{$city['comm2']} 치안 - {$city['secu']}/$city[secu2] + {$city['secu']}/{$city['secu2']} 수비 - {$city['def']}/$city[def2] + {$city['def']}/{$city['def2']} 성벽 - {$city['wall']}/$city[wall2] + {$city['wall']}/{$city['wall2']} 민심 diff --git a/twe/b_diplomacy.php b/twe/b_diplomacy.php index 6ab57f34..594ce42e 100644 --- a/twe/b_diplomacy.php +++ b/twe/b_diplomacy.php @@ -144,7 +144,7 @@ for($i=0; $i < $citycount; $i++) { if($city['conflict'] != "") { $nation = explode("|", $city['conflict']); - $killnum = explode("|", $city[conflict2]); + $killnum = explode("|", $city['conflict2']); $seq = mySort($killnum); // 큰 순서대로 순서를 구한다. diff --git a/twe/b_myBossInfo.php b/twe/b_myBossInfo.php index 40093ed9..9bbd4f0f 100644 --- a/twe/b_myBossInfo.php +++ b/twe/b_myBossInfo.php @@ -77,16 +77,16 @@ echo " "; for($i=12; $i >= $lv; $i-=2) { $i1 = $i; $i2 = $i - 1; - $imageTemp1 = GetImageURL($level[$i1][imgsvr]); - $imageTemp2 = GetImageURL($level[$i2][imgsvr]); + $imageTemp1 = GetImageURL($level[$i1]['imgsvr']); + $imageTemp2 = GetImageURL($level[$i2]['imgsvr']); echo " ".getLevel($i1, $nation['level'])." -   - ";echo $level[$i1][name]==''?"-":$level[$i1][name]; echo " ({$level[$i1][belong]}년) +   + ";echo $level[$i1]['name']==''?"-":$level[$i1]['name']; echo " ({$level[$i1]['belong']}년) ".getLevel($i2, $nation['level'])." -   - ";echo $level[$i2][name]==''?"-":$level[$i2][name]; echo " ({$level[$i2][belong]}년) +   + ";echo $level[$i2]['name']==''?"-":$level[$i2]['name']; echo " ({$level[$i2]['belong']}년) "; } @@ -457,13 +457,13 @@ $region = 0; for($j=0; $j < $citycount; $j++) { $city = MYDB_fetch_array($cityresult); - $query = "select name,belong,city from general where no='$city[gen1]'"; + $query = "select name,belong,city from general where no='{$city['gen1']}'"; $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = MYDB_fetch_array($genresult); - $query = "select name,belong,city from general where no='$city[gen2]'"; + $query = "select name,belong,city from general where no='{$city['gen2']}'"; $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen2 = MYDB_fetch_array($genresult); - $query = "select name,belong,city from general where no='$city[gen3]'"; + $query = "select name,belong,city from general where no='{$city['gen3']}'"; $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen3 = MYDB_fetch_array($genresult); diff --git a/twe/b_myCityInfo.php b/twe/b_myCityInfo.php index 0e4fdd4a..91204be5 100644 --- a/twe/b_myCityInfo.php +++ b/twe/b_myCityInfo.php @@ -84,15 +84,15 @@ $citycount = MYDB_num_rows($cityresult); for($j=0; $j < $citycount; $j++) { $city = MYDB_fetch_array($cityresult); if($city['city'] == $nation['capital']) { $city['name'] = "[{$city['name']}]"; } - $query = "select name from general where no='$city[gen1]'"; // 태수 + $query = "select name from general where no='{$city['gen1']}'"; // 태수 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = MYDB_fetch_array($genresult); - $query = "select name from general where no='$city[gen2]'"; // 군사 + $query = "select name from general where no='{$city['gen2']}'"; // 군사 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen2 = MYDB_fetch_array($genresult); - $query = "select name from general where no='$city[gen3]'"; // 시중 + $query = "select name from general where no='{$city['gen3']}'"; // 시중 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen3 = MYDB_fetch_array($genresult); @@ -115,17 +115,17 @@ for($j=0; $j < $citycount; $j++) { 주민 - {$city['pop']}/$city[pop2] + {$city['pop']}/{$city['pop2']} 농업 - {$city['agri']}/$city[agri2] + {$city['agri']}/{$city['agri2']} 상업 - {$city['comm']}/$city[comm2] + {$city['comm']}/{$city['comm2']} 치안 - {$city['secu']}/$city[secu2] + {$city['secu']}/{$city['secu2']} 수비 - {$city['def']}/$city[def2] + {$city['def']}/{$city['def2']} 성벽 - {$city['wall']}/$city[wall2] + {$city['wall']}/{$city['wall2']} 민심 @@ -133,7 +133,7 @@ for($j=0; $j < $citycount; $j++) { 시세 {$city['trade']}% 인구 - ".round($city['pop']/$city[pop2]*100, 2)." % + ".round($city['pop']/$city['pop2']*100, 2)." % 태수 ";echo $gen1['name']==''?"-":"{$gen1['name']}";echo " 군사 diff --git a/twe/b_myGenInfo.php b/twe/b_myGenInfo.php index c7261994..e59ffc42 100644 --- a/twe/b_myGenInfo.php +++ b/twe/b_myGenInfo.php @@ -151,7 +151,7 @@ for($j=0; $j < $gencount; $j++) { {$general['gold']} {$general['rice']} ".getGenChar($general['personal'])." - ".getGenSpecial($general['special'])." / ".getGenSpecial($general[special2])." + ".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])." {$general['belong']} {$general['connect']}"; echo "
(".getConnect($general['connect']).") "; diff --git a/twe/b_myKingdomInfo.php b/twe/b_myKingdomInfo.php index f9441468..bd4c4421 100644 --- a/twe/b_myKingdomInfo.php +++ b/twe/b_myKingdomInfo.php @@ -47,7 +47,7 @@ for($j=0; $j < $citycount; $j++) { if($city['city'] == $nation['capital']) { $cityname[$j] = "[{$city['name']}]"; } else { $cityname[$j] = $city['name']; } $totalpop += $city['pop']; - $maxpop += $city[pop2]; + $maxpop += $city['pop2']; } $query = "select sum(crew) as totcrew,sum(leader)*100 as maxcrew from general where nation='{$nation['nation']}'"; diff --git a/twe/c_auction.php b/twe/c_auction.php index 587406d6..6573869d 100644 --- a/twe/c_auction.php +++ b/twe/c_auction.php @@ -103,7 +103,7 @@ if($btn == "판매") { $valid = 0; } */ - if($auction[no2] > 0 && $value <= $auction['value']) { + if($auction['no2'] > 0 && $value <= $auction['value']) { $msg = "ㆍ현재판매가보다 높게 입찰해야 합니다."; $valid = 0; } @@ -182,7 +182,7 @@ if($btn == "판매") { $msg2 = "ㆍ현재 쌀만 거래 가능합니다."; $valid = 0; } - if($auction[no2] > 0 && $value >= $auction['value']) { + if($auction['no2'] > 0 && $value >= $auction['value']) { $msg2 = "ㆍ현재구매가보다 낮게 입찰해야 합니다."; $valid = 0; } diff --git a/twe/c_msgsubmit.php b/twe/c_msgsubmit.php index 4779a914..ae0f234d 100644 --- a/twe/c_msgsubmit.php +++ b/twe/c_msgsubmit.php @@ -24,6 +24,13 @@ $me = MYDB_fetch_array($result); $con = checkLimit($me['userlevel'], $me['con'], $admin['conlimit']); if($con >= 2) { //echo ""; exit(); + header('Content-Type: application/json'); + echo json_encode([ + 'result' => false, + 'reason' => '권한이 충분하지 않습니다.', + 'redirect' => 'main.php', + 'page_target' => 'top' + ]); echo 'main.php';//TODO:debug all and replace } diff --git a/twe/event_1.php b/twe/event_1.php index b9a61d7e..bc0d99b5 100644 --- a/twe/event_1.php +++ b/twe/event_1.php @@ -96,13 +96,13 @@ for($i=0; $i < 7; $i++) { $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $city = MYDB_fetch_array($result); //태수 해제 - $query = "update general set level=1 where no='{$city[gen1]}'"; + $query = "update general set level=1 where no='{$city['gen1']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); //군사 해제 - $query = "update general set level=1 where no='{$city[gen2]}'"; + $query = "update general set level=1 where no='{$city['gen2']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); //시중 해제 - $query = "update general set level=1 where no='{$city[gen3]}'"; + $query = "update general set level=1 where no='{$city['gen3']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $query = "update city set nation='{$nation['nation']}',pop='1000000',agri=agri2,comm=comm2,secu=secu2,def=def2,wall=wall2,supply=1,gen1=0,gen2=0,gen3=0 where city='{$cap[$i]}'"; diff --git a/twe/event_2.php b/twe/event_2.php index 29696f41..1e323cd5 100644 --- a/twe/event_2.php +++ b/twe/event_2.php @@ -100,13 +100,13 @@ for($i=0; $i < 7; $i++) { $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $city = MYDB_fetch_array($result); //태수 해제 - $query = "update general set level=1 where no='{$city[gen1]}'"; + $query = "update general set level=1 where no='{$city['gen1']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); //군사 해제 - $query = "update general set level=1 where no='{$city[gen2]}'"; + $query = "update general set level=1 where no='{$city['gen2']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); //시중 해제 - $query = "update general set level=1 where no='{$city[gen3]}'"; + $query = "update general set level=1 where no='{$city['gen3']}'"; $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $query = "update city set nation='{$nation['nation']}',pop='1000000',agri=agri2,comm=comm2,secu=secu2,def=def2,wall=wall2,supply=1,gen1=0,gen2=0,gen3=0 where city='{$cap[$i]}'"; diff --git a/twe/event_4.php b/twe/event_4.php index df66037d..94b6c052 100644 --- a/twe/event_4.php +++ b/twe/event_4.php @@ -81,7 +81,7 @@ if(rand()%2 == 0) { $intel = 150 - $leader - $power; } -RegGeneral4($connect,$admin['turnterm'],$gencount, 0, 0, "유기체", $leader, $power, $intel, $personal, $general['specage'], $general[specage2], "흠... 그럼 어쩔 수 없이 흉노로 가야겠군요."); $gencount++; +RegGeneral4($connect,$admin['turnterm'],$gencount, 0, 0, "유기체", $leader, $power, $intel, $personal, $general['specage'], $general['specage2'], "흠... 그럼 어쩔 수 없이 흉노로 가야겠군요."); $gencount++; //////////////////////////장수 끝/////////////////////////////////////////////// diff --git a/twe/func.php b/twe/func.php index b1cf9623..e8336382 100644 --- a/twe/func.php +++ b/twe/func.php @@ -1904,7 +1904,7 @@ function cityInfo($connect) { } if($city['gen1'] > 0) { - $query = "select name from general where no='$city[gen1]'"; + $query = "select name from general where no='{$city['gen1']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = MYDB_fetch_array($result); } else { @@ -1912,7 +1912,7 @@ function cityInfo($connect) { } if($city['gen2'] > 0) { - $query = "select name from general where no='$city[gen2]'"; + $query = "select name from general where no='{$city['gen2']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen2 = MYDB_fetch_array($result); } else { @@ -1920,7 +1920,7 @@ function cityInfo($connect) { } if($city['gen3'] > 0) { - $query = "select name from general where no='$city[gen3]'"; + $query = "select name from general where no='{$city['gen3']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen3 = MYDB_fetch_array($result); } else { @@ -2849,27 +2849,27 @@ function generalInfo2($connect, $no, $skin) { 숙 련 도 보병 - 　　$general[dex0] + 　　{$general['dex0']} ".bar($dex0, $skin, 16)." 궁병 - 　　$general[dex10] + 　　{$general['dex10']} ".bar($dex10, $skin, 16)." 기병 - 　　$general[dex20] + 　　{$general['dex20']} ".bar($dex20, $skin, 16)." 귀병 - 　　$general[dex30] + 　　{$general['dex30']} ".bar($dex30, $skin, 16)." 차병 - 　　$general[dex40] + 　　{$general['dex40']} ".bar($dex40, $skin, 16)." "; @@ -4137,7 +4137,7 @@ function checkTurn($connect) { for($i=0; $i < $gencount; $i++) { $general = MYDB_fetch_array($result); - //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이전 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general[turn0]})"; + //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이전 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})"; //if(PROCESS_LOG) pushProcessLog($connect, $processlog); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI'); @@ -4244,7 +4244,7 @@ function checkTurn($connect) { for($i=0; $i < $gencount; $i++) { $general = MYDB_fetch_array($result); - //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general[turn0]})"; + //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})"; //if(PROCESS_LOG) pushProcessLog($connect, $processlog); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI'); @@ -4328,7 +4328,7 @@ function addAge($connect) { for($i=0; $i < $gencount; $i++) { $general = MYDB_fetch_array($result); - $special2 = getSpecial2($connect, $general['leader'], $general['power'], $general['intel'], 0, $general[dex0], $general[dex10], $general[dex20], $general[dex30], $general[dex40]); + $special2 = getSpecial2($connect, $general['leader'], $general['power'], $general['intel'], 0, $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']); $query = "update general set special2='$special2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -4574,7 +4574,7 @@ function preUpdateMonthly($connect) { for($i=0; $i < $cityCount; $i++) { $city = MYDB_fetch_array($result); - $query = "update general set level=1 where no='$city[gen1]' or no='$city[gen2]' or no='$city[gen3]'"; + $query = "update general set level=1 where no='{$city['gen1']}' or no='{$city['gen2']}' or no='{$city['gen3']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【고립】{$city['name']}(이)가 보급이 끊겨 미지배 도시가 되었습니다."; @@ -4792,7 +4792,7 @@ group by A.nation $dip = MYDB_fetch_array($result); //양측 기간 모두 0이 되는 상황이면 휴전 - if($dip[term1] <= 1 && $dip[term2] <= 1) { + if($dip['term1'] <= 1 && $dip['term2'] <= 1) { $query = "select name from nation where nation='{$dip['me']}' or nation='{$dip['you']}'"; $nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($nationResult); @@ -5536,7 +5536,7 @@ function PreprocessCommand($connect, $no) { $log[0] = "●".getItemName($general['item'])."(을)를 사용하여 치료합니다!"; pushGenLog($general, $log); - } elseif($general['injury'] > 10 && $general['item'] == 1 && $general[turn0] != EncodeCommand(0, 0, 0, 50)) { + } elseif($general['injury'] > 10 && $general['item'] == 1 && $general['turn0'] != EncodeCommand(0, 0, 0, 50)) { //환약 사용 $query = "update general set injury=0,item=0 where no='$no'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -5791,7 +5791,7 @@ function updateTurntime($connect, $no) { $query = "update general set user_id='$npcid',password='$pw',npc='{$general['npc']}',killturn='{$general['killturn']}',mode=2 where no='$no'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $alllog[0] = "●{$admin['month']}월:$general[name2](이)가 {$general['name']}의 육체에서 유체이탈합니다!"; + $alllog[0] = "●{$admin['month']}월:{$general['name2']}(이)가 {$general['name']}의 육체에서 유체이탈합니다!"; pushAllLog($alllog); if($admin['isUnited'] == 0) { @@ -6412,12 +6412,12 @@ function popIncrease($connect) { // 국가보정 if($type[$city['nation']] == 4 || $type[$city['nation']] == 6 || $type[$city['nation']] == 7 || $type[$city['nation']] == 8 || $type[$city['nation']] == 12 || $type[$city['nation']] == 13) { $ratio *= 1.2; } if($type[$city['nation']] == 1 || $type[$city['nation']] == 3) { $ratio *= 0.8; } - $ratio *= (1 + $city['secu']/$city[secu2]/10); //치안에 따라 최대 10% 추가 + $ratio *= (1 + $city['secu']/$city['secu2']/10); //치안에 따라 최대 10% 추가 } else { // 국가보정 if($type[$city['nation']] == 4 || $type[$city['nation']] == 6 || $type[$city['nation']] == 7 || $type[$city['nation']] == 8 || $type[$city['nation']] == 12 || $type[$city['nation']] == 13) { $ratio *= 0.8; } if($type[$city['nation']] == 1 || $type[$city['nation']] == 3) { $ratio *= 1.2; } - $ratio *= (1 - $city['secu']/$city[secu2]/10); //치안에 따라 최대 10% 경감 + $ratio *= (1 - $city['secu']/$city['secu2']/10); //치안에 따라 최대 10% 경감 } $pop = $city['pop'] + floor($city['pop'] * $ratio) + 5000; // 기본 5000명은 증가 diff --git a/twe/func_auction.php b/twe/func_auction.php index c56fe55f..2abe51b0 100644 --- a/twe/func_auction.php +++ b/twe/func_auction.php @@ -161,8 +161,8 @@ function processAuction($connect) { // 유닉템 처리 if($auction['stuff'] != 0) { - if($auction[no2] == 0) { - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, 그러나 입찰자 부재"; + if($auction['no2'] == 0) { + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, 그러나 입찰자 부재"; pushAuctionLog($connect, $auctionLog); } else { $trader['no'] = 0; @@ -170,7 +170,7 @@ function processAuction($connect) { $trader['gold'] = 99999999; $trader['rice'] = 99999999; - $query = "select no,name,gold,rice from general where no='$auction[no2]'"; + $query = "select no,name,gold,rice from general where no='{$auction['no2']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $bidder = MYDB_fetch_array($result); @@ -191,28 +191,28 @@ function processAuction($connect) { if($count > 0) { $traderLog[0] = "◆{$auction['no']}번 거래 유찰! 이미 아이템을 누군가가 가로챘습니다!"; $bidderLog[0] = "◆{$auction['no']}번 거래 유찰! 이미 아이템을 누군가가 가로챘습니다!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 아이템 이미 매진!"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 아이템 이미 매진!"; } elseif($auction['value'] > $bidder['gold'] - 1000) { $gold = round($auction['value'] * 0.01); $bidder['gold'] -= $gold; if($bidder['gold'] < 0) $bidder['gold'] = 0; - $query = "update general set gold='{$bidder['gold']}' where no='$auction[no2]'"; + $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $traderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 ".GetStuffName($auction['stuff'])." 거래 유찰!"; $bidderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 ".GetStuffName($auction['stuff'])." 거래 유찰! 벌금 {$gold}"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; } else { $traderLog[0] = "◆{$auction['no']}번 거래 성사로 ".GetStuffName($auction['stuff'])."(을)를 판매, 금 {$auction['value']}(을)를 획득!"; $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}(을)를 지불, ".GetStuffName($auction['stuff'])." 구입!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction[name1]}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 구매"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction['name1']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 구매"; $auctionLog[0] .= " ★ 아이템 거래 ★"; - $query = "update general set gold=gold-'{$auction['value']}',{$type}='$sel2' where no='$auction[no2]'"; + $query = "update general set gold=gold-'{$auction['value']}',{$type}='$sel2' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $alllog[0] = "●{$admin['month']}월:$auction[name2](이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; - $history[0] = "●{$admin['year']}년 {$admin['month']}월:【암시장】$auction[name2](이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; + $alllog[0] = "●{$admin['month']}월:{$auction['name2']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; + $history[0] = "●{$admin['year']}년 {$admin['month']}월:【암시장】{$auction['name2']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; pushAllLog($alllog); pushHistory($connect, $history); } @@ -225,32 +225,32 @@ function processAuction($connect) { if($auction['no2'] == 0) { // 상인건수가 아닌것만 출력 if($auction['no1'] != 0) { - $query = "select no from general where no='$auction[no1]'"; + $query = "select no from general where no='{$auction['no1']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $trader = MYDB_fetch_array($result); $traderLog[0] = "◆입찰자 부재로 {$auction['no']}번 거래 유찰!"; if($auction['type'] == 0) { - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 판매, 그러나 입찰자 부재"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 판매, 그러나 입찰자 부재"; } else { - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 구매, 그러나 입찰자 부재"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 구매, 그러나 입찰자 부재"; } pushGenLog($trader, $traderLog); pushAuctionLog($connect, $auctionLog); } } else { - if($auction[no1] == 0) { + if($auction['no1'] == 0) { $trader['no'] = 0; $trader['name'] = 'ⓝ상인'; $trader['gold'] = 99999; $trader['rice'] = 99999; } else { - $query = "select no,name,gold,rice from general where no='$auction[no1]'"; + $query = "select no,name,gold,rice from general where no='{$auction['no1']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $trader = MYDB_fetch_array($result); } - $query = "select no,name,gold,rice from general where no='$auction[no2]'"; + $query = "select no,name,gold,rice from general where no='{$auction['no2']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $bidder = MYDB_fetch_array($result); //판매거래 @@ -259,26 +259,26 @@ function processAuction($connect) { $gold = round($auction['value'] * 0.01); $trader['gold'] -= $gold; if($trader['gold'] < 0) $trader['gold'] = 0; - $query = "update general set gold='{$trader['gold']}' where no='$auction[no1]'"; + $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $traderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; $bidderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 판매자 군량부족, 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 판매자 군량부족, 벌금 {$gold}"; } elseif($auction['value'] > $bidder['gold'] - 1000) { $gold = round($auction['value'] * 0.01); $bidder['gold'] -= $gold; if($bidder['gold'] < 0) $bidder['gold'] = 0; - $query = "update general set gold='{$bidder['gold']}' where no='$auction[no2]'"; + $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $traderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; $bidderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; } else { $traderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}(을)를 판매, 금 {$auction['value']}(을)를 획득!"; $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}(을)를 지불, 쌀 {$auction['amount']}(을)를 구입!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 구매"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 판매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 구매"; if($auction['value'] >= $auction['amount'] * 2) { $auctionLog[0] .= " ★ 최고가 거래 ★"; } elseif($auction['value'] >= $auction['topv']) { @@ -286,9 +286,9 @@ function processAuction($connect) { } elseif($auction['value'] * 2 <= $auction['amount']) { $auctionLog[0] .= " ★ 최저가 거래 ★"; } - $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='$auction[no1]'"; + $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no1']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='$auction[no2]'"; + $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } pushGenLog($trader, $traderLog); @@ -300,26 +300,26 @@ function processAuction($connect) { $gold = round($auction['value'] * 0.01); $bidder['gold'] -= $gold; if($bidder['gold'] < 0) $bidder['gold'] = 0; - $query = "update general set gold='{$bidder['gold']}' where no='$auction[no2]'"; + $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $traderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; $bidderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 군량부족, 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 입찰자 군량부족, 벌금 {$gold}"; } elseif($auction['value'] > $trader['gold'] - 1000) { $gold = round($auction['value'] * 0.01); $trader['gold'] -= $gold; if($trader['gold'] < 0) $trader['gold'] = 0; - $query = "update general set gold='{$trader['gold']}' where no='$auction[no1]'"; + $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $traderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; $bidderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 구매자 자금부족, 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 입찰, 그러나 구매자 자금부족, 벌금 {$gold}"; } else { $traderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}(을)를 지불, 쌀 {$auction['amount']}(을)를 구입!"; $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}(을)를 판매, 금 {$auction['value']}(을)를 획득!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 성사 : {$auction[name1]}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction[name2]}(이)가 금 {$auction['value']}(으)로 판매"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 성사 : {$auction['name1']}(이)가 쌀 {$auction['amount']}(을)를 구매, {$auction['name2']}(이)가 금 {$auction['value']}(으)로 판매"; if($auction['value'] >= $auction['amount'] * 2) { $auctionLog[0] .= " ★ 최고가 거래 ★"; } elseif($auction['value'] * 2 <= $auction['amount']) { @@ -328,9 +328,9 @@ function processAuction($connect) { $auctionLog[0] .= " ★ 즉시구매가 거래 ★"; } - $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='$auction[no1]'"; + $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no1']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='$auction[no2]'"; + $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } pushGenLog($trader, $traderLog); diff --git a/twe/func_npc.php b/twe/func_npc.php index c1a30d2c..8233a7e7 100644 --- a/twe/func_npc.php +++ b/twe/func_npc.php @@ -1702,7 +1702,7 @@ function processAI($connect, $no) { if($selCity['city'] == 0) { $selCity['city'] = $general['city']; } - SetCrew($connect, $general['no'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $selRegion['region'], $selCity['city'], $general[dex0], $general[dex10], $general[dex20], $general[dex30], $general[dex40]); + SetCrew($connect, $general['no'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $selRegion['region'], $selCity['city'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']); return; default: $query = "update general set turn0='$command' where no='{$general['no']}'"; diff --git a/twe/func_process.php b/twe/func_process.php index 1d7ba253..7a9fe355 100644 --- a/twe/func_process.php +++ b/twe/func_process.php @@ -89,7 +89,7 @@ function process_1($connect, &$general, $type) { // 군주, 참모, 모사 보정 if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 9 || $general['level'] == 7 || $general['level'] == 5) { $score *= 1.05; } // 군사 보정 - if($general['level'] == 3 && $general['no'] == $city[gen2]) { $score *= 1.05; } + if($general['level'] == 3 && $general['no'] == $city['gen2']) { $score *= 1.05; } $rd = rand() % 100; $r = CriticalRatio($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book']), 2); @@ -127,7 +127,7 @@ function process_1($connect, &$general, $type) { // 자금 하락, 경험치 상승 $general['gold'] -= $admin['develcost']; $general['intel2']++; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',intel2='$general[intel2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',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($connect, $general, $log); @@ -228,7 +228,7 @@ function process_3($connect, &$general) { $general['gold'] -= $admin['develcost']; $general['intel2']++; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',intel2='$general[intel2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',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($connect, $general, $log); @@ -288,7 +288,7 @@ function process_4($connect, &$general) { // 군주, 참모 보정 if($general['level'] == 12 || $general['level'] == 11) { $score *= 1.05; } // 시중 보정 - if($general['level'] == 2 && $general['no'] == $city[gen3]) { $score *= 1.05; } + if($general['level'] == 2 && $general['no'] == $city['gen3']) { $score *= 1.05; } $rd = rand() % 100; $r = CriticalRatio($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book']), 0); @@ -324,7 +324,7 @@ function process_4($connect, &$general) { // 군량 하락 내정보다 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']}'"; + $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -391,7 +391,7 @@ function process_5($connect, &$general, $type) { // 군주, 참모, 장군 보정 if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) { $score *= 1.05; } // 태수 보정 - if($general['level'] == 4 && $general['no'] == $city[gen1]) { $score *= 1.05; } + if($general['level'] == 4 && $general['no'] == $city['gen1']) { $score *= 1.05; } $rd = rand() % 100; // 현재 20% $r = CriticalRatio($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book']), 0); @@ -428,7 +428,7 @@ function process_5($connect, &$general, $type) { // 자금 하락, 무력 경험 경험, 공헌 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -488,7 +488,7 @@ function process_7($connect, &$general) { // 군주, 참모 보정 if($general['level'] == 12 || $general['level'] == 11) { $score *= 1.05; } // 시중 보정 - if($general['level'] == 2 && $general['no'] == $city[gen3]) { $score *= 1.05; } + if($general['level'] == 2 && $general['no'] == $city['gen3']) { $score *= 1.05; } $rd = rand() % 100; // 현재 20% $r = CriticalRatio($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book']), 0); @@ -524,7 +524,7 @@ function process_7($connect, &$general) { // 군량 하락 내정보다 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']}'"; + $query = "update general set resturn='SUCCESS',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -626,7 +626,7 @@ function process_8($connect, &$general) { // 자금 하락, 무력 경험 경험, 공헌 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -711,15 +711,15 @@ function process_9($connect, &$general) { switch(rand()%3) { case 0: $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',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']}'"; + $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; break; case 2: $general['intel2']++; - $query = "update general set resturn='SUCCESS',intel2='$general[intel2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; break; } MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -907,7 +907,7 @@ function process_11($connect, &$general, $type) { // 통솔경험, 병종 변경, 병사수 변경, 훈련치 변경, 사기치 변경, 자금 군량 하락, 공헌도, 명성 상승 $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',crewtype='$armtype',crew='{$general['crew']}',train='$train',atmos='$atmos',gold='{$general['gold']}',rice=rice-'$crew',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',crewtype='$armtype',crew='{$general['crew']}',train='$train',atmos='$atmos',gold='{$general['gold']}',rice=rice-'$crew',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -981,7 +981,7 @@ function process_13($connect, &$general) { // 경험치 상승 // 공헌도, 명성 상승 $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -1048,7 +1048,7 @@ function process_14($connect, &$general) { $score += $general['atmos']; if($score > $_maxatmos) { $score = $_maxatmos; } $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']}'"; + $query = "update general set resturn='SUCCESS',atmos='$score',gold='$gold',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -1118,7 +1118,7 @@ function process_15($connect, &$general) { // 훈련,사기치 변경 // 자금 감소 // 경험치 상승 // 공헌도, 명성 상승 $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']}'"; + $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']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -1290,7 +1290,7 @@ function process_21($connect, &$general) { // 이동, 경험치 상승, 명성 상승, 사기 감소 $general['leader2']++; - $query = "update general set resturn='SUCCESS',gold=gold-'{$admin['develcost']}',city='$destination',atmos=atmos*0.95,leader2='$general[leader2]',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold=gold-'{$admin['develcost']}',city='$destination',atmos=atmos*0.95,leader2='{$general['leader2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($general['level'] == 12) { @@ -1366,7 +1366,7 @@ function process_22($connect, &$general) { ScoutMsg($connect, $general['no'], $nation['name'], $who, $you['msgindex']); $general['intel2']++; - $query = "update general set resturn='SUCCESS',gold=gold-'$cost',intel2='$general[intel2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold=gold-'$cost',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($connect, $general, $log); @@ -1740,7 +1740,7 @@ function process_26($connect, &$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']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -1876,7 +1876,7 @@ function process_28($connect, &$general) { // 경험치 상승 // 명성,공헌 상승 $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',experience=experience+'$exp',dedication=dedication+'$ded' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp',dedication=dedication+'$ded' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -2095,7 +2095,7 @@ function process_29($connect, &$general) { '$scoutLevel','100','100','0','0','0','0','0', '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','', '0','$bornyear','$deadyear', - '$avgGen[dex0]','$avgGen[dex10]','$avgGen[dex20]','$avgGen[dex30]','$avgGen[dex40]' + '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}' )", $connect ) or Error(__LINE__.MYDB_error($connect),""); @@ -2131,7 +2131,7 @@ function process_29($connect, &$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',leader2='{$general['leader2']}',power2='{$general['power2']}',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($connect, $general, $log); @@ -2178,7 +2178,7 @@ function process_30($connect, &$general) { // 이동, 경험치 상승, 명성 상승, 병력/사기/훈련 감소 $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']}'"; + $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']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($general['level'] == 12) { @@ -2297,7 +2297,7 @@ function process_31($connect, &$general) { $general['leader2']++; $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']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $query = "select spy from nation where nation='{$general['nation']}'"; @@ -2379,7 +2379,7 @@ function process_32($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $intelgen = MYDB_fetch_array($result); - $ratio = round((($general['intel']+getBookEff($general['book']) - $intelgen['intel']-getBookEff($intelgen['book'])) / $_firing - ($destcity['secu']/$destcity[secu2])/5 + $_basefiring)*100); + $ratio = round((($general['intel']+getBookEff($general['book']) - $intelgen['intel']-getBookEff($intelgen['book'])) / $_firing - ($destcity['secu']/$destcity['secu2'])/5 + $_basefiring)*100); $ratio2 = rand() % 100; if($general['item'] == 5) { @@ -2402,7 +2402,7 @@ function process_32($connect, &$general) { } // 특기보정 : 신산, 귀모 - if($general[special2] == 41) { $ratio += 10; } + if($general['special2'] == 41) { $ratio += 10; } if($general['special'] == 31) { $ratio += 20; } // 국가보정 @@ -2440,7 +2440,7 @@ function process_32($connect, &$general) { $general['intel2']++; $general['gold'] -= $admin['develcost']*5; $general['rice'] -= $admin['develcost']*5; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',intel2='$general[intel2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',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($connect, $general, $log); @@ -2509,7 +2509,7 @@ function process_33($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $powergen = MYDB_fetch_array($result); - $ratio = round((($general['power']+getWeapEff($general['weap']) - $powergen['power']-getWeapEff($powergen['weap'])) / $_firing - ($destcity['secu']/$destcity[secu2])/5 + $_basefiring)*100); + $ratio = round((($general['power']+getWeapEff($general['weap']) - $powergen['power']-getWeapEff($powergen['weap'])) / $_firing - ($destcity['secu']/$destcity['secu2'])/5 + $_basefiring)*100); $ratio2 = rand() % 100; if($general['item'] == 5) { @@ -2532,7 +2532,7 @@ function process_33($connect, &$general) { } // 특기보정 : 신산, 귀모 - if($general[special2] == 41) { $ratio += 10; } + if($general['special2'] == 41) { $ratio += 10; } if($general['special'] == 31) { $ratio += 20; } // 국가보정 @@ -2592,7 +2592,7 @@ function process_33($connect, &$general) { $general['power2']++; $general['gold'] -= $admin['develcost']*5; $general['rice'] -= $admin['develcost']*5; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='$general[power2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -2654,7 +2654,7 @@ function process_34($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $powergen = MYDB_fetch_array($result); - $ratio = round((($general['power']+getWeapEff($general['weap']) - $powergen['power']-getWeapEff($powergen['weap'])) / $_firing - ($destcity['secu']/$destcity[secu2])/5 + $_basefiring)*100); + $ratio = round((($general['power']+getWeapEff($general['weap']) - $powergen['power']-getWeapEff($powergen['weap'])) / $_firing - ($destcity['secu']/$destcity['secu2'])/5 + $_basefiring)*100); $ratio2 = rand() % 100; if($general['item'] == 5) { @@ -2677,7 +2677,7 @@ function process_34($connect, &$general) { } // 특기보정 : 신산, 귀모 - if($general[special2] == 41) { $ratio += 10; } + if($general['special2'] == 41) { $ratio += 10; } if($general['special'] == 31) { $ratio += 20; } // 국가보정 @@ -2716,7 +2716,7 @@ function process_34($connect, &$general) { $general['power2']++; $general['gold'] -= $admin['develcost']*5; $general['rice'] -= $admin['develcost']*5; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='$general[power2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -2786,7 +2786,7 @@ function process_35($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen = MYDB_fetch_array($result); - $ratio = round(((floor($general['leader'] * (100 - $general['injury'])/100)+getHorseEff($general['horse'])+$lbonus - ($gen['sum']-$gen['horse']+getHorseEff($gen['horse']))) / $_firing - ($destcity['secu']/$destcity[secu2])/5 + $_basefiring)*100); + $ratio = round(((floor($general['leader'] * (100 - $general['injury'])/100)+getHorseEff($general['horse'])+$lbonus - ($gen['sum']-$gen['horse']+getHorseEff($gen['horse']))) / $_firing - ($destcity['secu']/$destcity['secu2'])/5 + $_basefiring)*100); $ratio2 = rand() % 100; if($general['item'] == 5) { @@ -2809,7 +2809,7 @@ function process_35($connect, &$general) { } // 특기보정 : 신산, 귀모 - if($general[special2] == 41) { $ratio += 10; } + if($general['special2'] == 41) { $ratio += 10; } if($general['special'] == 31) { $ratio += 20; } // 국가보정 @@ -2848,7 +2848,7 @@ function process_35($connect, &$general) { $general['leader2']++; $general['gold'] -= $admin['develcost']*5; $general['rice'] -= $admin['develcost']*5; - $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']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -2918,7 +2918,7 @@ function process_36($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen = MYDB_fetch_array($result); - $ratio = round(((floor(($general['leader']+$general['intel']+$general['power']) * (100 - $general['injury'])/100)+getWeapEff($general['weap'])+getHorseEff($general['horse'])+$lbonus+getBookEff($general['book']) - ($gen['sum']-$gen['weap']-$gen['horse']-$gen['book']+getWeapEff($gen['weap'])+getHorseEff($gen['horse'])+getBookEff($gen['book']))) / $_firing - ($destcity['secu']/$destcity[secu2])/5 + $_basefiring)*100); + $ratio = round(((floor(($general['leader']+$general['intel']+$general['power']) * (100 - $general['injury'])/100)+getWeapEff($general['weap'])+getHorseEff($general['horse'])+$lbonus+getBookEff($general['book']) - ($gen['sum']-$gen['weap']-$gen['horse']-$gen['book']+getWeapEff($gen['weap'])+getHorseEff($gen['horse'])+getBookEff($gen['book']))) / $_firing - ($destcity['secu']/$destcity['secu2'])/5 + $_basefiring)*100); $ratio2 = rand() % 100; if($general['item'] == 5) { @@ -2941,7 +2941,7 @@ function process_36($connect, &$general) { } // 특기보정 : 신산, 귀모 - if($general[special2] == 41) { $ratio += 10; } + if($general['special2'] == 41) { $ratio += 10; } if($general['special'] == 31) { $ratio += 20; } // 국가보정 @@ -2990,7 +2990,7 @@ function process_36($connect, &$general) { $general['power2']++; $general['gold'] -= $admin['develcost']*5; $general['rice'] -= $admin['develcost']*5; - $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leader2='$general[leader2]',intel2='$general[intel2]',power2='$general[power2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leader2='{$general['leader2']}',intel2='{$general['intel2']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -3100,7 +3100,7 @@ function process_42($connect, &$general) { $log[count($log)] = "●{$admin['month']}월:어느 명사와 설전을 벌여 멋지게 이겼습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['intel2'] += 2; - $query = "update general set resturn='SUCCESS',intel2='$general[intel2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',intel2='{$general['intel2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 4: @@ -3113,7 +3113,7 @@ function process_42($connect, &$general) { $log[count($log)] = "●{$admin['month']}월:동네 장사와 힘겨루기를 하여 멋지게 이겼습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',power2='$general[power2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 6: @@ -3126,7 +3126,7 @@ function process_42($connect, &$general) { $log[count($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']}'"; + $query = "update general set resturn='SUCCESS',gold=gold+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 8: @@ -3141,7 +3141,7 @@ function process_42($connect, &$general) { $log[count($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']}'"; + $query = "update general set resturn='SUCCESS',rice=rice+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 10: @@ -3149,14 +3149,14 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 11: $log[count($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']}'"; + $query = "update general set resturn='SUCCESS',rice=rice+300,power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 12: @@ -3164,7 +3164,7 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 13: @@ -3184,14 +3184,14 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 16: $log[count($log)] = "●{$admin['month']}월:돈을 빌려주었다가 이자 300을 받았습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['intel2']++; - $query = "update general set resturn='SUCCESS',gold=gold+300,intel2='$general[intel2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',gold=gold+300,intel2='{$general['intel2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 17: @@ -3206,7 +3206,7 @@ function process_42($connect, &$general) { $log[count($log)] = "●{$admin['month']}월:쌀을 빌려주었다가 이자 300을 받았습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['intel2']++; - $query = "update general set resturn='SUCCESS',rice=rice+300,intel2='$general[intel2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',rice=rice+300,intel2='{$general['intel2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 19: @@ -3221,28 +3221,28 @@ function process_42($connect, &$general) { $log[count($log)] = "●{$admin['month']}월:거리에서 글 모르는 아이들을 모아 글을 가르쳤습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['intel2'] += 2; - $query = "update general set resturn='SUCCESS',intel2='$general[intel2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',intel2='{$general['intel2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 21: $log[count($log)] = "●{$admin['month']}월:백성들에게 현인의 가르침을 설파했습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['leader2'] += 2; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 22: $log[count($log)] = "●{$admin['month']}월:어느 집의 무너진 울타리를 고쳐주었습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['power2'] += 2; - $query = "update general set resturn='SUCCESS',power2='$general[power2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 23: $log[count($log)] = "●{$admin['month']}월:어느 집의 도망친 가축을 되찾아 주었습니다. <1>$date"; // 경험치 상승 // 명성 상승 $general['leader2'] += 2; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',experience=experience+'$exp2' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 24: @@ -3250,7 +3250,7 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 25: @@ -3258,7 +3258,7 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 26: @@ -3266,7 +3266,7 @@ function process_42($connect, &$general) { // 경험치 하락 // 명성 상승 $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']}'"; + $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; default: @@ -3358,7 +3358,7 @@ function process_43($connect, &$general) { // 경험치 상승 // 공헌도, 명성 상승 $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -3444,7 +3444,7 @@ function process_44($connect, &$general) { // 경험치 상승 // 공헌도, 명성 상승 $general['leader2']++; - $query = "update general set resturn='SUCCESS',leader2='$general[leader2]',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; + $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = checkAbility($connect, $general, $log); @@ -3929,17 +3929,17 @@ function process_49($connect, &$general) { switch(rand()%3) { case 0: $general['leader2']++; - $query = "update general set leader2='$general[leader2]' where no='{$general['no']}'"; + $query = "update general set leader2='{$general['leader2']}' 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']}'"; + $query = "update general set power2='{$general['power2']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 2: $general['intel2']++; - $query = "update general set intel2='$general[intel2]' where no='{$general['no']}'"; + $query = "update general set intel2='{$general['intel2']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; } @@ -4834,7 +4834,7 @@ function process_65($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //직위해제 - $query = "update general set level=1 where no='$destcity[gen1]' or no='$destcity[gen2]' or no='$destcity[gen3]'"; + $query = "update general set level=1 where no='{$destcity['gen1']}' or no='{$destcity['gen2']}' or no='{$destcity['gen3']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //성 공백지로 @@ -5911,7 +5911,7 @@ function process_76($connect, &$general) { '1','100','100','0','0','0','0','0', '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','', '0','$bornyear','$deadyear', - '$avgGen[dex0]','$avgGen[dex10]','$avgGen[dex20]','$avgGen[dex30]','$avgGen[dex40]' + '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}' )", $connect ) or Error(__LINE__.MYDB_error($connect),""); diff --git a/twe/func_tournament.php b/twe/func_tournament.php index f184bd73..55410edf 100644 --- a/twe/func_tournament.php +++ b/twe/func_tournament.php @@ -431,7 +431,7 @@ function selection($connect, $tnmt_type, $tnmt, $phase) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); //본선에 추가 - $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$grp', '$grp_no', '$general[h]', '$general[w]', '$general[b]')"; + $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$grp', '$grp_no', '{$general['h']}', '{$general['w']}', '{$general['b']}')"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //시드 삭제 $query = "update tournament set prmt=0 where grp='{$general['grp']}' and grp_no='{$general['grp_no']}'"; @@ -499,7 +499,7 @@ function final16set($connect) { //16강에 추가 $newGrp = 20 + floor($i / 2); $newGrp_no = $i % 2; - $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$newGrp', '$newGrp_no', '$general[h]', '$general[w]', '$general[b]')"; + $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$newGrp', '$newGrp_no', '{$general['h']}', '{$general['w']}', '{$general['b']}')"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } $query = "update tournament set prmt=0"; @@ -529,7 +529,7 @@ function finalFight($connect, $tnmt_type, $tnmt, $phase, $type) { //x강에 추가 $newGrp = floor($phase / 2) + $offset + 10; $newGrp_no = $phase % 2; - $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$newGrp', '$newGrp_no', '$general[h]', '$general[w]', '$general[b]')"; + $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no, h, w, b) values ('{$general['no']}', '{$general['npc']}', '{$general['name']}', '{$general['ldr']}', '{$general['pwr']}', '{$general['itl']}', '{$general['lvl']}', '$newGrp', '$newGrp_no', '{$general['h']}', '{$general['w']}', '{$general['b']}')"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($phase >= $turn) { @@ -740,52 +740,52 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { $e2 = $energy2 = round($gen2[$tp] * getLog($gen1['lvl'], $gen2['lvl']) * 10); //아이템 로그 - if($gen1[h] > 6 && ($tnmt_type == 0 || $tnmt_type == 1)) { + if($gen1['h'] > 6 && ($tnmt_type == 0 || $tnmt_type == 1)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1[h])."(이)가 포효합니다!"; break; - case 1: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1[h])."(이)가 그 위용을 뽐냅니다!"; break; - case 2: $log[count($log)] = "● {$gen1['name']}(이)가 ".getHorseName($gen1[h])."(을)를 타고 있습니다!"; break; - case 3: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1[h])."(이)가 갈기를 휘날립니다!"; break; + case 0: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1['h'])."(이)가 포효합니다!"; break; + case 1: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1['h'])."(이)가 그 위용을 뽐냅니다!"; break; + case 2: $log[count($log)] = "● {$gen1['name']}(이)가 ".getHorseName($gen1['h'])."(을)를 타고 있습니다!"; break; + case 3: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1['h'])."(이)가 갈기를 휘날립니다!"; break; } } if($gen1[w] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1[w])."(이)가 번뜩입니다!"; break; - case 1: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1[w])."(이)가 푸르게 빛납니다!"; break; - case 2: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1[w])."에서 살기가 느껴집니다!"; break; - case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getWeapName($gen1[w])."(이)가 쥐어져 있습니다!"; break; + case 0: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1['w'])."(이)가 번뜩입니다!"; break; + case 1: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1['w'])."(이)가 푸르게 빛납니다!"; break; + case 2: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1['w'])."에서 살기가 느껴집니다!"; break; + case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getWeapName($gen1['w'])."(이)가 쥐어져 있습니다!"; break; } } if($gen1[b] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1[b])."(을)를 펼쳐듭니다!"; break; - case 1: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1[b])."(을)를 품에서 꺼냅니다!"; break; - case 2: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1[b])."(을)를 들고 있습니다!"; break; - case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getBookName($gen1[b])."(이)가 쥐어져 있습니다!"; break; + case 0: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1['b'])."(을)를 펼쳐듭니다!"; break; + case 1: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1['b'])."(을)를 품에서 꺼냅니다!"; break; + case 2: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1['b'])."(을)를 들고 있습니다!"; break; + case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getBookName($gen1['b'])."(이)가 쥐어져 있습니다!"; break; } } if($gen2[h] > 6 && ($tnmt_type == 0 || $tnmt_type == 1)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2[h])."(이)가 포효합니다!"; break; - case 1: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2[h])."(이)가 그 위용을 뽐냅니다!"; break; - case 2: $log[count($log)] = "● {$gen2['name']}(이)가 ".getHorseName($gen2[h])."(을)를 타고 있습니다!"; break; - case 3: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2[h])."(이)가 갈기를 휘날립니다!"; break; + case 0: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 포효합니다!"; break; + case 1: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 그 위용을 뽐냅니다!"; break; + case 2: $log[count($log)] = "● {$gen2['name']}(이)가 ".getHorseName($gen2['h'])."(을)를 타고 있습니다!"; break; + case 3: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 갈기를 휘날립니다!"; break; } } if($gen2[w] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2[w])."(이)가 번뜩입니다!"; break; - case 1: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2[w])."(이)가 푸르게 빛납니다!"; break; - case 2: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2[w])."에서 살기가 느껴집니다!"; break; - case 3: $log[count($log)] = "● {$gen2['name']}의 손에는 ".getWeapName($gen2[w])."(이)가 쥐어져 있습니다!"; break; + case 0: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2['w'])."(이)가 번뜩입니다!"; break; + case 1: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2['w'])."(이)가 푸르게 빛납니다!"; break; + case 2: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2['w'])."에서 살기가 느껴집니다!"; break; + case 3: $log[count($log)] = "● {$gen2['name']}의 손에는 ".getWeapName($gen2['w'])."(이)가 쥐어져 있습니다!"; break; } } if($gen2[b] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { switch(rand()%4) { - case 0: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2[b])."(을)를 펼쳐듭니다!"; break; - case 1: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2[b])."(을)를 품에서 꺼냅니다!"; break; - case 2: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2[b])."(을)를 들고 있습니다!"; break; - case 3: $log[count($log)] = "● {$gen2['name']}의 손에는 ".getBookName($gen2[b])."(이)가 쥐어져 있습니다!"; break; + case 0: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2['b'])."(을)를 펼쳐듭니다!"; break; + case 1: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2['b'])."(을)를 품에서 꺼냅니다!"; break; + case 2: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2['b'])."(을)를 들고 있습니다!"; break; + case 3: $log[count($log)] = "● {$gen2['name']}의 손에는 ".getBookName($gen2['b'])."(이)가 쥐어져 있습니다!"; break; } } diff --git a/twe/j_msgsubmit.php b/twe/j_msgsubmit.php new file mode 100644 index 00000000..47ed124d --- /dev/null +++ b/twe/j_msgsubmit.php @@ -0,0 +1,146 @@ += 2) { + //echo ""; exit(); + header('Content-Type: application/json'); + echo json_encode([ + 'result' => false, + 'reason' => '권한이 충분하지 않습니다.', + 'redirect' => 'main.php', + 'page_target' => 'top' + ]); + //echo 'main.php';//TODO:debug all and replace + } + +$msg = str_replace("|", "", $msg); +$msg = trim($msg); + +//TODO : 몰라서 임시로 값 세팅해봄. 추후에 용도를 확인하고 수정 필요 +$s = 50; +$msg = _String::SubStrForWidth($msg, $s, 198); + +$date = date('Y-m-d H:i:s'); + +// 전체 메세지 +if($genlist == 9999 && str_replace(" ", "", $msg) != "") { + //echo ''; + if($me['nation'] == 0) { + $nation['name'] = '재야'; + $nation['color'] = 'FFFFFF'; + } else { + $query = "select nation,name,color from nation where nation='{$me['nation']}'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $nation = MYDB_fetch_array($result); + } + PushMsg(1, 0, $me['picture'], $me['imgsvr'], "{$me['name']}:", $nation['color'], $nation['name'], $nation['color'], $msg); +// 국가 메세지 +} elseif($genlist >= 9000 && $msg != "") { + if($me['nation'] == 0) { + $nation['name'] = '재야'; + $nation['color'] = 'FFFFFF'; + $nation['nation'] = 0; + } else { + $query = "select nation,name,color from nation where nation='{$me['nation']}'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $nation = MYDB_fetch_array($result); + } + + $genlist -= 9000; + $query = "select nation,name,color from nation where nation='$genlist'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $dest = MYDB_fetch_array($result); + + //$dest가 없다는건 수신도 재야. + if(empty($dest)){ + $dest['name'] = '재야'; + $dest['color'] = 'FFFFFF'; + $dest['nation'] = 0; + } + + if($nation['nation'] == $dest['nation']) { + PushMsg(2, $nation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:", $nation['color'], $dest['name'], $dest['color'], $msg); + } else { + //타국에 보내는 경우 + PushMsg(2, $nation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$nation['name']}▶", $nation['color'], $dest['name'], $dest['color'], $msg); + // 수뇌이면 발송, 아니면 자국으로 돌림 + if($me['level'] >= 5) { + PushMsg(3, $dest['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$nation['name']}▶", $nation['color'], $dest['name'], $dest['color'], $msg); + } else { + PushMsg(2, $nation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$nation['name']}▶", $nation['color'], $dest['name'], $dest['color'], "반송"); + } + } +// 개인 메세지 +} elseif($genlist > 0 && $msg != "") { + $query = "select name,msgindex from general where no='$genlist'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $you = MYDB_fetch_array($result); + //발신, 수신인 코딩 + $who = $me['no'] * 10000 + $genlist; + + $msg = addslashes(SQ2DQ($msg)); + + $query = "select msg{$me['msgindex']}_when as priv_when from general where no='{$me['no']}'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $prev_msg = MYDB_fetch_array($result); + $diff_second = strtotime($date) - strtotime($prev_msg['priv_when']); + + if($diff_second < 3) { + $who = 1 * 10000 + $me['no']; // 운영자가 본인에게 + $msg = "개인메세지는 3초당 1건만 보낼 수 있습니다!"; + //자신에게 표시 + $me['msgindex']++; + if($me['msgindex'] >= 10) { $me['msgindex'] = 0; } + $query = "update general set msgindex='{$me['msgindex']}',msg{$me['msgindex']}='$msg',msg{$me['msgindex']}_type='10',msg{$me['msgindex']}_who='$who',msg{$me['msgindex']}_when='$date',newmsg=1 where no='{$me['no']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + } else { + //자신에게 표시 + $me['msgindex']++; + if($me['msgindex'] >= 10) { $me['msgindex'] = 0; } + $query = "update general set msgindex='{$me['msgindex']}',msg{$me['msgindex']}='$msg',msg{$me['msgindex']}_type='9',msg{$me['msgindex']}_who='$who',msg{$me['msgindex']}_when='$date' where no='{$me['no']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + + // 상대에게 발송 + $you['msgindex']++; + if($you['msgindex'] >= 10) { $you['msgindex'] = 0; } + $query = "update general set msgindex='{$you['msgindex']}',msg{$you['msgindex']}='$msg',msg{$you['msgindex']}_type='10',msg{$you['msgindex']}_who='$who',msg{$you['msgindex']}_when='$date',newmsg=1 where no='$genlist'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + } + + $fp = fopen("logs/_gen_msg.txt", "a"); + //로그 파일에 기록 + fwrite($fp, _String::Fill($me['name'],12," ")." > "._String::Fill($you['name'],12," ")." | {$msg}\r\n"); + fclose($fp); +} + +//echo ""; +//echo 'msglist.php';//TODO:debug all and replace + +header('Content-Type: application/json'); +echo json_encode([ + 'result' => true, + 'reason' => 'SUCCESS', + 'redirect' => 'msglist.php', + 'page_target' => '#msglist' +]); \ No newline at end of file diff --git a/twe/js/main.js b/twe/js/main.js index e69de29b..4ea5edef 100644 --- a/twe/js/main.js +++ b/twe/js/main.js @@ -0,0 +1,69 @@ + +if (document.all) { + document.onkeydown = function () { + var key_f5 = 116; // 116 = F5 + var key_enter = 13; // 13 = 엔터 + if (key_f5 == event.keyCode) { + event.keyCode=0; + refreshing(0,0); + return false; + } else if(key_enter == event.keyCode) { + event.keyCode=0; + refreshing(4,message); + return false; + } + return true; + } +} + +function refreshing(arg1, arg2) { +// if(term <= 0) { + switch(arg1) { + case 0: location.reload(); break; + case 1: go(arg2); break; + case 2: turn(arg2); break; + case 3: arg2.submit(); break; + case 4: + arg2.submit(); + message.msg.value = ""; + document.getElementById("msg").value = ""; + message.msg.focus(); + break; + } +} + +function go(type) { + if(type == 1) location.replace('b_nationboard.php'); + else if(type == 2) location.replace('b_troop.php'); + else if(type == 3) location.replace('b_nationrule.php'); + else if(type == 4) location.replace('b_chiefboard.php'); + else if(type == 5) location.replace('b_chiefcenter.php'); + else if(type == 6) window.open('b_genList.php'); + else if(type == 7) location.replace('b_myKingdomInfo.php'); + else if(type == 8) location.replace('b_myCityInfo.php'); + else if(type == 9) location.replace('b_myGenInfo.php'); + else if(type == 10) location.replace('b_myBossInfo.php'); + else if(type == 11) location.replace('b_currentCity.php'); + else if(type == 12) location.replace('b_myPage.php'); + else if(type == 13) location.replace('b_dipcenter.php'); + else if(type == 14) location.replace('b_diplomacy.php'); + else if(type == 15) window.open('b_tournament.php'); + else if(type == 16) window.open('b_betting.php'); + else if(type == 17) window.open('b_auction.php'); + else if(type == 18) window.open('b_battleCenter.php'); +} + +function turn(type) { + num = form2.sel.value; + commandlist.location.replace('turn.php?type=' + type + '&sel=' + num); +} + +jQuery(function($){ + $('#message').submit(function(event){ + var $this = $(this); + var target = $('[name="genlist"]').val(); + var msg = $('#msg').val(); + console.log(target, msg); + return false; + }); +}); \ No newline at end of file diff --git a/twe/logout_process.php b/twe/logout_process.php index 1d246fb6..93390c01 100644 --- a/twe/logout_process.php +++ b/twe/logout_process.php @@ -20,7 +20,8 @@ $conmsg = $me['conmsg']; session_destroy(); //echo ""; -echo 'start.php';//TODO:debug all and replace +//echo 'start.php';//TODO:debug all and replace +header('Location:start.php'); /* diff --git a/twe/main.php b/twe/main.php index ca973065..8fe0c67a 100644 --- a/twe/main.php +++ b/twe/main.php @@ -19,7 +19,8 @@ $me = MYDB_fetch_array($result); //그새 사망이면 if($me['no'] == 0) { //echo "a"; - echo ""; + header('Location: start.php'); + //echo ""; exit(0); } @@ -58,68 +59,7 @@ $scenario = getScenario($connect); type=text/css> - + @@ -303,17 +243,17 @@ if($me['userlevel'] >= 5) {
-
+ ;color:white;font-size:13;width:100px; value='서신전달&갱신' onclick='refreshing(4,message)'> -
내용 없이 '서신전달&갱신'을 누르면 메세지창이 갱신됩니다. +
내용 없이 '서신전달&갱신'을 누르면 메세지창이 갱신됩니다.
-
diff --git a/twe/process_war.php b/twe/process_war.php index 9ea5b3e4..11188a94 100644 --- a/twe/process_war.php +++ b/twe/process_war.php @@ -14,7 +14,7 @@ function processWar($connect, $general, $city) { $warphase = getRate($game, $general['crewtype'], "spd"); //병종간 페이즈 수 얻기 // 특기보정 : 돌격 - if($general[special2] == 60) { $warphase += 1; } + if($general['special2'] == 60) { $warphase += 1; } $genAtmos = 0; if($general['item'] == 3) { @@ -193,20 +193,20 @@ function processWar($connect, $general, $city) { } // 특기보정 : 신산 - if($general[special2] == 41) { $ratio2 += 200; } + if($general['special2'] == 41) { $ratio2 += 200; } $ratio = rand() % 1000; // 0~999 if($ratio <= $ratio2) { $ratio = rand() % 100; // 0~99 // 특기보정 : 귀병, 신산, 환술, 신중 - if($general[special2] == 40) { $ratio += 20; } - if($general[special2] == 41) { $ratio += 20; } - if($general[special2] == 42) { $ratio += 10; } - if($general[special2] == 44) { $ratio += 100; } + if($general['special2'] == 40) { $ratio += 20; } + if($general['special2'] == 41) { $ratio += 20; } + if($general['special2'] == 42) { $ratio += 10; } + if($general['special2'] == 44) { $ratio += 100; } if($ratio >= 30) { // 특기보정 : 환술, 집중 - if($general[special2] == 42) { $cityCrew *= 1.3; } - if($general[special2] == 43) { $cityCrew *= 1.5; } + if($general['special2'] == 42) { $cityCrew *= 1.3; } + if($general['special2'] == 43) { $cityCrew *= 1.5; } $type = rand() % 3; switch($type) { case 0: @@ -258,14 +258,14 @@ function processWar($connect, $general, $city) { $cityCrew = $cityCrew * (100 + $general['explevel']/6)/100; // 특기보정 : 공성, 기병, 돌격, 무쌍, 보병, 견고, 의술(청낭서,태평청령) - if($general[special2] == 53) { $cityCrew *= 2.00; } - if($general[special2] == 52) { $cityCrew *= 1.20; } - if($general[special2] == 60) { $cityCrew *= 1.10; } - if($general[special2] == 61) { $cityCrew *= 1.10; } - if($general[special2] == 50) { $myCrew *= 0.90; } - if($general[special2] == 62) { $myCrew *= 0.90; } + if($general['special2'] == 53) { $cityCrew *= 2.00; } + if($general['special2'] == 52) { $cityCrew *= 1.20; } + if($general['special2'] == 60) { $cityCrew *= 1.10; } + if($general['special2'] == 61) { $cityCrew *= 1.10; } + if($general['special2'] == 50) { $myCrew *= 0.90; } + if($general['special2'] == 62) { $myCrew *= 0.90; } $ratio = rand() % 100; // 0 ~ 99 - if(($general[special2] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $avoid == 1) { + if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $avoid == 1) { $batlog[count($batlog)] = "●치료했다!"; $myCrew /= 1.5; // 66%만 소모 $avoid = 0; @@ -275,8 +275,8 @@ function processWar($connect, $general, $city) { $rd = rand() % 100; // 0 ~ 99 $ratio = CriticalRatio2($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book'])); // 특기보정 : 무쌍, 필살 - if($general[special2] == 61) { $ratio += 10; } - if($general[special2] == 71) { $ratio += 20; } + if($general['special2'] == 61) { $ratio += 10; } + if($general['special2'] == 71) { $ratio += 20; } if($ratio >= $rd && $avoid == 1) { $batlog[count($batlog)] = "●필살공격!"; $cityCrew = CriticalScore2($cityCrew); @@ -286,7 +286,7 @@ function processWar($connect, $general, $city) { $ratio = rand() % 100; // 0 ~ 99 $ratio2 = getRate($game, $general['crewtype'], "avd"); //회피율 //특기보정 : 궁병 - if($general[special2] == 51) { $ratio2 += 20; } + if($general['special2'] == 51) { $ratio2 += 20; } //도구 보정 : 둔갑천서, 태평요술 if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; } if($ratio < $ratio2 && $avoid == 1) { @@ -300,7 +300,7 @@ function processWar($connect, $general, $city) { $myCrew *= (rand() % 21 + 90)/100; // 90~110% //특기보정 : 위압 - if($general[special2] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) { + if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) { $batlog[count($batlog)] = "●상대에게 위압을 줬다!"; $myCrew = 0; } @@ -529,7 +529,7 @@ function processWar($connect, $general, $city) { $ratio = rand() % 100; //특기보정 : 저격(수극), 활무기저격 - if(($general[special2] == 70 && $ratio <= 33) || ($general['item'] == 2 && $ratio <= 20) || (($general['weap'] == 10 || $general['weap'] == 14 || $general['weap'] == 18 || $general['weap'] == 22) && $ratio <= 20)) { + if(($general['special2'] == 70 && $ratio <= 33) || ($general['item'] == 2 && $ratio <= 20) || (($general['weap'] == 10 || $general['weap'] == 14 || $general['weap'] == 18 || $general['weap'] == 22) && $ratio <= 20)) { //수극 사용 if($general['item'] == 2) { $query = "update general set item=0 where no='{$general['no']}'"; @@ -554,7 +554,7 @@ function processWar($connect, $general, $city) { } $ratio = rand() % 100; //특기보정 : 저격(수극), 활무기저격 - if(($oppose[special2] == 70 && $ratio <= 33) || ($oppose['item'] == 2 && $ratio <= 20) || (($oppose['weap'] == 10 || $oppose['weap'] == 14 || $oppose['weap'] == 18 || $oppose['weap'] == 22) && $ratio <= 20)) { + if(($oppose['special2'] == 70 && $ratio <= 33) || ($oppose['item'] == 2 && $ratio <= 20) || (($oppose['weap'] == 10 || $oppose['weap'] == 14 || $oppose['weap'] == 18 || $oppose['weap'] == 22) && $ratio <= 20)) { //수극 사용 if($oppose['item'] == 2) { $query = "update general set item=0 where no='{$oppose['no']}'"; @@ -644,26 +644,26 @@ function processWar($connect, $general, $city) { } // 특기보정 : 신산 - if($general[special2] == 41) { $ratio2 += 200; } + if($general['special2'] == 41) { $ratio2 += 200; } $ratio = rand() % 1000; // 0~999 if($ratio <= $ratio2) { $ratio = rand() % 100; // 특기보정 : 귀병, 신산, 환술, 신중 - if($general[special2] == 40) { $ratio += 20; } - if($general[special2] == 41) { $ratio += 20; } - if($general[special2] == 42) { $ratio += 10; } - if($general[special2] == 44) { $ratio += 100; } + if($general['special2'] == 40) { $ratio += 20; } + if($general['special2'] == 41) { $ratio += 20; } + if($general['special2'] == 42) { $ratio += 10; } + if($general['special2'] == 44) { $ratio += 100; } if($ratio >= 30) { // 특기보정 : 환술, 집중 - if($general[special2] == 42) { $opCrew *= 1.3; } - if($general[special2] == 43) { $opCrew *= 1.5; } + if($general['special2'] == 42) { $opCrew *= 1.3; } + if($general['special2'] == 43) { $opCrew *= 1.5; } $type = rand() % 5; // 0~4 switch($type) { case 0: $ratio = rand() % 100; // 특기보정 : 반계 - if($oppose[special2] == 45 && $ratio > 70) { + if($oppose['special2'] == 45 && $ratio > 70) { $batlog[count($batlog)] = "●위보를 역으로 당했다!"; $oppbatlog[count($oppbatlog)] = "●반계로 상대의 위보를 되돌렸다!"; $myCrew *= 1.2; @@ -676,7 +676,7 @@ function processWar($connect, $general, $city) { case 1: $ratio = rand() % 100; // 특기보정 : 반계 - if($oppose[special2] == 45 && $ratio > 70) { + if($oppose['special2'] == 45 && $ratio > 70) { $batlog[count($batlog)] = "●매복을 역으로 당했다!"; $oppbatlog[count($oppbatlog)] = "●반계로 상대의 매복을 되돌렸다!"; $myCrew *= 1.4; @@ -689,7 +689,7 @@ function processWar($connect, $general, $city) { case 2: $ratio = rand() % 100; // 특기보정 : 반계 - if($oppose[special2] == 45 && $ratio > 70) { + if($oppose['special2'] == 45 && $ratio > 70) { $batlog[count($batlog)] = "●반목을 역으로 당했다!"; $oppbatlog[count($oppbatlog)] = "●반계로 상대의 반목을 되돌렸다!"; $myCrew *= 1.6; @@ -698,13 +698,13 @@ function processWar($connect, $general, $city) { $oppbatlog[count($oppbatlog)] = "●반목에 당했다!"; $opCrew *= 1.6; // 특기보정 : 반계 - if($general[special2] == 45) { $opCrew *= 2; } + if($general['special2'] == 45) { $opCrew *= 2; } } break; case 3: $ratio = rand() % 100; // 특기보정 : 반계 - if($oppose[special2] == 45 && $ratio > 70) { + if($oppose['special2'] == 45 && $ratio > 70) { $batlog[count($batlog)] = "●화계를 역으로 당했다!"; $oppbatlog[count($oppbatlog)] = "●반계로 상대의 화계를 되돌렸다!"; $myCrew *= 1.8; @@ -717,7 +717,7 @@ function processWar($connect, $general, $city) { case 4: $ratio = rand() % 100; // 특기보정 : 반계 - if($oppose[special2] == 45 && $ratio > 70) { + if($oppose['special2'] == 45 && $ratio > 70) { $batlog[count($batlog)] = "●혼란을 역으로 당했다!"; $oppbatlog[count($oppbatlog)] = "●반계로 상대의 혼란을 되돌렸다!"; $myCrew *= 2.0; @@ -785,26 +785,26 @@ function processWar($connect, $general, $city) { } // 특기보정 : 신산 - if($oppose[special2] == 41) { $ratio2 += 200; } + if($oppose['special2'] == 41) { $ratio2 += 200; } $ratio = rand() % 1000; // 0~999 if($ratio <= $ratio2) { $ratio = rand() % 100; // 특기보정 : 귀병, 신산, 환술, 신중 - if($oppose[special2] == 40) { $ratio += 20; } - if($oppose[special2] == 41) { $ratio += 20; } - if($oppose[special2] == 42) { $ratio += 10; } - if($oppose[special2] == 44) { $ratio += 100; } + if($oppose['special2'] == 40) { $ratio += 20; } + if($oppose['special2'] == 41) { $ratio += 20; } + if($oppose['special2'] == 42) { $ratio += 10; } + if($oppose['special2'] == 44) { $ratio += 100; } if($ratio >= 30) { // 특기보정 : 환술, 집중 - if($oppose[special2] == 42) { $myCrew *= 1.3; } - if($oppose[special2] == 43) { $myCrew *= 1.5; } + if($oppose['special2'] == 42) { $myCrew *= 1.3; } + if($oppose['special2'] == 43) { $myCrew *= 1.5; } $type = rand() % 5; // 0~4 switch($type) { case 0: $ratio = rand() % 100; // 특기보정 : 반계 - if($general[special2] == 45 && $ratio > 70) { + if($general['special2'] == 45 && $ratio > 70) { $oppbatlog[count($oppbatlog)] = "●위보를 역으로 당했다!"; $batlog[count($batlog)] = "●반계로 상대의 위보를 되돌렸다!"; $opCrew *= 1.2; @@ -817,7 +817,7 @@ function processWar($connect, $general, $city) { case 1: $ratio = rand() % 100; // 특기보정 : 반계 - if($general[special2] == 45 && $ratio > 70) { + if($general['special2'] == 45 && $ratio > 70) { $oppbatlog[count($oppbatlog)] = "●매복을 역으로 당했다!"; $batlog[count($batlog)] = "●반계로 상대의 매복을 되돌렸다!"; $opCrew *= 1.4; @@ -830,7 +830,7 @@ function processWar($connect, $general, $city) { case 2: $ratio = rand() % 100; // 특기보정 : 반계 - if($general[special2] == 45 && $ratio > 70) { + if($general['special2'] == 45 && $ratio > 70) { $oppbatlog[count($oppbatlog)] = "●반목을 역으로 당했다!"; $batlog[count($batlog)] = "●반계로 상대의 반목을 되돌렸다!"; $opCrew *= 1.6; @@ -839,13 +839,13 @@ function processWar($connect, $general, $city) { $batlog[count($batlog)] = "●반목에 당했다!"; $myCrew *= 1.6; // 특기보정 : 반계 - if($oppose[special2] == 45) { $myCrew *= 2; } + if($oppose['special2'] == 45) { $myCrew *= 2; } } break; case 3: $ratio = rand() % 100; // 특기보정 : 반계 - if($general[special2] == 45 && $ratio > 70) { + if($general['special2'] == 45 && $ratio > 70) { $oppbatlog[count($oppbatlog)] = "●화계를 역으로 당했다!"; $batlog[count($batlog)] = "●반계로 상대의 화계을 되돌렸다!"; $opCrew *= 1.8; @@ -858,7 +858,7 @@ function processWar($connect, $general, $city) { case 4: $ratio = rand() % 100; // 특기보정 : 반계 - if($general[special2] == 45 && $ratio > 70) { + if($general['special2'] == 45 && $ratio > 70) { $oppbatlog[count($oppbatlog)] = "●혼란을 역으로 당했다!"; $batlog[count($batlog)] = "●반계로 상대의 혼란을 되돌렸다!"; $opCrew *= 2.0; @@ -903,7 +903,7 @@ function processWar($connect, $general, $city) { } // 특기보정: 돌격 - if($oppose['crewtype'] == 43 && $general[special2] != 60) { // 목우 + if($oppose['crewtype'] == 43 && $general['special2'] != 60) { // 목우 $r = 0; $r += $oppose['atmos'] + $oppAtmos + $oppAtmosBonus; $r += $oppose['train'] + $oppTrain + $oppTrainBonus; @@ -975,11 +975,11 @@ function processWar($connect, $general, $city) { //참모, 모사 방어 보정 5% } elseif($oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) { $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 4 && $oppose['no'] == $city[gen1]) { // 태수 보정 + } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정 $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 3 && $oppose['no'] == $city[gen2]) { // 군사 보정 + } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정 $opCrew = $opCrew * 0.95; - } elseif($oppose['level'] == 2 && $oppose['no'] == $city[gen3]) { // 시중 보정 + } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정 $opCrew = $opCrew * 0.95; } @@ -990,12 +990,12 @@ function processWar($connect, $general, $city) { $opCrew = $opCrew * ((100 - $oppose['explevel']/3)/100); // 특기보정 : 기병, 돌격, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령) - if($general[special2] == 52) { $opCrew *= 1.20; } - if($general[special2] == 60) { $opCrew *= 1.10; } - if($general[special2] == 61) { $opCrew *= 1.10; } - if($general[special2] == 50) { $myCrew *= 0.90; } - if($general[special2] == 62) { $myCrew *= 0.90; } - if($general[special2] == 75) { + if($general['special2'] == 52) { $opCrew *= 1.20; } + if($general['special2'] == 60) { $opCrew *= 1.10; } + if($general['special2'] == 61) { $opCrew *= 1.10; } + if($general['special2'] == 50) { $myCrew *= 0.90; } + if($general['special2'] == 62) { $myCrew *= 0.90; } + if($general['special2'] == 75) { if($oppose['crewtype'] != 0 && $oppose['crewtype'] != 10 && $oppose['crewtype'] != 20 && $oppose['crewtype'] != 30 && $oppose['crewtype'] != 40 && $oppose['crewtype'] != 41) { @@ -1003,18 +1003,18 @@ function processWar($connect, $general, $city) { } } $ratio = rand() % 100; // 0 ~ 99 - if(($general[special2] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $myAvoid == 1) { + if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $myAvoid == 1) { $batlog[count($batlog)] = "●치료했다!"; $myCrew /= 1.5; // 66%만 소모 $myAvoid = 0; } // 상대 특기보정 : 기병, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령) - if($oppose[special2] == 52) { $myCrew *= 1.10; } - if($oppose[special2] == 61) { $myCrew *= 1.10; } - if($oppose[special2] == 50) { $opCrew *= 0.80; } - if($oppose[special2] == 62) { $myCrew *= 1.10; } - if($oppose[special2] == 75) { + if($oppose['special2'] == 52) { $myCrew *= 1.10; } + if($oppose['special2'] == 61) { $myCrew *= 1.10; } + if($oppose['special2'] == 50) { $opCrew *= 0.80; } + if($oppose['special2'] == 62) { $myCrew *= 1.10; } + if($oppose['special2'] == 75) { if($general['crewtype'] != 0 && $general['crewtype'] != 10 && $general['crewtype'] != 20 && $general['crewtype'] != 30 && $general['crewtype'] != 40 && $general['crewtype'] != 41) { @@ -1022,7 +1022,7 @@ function processWar($connect, $general, $city) { } } $ratio = rand() % 100; // 0 ~ 99 - if(($oppose[special2] == 73 || $oppose['item'] == 23 || $oppose['item'] == 24) && $ratio > 80 && $opAvoid == 1) { + if(($oppose['special2'] == 73 || $oppose['item'] == 23 || $oppose['item'] == 24) && $ratio > 80 && $opAvoid == 1) { $oppbatlog[count($oppbatlog)] = "●치료했다!"; $opCrew /= 1.5; // 66%만 소모 $opAvoid = 0; @@ -1032,8 +1032,8 @@ function processWar($connect, $general, $city) { $rd = rand() % 100; // 0 ~ 99 $ratio = CriticalRatio2($general['leader']+getHorseEff($general['horse'])+$lbonus, $general['power']+getWeapEff($general['weap']), $general['intel']+getBookEff($general['book'])); // 특기보정 : 무쌍, 필살 - if($general[special2] == 61) { $ratio += 10; } - if($general[special2] == 71) { $ratio += 20; } + if($general['special2'] == 61) { $ratio += 10; } + if($general['special2'] == 71) { $ratio += 20; } if($ratio >= $rd && $myAvoid == 1) { $batlog[count($batlog)] = "●필살공격!"; $oppbatlog[count($oppbatlog)] = "●상대의 필살공격!"; @@ -1041,7 +1041,7 @@ function processWar($connect, $general, $city) { $myAvoid = 0; // 특기보정 : 격노 - if($oppose[special2] == 74) { + if($oppose['special2'] == 74) { if(rand() % 100 < 50) { $batlog[count($batlog)] = "●필살 공격에 상대가 격노했다!"; $oppbatlog[count($oppbatlog)] = "●상대의 필살 공격에 격노했다!"; @@ -1054,7 +1054,7 @@ function processWar($connect, $general, $city) { $rd = rand() % 100; // 0 ~ 99 $ratio = CriticalRatio2($oppose['leader']+getHorseEff($oppose['horse'])+$opplbonus, $oppose['power']+getWeapEff($oppose['weap']), $oppose['intel']+getBookEff($oppose['book'])); // 특기보정 : 필살 - if($oppose[special2] == 71) { $ratio += 20; } + if($oppose['special2'] == 71) { $ratio += 20; } if($ratio >= $rd && $opAvoid == 1) { $oppbatlog[count($oppbatlog)] = "●필살공격!"; $batlog[count($batlog)] = "●상대의 필살공격!"; @@ -1062,7 +1062,7 @@ function processWar($connect, $general, $city) { $opAvoid = 0; // 특기보정 : 격노 - if($general[special2] == 74) { + if($general['special2'] == 74) { if(rand() % 100 < 33) { $oppbatlog[count($oppbatlog)] = "●필살 공격에 상대가 진노했다!"; $batlog[count($batlog)] = "●상대의 필살 공격에 진노했다!"; @@ -1082,13 +1082,13 @@ function processWar($connect, $general, $city) { $ratio = rand() % 100; // 0 ~ 99 $ratio2 = getRate($game, $general['crewtype'], "avd"); //회피율 //특기보정 : 돌격, 궁병 - if($oppose[special2] == 60) { $ratio2 -= 100; } - if($general[special2] == 51) { $ratio2 += 20; } + if($oppose['special2'] == 60) { $ratio2 -= 100; } + if($general['special2'] == 51) { $ratio2 += 20; } //도구 보정 : 둔갑천서, 태평요술 if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; } if($ratio < $ratio2 && $myAvoid == 1) { // 특기보정 : 격노 - if($oppose[special2] == 74 && rand() % 100 < 50) { + if($oppose['special2'] == 74 && rand() % 100 < 50) { $batlog[count($batlog)] = "●회피 시도에 상대가 격노했다!"; $oppbatlog[count($oppbatlog)] = "●상대의 회피 시도에 격노했다!"; $myCrew = CriticalScore2($myCrew); @@ -1104,19 +1104,19 @@ function processWar($connect, $general, $city) { $ratio = rand() % 100; // 0 ~ 99 $ratio2 = getRate($game, $oppose['crewtype'], "avd"); //회피율 // 특기보정 : 돌격, 궁병 - if($general[special2] == 60) { $ratio2 -= 100; } - if($oppose[special2] == 51) { $ratio2 += 20; } + if($general['special2'] == 60) { $ratio2 -= 100; } + if($oppose['special2'] == 51) { $ratio2 += 20; } //도구 보정 : 둔갑천서, 태평요술 if($oppose['item'] == 26 || $oppose['item'] == 25) { $ratio2 += 20; } if($ratio < $ratio2 && $opAvoid == 1) { // 특기보정 : 격노 - if($general[special2] == 74 && rand() % 100 < 33) { + if($general['special2'] == 74 && rand() % 100 < 33) { $oppbatlog[count($oppbatlog)] = "●회피 시도에 상대가 진노했다!"; $batlog[count($batlog)] = "●상대의 회피 시도에 진노했다!"; $opCrew = CriticalScore2($opCrew); $myAvoid = 0; $warphase++; - } elseif($general[special2] == 74 && rand() % 100 < 33) { + } elseif($general['special2'] == 74 && rand() % 100 < 33) { $oppbatlog[count($oppbatlog)] = "●회피 시도에 상대가 격노했다!"; $batlog[count($batlog)] = "●상대의 회피 시도에 격노했다!"; $opCrew = CriticalScore2($opCrew); @@ -1134,13 +1134,13 @@ function processWar($connect, $general, $city) { $myCrew *= (rand() % 21 + 90)/100; // 90~110% //특기보정 : 위압 - if($general[special2] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) { + if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) { $batlog[count($batlog)] = "●상대에게 위압을 줬다!"; $oppbatlog[count($oppbatlog)] = "●상대에게 위압받았다!"; $myCrew = 0; } //특기보정: 위압 - if($oppose[special2] == 63 && $phase == 1 && $oppose['crew'] >= 1000 && $oppose['atmos'] >= 90 && $oppose['train'] >= 90) { + if($oppose['special2'] == 63 && $phase == 1 && $oppose['crew'] >= 1000 && $oppose['atmos'] >= 90 && $oppose['train'] >= 90) { $batlog[count($batlog)] = "●상대에게 위압받았다!"; $oppbatlog[count($oppbatlog)] = "●상대에게 위압을 줬다!"; $opCrew = 0; @@ -1347,11 +1347,11 @@ function processWar($connect, $general, $city) { // 경험치 상승 if(floor($oppose['crewtype']/10) == 3) { // 귀병 - $oppose[intel2]++; + $oppose['intel2']++; } elseif(floor($oppose['crewtype']/10) == 4) { // 차병 - $oppose[leader2]++; + $oppose['leader2']++; } else { - $oppose[power2]++; + $oppose['power2']++; } $oppose['atmos'] *= 1.1; //사기 증가 @@ -1365,7 +1365,7 @@ function processWar($connect, $general, $city) { $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($game, $oppose['crewtype'], $destnation['tech'])); if($oppose['rice'] < 0) { $oppose['rice'] = 0; } - $query = "update general set rice='{$oppose['rice']}',leader2='$oppose[leader2]',power2='$oppose[power2]',intel2='$oppose[intel2]',atmos='{$oppose['atmos']}',experience=experience+'$opexp',dedication=dedication+'$opexp',killnum=killnum+1 where no='{$oppose['no']}'"; + $query = "update general set rice='{$oppose['rice']}',leader2='{$oppose['leader2']}',power2='{$oppose['power2']}',intel2='{$oppose['intel2']}',atmos='{$oppose['atmos']}',experience=experience+'$opexp',dedication=dedication+'$opexp',killnum=killnum+1 where no='{$oppose['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -1406,13 +1406,13 @@ function processWar($connect, $general, $city) { // 경험치 상승 if(floor($general['crewtype']/10) == 3) { // 귀병 - $general[intel2] += $exp2; + $general['intel2'] += $exp2; } elseif(floor($general['crewtype']/10) == 4) { // 차병 - $general[leader2] += $exp2; + $general['leader2'] += $exp2; } else { - $general[power2] += $exp2; + $general['power2'] += $exp2; } - $query = "update general set leader2='$general[leader2]',power2='$general[power2]',intel2='$general[intel2]' where no='{$general['no']}'"; + $query = "update general set leader2='{$general['leader2']}',power2='{$general['power2']}',intel2='{$general['intel2']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 공헌, 명성 상승 @@ -1526,7 +1526,7 @@ function addConflict($connect, $city, $nationnum, $mykillnum) { unset($killnum); } else { $nationlist = explode("|", $city['conflict']); - $killnum = explode("|", $city[conflict2]); + $killnum = explode("|", $city['conflict2']); } for($i=0; $i < count($nationlist); $i++) { @@ -1548,9 +1548,9 @@ function addConflict($connect, $city, $nationnum, $mykillnum) { $killnum[$i] += $mykillnum; } $city['conflict'] = implode("|", $nationlist); - $city[conflict2] = implode("|", $killnum); + $city['conflict2'] = implode("|", $killnum); - $query = "update city set conflict='{$city['conflict']}',conflict2='$city[conflict2]' where city='{$city['city']}'"; + $query = "update city set conflict='{$city['conflict']}',conflict2='{$city['conflict2']}' where city='{$city['city']}'"; MYDB_query($query, $connect) or Error("addConflict ".MYDB_error($connect),""); return $city; @@ -1567,7 +1567,7 @@ function DeleteConflict($connect, $nation) { if(strpos($city['conflict'], $nation)) { $nationlist = explode("|", $city['conflict']); - $killnum = explode("|", $city[conflict2]); + $killnum = explode("|", $city['conflict2']); $count = count($nationlist); for($i=0; $i < $count; $i++) { @@ -1588,7 +1588,7 @@ function DeleteConflict($connect, $nation) { function getConquerNation($connect, $city) { $nationlist = explode("|", $city['conflict']); - $killnum = explode("|", $city[conflict2]); + $killnum = explode("|", $city['conflict2']); $max = 0; for($i=0; $i < count($nationlist); $i++) { @@ -1739,11 +1739,11 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) { // 멸망이 아니면 } else { // 태수,군사,시중은 일반으로... - $query = "update general set level='1' where no='$city[gen1]'"; + $query = "update general set level='1' where no='{$city['gen1']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set level='1' where no='$city[gen2]'"; + $query = "update general set level='1' where no='{$city['gen2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set level='1' where no='$city[gen3]'"; + $query = "update general set level='1' where no='{$city['gen3']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //수도였으면 긴급 천도 if($destnation['capital'] == $city['city']) { diff --git a/twe/processing.php b/twe/processing.php index bcf340dd..4a1ce5a4 100644 --- a/twe/processing.php +++ b/twe/processing.php @@ -387,8 +387,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 보병, 징병 - if($me[special2] == 50) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 50) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -437,8 +437,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 궁병, 징병 - if($me[special2] == 51) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 51) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -487,8 +487,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 기병, 징병 - if($me[special2] == 52) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 52) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -537,8 +537,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 귀병, 징병 - if($me[special2] == 40) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 40) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -587,8 +587,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 공성, 징병 - if($me[special2] == 53) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 53) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -821,8 +821,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 보병, 징병 - if($me[special2] == 50) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 50) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -871,8 +871,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 궁병, 징병 - if($me[special2] == 51) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 51) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -921,8 +921,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 기병, 징병 - if($me[special2] == 52) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 52) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -971,8 +971,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 귀병, 징병 - if($me[special2] == 40) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 40) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; @@ -1021,8 +1021,8 @@ function calc(cost, formnum) { //성격 보정 $cst = CharCost($cst, $me['personal']); //특기 보정 : 공성, 징병 - if($me[special2] == 53) { $cst *= 0.9; } - if($me[special2] == 72) { $cst *= 0.5; } + if($me['special2'] == 53) { $cst *= 0.9; } + if($me['special2'] == 72) { $cst *= 0.5; } $att = $admin["att{$i}"] + $abil; $def = $admin["def{$i}"] + $abil; $spd = $admin["spd{$i}"]; diff --git a/twe/start.php b/twe/start.php index 83358cc6..48c460f9 100644 --- a/twe/start.php +++ b/twe/start.php @@ -1,5 +1,11 @@ + - ../