gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Allow maps to not specify BaseResourceClass

Browse Source 
There was already a check to handle no `BaseResourceClass` but it's
handled in a way that could lead to errors later on.
This commit is contained in:
phosit
2025-07-31 19:19:50 +02:00
committed by Phosit
parent 0c96ef7906
commit 0cf1697594
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/maps/random/rmgen-common/player.js
+4 -6
View File
@@ -203,12 +203,10 @@ function addCivicCenterAreaToClass(position, tileClass)
*/
function getPlayerBaseConstraint(playerBaseArgs)
{
let baseResourceConstraint = playerBaseArgs.BaseResourceClass && avoidClasses(playerBaseArgs.BaseResourceClass, 4);
if (playerBaseArgs.baseResourceConstraint)
baseResourceConstraint = new AndConstraint([baseResourceConstraint, playerBaseArgs.baseResourceConstraint]);
return baseResourceConstraint;
return new AndConstraint([
playerBaseArgs.BaseResourceClass ? avoidClasses(playerBaseArgs.BaseResourceClass, 4) : [],
playerBaseArgs.baseResourceConstraint || []
].flat());
}
function placePlayerBaseCityPatch(args)