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

buildGeneralCommandClass류 구현

Browse Source
This commit is contained in:
Hide_D
2018-10-06 04:08:43 +09:00
parent bf788d4f6e
commit 7cfc8f0269
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_command.old.php
+2 -4
View File
@@ -5,8 +5,7 @@ function getGeneralTurnBrief(General $generalObj, array $turnList) {
$result = []; $result = [];
foreach($turnList as $turnIdx => [$action, $arg]){ foreach($turnList as $turnIdx => [$action, $arg]){
$commandClass = getGeneralCommandClass($action); $commandObj = buildGeneralCommandClass($action, $generalObj, [], $arg);
$commandObj = new $commandClass($generalObj, [], $arg);
$turnText = $commandObj->getBrief(); $turnText = $commandObj->getBrief();
$result[$turnIdx] = $turnText; $result[$turnIdx] = $turnText;
} }
@@ -270,8 +269,7 @@ function getNationTurnBrief(General $generalObj, array $turnList) {
$tmpTurn = new LastTurn(); $tmpTurn = new LastTurn();
foreach($turnList as $turnIdx => [$action, $arg]){ foreach($turnList as $turnIdx => [$action, $arg]){
$commandClass = getNationCommandClass($action); $commandObj = buildNationCommandClass($action, $generalObj, [], $tmpTurn, $arg);
$commandObj = new $commandClass($generalObj, [], $tmpTurn, $arg);
$turnText = $commandObj->getBrief(); $turnText = $commandObj->getBrief();
$result[$turnIdx] = $turnText; $result[$turnIdx] = $turnText;
} }
hwe/func_command.php
+2 -4
View File
@@ -5,8 +5,7 @@ function getGeneralTurnBrief(General $generalObj, array $turnList) {
$result = []; $result = [];
foreach($turnList as $turnIdx => [$action, $arg]){ foreach($turnList as $turnIdx => [$action, $arg]){
$commandClass = getGeneralCommandClass($action); $commandObj = buildGeneralCommandClass($action, $generalObj, [], $arg);
$commandObj = new $commandClass($generalObj, [], $arg);
$turnText = $commandObj->getBrief(); $turnText = $commandObj->getBrief();
$result[$turnIdx] = $turnText; $result[$turnIdx] = $turnText;
} }
@@ -18,8 +17,7 @@ function getNationTurnBrief(General $generalObj, array $turnList) {
$tmpTurn = new LastTurn(); $tmpTurn = new LastTurn();
foreach($turnList as $turnIdx => [$action, $arg]){ foreach($turnList as $turnIdx => [$action, $arg]){
$commandClass = getNationCommandClass($action); $commandObj = buildNationCommandClass($action, $generalObj, [], $tmpTurn, $arg);
$commandObj = new $commandClass($generalObj, [], $tmpTurn, $arg);
$turnText = $commandObj->getBrief(); $turnText = $commandObj->getBrief();
$result[$turnIdx] = $turnText; $result[$turnIdx] = $turnText;
} }
hwe/func_converter.php
+10
View File
@@ -313,6 +313,11 @@ function getGeneralCommandClass(?string $type){
throw new \InvalidArgumentException("{$type}은 올바른 장수 커맨드가 아님"); throw new \InvalidArgumentException("{$type}은 올바른 장수 커맨드가 아님");
} }
function buildGeneralCommandClass(?string $type, General $generalObj, array $env, $arg = null):Command\GeneralCommand{
$class = getGeneralCommandClass($type);
return new $class($generalObj, $env, $arg);
}
function getNationCommandClass(?string $type){ function getNationCommandClass(?string $type){
if($type === null){ if($type === null){
$type = '휴식'; $type = '휴식';
@@ -328,6 +333,11 @@ function getNationCommandClass(?string $type){
throw new \InvalidArgumentException("{$type}은 올바른 국가 커맨드가 아님"); throw new \InvalidArgumentException("{$type}은 올바른 국가 커맨드가 아님");
} }
function buildNationCommandClass(?string $type, General $generalObj, array $env, LastTurn $lastTurn, $arg = null):Command\NationCommand{
$class = getNationCommandClass($type);
return new $class($generalObj, $env, $lastTurn, $arg);
}
function getLevel($level, $nlevel=8) { function getLevel($level, $nlevel=8) {
if($level >= 0 && $level <= 4) { $nlevel = 0; } if($level >= 0 && $level <= 4) { $nlevel = 0; }
$code = $nlevel * 100 + $level; $code = $nlevel * 100 + $level;
hwe/sammo/TurnExecutionHelper.php
+1 -3
View File
@@ -75,9 +75,7 @@ class TurnExecutionHelper
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$commandClass = getNationCommandClass($commandClassName); $commandObj = buildNationCommandClass($commandClassName, $general, $gameStor->getAll(true), $commandLast, $commandArg);
/** @var \sammo\Command\NationCommand $commandObj */
$commandObj = new $commandClass($general, $gameStor->getAll(true), $commandLast, $commandArg);
$failReason = $commandObj->testReservable(); $failReason = $commandObj->testReservable();
if($failReason){ if($failReason){