Merge branch 'devel' into kvstorage_game

This commit is contained in:
Hide_D committed 2018-05-20 22:20:03 +09:00
commit d0778550ab
7 files changed
+705 -690

No files matched your search

+4 -1
View File
@@ -152,7 +152,7 @@ class NPC{
$city = $this->locatedCity;
if($city === null){
if($nationID == 0){
if($nationID == 0 || !CityHelper::getAllNationCities($nationID)){
$cityObj = Util::choiceRandom(CityHelper::getAllCities());
}
else{
@@ -161,6 +161,9 @@ class NPC{
'@phan-var array<string,string|int> $cityObj';
$city = $cityObj['id'];
}
else{
$city = CityHelper::getCityByName($city)['id'];
}
$experience = $age * 100;
$dedication = $age * 100;