Переглянути джерело

Merge pull request #4476 from IvanSavenko/mod_repo_160

Use 1.6 repository for mods
Ivan Savenko 1 рік тому
батько
коміт
2a54de7569

+ 1 - 1
config/schemas/settings.json

@@ -587,7 +587,7 @@
 				},
 				"defaultRepositoryURL" : {
 					"type" : "string",
-					"default" : "https://raw.githubusercontent.com/vcmi/vcmi-mods-repository/develop/vcmi-1.5.json",
+					"default" : "https://raw.githubusercontent.com/vcmi/vcmi-mods-repository/develop/vcmi-1.6.json",
 				},
 				"extraRepositoryEnabled" : {
 					"type" : "boolean",

+ 1 - 1
server/battles/BattleFlowProcessor.cpp

@@ -763,7 +763,7 @@ void BattleFlowProcessor::stackTurnTrigger(const CBattleInfoCallback & battle, c
 
 				auto &levelInfo = spell->getLevelInfo(bonus->val);
 				bool isDamageSpell = spell->isDamage() || spell->isOffensive();
-				if (!isDamageSpell || levelInfo.smartTarget || levelInfo.range != "X")
+				if (!isDamageSpell || levelInfo.smartTarget || !levelInfo.range.empty())
 				{
 					parameters.massive = true;
 					parameters.smart = true;