사용되지 않는 chemi 제거
This commit is contained in:
@@ -155,7 +155,6 @@ SELECT
|
|||||||
A.nation,
|
A.nation,
|
||||||
A.name,
|
A.name,
|
||||||
A.power,
|
A.power,
|
||||||
A.chemi,
|
|
||||||
A.color,
|
A.color,
|
||||||
A.tech,
|
A.tech,
|
||||||
A.sabotagelimit,
|
A.sabotagelimit,
|
||||||
@@ -229,7 +228,6 @@ for($i=0; $i < $nationCount; $i++) {
|
|||||||
<td align=center> {$nation['connect']} </td>
|
<td align=center> {$nation['connect']} </td>
|
||||||
<td align=center> {$nation['con']} </td>
|
<td align=center> {$nation['con']} </td>
|
||||||
<td align=center> {$nation['power']} </td>
|
<td align=center> {$nation['power']} </td>
|
||||||
<td align=center> {$nation['chemi']} </td>
|
|
||||||
<td align=center> {$gen['cnt']} </td>
|
<td align=center> {$gen['cnt']} </td>
|
||||||
<td align=center> {$city['cnt']} </td>
|
<td align=center> {$city['cnt']} </td>
|
||||||
<td align=center> {$nation['tech']} </td>
|
<td align=center> {$nation['tech']} </td>
|
||||||
|
|||||||
+4
-12
@@ -84,7 +84,7 @@ if($genlist != 0 && $me['nation'] != $general['nation']){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($btn == "추방") {
|
if($btn == "추방") {
|
||||||
$query = "select name,l{$meLevel}set,chemi,color from nation where nation='{$me['nation']}'";
|
$query = "select name,l{$meLevel}set,color from nation where nation='{$me['nation']}'";
|
||||||
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
$nation = MYDB_fetch_array($result);
|
$nation = MYDB_fetch_array($result);
|
||||||
|
|
||||||
@@ -213,19 +213,17 @@ if($btn == "추방") {
|
|||||||
$gennum = $gencount;
|
$gennum = $gencount;
|
||||||
if($gencount < GameConst::$initialNationGenLimit) $gencount = GameConst::$initialNationGenLimit;
|
if($gencount < GameConst::$initialNationGenLimit) $gencount = GameConst::$initialNationGenLimit;
|
||||||
|
|
||||||
$nation['chemi'] -= 1;
|
|
||||||
if($nation['chemi'] < 0) { $nation['chemi'] = 0; }
|
|
||||||
|
|
||||||
if($admin['year'] < $admin['startyear']+3) {
|
if($admin['year'] < $admin['startyear']+3) {
|
||||||
//초반엔 군주 부상 증가(엔장 임관지양)
|
//초반엔 군주 부상 증가(엔장 임관지양)
|
||||||
$query = "update general set injury=injury+1 where no='{$ruler['no']}'";
|
$query = "update general set injury=injury+1 where no='{$ruler['no']}'";
|
||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
|
|
||||||
$query = "update nation set gennum='$gennum',chemi='{$nation['chemi']}',gold=gold+'$gold',rice=rice+'$rice' where nation='{$general['nation']}'";
|
$query = "update nation set gennum='$gennum',gold=gold+'$gold',rice=rice+'$rice' where nation='{$general['nation']}'";
|
||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
} else {
|
} else {
|
||||||
//이번분기는 추방불가(초반 제외)
|
//이번분기는 추방불가(초반 제외)
|
||||||
$query = "update nation set l{$meLevel}set=1,gennum='$gennum',chemi='{$nation['chemi']}',gold=gold+'$gold',rice=rice+'$rice' where nation='{$general['nation']}'";
|
$query = "update nation set l{$meLevel}set=1,gennum='$gennum',gold=gold+'$gold',rice=rice+'$rice' where nation='{$general['nation']}'";
|
||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,7 +238,7 @@ if($btn == "추방") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($btn == "임명" && $level >= 5 && $level <= 11) {
|
if($btn == "임명" && $level >= 5 && $level <= 11) {
|
||||||
$query = "select l{$level}set,level,chemi from nation where nation='{$me['nation']}'";
|
$query = "select l{$level}set,level from nation where nation='{$me['nation']}'";
|
||||||
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
$nation = MYDB_fetch_array($result);
|
$nation = MYDB_fetch_array($result);
|
||||||
|
|
||||||
@@ -249,12 +247,6 @@ if($btn == "임명" && $level >= 5 && $level <= 11) {
|
|||||||
|
|
||||||
//이미 지정했다면 무시
|
//이미 지정했다면 무시
|
||||||
if($nation["l{$level}set"] == 0 && $lv <= $level) {
|
if($nation["l{$level}set"] == 0 && $lv <= $level) {
|
||||||
$nation['chemi'] -= 1;
|
|
||||||
if($nation['chemi'] < 0) { $nation['chemi'] = 0; }
|
|
||||||
|
|
||||||
$query = "update nation set chemi='{$nation['chemi']}' where nation='{$me['nation']}'";
|
|
||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
|
||||||
|
|
||||||
//기존 장수 일반으로
|
//기존 장수 일반으로
|
||||||
$query = "update general set level=1 where nation='{$me['nation']}' and level='$level'";
|
$query = "update general set level=1 where nation='{$me['nation']}' and level='$level'";
|
||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
|
|||||||
+1
-16
@@ -501,7 +501,7 @@ function postUpdateMonthly() {
|
|||||||
// 명성,공헌
|
// 명성,공헌
|
||||||
$nations = $db->query('SELECT
|
$nations = $db->query('SELECT
|
||||||
A.nation,
|
A.nation,
|
||||||
A.gennum, A.gennum2, A.chemi, A.aux,
|
A.gennum, A.gennum2, A.aux,
|
||||||
round((
|
round((
|
||||||
round(((A.gold+A.rice)+(select sum(gold+rice) from general where nation=A.nation))/100)
|
round(((A.gold+A.rice)+(select sum(gold+rice) from general where nation=A.nation))/100)
|
||||||
+A.tech
|
+A.tech
|
||||||
@@ -523,20 +523,6 @@ function postUpdateMonthly() {
|
|||||||
$genNum[$nation['nation']] = $nation['gennum'];
|
$genNum[$nation['nation']] = $nation['gennum'];
|
||||||
|
|
||||||
$aux = Json::decode($nation['aux']);
|
$aux = Json::decode($nation['aux']);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if($nation['gennum'] > $nation['gennum2']) {
|
|
||||||
// 장수가 증가했을때
|
|
||||||
$nation['chemi'] -= ceil(($nation['gennum'] - $nation['gennum2']) / $nation['gennum'] * 100);
|
|
||||||
} else {
|
|
||||||
// 장수가 감소했을때
|
|
||||||
$nation['chemi'] -= ceil(($nation['gennum2'] - $nation['gennum']) / $nation['gennum2'] * 100);
|
|
||||||
}
|
|
||||||
// 매달 2씩 증가
|
|
||||||
$nation['chemi'] += 2;
|
|
||||||
if($nation['chemi'] < 0) { $nation['chemi'] = 0; }
|
|
||||||
if($nation['chemi'] > 100) { $nation['chemi'] = 100; }
|
|
||||||
|
|
||||||
//약간의 랜덤치 부여 (95% ~ 105%)
|
//약간의 랜덤치 부여 (95% ~ 105%)
|
||||||
|
|
||||||
@@ -551,7 +537,6 @@ function postUpdateMonthly() {
|
|||||||
$db->update('nation', [
|
$db->update('nation', [
|
||||||
'power'=>$nation['power'],
|
'power'=>$nation['power'],
|
||||||
'gennum2'=>$nation['gennum'],
|
'gennum2'=>$nation['gennum'],
|
||||||
'chemi'=>$nation['chemi'],
|
|
||||||
'aux'=>Json::encode($aux)
|
'aux'=>Json::encode($aux)
|
||||||
], 'nation=%i', $nation['nation']);
|
], 'nation=%i', $nation['nation']);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -522,7 +522,7 @@ function process_45(&$general) {
|
|||||||
|
|
||||||
$admin = $gameStor->getValues(['startyear', 'year', 'month']);
|
$admin = $gameStor->getValues(['startyear', 'year', 'month']);
|
||||||
|
|
||||||
$query = "select name,chemi from nation where nation='{$general['nation']}'";
|
$query = "select name from nation where nation='{$general['nation']}'";
|
||||||
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
$nation = MYDB_fetch_array($result);
|
$nation = MYDB_fetch_array($result);
|
||||||
|
|
||||||
@@ -610,12 +610,8 @@ function process_45(&$general) {
|
|||||||
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
|
||||||
}
|
}
|
||||||
|
|
||||||
$nation['chemi'] -= 1;
|
|
||||||
if($nation['chemi'] < 0) { $nation['chemi'] = 0; }
|
|
||||||
|
|
||||||
$db->update('nation', [
|
$db->update('nation', [
|
||||||
'gennum'=>$db->sqleval('gennum - 1'),
|
'gennum'=>$db->sqleval('gennum - 1'),
|
||||||
'chemi'=>$nation['chemi'],
|
|
||||||
'gold'=>$db->sqleval('gold + %i', $gold),
|
'gold'=>$db->sqleval('gold + %i', $gold),
|
||||||
'rice'=>$db->sqleval('rice + %i', $rice),
|
'rice'=>$db->sqleval('rice + %i', $rice),
|
||||||
], 'nation=%i', $general['nation']);
|
], 'nation=%i', $general['nation']);
|
||||||
|
|||||||
@@ -177,7 +177,6 @@ CREATE TABLE `nation` (
|
|||||||
`capset` INT(1) NULL DEFAULT '0',
|
`capset` INT(1) NULL DEFAULT '0',
|
||||||
`gennum` INT(3) NULL DEFAULT '1',
|
`gennum` INT(3) NULL DEFAULT '1',
|
||||||
`gennum2` INT(3) NULL DEFAULT '1',
|
`gennum2` INT(3) NULL DEFAULT '1',
|
||||||
`chemi` INT(3) NULL DEFAULT '0',
|
|
||||||
`gold` INT(8) NULL DEFAULT '0',
|
`gold` INT(8) NULL DEFAULT '0',
|
||||||
`rice` INT(8) NULL DEFAULT '0',
|
`rice` INT(8) NULL DEFAULT '0',
|
||||||
`bill` INT(3) NULL DEFAULT '0',
|
`bill` INT(3) NULL DEFAULT '0',
|
||||||
|
|||||||
Reference in New Issue
Block a user