phan 1차

This commit is contained in:
2020-05-01 17:33:14 +09:00
parent f7a123c10b
commit ef5dd47604
27 changed files with 76 additions and 48 deletions
+4 -2
View File
@@ -18,7 +18,9 @@ class Scenario{
private $history;
/** @var \sammo\Scenario\Nation[] */
private $nations;
/** @var \sammo\Scenario\Nation[] */
private $nationsInv;
private $diplomacy;
@@ -125,7 +127,7 @@ class Scenario{
) = $rawGeneral;
if(key_exists($nationName, $this->nationsInv)){
$nationID = $this->nationsInv[$nationName]->id;;
$nationID = $this->nationsInv[$nationName]->getID();
}
else if(key_exists($nationName, $this->nations)){
$nationID = (int)$nationName;
@@ -167,7 +169,7 @@ class Scenario{
) = $rawGeneral;
if(key_exists($nationName, $this->nationsInv)){
$nationID = $this->nationsInv[$nationName]->id;;
$nationID = $this->nationsInv[$nationName]->getID();
}
else if(key_exists($nationName, $this->nations)){
$nationID = (int)$nationName;