浏览代码

Fixed empty Black Market on game start

Ivan Savenko 2 年之前
父节点
当前提交
5a5aced67e
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 1 0
      ChangeLog.md
  2. 3 3
      lib/mapObjects/CGMarket.cpp

+ 1 - 0
ChangeLog.md

@@ -2,6 +2,7 @@
 
 ### GENERAL:
 * Fixed movement cost penalty from terrain
+* Fixed empty Black Market on game start
 * Fixed blocked progress in Launcher on language detection failure
 * Launcher will now correctly handle selection of Data directory in H3 install
 

+ 3 - 3
lib/mapObjects/CGMarket.cpp

@@ -279,10 +279,10 @@ void CGBlackMarket::newTurn(CRandomGenerator & rand) const
 {
 	int resetPeriod = VLC->settings()->getInteger(EGameSettings::MARKETS_BLACK_MARKET_RESTOCK_PERIOD);
 
-	if(resetPeriod == 0) //check if feature changing OH3 behavior is enabled
-		return;
+	bool isFirstDay = cb->getDate(Date::DAY) == 1;
+	bool regularResetTriggered = resetPeriod != 0 && ((cb->getDate(Date::DAY)-1) % resetPeriod) != 0;
 
-	if (((cb->getDate(Date::DAY)-1) % resetPeriod) != 0)
+	if (!isFirstDay && !regularResetTriggered)
 		return;
 
 	SetAvailableArtifacts saa;