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

아이템 코드를 String으로 바꾸었으므로 연동 대상 또한 변경

Browse Source
This commit is contained in:
Hide_D
2019-06-09 22:50:39 +09:00
parent 23d4136096
commit 890ecf5846
19 changed files with 315 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/ActionItem/che_Dummy.php
+3 -3
View File
@@ -5,7 +5,7 @@ use \sammo\General;
use \sammo\GeneralTrigger;
use function sammo\isConsumable;
use function sammo\getItemInfo;
use function sammo\getItemCost2;
use function sammo\getItemCost;
//XXX:임시용!
class che_Dummy extends \sammo\BaseItem{
@@ -32,11 +32,11 @@ class che_Dummy extends \sammo\BaseItem{
return $this->_consumable;
}
public function __construct(int $itemCode)
public function __construct(string $itemCode)
{
$this->_id = $itemCode;
[$this->_name, $this->_info] = getItemInfo($itemCode);
$this->_cost = getItemCost2($itemCode);
$this->_cost = getItemCost($itemCode);
$this->_consumable = isConsumable($itemCode);
}
}
hwe/sammo/Command/General/che_군량매매.php
+2 -2
View File
@@ -15,9 +15,9 @@ use \sammo\{
use function \sammo\{
tryUniqueItemLottery,
getItemCost, getItemCost2,
getItemCost,
getItemInfo,
getHorseName, getWeapName, getBookName, getItemName
getItemName
};
use \sammo\Constraint\Constraint;
hwe/sammo/Command/General/che_장비매매.php
+7 -26
View File
@@ -15,9 +15,9 @@ use \sammo\{
use function \sammo\{
tryUniqueItemLottery,
getItemCost, getItemCost2,
getItemCost,
getItemInfo,
getHorseName, getWeapName, getBookName, getItemName
getItemName
};
use \sammo\Constraint\Constraint;
@@ -95,12 +95,8 @@ class che_장비매매 extends Command\GeneralCommand{
$itemType = $this->arg['itemType'];
$itemCode = $this->arg['itemCode'];
if($itemType == 'item'){
$reqGold = getItemCost2($itemCode);
}
else{
$reqGold = getItemCost($itemCode);
}
$reqGold = getItemCost($itemCode);
return [$reqGold, 0];
}
@@ -128,30 +124,15 @@ class che_장비매매 extends Command\GeneralCommand{
if($itemCode == 0){
$buying = false;
$itemCode = $general->getVar($itemType);
if($itemType == 'item'){
$cost = getItemCost2($itemCode);
}
else{
$cost = getItemCost($itemCode);
}
$cost = getItemCost($itemCode);
}
else{
$buying = true;
$cost = $this->getCost()[0];
}
if($itemType == 'horse'){
$itemName = getHorseName($itemCode);
}
else if($itemType == 'weap'){
$itemName = getWeapName($itemCode);
}
else if($itemType == 'book'){
$itemName = getBookName($itemCode);
}
else{
$itemName = getItemName($itemCode);
}
$itemName = getItemName($itemCode);
$josaUl = JosaUtil::pick($itemName, '을');
$logger = $general->getLogger();