쌀 거래만 가능하므로 아이템 거래는 삭제

hwe/b_auction.php

@@ -88,13 +88,12 @@ $count = MYDB_num_rows($result);
 $chk = 0;
 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) {
+    } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) {
         $radio = " disabled";
         $alert = "<font color=red>";
         $alert2 = "</font>";
@@ -108,15 +107,13 @@ for ($i=0; $i < $count; $i++) {
     }
     $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
     $pv = substr((string)$pv, 0, 4);
-    if ($auction['stuff'] != 0) {
+
-        $pv = '-';
-    }
     echo "
     <tr align=center>
         <td>{$auction['no']}</td>
         <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
         <td>{$auction['name1']}</td>
-        <td>{$itemname}</td>
+        <td>쌀</td>
         <td>{$auction['amount']}</td>
         <td>금 {$auction['cost']}</td>
         <td>{$alert}금 {$auction['value']}{$alert2}</td>
@@ -143,9 +140,7 @@ for ($i=0; $i < $count; $i++) {
         <td align=center id=bg1>거래등록</td>
         <td colspan=10>
             　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: <select size=1 name=stuff style=color:white;background-color:black;>
+            　물품: 쌀
-                <option style=color:white; value=0>쌀</option>
-            </select>
             　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
             　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
             　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
@@ -186,13 +181,12 @@ $count = MYDB_num_rows($result);
 $chk = 0;
 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) {
+    } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) {
         $radio = " disabled";
         $alert = "<font color=red>";
         $alert2 = "</font>";
@@ -206,15 +200,12 @@ for ($i=0; $i < $count; $i++) {
     }
     $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
     $pv = substr((string)$pv, 0, 4);
-    if ($auction['stuff'] != 0) {
-        $pv = '-';
-    }
     echo "
     <tr align=center>
         <td>{$auction['no']}</td>
         <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
         <td>{$auction['name1']}</td>
-        <td>{$itemname}</td>
+        <td>쌀</td>
         <td>{$auction['amount']}</td>
         <td>금 {$auction['cost']}</td>
         <td>{$alert}금 {$auction['value']}{$alert2}</td>
@@ -241,9 +232,7 @@ for ($i=0; $i < $count; $i++) {
         <td align=center id=bg1>거래등록</td>
         <td colspan=10>
             　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: <select size=1 name=stuff style=color:white;background-color:black;>
+            　물품: 쌀
-                <option style=color:white; value=0>쌀</option>
-            </select>
             　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
             　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
             　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>

hwe/c_auction.php

@@ -11,7 +11,6 @@ $v->rule('integer', [
     'topv',
     'value',
     'term',
-    'stuff',
     'sel'
 ]);
 
@@ -21,7 +20,6 @@ $cost = Util::getReq('cost', 'int');
 $topv = Util::getReq('topv', 'int');
 $value = Util::getReq('value', 'int');
 $term = Util::getReq('term', 'int');
-$stuff = Util::getReq('stuff', 'int');
 $sel = Util::getReq('sel', 'int');
 
 $msg = '';
@@ -66,10 +64,6 @@ if ($session->userGrade >= 5) {
 }
 
 if ($btn == "판매") {
-    if ($stuff != 0) {
-        $msg = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
     if ($term < 0 || $term > 24) {
         $msg = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
         $valid = 0;
@@ -101,7 +95,6 @@ if ($btn == "판매") {
             'type'=>0,
             'no1'=>$me['no'],
             'name1'=>$me['name'],
-            'stuff'=>$stuff,
             'amount'=>$amount,
             'cost'=>$cost,
             'value'=>$cost,
@@ -119,12 +112,6 @@ if ($btn == "판매") {
         $msg = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
         $valid = 0;
     }
-    /*
-        if($stuff != 0) {
-            $msg = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-            $valid = 0;
-        }
-    */
     if ($auction['no2'] > 0 && $value <= $auction['value']) {
         $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
         $valid = 0;
@@ -166,10 +153,6 @@ if ($btn == "판매") {
         ], 'no=%i', $sel);
     }
 } elseif ($btn == "구매") {
-    if ($stuff != 0) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
     if ($term < 0 || $term > 24) {
         $msg2 = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
         $valid = 0;
@@ -202,7 +185,6 @@ if ($btn == "판매") {
             'type'=>1,
             'no1'=>$me['no'],
             'name1'=>$me['name'],
-            'stuff'=>$stuff, 
             'amount'=>$amount, 
             'cost'=>$cost, 
             'value'=>$cost, 
@@ -220,10 +202,6 @@ if ($btn == "판매") {
         $msg2 = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
         $valid = 0;
     }
-    if ($stuff != 0) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
     if ($auction['no2'] > 0 && $value >= $auction['value']) {
         $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
         $valid = 0;

hwe/func_auction.php

@@ -1,21 +1,6 @@
 <?php
 namespace sammo;
 
-function GetStuffName($stuff) {
-    $type1 = $stuff % 10;
-    $type2 = intdiv($stuff, 10);
-
-    switch($type1) {
-    case 0: $str = "쌀"; break;
-    case 1: $str = getItemName($type2); break;
-    case 2: $str = getItemName($type2); break;
-    case 3: $str = getItemName($type2); break;
-    case 4: $str = getItemName($type2); break;
-    default:$str = "?"; break;
-    }
-    return $str;
-}
-
 function registerAuction() {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -35,7 +20,7 @@ function registerAuction() {
     if($general['rice'] <  1000) { $general['rice'] =  1000; }
     if($general['rice'] > 20000) { $general['rice'] = 20000; }
 
-    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND stuff=0 AND no1=0');
+    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND no1=0');
     $count += 5;
     // 판매건 등록
     if(rand()%$count == 0) {
@@ -53,11 +38,11 @@ function registerAuction() {
 
         $term = 3 + rand() % 10;
         $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $query = "insert into auction (type, no1, name1, stuff, amount, cost, value, topv, expire) values (0, '0', 'ⓝ상인', '0', '$amount', '$cost', '$cost', '$topv', '$date')";
+        $query = "insert into auction (type, no1, name1, amount, cost, value, topv, expire) values (0, '0', 'ⓝ상인', '$amount', '$cost', '$cost', '$topv', '$date')";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
 
-    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND stuff=0 AND no1=0');
+    $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND no1=0');
     $count += 5;
     // 구매건 등록
     if(rand()%$count == 0) {
@@ -75,7 +60,7 @@ function registerAuction() {
 
         $term = 3 + rand() % 10;
         $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $query = "insert into auction (type, no1, name1, stuff, amount, cost, value, topv, expire) values (1, '0', 'ⓝ상인', '0', '$amount', '$cost', '$cost', '$topv', '$date')";
+        $query = "insert into auction (type, no1, name1, amount, cost, value, topv, expire) values (1, '0', 'ⓝ상인', '0', '$cost', '$cost', '$topv', '$date')";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
 }
@@ -106,76 +91,6 @@ function processAuction() {
         $josaYi1 = JosaUtil::pick($auction['name1'], '이');
         $josaYi2 = JosaUtil::pick($auction['name2'], '이');
 
-        // 유닉템 처리
-        if($auction['stuff'] != 0) {
-            if($auction['no2'] == 0) {
-                $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을');
-                $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} <C>".GetStuffName($auction['stuff'])."</>{$josaUl} 판매, 그러나 입찰자 부재";
-                pushAuctionLog($auctionLog);
-            } else {
-                $trader['no'] = 0;
-                $trader['name'] = 'ⓝ암시장상인';
-                $trader['gold'] = 99999999;
-                $trader['rice'] = 99999999;
-
-                $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);
-
-                $sel1 = $auction['stuff'] % 10;
-                $sel2 = intdiv($auction['stuff'], 10);
-                switch($sel1) {
-                case 1: $type = "weap"; break;
-                case 2: $type = "book"; break;
-                case 3: $type = "horse"; break;
-                case 4: $type = "item"; break;
-                }
-                // 이미 유닉템이 풀렸는지 검사
-                $query = "select no from general where {$type}='$sel2'";
-                $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $count = MYDB_num_rows($result);
-
-                // 판매거래만 존재
-                if($count > 0) {
-                    $traderLog[0] = "<S>◆</>{$auction['no']}번 거래 <M>유찰</>! 이미 아이템을 누군가가 가로챘습니다!";
-                    $bidderLog[0] = "<S>◆</>{$auction['no']}번 거래 <M>유찰</>! 이미 아이템을 누군가가 가로챘습니다!";
-                    $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을');
-                    $josaRo = JosaUtil::pick($auction['value'], '로');
-                    $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} <C>".GetStuffName($auction['stuff'])."</>$josaUl 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 아이템 이미 매진!";
-                } elseif($auction['value'] > $bidder['gold'] - 1000) {
-                    $gold = Util::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']}'";
-                    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-                    $traderLog[0] = "<S>◆</>입찰자의 자금 부족으로 {$auction['no']}번 <C>".GetStuffName($auction['stuff'])."</> 거래 <M>유찰</>!";
-                    $bidderLog[0] = "<S>◆</>입찰자의 자금 부족으로 {$auction['no']}번 <C>".GetStuffName($auction['stuff'])."</> 거래 <M>유찰</>! 벌금 <C>{$gold}</>";
-                    $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을');
-                    $josaRo = JosaUtil::pick($auction['value'], '로');
-                    $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <M>유찰</> : <Y>{$auction['name1']}</>{$josaYi1} <C>".GetStuffName($auction['stuff'])."</>$josaUl 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 입찰, 그러나 입찰자 자금부족, 벌금 <C>{$gold}</>";
-                } else {
-                    $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을');
-                    $josaUlGold = JosaUtil::pick($auction['value'], '을');
-                    $josaRo = JosaUtil::pick($auction['value'], '로');
-                    $traderLog[0] = "<S>◆</>{$auction['no']}번 거래 <C>성사</>로 <C>".GetStuffName($auction['stuff'])."</>$josaUl 판매, 금 <C>{$auction['value']}</>{$josaUlGold} 획득!";
-                    $bidderLog[0] = "<S>◆</>{$auction['no']}번 거래 <C>성사</>로 금 <C>{$auction['value']}</>{$josaUlGold} 지불, <C>".GetStuffName($auction['stuff'])."</> 구입!";
-                    $auctionLog[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 <span class='sell'>판매</span> <C>성사</> : <Y>{$auction['name1']}</>{$josaYi1} <C>".GetStuffName($auction['stuff'])."</>$josaUl 판매, <Y>{$auction['name2']}</>{$josaYi2} 금 <C>{$auction['value']}</>{$josaRo} 구매";
-                    $auctionLog[0] .= " <M>★ 아이템 거래 ★</>";
-
-                    $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] = "<C>●</>{$admin['month']}월:<Y>{$auction['name2']}</>{$josaYi2} <C>".GetStuffName($auction['stuff'])."</>$josaUl 구매했습니다!";
-                    $history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【암시장】</b></><Y>{$auction['name2']}</>{$josaYi2} <C>".GetStuffName($auction['stuff'])."</>$josaUl 구매했습니다!";
-                    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-                    pushWorldHistory($history, $admin['year'], $admin['month']);
-                }
-                pushGenLog($trader, $traderLog);
-                pushGenLog($bidder, $bidderLog);
-                pushAuctionLog($auctionLog);
-            }
-        } else {
         // 쌀 처리
         if($auction['no2'] == 0) {
             // 상인건수가 아닌것만 출력
@@ -310,7 +225,6 @@ function processAuction() {
             }
         }
     }
-    }
 
     $query = "delete from auction where expire<='$date'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/sql/schema.sql

@@ -506,7 +506,6 @@ create table auction (
   type   int(6) default 0,
   no1    int(6) default 0,
   name1  char(64) default '-',
-  stuff  int(6) default 0,
   amount int(6) default 0,
   cost   int(6) default 0,
   value  int(6) default 0,