Ticket #3934: resource_agnostic-v5.patch

binaries/data/mods/public/gui/common/functions_repeat_positioning.js

@@ +1 @@
+/**
+ * Horizontally fit objects repeated with the `<repeat>` tag within a parent object
+ * 
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @param limit The number of elements to fit
+ * @return The number of elements affected
+ */
+function horizFitRepeatedObjects(basename, splitvar="n", margin=0, limit=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+
+    let objObj;
+    if (limit == 0)
+        do
+        {
+            objObj = Engine.GetGUIObjectByName(basename.join("["+ ++limit +"]"));
+        }
+        while (objObj)
+
+    for (let c = 0; c < limit; ++c)
+    {
+        objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        let objSize = objObj.size;
+        objSize.rleft = c * (100/limit);
+        objSize.rright = (c+1) * (100/limit);
+        objSize.right = -margin;
+        objObj.size = objSize;
+    }
+
+    return limit;
+}
+
+/**
+ * Hide all repeated elements after a certain index
+ * 
+ * @param prefix The part of the element name preceeding the index
+ * @param idx The index from which to start
+ * @param prefix The part of the element name after the index
+ */
+function hideRemaining(prefix, idx, suffix)
+{
+    while (true)
+    {
+        let obj = Engine.GetGUIObjectByName(prefix + idx + suffix);
+        if (!obj)
+            return;
+        obj.hidden = true;
+        ++idx;
+    }
+}

binaries/data/mods/public/gui/common/l10n.js

@@ -1 @@
-const localisedResourceNames = {
-    "firstWord": {
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "food": translateWithContext("firstWord", "Food"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "meat": translateWithContext("firstWord", "Meat"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "metal": translateWithContext("firstWord", "Metal"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "ore": translateWithContext("firstWord", "Ore"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "rock": translateWithContext("firstWord", "Rock"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "ruins": translateWithContext("firstWord", "Ruins"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "stone": translateWithContext("firstWord", "Stone"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "treasure": translateWithContext("firstWord", "Treasure"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "tree": translateWithContext("firstWord", "Tree"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "wood": translateWithContext("firstWord", "Wood"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "fruit": translateWithContext("firstWord", "Fruit"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "grain": translateWithContext("firstWord", "Grain"),
-        // Translation: Word as used at the beginning of a sentence or as a single-word sentence.
-        "fish": translateWithContext("firstWord", "Fish"),
-    },
-    "withinSentence": {
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "food": translateWithContext("withinSentence", "Food"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "meat": translateWithContext("withinSentence", "Meat"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "metal": translateWithContext("withinSentence", "Metal"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "ore": translateWithContext("withinSentence", "Ore"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "rock": translateWithContext("withinSentence", "Rock"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "ruins": translateWithContext("withinSentence", "Ruins"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "stone": translateWithContext("withinSentence", "Stone"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "treasure": translateWithContext("withinSentence", "Treasure"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "tree": translateWithContext("withinSentence", "Tree"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "wood": translateWithContext("withinSentence", "Wood"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "fruit": translateWithContext("withinSentence", "Fruit"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "grain": translateWithContext("withinSentence", "Grain"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "fish": translateWithContext("withinSentence", "Fish"),
-    }
-};
 
-function getLocalizedResourceName(resourceCode, context)
+function getLocalizedResourceName(resourceName, context)
 {
-    if (!localisedResourceNames[context])
-    {
-        warn("Internationalization: Unexpected context for resource type localization found: ‘" + context + "’. This context is not supported.");
-        return resourceCode;
-    }
-    if (!localisedResourceNames[context][resourceCode])
-    {
-        warn("Internationalization: Unexpected resource type found with code ‘" + resourceCode + ". This resource type must be internationalized.");
-        return resourceCode;
-    }
-    return localisedResourceNames[context][resourceCode];
+    return translateWithContext(context, resourceName);
 }
 
 /**
  * Format resource amounts to proper english and translate (for example: "200 food, 100 wood, and 300 metal").
  */
@@ -79 +11 @@
 {
     let amounts = Object.keys(resources)
         .filter(type => resources[type] > 0)
         .map(type => sprintf(translate("%(amount)s %(resourceType)s"), {
             "amount": resources[type],
-            "resourceType": getLocalizedResourceName(type, "withinSentence")
+            "resourceType": translateWithContext("withinSentence", type)
         }));
 
     if (amounts.length > 1)
     {
         let lastAmount = amounts.pop();

binaries/data/mods/public/gui/common/setup_resources.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <setup>
     <!-- Icons -->
-    <icon name="iconFood"
+    <icon name="icon_food"
           sprite="stretched:session/icons/resources/food_small.png"
           size="16 16"
     />
-    <icon name="iconMetal"
+    <icon name="icon_metal"
           sprite="stretched:session/icons/resources/metal_small.png"
           size="16 16"
     />
-    <icon name="iconPopulation"
+    <icon name="icon_population"
           sprite="stretched:session/icons/resources/population_small.png"
           size="16 16"
     />
-    <icon name="iconStone"
+    <icon name="icon_stone"
           sprite="stretched:session/icons/resources/stone_small.png"
           size="16 16"
     />
-    <icon name="iconWood"
+    <icon name="icon_wood"
           sprite="stretched:session/icons/resources/wood_small.png"
           size="16 16"
     />
-    <icon name="iconTime"
+    <icon name="icon_time"
           sprite="stretched:session/icons/resources/time_small.png"
           size="16 16"
     />
 </setup>

binaries/data/mods/public/gui/common/tooltips.js

@@ -1 @@
-const g_CostDisplayIcons = {
-    "food": '[icon="iconFood"]',
-    "wood": '[icon="iconWood"]',
-    "stone": '[icon="iconStone"]',
-    "metal": '[icon="iconMetal"]',
-    "population": '[icon="iconPopulation"]',
-    "time": '[icon="iconTime"]'
-};
-
 const g_TooltipTextFormats = {
     "unit": ['[font="sans-10"][color="orange"]', '[/color][/font]'],
     "header": ['[font="sans-bold-13"]', '[/font]'],
     "body": ['[font="sans-13"]', '[/font]'],
     "comma": ['[font="sans-12"]', '[/font]']
@@ -25 +16 @@
     "hack": translate("Hack"),
     "pierce": translate("Pierce"),
     "crush": translate("Crush"),
 };
 
+function costIcon(resource)
+{
+    return '[icon="icon_' + resource + "]';
+}
+
 function bodyFont(text)
 {
     return g_TooltipTextFormats.body[0] + text + g_TooltipTextFormats.body[1];
 }
 
@@ -321 +317 @@
     if (template.cost.time)
         totalCosts.time = Math.ceil(template.cost.time * (entity ? Engine.GuiInterfaceCall("GetBatchTime", { "entity": entity, "batchSize": trainNum }) : 1));
 
     let costs = [];
 
-    for (let type in g_CostDisplayIcons)
-        if (totalCosts[type])
+    for (let c in template.cost)
+    {
+        if (c == "populationBonus" || !totalCosts[c])
+            continue;
+
+        if (typeof GetSimState === "undefined" || GetSimState().resources.codes.indexOf(c) > -1 || c === "time")
             costs.push(sprintf(translate("%(component)s %(cost)s"), {
-                "component": g_CostDisplayIcons[type],
-                "cost": totalCosts[type]
+                "component": costIcon(c),
+                "cost": totalCosts[c]
             }));
+    }
 
     return costs;
 }
 function getGatherTooltip(template)
 {
@@ -340 +341 @@
     return sprintf(translate("%(label)s %(details)s"), {
         "label": headerFont(translate("Gather Rates:")),
         "details":
             Object.keys(template.gather).map(
                 type => sprintf(translate("%(resourceIcon)s %(rate)s"), {
-                    "resourceIcon": g_CostDisplayIcons[type],
+                    "resourceIcon": costIcon(type),
                     "rate": template.gather[type]
                 })
             ).join("  ")
     });
 }
@@ -389 +390 @@
     if (sameTypes)
         for (let resource in resourceCount)
             // Translation: This string is part of the resources cost string on
             // the tooltip for wall structures.
             out.push(sprintf(translate("%(resourceIcon)s %(minimum)s to %(resourceIcon)s %(maximum)s"), {
-                "resourceIcon": g_CostDisplayIcons[resource],
+                "resourceIcon": costIcon(resource),
                 "minimum": Math.min.apply(Math, resourceCount[resource]),
                 "maximum": Math.max.apply(Math, resourceCount[resource])
             }));
     else
         for (let i = 0; i < wallTypes.length; ++i)
@@ -452 +453 @@
         return "";
 
     let formatted = [];
     for (let resource in resources)
         formatted.push(sprintf(translate("%(component)s %(cost)s"), {
-            "component": '[font="sans-12"]' + g_CostDisplayIcons[resource] + '[/font]',
+            "component": '[font="sans-12"]' + costIcon(resource) + '[/font]',
             "cost": resources[resource]
         }));
 
     return '\n[font="sans-bold-13"][color="red"]' + translate("Insufficient resources:") + '[/color][/font]\n' + formatted.join("  ");
 }

binaries/data/mods/public/gui/session/diplomacy_window.xml

@@ -9 +9 @@
     <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">
         <translatableAttribute id="caption">Diplomacy</translatableAttribute>
     </object>
 
     <object name="diplomacyHeader" size="32 32 100%-32 64">
-        <object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="chatPanel" ghost="true">
+        <object name="diplomacyHeaderName" size="0 0 140 100%" type="text" style="chatPanel" ghost="true" text_align="center">
             <translatableAttribute id="caption">Name</translatableAttribute>
         </object>
         <object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="chatPanel" ghost="true">
             <translatableAttribute id="caption">Civilization</translatableAttribute>
         </object>
@@ -21 +21 @@
             <translatableAttribute id="caption">Team</translatableAttribute>
         </object>
         <object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="chatPanel" ghost="true">
             <translatableAttribute id="caption">Theirs</translatableAttribute>
         </object>
-        <object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
+        <object name="diplomacyHeaderAlly" size="360 0 380 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
             <translatableAttribute id="caption">A</translatableAttribute>
             <translatableAttribute id="tooltip">Ally</translatableAttribute>
         </object>
-        <object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
+        <object name="diplomacyHeaderNeutral" size="380 0 400 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
             <translatableAttribute id="caption">N</translatableAttribute>
             <translatableAttribute id="tooltip">Neutral</translatableAttribute>
         </object>
-        <object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
+        <object name="diplomacyHeaderEnemy" size="400 0 420 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
             <translatableAttribute id="caption">E</translatableAttribute>
             <translatableAttribute id="tooltip">Enemy</translatableAttribute>
         </object>
-        <object name="diplomacyHeaderTribute" size="100%-110 0 100% 100%" type="text" style="chatPanel">
+        <object name="diplomacyHeaderTribute" size="430 0 100%-30 100%" type="text" style="chatPanel" text_align="center">
             <translatableAttribute id="caption">Tribute</translatableAttribute>
         </object>
     </object>
     <object size="32 64 100%-32 384">
         <repeat count="16">
@@ -46 +46 @@
                 <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="chatPanel" ghost="true"/>
                 <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="chatPanel" ghost="true"/>
                 <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="chatPanel" ghost="true"/>
 
                 <!-- Diplomatic stance - selection -->
-                <object name="diplomacyPlayerAlly[n]" size="100%-180 0 100%-160 100%" type="button" style="StoneButton" hidden="true"/>
-                <object name="diplomacyPlayerNeutral[n]" size="100%-160 0 100%-140 100%" type="button" style="StoneButton" hidden="true"/>
-                <object name="diplomacyPlayerEnemy[n]" size="100%-140 0 100%-120 100%" type="button" style="StoneButton" hidden="true"/>
+                <object name="diplomacyPlayerAlly[n]" size="360 0 380 100%" type="button" style="StoneButton" hidden="true"/>
+                <object name="diplomacyPlayerNeutral[n]" size="380 0 400 100%" type="button" style="StoneButton" hidden="true"/>
+                <object name="diplomacyPlayerEnemy[n]" size="400 0 420 100%" type="button" style="StoneButton" hidden="true"/>
 
-                <!-- Tribute -->
-                <object name="diplomacyPlayerTributeFood[n]" size="100%-110 0 100%-90 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
-                    <object name="diplomacyPlayerTributeFoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
-                </object>
-                <object name="diplomacyPlayerTributeWood[n]" size="100%-90 0 100%-70 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
-                    <object name="diplomacyPlayerTributeWoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
-                </object>
-                <object name="diplomacyPlayerTributeStone[n]" size="100%-70 0 100%-50 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
-                    <object name="diplomacyPlayerTributeStoneImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
-                </object>
-                <object name="diplomacyPlayerTributeMetal[n]" size="100%-50 0 100%-30 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
-                    <object name="diplomacyPlayerTributeMetalImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
+                <!-- Tribute --> 
+                <object size="430 0 100%-40 100%">
+                    <repeat count="8" var="r">
+                        <object name="diplomacyPlayer[n]_tribute[r]" size="0 0 20 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
+                            <object name="diplomacyPlayer[n]_tribute[r]_image" type="image" size="0 0 100% 100%" ghost="true"/>
+                        </object>
+                    </repeat>
                 </object>
 
                 <object name="diplomacyAttackRequest[n]" size="100%-20 0 100% 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
                     <object name="diplomacyAttackRequestImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/attack-request.png" ghost="true"/>
                 </object>

binaries/data/mods/public/gui/session/menu.js

@@ -20 +20 @@
 const INITIAL_MENU_POSITION = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
 
 // Number of pixels per millisecond to move
 const MENU_SPEED = 1.2;
 
-// Available resources in trade and tribute menu
-const RESOURCES = ["food", "wood", "stone", "metal"];
-
 // Trade menu: step for probability changes
 const STEP = 5;
 
 // Shown in the trade dialog.
 const g_IdleTraderTextColor = "orange";
@@ -235 +232 @@
         return;
 
     g_IsDiplomacyOpen = true;
 
     let isCeasefireActive = GetSimState().ceasefireActive;
+    let resCodes = GetSimState().resources.codes;
 
     // Get offset for one line
     let onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
     let rowsize = onesize.bottom - onesize.top;
 
@@ -253 +251 @@
         diplomacyFormatStanceButtons(i, myself || playerInactive || isCeasefireActive || g_Players[g_ViewedPlayer].teamsLocked);
         diplomacyFormatTributeButtons(i, myself || playerInactive);
         diplomacyFormatAttackRequestButton(i, myself || playerInactive || isCeasefireActive || !hasAllies || !g_Players[i].isEnemy[g_ViewedPlayer]);
     }
 
-    Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
+    let dialog = Engine.GetGUIObjectByName("diplomacyDialogPanel");
+    let size = dialog.size;
+    let wid = resCodes.length * 10;
+    size.left = -(260 + wid);
+    size.right = (260 + wid);
+    dialog.size = size;
+    dialog.hidden = false;
 }
 
 function diplomacySetupTexts(i, rowsize)
 {
     // Apply offset
@@ -303 +307 @@
     }
 }
 
 function diplomacyFormatTributeButtons(i, hidden)
 {
-    for (let resource of RESOURCES)
+    let resources = GetSimState().resources;
+    let r = 0;
+    for (let resCode of resources.codes)
     {
-        let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
+        let button = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]_tribute["+r+"]");
+        Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]_tribute["+r+"]_image").sprite = "stretched:session/icons/resources/"+resCode+".png";
         button.hidden = hidden;
+        setPanelObjectPosition(button, r, 8, 0);
+        ++r;
         if (hidden)
             continue;
 
         button.enabled = controlsPlayer(g_ViewedPlayer);
-        button.tooltip = formatTributeTooltip(i, resource, 100);
-        button.onpress = (function(i, resource, button) {
+        button.tooltip = formatTributeTooltip(i, resources.names[resCode], 100);
+        button.onpress = (function(i, resCode, button) {
             // Shift+click to send 500, shift+click+click to send 1000, etc.
             // See INPUT_MASSTRIBUTING in input.js
             let multiplier = 1;
             return function() {
                 let isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
@@ -325 +334 @@
                     inputState = INPUT_MASSTRIBUTING;
                     multiplier += multiplier == 1 ? 4 : 5;
                 }
 
                 let amounts = {};
-                for (let type of RESOURCES)
-                    amounts[type] = 0;
-                amounts[resource] = 100 * multiplier;
+                for (let res of resources.codes)
+                    amounts[res] = 0;
+                amounts[resCode] = 100 * multiplier,
 
-                button.tooltip = formatTributeTooltip(i, resource, amounts[resource]);
+                button.tooltip = formatTributeTooltip(i, resources.names[resCode], amounts[resCode]);
 
                 // This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
                 // evil global variable hackery.
                 g_FlushTributing = function() {
                     Engine.PostNetworkCommand({ "type": "tribute", "player": i, "amounts":  amounts });
                     multiplier = 1;
-                    button.tooltip = formatTributeTooltip(i, resource, 100);
+                    button.tooltip = formatTributeTooltip(i, resources.names[resCode], 100);
                 };
 
                 if (!isBatchTrainPressed)
                     g_FlushTributing();
             };
-        })(i, resource, button);
+        })(i, resCode, button);
     }
 }
 
 function diplomacyFormatAttackRequestButton(i, hidden)
 {
@@ -396 +405 @@
             button[res].up.hidden = !controlsPlayer(g_ViewedPlayer) || res == selec || proba[res] == 100 || proba[selec] == 0;
             button[res].dn.hidden = !controlsPlayer(g_ViewedPlayer) || res == selec || proba[res] == 0 || proba[selec] == 100;
         }
     };
 
-    var proba = Engine.GuiInterfaceCall("GetTradingGoods", g_ViewedPlayer);
-    var button = {};
-    var selec = RESOURCES[0];
-    for (var i = 0; i < RESOURCES.length; ++i)
+    let proba = Engine.GuiInterfaceCall("GetTradingGoods", g_ViewedPlayer);
+    let button = {};
+    let resCodes = GetSimState().resources.codes;
+    let selec = resCodes[0];
+    hideRemaining("tradeResource[", resCodes.length, "]");
+
+    for (let i = 0; i < resCodes.length; ++i)
     {
-        var buttonResource = Engine.GetGUIObjectByName("tradeResource["+i+"]");
-        if (i > 0)
-        {
-            var size = Engine.GetGUIObjectByName("tradeResource["+(i-1)+"]").size;
-            var width = size.right - size.left;
-            size.left += width;
-            size.right += width;
-            Engine.GetGUIObjectByName("tradeResource["+i+"]").size = size;
-        }
-        var resource = RESOURCES[i];
-        proba[resource] = (proba[resource] ? proba[resource] : 0);
-        var buttonResource = Engine.GetGUIObjectByName("tradeResourceButton["+i+"]");
-        var icon = Engine.GetGUIObjectByName("tradeResourceIcon["+i+"]");
-        icon.sprite = "stretched:session/icons/resources/" + resource + ".png";
-        var label = Engine.GetGUIObjectByName("tradeResourceText["+i+"]");
-        var buttonUp = Engine.GetGUIObjectByName("tradeArrowUp["+i+"]");
-        var buttonDn = Engine.GetGUIObjectByName("tradeArrowDn["+i+"]");
-        var iconSel = Engine.GetGUIObjectByName("tradeResourceSelection["+i+"]");
-        button[resource] = { "up": buttonUp, "dn": buttonDn, "label": label, "sel": iconSel };
+        let buttonResource = Engine.GetGUIObjectByName("tradeResource["+i+"]");
+        setPanelObjectPosition(buttonResource, i, 8);
+        let resCode = resCodes[i];
+        proba[resCode] = (proba[resCode] ? proba[resCode] : 0);
+        buttonResource = Engine.GetGUIObjectByName("tradeResourceButton["+i+"]");
+        let icon = Engine.GetGUIObjectByName("tradeResourceIcon["+i+"]");
+        icon.sprite = "stretched:session/icons/resources/" + resCode + ".png";
+        let label = Engine.GetGUIObjectByName("tradeResourceText["+i+"]");
+        let buttonUp = Engine.GetGUIObjectByName("tradeArrowUp["+i+"]");
+        let buttonDn = Engine.GetGUIObjectByName("tradeArrowDn["+i+"]");
+        let iconSel = Engine.GetGUIObjectByName("tradeResourceSelection["+i+"]");
+        button[resCode] = { "up": buttonUp, "dn": buttonDn, "label": label, "sel": iconSel };
 
         buttonResource.enabled = controlsPlayer(g_ViewedPlayer);
         buttonResource.onpress = (function(resource){
             return function() {
                 if (Engine.HotkeyIsPressed("session.fulltradeswap"))
                 {
-                    for (var ress of RESOURCES)
+                    for (let ress of resCodes)
                         proba[ress] = 0;
                     proba[resource] = 100;
                     Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
                 }
                 selec = resource;
                 updateButtons();
             };
-        })(resource);
+        })(resCode);
 
         buttonUp.enabled = controlsPlayer(g_ViewedPlayer);
         buttonUp.onpress = (function(resource){
             return function() {
                 proba[resource] += Math.min(STEP, proba[selec]);
                 proba[selec]    -= Math.min(STEP, proba[selec]);
                 Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
                 updateButtons();
             };
-        })(resource);
+        })(resCode);
 
         buttonDn.enabled = controlsPlayer(g_ViewedPlayer);
         buttonDn.onpress = (function(resource){
             return function() {
                 proba[selec]    += Math.min(STEP, proba[resource]);
                 proba[resource] -= Math.min(STEP, proba[resource]);
                 Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
                 updateButtons();
             };
-        })(resource);
+        })(resCode);
     }
     updateButtons();
 
     let traderNumber = Engine.GuiInterfaceCall("GetTraderNumber", g_ViewedPlayer);
     Engine.GetGUIObjectByName("landTraders").caption = getIdleLandTradersText(traderNumber);
     Engine.GetGUIObjectByName("shipTraders").caption = getIdleShipTradersText(traderNumber);
 
-    Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false;
+    let dialog = Engine.GetGUIObjectByName("tradeDialogPanel");
+    let size = dialog.size;
+    let wid = resCodes.length * (58/2);
+    size.left = -(134 + wid);
+    size.right = (134 + wid);
+    dialog.size = size;
+    dialog.hidden = false;
 }
 
 function getIdleLandTradersText(traderNumber)
 {
     let active = traderNumber.landTrader.trading;

binaries/data/mods/public/gui/session/selection_details.js

@@ -11 +11 @@
 }
 
 function getResourceTypeDisplayName(resourceType)
 {
     let resourceCode = resourceType.generic;
-    if (resourceCode == "treasure")
-        return getLocalizedResourceName(resourceType.specific, "firstWord");
-    else
-        return getLocalizedResourceName(resourceCode, "firstWord");
+    let resourceName = GetSimState().resources.names[(resourceCode == "treasure" ? resourceType.specific : resourceCode)]
+    return getLocalizedResourceName(resourceName, "firstWord");
 }
 
 // Updates the health bar of garrisoned units
 function updateGarrisionHealthBar(entState, selection)
 {
@@ -393 +391 @@
     }
 
     let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");
     numberOfUnits.caption = selection.length;
     numberOfUnits.tooltip = Object.keys(totalResourcesCarried).map(res =>
-        g_CostDisplayIcons[res] + totalResourcesCarried[res]
+        costIcon(res) + totalResourcesCarried[res]
     ).join(" ");
 
     // Unhide Details Area
     Engine.GetGUIObjectByName("detailsAreaMultiple").hidden = false;
     Engine.GetGUIObjectByName("detailsAreaSingle").hidden = true;

binaries/data/mods/public/gui/session/selection_panels.js

@@ -32 +32 @@
 let g_AvailableFormations = new Map();
 let g_FormationsInfo = new Map();
 
 let g_SelectionPanels = {};
 
+let g_BarterSell;
+
 g_SelectionPanels.Alert = {
     "getMaxNumberOfItems": function()
     {
         return 2;
     },
@@ -85 +87 @@
 };
 
 g_SelectionPanels.Barter = {
     "getMaxNumberOfItems": function()
     {
-        return 4;
+        return 8;
     },
     "rowLength": 4,
     "getItems": function(unitEntState, selection)
     {
         if (!unitEntState.barterMarket)
             return [];
-        // ["food", "wood", "stone", "metal"]
-        return BARTER_RESOURCES;
+        return GetSimState().resources.codes;
     },
     "setupButton": function(data)
     {
         // data.item is the resource name in this case
         let button = {};
@@ -113 +114 @@
 
         let amountToSell = BARTER_RESOURCE_AMOUNT_TO_SELL;
         if (Engine.HotkeyIsPressed("session.massbarter"))
             amountToSell *= BARTER_BUNCH_MULTIPLIER;
 
+        if (!g_BarterSell)
+            g_BarterSell = GetSimState().resources.codes[0];
+
         amount.Sell.caption = "-" + amountToSell;
         let prices = data.unitEntState.barterMarket.prices;
         amount.Buy.caption = "+" + Math.round(prices.sell[g_BarterSell] / prices.buy[data.item] * amountToSell);
 
-        let resource = getLocalizedResourceName(data.item, "withinSentence");
+        let resource = getLocalizedResourceName(GetSimState().resources.names[data.item], "firstWord");
         button.Buy.tooltip = sprintf(translate("Buy %(resource)s"), { "resource": resource });
         button.Sell.tooltip = sprintf(translate("Sell %(resource)s"), { "resource": resource });
 
         button.Sell.onPress = function() {
             g_BarterSell = data.item;
@@ -162 +166 @@
         button.Buy.hidden = isSelected;
         button.Buy.enabled = controlsPlayer(data.unitEntState.player);
         button.Sell.hidden = false;
         selectionIcon.hidden = !isSelected;
 
-        setPanelObjectPosition(button.Sell, data.i, data.rowLength);
-        setPanelObjectPosition(button.Buy, data.i + data.rowLength, data.rowLength);
+        let sellPos = data.i + (data.i >= data.rowLength ? data.rowLength : 0);
+        let buyPos = data.i + data.rowLength * (data.i >= data.rowLength ? 2 : 1);
+        setPanelObjectPosition(button.Sell, sellPos, data.rowLength);
+        setPanelObjectPosition(button.Buy, buyPos, data.rowLength);
         return true;
     }
 };
 
 g_SelectionPanels.Command = {
@@ -647 +653 @@
         let tooltip = getEntityNames(template);
         if (data.item.neededSlots)
         {
             tooltip += "\n[color=\"red\"]" + translate("Insufficient population capacity:") + "\n[/color]";
             tooltip += sprintf(translate("%(population)s %(neededSlots)s"), {
-                "population": g_CostDisplayIcons.population,
+                "population": costIcon("population"),
                 "neededSlots": data.item.neededSlots
             });
         }
         data.button.tooltip = tooltip;
 
@@ -874 +880 @@
         }
 
         let tooltip = getEntityNames(template);
         if (data.carried)
             tooltip += "\n" + Object.keys(data.carried).map(res =>
-                g_CostDisplayIcons[res] + data.carried[res]
+                costIcon(res) + data.carried[res]
             ).join(" ");
         data.button.tooltip = tooltip;
 
         data.countDisplay.caption = ents.length || "";
 

binaries/data/mods/public/gui/session/selection_panels_helpers.js

@@ -1 +1 @@
 const BARTER_RESOURCE_AMOUNT_TO_SELL = 100;
 const BARTER_BUNCH_MULTIPLIER = 5;
-const BARTER_RESOURCES = ["food", "wood", "stone", "metal"];
 const BARTER_ACTIONS = ["Sell", "Buy"];
 const GATE_ACTIONS = ["lock", "unlock"];
 
-// upgrade constants
 const UPGRADING_NOT_STARTED = -2;
 const UPGRADING_CHOSEN_OTHER = -1;
 
-// ==============================================
-// BARTER HELPERS
-// Resources to sell on barter panel
-var g_BarterSell = "food";
-
 function canMoveSelectionIntoFormation(formationTemplate)
 {
     if (!(formationTemplate in g_canMoveIntoFormation))
     {
         g_canMoveIntoFormation[formationTemplate] = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {

binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="unitBarterPanel" 
-    size="6 36 100% 100%"
+    size="24 12 100% 100%"
     hidden="true"
 >
-    <object ghost="true" style="resourceText" type="text" size="0 0 100% 20">
-        <translatableAttribute id="tooltip">Exchange resources:</translatableAttribute>
-    </object>
-    <object size="0 32 100% 124">
-        <repeat count="4">
-            <!-- sell -->
-            <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
-                <object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-                <object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
-                <object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
-            </object>
-            <!-- buy -->
-            <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
-                <object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-                <object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
-            </object>
-        </repeat>
-    </object>
+
+    <repeat count="8">
+
+        <!-- sell -->
+        <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" hidden="true">
+            <object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+            <object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+            <object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+        </object>
+
+        <!-- buy -->
+        <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" hidden="true">
+            <object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+            <object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+        </object>
+
+    </repeat>
+
 </object>

binaries/data/mods/public/gui/session/session.js

@@ -464 +464 @@
         let civName = g_CivData[g_Players[g_ViewedPlayer].civ].Name;
         Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[g_ViewedPlayer].civ].Emblem;
         Engine.GetGUIObjectByName("civIconOverlay").tooltip = sprintf(translate("%(civ)s - Structure Tree"), { "civ": civName });
     }
 
+    let resources = GetSimState().resources;
+    let r = 0;
+    for (let resCode of resources.codes)
+    {
+        Engine.GetGUIObjectByName("resource["+r+"]").tooltip = getLocalizedResourceName(resources.names[resCode], "firstWord");
+        Engine.GetGUIObjectByName("resource["+r+"]_icon").sprite = "stretched:session/icons/resources/" + resCode + ".png";
+        ++r;
+    }
+    horizFitRepeatedObjects ("resource[n]", "n", 0, r);
+    hideRemaining("resource[", r, "]");
+
     // Hide stuff gaia/observers don't use.
-    Engine.GetGUIObjectByName("food").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("wood").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("stone").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("metal").hidden = !isPlayer;
+    for (let r = 0; r < resources.codes.length; ++r)
+        Engine.GetGUIObjectByName("resource["+r+"]").hidden = !isPlayer;
     Engine.GetGUIObjectByName("population").hidden = !isPlayer;
     Engine.GetGUIObjectByName("civIcon").hidden = !isPlayer;
     Engine.GetGUIObjectByName("diplomacyButton1").hidden = !isPlayer;
     Engine.GetGUIObjectByName("tradeButton1").hidden = !isPlayer;
     Engine.GetGUIObjectByName("observerText").hidden = isPlayer;
@@ -933 +942 @@
     debug.caption = text.replace(/\[/g, "\\[");
 }
 
 function updatePlayerDisplay()
 {
-    let playerState = GetSimState().players[g_ViewedPlayer];
+    let simState = GetSimState();
+    let playerState = simState.players[g_ViewedPlayer];
     if (!playerState)
         return;
 
-    Engine.GetGUIObjectByName("resourceFood").caption = Math.floor(playerState.resourceCounts.food);
-    Engine.GetGUIObjectByName("resourceWood").caption = Math.floor(playerState.resourceCounts.wood);
-    Engine.GetGUIObjectByName("resourceStone").caption = Math.floor(playerState.resourceCounts.stone);
-    Engine.GetGUIObjectByName("resourceMetal").caption = Math.floor(playerState.resourceCounts.metal);
+    let resCodes = simState.resources.codes;
+    for (let r = 0; r < resCodes.length; ++r)
+        Engine.GetGUIObjectByName("resource["+r+"]_count").caption = Math.floor(playerState.resourceCounts[resCodes[r]]);
+
     Engine.GetGUIObjectByName("resourcePop").caption = playerState.popCount + "/" + playerState.popLimit;
     Engine.GetGUIObjectByName("population").tooltip = translate("Population (current / limit)") + "\n" +
                     sprintf(translate("Maximum population: %(popCap)s"), { "popCap": playerState.popMax });
 
     g_IsTrainingBlocked = playerState.trainingBlocked;

binaries/data/mods/public/gui/session/session.xml

@@ -4 +4 @@
 
 <script file="gui/common/color.js"/>
 <script file="gui/common/colorFades.js"/>
 <script file="gui/common/functions_civinfo.js"/>
 <script file="gui/common/functions_global_object.js"/>
+<script file="gui/common/functions_repeat_positioning.js"/>
 <script file="gui/common/functions_utility.js"/>
 <script file="gui/common/l10n.js"/>
 <script file="gui/common/music.js"/>
 <script file="gui/common/network.js"/>
 <script file="gui/common/settings.js"/>

binaries/data/mods/public/gui/session/top_panel/resource_population.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="population" size="370 0 460 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
+<object name="population" size="50%-90-52 0 50%-52 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
     <object size="0 -4 40 34" type="image" sprite="stretched:session/icons/resources/population.png" ghost="true"/>
     <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/>
 </object>

binaries/data/mods/public/gui/session/trade_window.xml

@@ -14 +14 @@
         <object name="tradeHeader" size="0 0 180 100%" type="text" style="ModernLabelText" text_align="left" ghost="true">
             <translatableAttribute id="caption">Trading goods selection:</translatableAttribute>
         </object>
 
         <object size="180 0 100% 100%">
-            <repeat count="4">
+            <repeat count="8">
                 <object name="tradeResource[n]" size="0 0 58 32">
                     <object name="tradeResourceButton[n]" size="4 0 36 100%" type="button" style="StoneButton">
                         <object name="tradeResourceIcon[n]" type="image" ghost="true"/>
                         <object name="tradeResourceSelection[n]" type="image" sprite="stretched:session/icons/corners.png" ghost="true"/>
                         <object name="tradeResourceText[n]" type="text" style="ModernLabelText" ghost="true"/>

binaries/data/mods/public/gui/summary/counters.js

@@ -248 +248 @@
         playerState.statistics.enemyUnitsKilled[type]);
 }
 
 function calculateResources(playerState, position)
 {
-    let type = g_ResourcesTypes[position];
+    let type = g_GameData.resources.codes[position];
 
     return formatIncome(
         playerState.statistics.resourcesGathered[type],
         playerState.statistics.resourcesUsed[type] - playerState.statistics.resourcesSold[type]);
 }
@@ -260 +260 @@
 function calculateTotalResources(playerState)
 {
     let totalGathered = 0;
     let totalUsed = 0;
 
-    for (let type of g_ResourcesTypes)
+    for (let type of g_GameData.resources.codes)
     {
         totalGathered += playerState.statistics.resourcesGathered[type];
         totalUsed += playerState.statistics.resourcesUsed[type] - playerState.statistics.resourcesSold[type];
     }
 
@@ -328 +328 @@
     }
 }
 
 function calculateResourceExchanged(playerState, position)
 {
-    let type = g_ResourcesTypes[position];
+    let type = g_GameData.resources.codes[position];
 
     return formatIncome(
         playerState.statistics.resourcesBought[type],
         playerState.statistics.resourcesSold[type]);
 }

binaries/data/mods/public/gui/summary/layout.js

@@ -90 +90 @@
         "teamCounterFn": calculateUnitsTeam
     },
     "resources": {
         "headings": [
             { "caption": translate("Player name"), "yStart": 26, "width": 200 },
-            { "caption": translate("Food"), "yStart": 34, "width": 100 },
-            { "caption": translate("Wood"), "yStart": 34, "width": 100 },
-            { "caption": translate("Stone"), "yStart": 34, "width": 100 },
-            { "caption": translate("Metal"), "yStart": 34, "width": 100 },
             { "caption": translate("Total"), "yStart": 34, "width": 110 },
             {
                 "caption": sprintf(translate("Tributes \n(%(sent)s / %(received)s)"),
                     {
                         "sent": g_IncomeColor + translate("Sent") + '[/color]',
@@ -119 +115 @@
                 "yStart": 16,
                 "width": (100 * 4 + 110)
             }, // width = 510
         ],
         "counters": [
-            { "width": 100, "fn": calculateResources, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResources, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResources, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResources, "verticalOffset": 12 },
             { "width": 110, "fn": calculateTotalResources, "verticalOffset": 12 },
             { "width": 121, "fn": calculateTributeSent, "verticalOffset": 12 },
             { "width": 100, "fn": calculateTreasureCollected, "verticalOffset": 12 },
             { "width": 100, "fn": calculateLootCollected, "verticalOffset": 12 }
         ],
         "teamCounterFn": calculateResourcesTeam
     },
     "market": {
         "headings": [
             { "caption": translate("Player name"), "yStart": 26, "width": 200 },
-            { "caption": translate("Food exchanged"), "yStart": 16, "width": 100 },
-            { "caption": translate("Wood exchanged"), "yStart": 16, "width": 100 },
-            { "caption": translate("Stone exchanged"), "yStart": 16, "width": 100 },
-            { "caption": translate("Metal exchanged"), "yStart": 16, "width": 100 },
             { "caption": translate("Barter efficiency"), "yStart": 16, "width": 100 },
             { "caption": translate("Trade income"), "yStart": 16, "width": 100 }
         ],
         "titleHeadings": [],
         "counters": [
-            { "width": 100, "fn": calculateResourceExchanged, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResourceExchanged, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResourceExchanged, "verticalOffset": 12 },
-            { "width": 100, "fn": calculateResourceExchanged, "verticalOffset": 12 },
             { "width": 100, "fn": calculateBarterEfficiency, "verticalOffset": 12 },
             { "width": 100, "fn": calculateTradeIncome, "verticalOffset": 12 }
         ],
         "teamCounterFn": calculateMarketTeam
     },

binaries/data/mods/public/gui/summary/summary.js

@@ -1 @@
-const g_MaxHeadingTitle= 8;
+const g_MaxHeadingTitle= 12;
 
 // const for filtering long collective headings
 const g_LongHeadingWidth = 250;
 
 const g_PlayerBoxYSize = 40;
@@ -15 +15 @@
 const g_KilledColor = '[color="196 198 255"]';
 const g_CapturedColor = '[color="255 255 157"]';
 
 const g_BuildingsTypes = [ "total", "House", "Economic", "Outpost", "Military", "Fortress", "CivCentre", "Wonder" ];
 const g_UnitsTypes = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship", "Trader" ];
-const g_ResourcesTypes = [ "food", "wood", "stone", "metal" ];
 
 // Colors used for gathered and traded resources
 const g_IncomeColor = '[color="201 255 200"]';
 const g_OutcomeColor = '[color="255 213 213"]';
 
@@ -240 +239 @@
             g_Teams = false;    // Each player has his own team. Displaying teams makes no sense.
     }
     else
         g_Teams = false;
 
+    // Resource names and counters
+    let resHeads = [];
+    let tradeHeads = [];
+    let resPanel = g_ScorePanelsData.resources;
+    let tradePanel = g_ScorePanelsData.market;
+    for (let code of g_GameData.resources.codes)
+    {
+        resHeads.push({
+                "caption": translateWithContext("firstWord", g_GameData.resources.names[code]),
+                "yStart": 34, "width": 100
+            });
+        resPanel.counters.unshift({"width": 100, "fn": calculateResources, "verticalOffset": 12});
+        
+        tradeHeads.push({
+                "caption": sprintf(
+                    translate("%(resource)s exchanged"), {
+                        "resource": translateWithContext("withinSentence", g_GameData.resources.names[code])
+                    }),
+                "yStart": 16, "width": 100
+            });
+        tradePanel.counters.unshift({"width": 100, "fn": calculateResourceExchanged, "verticalOffset": 12});
+    }
+    resPanel.headings.splice.apply(resPanel.headings, [1, 0].concat(resHeads));
+    resPanel.titleHeadings[0].width = (100 * g_GameData.resources.codes.length) + 110;
+    tradePanel.headings.splice.apply(tradePanel.headings, [1, 0].concat(tradeHeads));
+
     // Erase teams data if teams are not displayed
     if (!g_Teams)
     {
         for (let p = 0; p < g_PlayerCount; ++p)
             g_GameData.sim.playerStates[p+1].team = -1;

binaries/data/mods/public/gui/summary/summary.xml

@@ -101 +101 @@
         <object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
             <object size="0 0 100% 100%-50">
                 <object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
                     <translatableAttribute id="caption">Player name</translatableAttribute>
                 </object>
-                <repeat var="x" count="8">
+                <repeat var="x" count="12">
                     <object name="titleHeading[x]" type="text" style="ModernTabLabelText">
                     </object>
                 </repeat>
-                <repeat var="x" count="8">
+                <repeat var="x" count="12">
                     <object name="Heading[x]" type="text" style="ModernTabLabelText">
                     </object>
                 </repeat>
             </object>
 
@@ -122 +122 @@
                                 <object type="image" sprite="ForegroundBox" size="10 9 34 33">
                                     <object name="playerColorBoxt[i][n]" type="image" size="2 2 22 22"/>
                                 </object>
                                 <object name="playerNamet[i][n]" type="text" size="40 2 208 100%" style="ModernLeftLabelText"/>
                                 <object name="civIcont[i][n]" type="image" size="208 5 240 37" />
-                                <repeat var="x" count="8">
+                                <repeat var="x" count="12">
                                     <object name="valueDataTeam[i][n][x]" type="text" style="ModernTabLabelText">
                                     </object>
                                 </repeat>
                             </object>
                         </repeat>
                     </object>
                     <object name="teamHeadingt[i]" type="text" style="ModernLeftTabLabelText"/>
-                    <repeat var="x" count="8">
+                    <repeat var="x" count="12">
                         <object name="valueDataTeam[i][x]" type="text" style="ModernTabLabelText">
                         </object>
                     </repeat>
                 </object>
             </repeat>
@@ -145 +145 @@
                         <object type="image" sprite="ForegroundBox" size="10 9 34 33">
                             <object name="playerColorBox[n]" type="image" size="2 2 22 22"/>
                         </object>
                         <object name="playerName[n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
                         <object name="civIcon[n]" type="image" size="208 5 240 37"/>
-                        <repeat var="x" count="8">
+                        <repeat var="x" count="12">
                             <object name="valueData[n][x]" type="text" style="ModernTabLabelText">
                             </object>
                         </repeat>
                     </object>
                 </repeat>

binaries/data/mods/public/l10n/messages.json

@@ -287 +287 @@
                         },
                         "translate": {}
                     }
                 }
             },
-            {
+            {
                 "extractor": "json",
                 "filemasks": [
                     "gui/credits/texts/**.json"
                 ],
                 "options": {
@@ -560 +560 @@
                     "keywords": [
                         "name",
                         "description"
                     ]
                 }
+            },
+            {
+                "extractor": "json",
+                "filemasks": [
+                    "simulation/data/resources/**.json"
+                ],
+                "options": {
+                    "keywords": [
+                        "name",
+                        "subtypes"
+                    ],
+                    "context": "firstWord"
+                }
+            },
+            {
+                "extractor": "json",
+                "filemasks": [
+                    "simulation/data/resources/**.json"
+                ],
+                "options": {
+                    "keywords": [
+                        "name",
+                        "subtypes"
+                    ],
+                    "context": "withinSentence"
+                }
             }
         ]
     },
     {
         "output": "public-maps.pot",

binaries/data/mods/public/simulation/components/Cost.js

@@ -1 +1 @@
 function Cost() {}
 
+Cost.prototype.ResourcesSchema = Resources.BuildSchema("nonNegativeInteger");
+
 Cost.prototype.Schema =
     "<a:help>Specifies the construction/training costs of this entity.</a:help>" +
     "<a:example>" +
         "<Population>1</Population>" +
         "<PopulationBonus>15</PopulationBonus>" +
@@ -17 +19 @@
         "<data type='nonNegativeInteger'/>" +
     "</element>" +
     "<element name='PopulationBonus' a:help='Population cap increase while this entity exists'>" +
         "<data type='nonNegativeInteger'/>" +
     "</element>" +
-    "<element name='BuildTime' a:help='Time taken to construct/train this unit (in seconds)'>" +
+    "<element name='BuildTime' a:help='Time taken to construct/train this entity (in seconds)'>" +
         "<ref name='nonNegativeDecimal'/>" +
     "</element>" +
-    "<element name='Resources' a:help='Resource costs to construct/train this unit'>" +
-        "<interleave>" +
-            "<element name='food'><data type='nonNegativeInteger'/></element>" +
-            "<element name='wood'><data type='nonNegativeInteger'/></element>" +
-            "<element name='stone'><data type='nonNegativeInteger'/></element>" +
-            "<element name='metal'><data type='nonNegativeInteger'/></element>" +
-        "</interleave>" +
+    "<element name='Resources' a:help='Resource costs to construct/train this entity'>" +
+        Cost.prototype.ResourcesSchema +
     "</element>";
 
 Cost.prototype.Init = function()
 {
     this.populationCost = +this.template.Population;
@@ -68 +65 @@
     let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
     let entityTemplateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
     let entityTemplate = cmpTemplateManager.GetTemplate(entityTemplateName);
 
     let costs = {};
-    for (let r in this.template.Resources)
-        costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +this.template.Resources[r], owner, entityTemplate);
+    let resCodes = Resources.GetCodes();
+
+    for (let res in this.template.Resources)
+    {
+        let cost = +this.template.Resources[res];
+        if (resCodes.indexOf(res) < 0)
+            continue;
+        costs[res] = ApplyValueModificationsToTemplate("Cost/Resources/"+res, cost, owner, entityTemplate);
+    }
+
     return costs;
 };
 
 Cost.prototype.OnOwnershipChanged = function(msg)
 {

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -149 +149 @@
 
     // Add bartering prices
     let cmpBarter = Engine.QueryInterface(SYSTEM_ENTITY, IID_Barter);
     ret.barterPrices = cmpBarter.GetPrices();
 
+    // Add Resource Codes, untranslated names and AI Analysis
+    ret.resources = {
+        "codes": Resources.GetCodes(),
+        "names": Resources.GetNames()
+    };
+    ret.aiResourceAnalysis = {};
+    for (let res of Resources.GetCodes())
+        ret.aiResourceAnalysis[res] = Resources.GetResource(res).aiAnalysis || null;
+
     // Add basic statistics to each player
     for (let i = 0; i < numPlayers; ++i)
     {
         let playerEnt = cmpPlayerManager.GetPlayerByID(i);
         let cmpPlayerStatisticsTracker = Engine.QueryInterface(playerEnt, IID_StatisticsTracker);
@@ -1265 +1274 @@
     // --------------------------------------------------------------------------------
     // calculate wall placement and position preview entities
 
     let result = {
         "pieces": [],
-        "cost": { "food": 0, "wood": 0, "stone": 0, "metal": 0, "population": 0, "populationBonus": 0, "time": 0 },
+        "cost": {"population": 0, "populationBonus": 0, "time": 0},
     };
-
+    for (let res of Resources.GetCodes())
+        result.cost[res] = 0;
+    
     let previewEntities = [];
     if (end.pos)
         previewEntities = GetWallPlacement(this.placementWallEntities, wallSet, start, end); // see helpers/Walls.js
 
     // For wall placement, we may (and usually do) need to have wall pieces overlap each other more than would
@@ -1541 +1552 @@
 
             // grab the cost of this wall piece and add it up (note; preview entities don't have their Cost components
             // copied over, so we need to fetch it from the template instead).
             // TODO: we should really use a Cost object or at least some utility functions for this, this is mindless
             // boilerplate that's probably duplicated in tons of places.
-            result.cost.food += tplData.cost.food;
-            result.cost.wood += tplData.cost.wood;
-            result.cost.stone += tplData.cost.stone;
-            result.cost.metal += tplData.cost.metal;
-            result.cost.population += tplData.cost.population;
-            result.cost.populationBonus += tplData.cost.populationBonus;
-            result.cost.time += tplData.cost.time;
+            let entries = Resources.GetCodes().concat("population", "populationBonus", "time");
+            for (let res of entries)
+                result.cost[res] = tplData.cost[res];
         }
 
         let canAfford = true;
         let cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
         if (cmpPlayer && cmpPlayer.GetNeededResources(result.cost))

binaries/data/mods/public/simulation/components/Loot.js

@@ -1 +1 @@
 function Loot() {}
 
+Loot.prototype.ResourcesSchema = Resources.BuildSchema("nonNegativeInteger", [ "xp" ]);
+
 Loot.prototype.Schema =
-    "<optional>" +
-        "<element name='xp'><data type='nonNegativeInteger'/></element>" +
-    "</optional>" +
-    "<optional>" +
-        "<element name='food'><data type='nonNegativeInteger'/></element>" +
-    "</optional>" +
-    "<optional>" +
-        "<element name='wood'><data type='nonNegativeInteger'/></element>" +
-    "</optional>" +
-    "<optional>" +
-        "<element name='stone'><data type='nonNegativeInteger'/></element>" +
-    "</optional>" +
-    "<optional>" +
-        "<element name='metal'><data type='nonNegativeInteger'/></element>" +
-    "</optional>";
+    "<a:help>Specifies the loot credited when this entity is killed.</a:help>" +
+    "<a:example>" +
+        "<xp>35</xp>" +
+        "<metal>10</metal>" +
+    "</a:example>" +
+    Loot.prototype.ResourcesSchema;
 
 Loot.prototype.Serialize = null; // we have no dynamic state to save
 
 Loot.prototype.GetXp = function()
 {
     return +(this.template.xp || 0);
 };
 
 Loot.prototype.GetResources = function()
 {
-    return {
-        "food": +(this.template.food || 0),
-        "wood": +(this.template.wood || 0),
-        "metal": +(this.template.metal || 0),
-        "stone": +(this.template.stone || 0)
-    };
+    let ret = {};
+    for (let res of Resources.GetCodes())
+        ret[res] = +(this.template[res] || 0);
+    
+    return ret;
 };
 
 Engine.RegisterComponentType(IID_Loot, "Loot", Loot);

binaries/data/mods/public/simulation/components/Player.js

@@ -16 +16 @@
     this.color = { "r": 0.0, "g": 0.0, "b": 0.0, "a": 1.0 };
     this.popUsed = 0; // population of units owned or trained by this player
     this.popBonuses = 0; // sum of population bonuses of player's entities
     this.maxPop = 300; // maximum population
     this.trainingBlocked = false; // indicates whether any training queue is currently blocked
-    this.resourceCount = {
-        "food": 300,
-        "wood": 300,
-        "metal": 300,
-        "stone": 300
-    };
-    // goods for next trade-route and its proba in % (the sum of probas must be 100)
-    this.tradingGoods = [
-        { "goods":  "wood", "proba": 30 },
-        { "goods": "stone", "proba": 35 },
-        { "goods": "metal", "proba": 35 },
-    ];
+    this.resourceCount = {};
+    this.tradingGoods = []; // goods for next trade-route and its proba in % (the sum of probas must be 100)
     this.team = -1; // team number of the player, players on the same team will always have ally diplomatic status - also this is useful for team emblems, scoring, etc.
     this.teamsLocked = false;
     this.state = "active"; // game state - one of "active", "defeated", "won"
     this.diplomacy = [];    // array of diplomatic stances for this player with respect to other players (including gaia and self)
     this.sharedDropsites = false;
@@ -42 +32 @@
     this.gatherRateMultiplier = 1;
     this.tradeRateMultiplier = 1;
     this.cheatsEnabled = false;
     this.cheatTimeMultiplier = 1;
     this.heroes = [];
-    this.resourceNames = {
-        "food": markForTranslation("Food"),
-        "wood": markForTranslation("Wood"),
-        "metal": markForTranslation("Metal"),
-        "stone": markForTranslation("Stone"),
-    };
+    this.resourceNames = {};
     this.disabledTemplates = {};
     this.disabledTechnologies = {};
     this.startingTechnologies = [];
+    
+    let resCodes = Resources.GetCodes();
+    let tradeProportions = [ 0, 0 ];
+    tradeProportions[0] = Math.floor(20 / resCodes.length);
+    tradeProportions[1] = 20 - resCodes.length * tradeProportions[0];
+    let resPos = 0;
+    for (let res of resCodes)
+    {
+        this.resourceCount[res] = 300;
+        this.resourceNames[res] = Resources.GetResource(res).name;
+        let proportion = tradeProportions[0] + ((resPos < tradeProportions[1]) ? 1 : 0);
+        this.tradingGoods.push({ "goods":  res, "proba": (proportion * 5) });
+        ++resPos;
+    }
 };
 
 Player.prototype.SetPlayerID = function(id)
 {
     this.playerID = id;
@@ -195 +194 @@
     this.trainingBlocked = false;
 };
 
 Player.prototype.SetResourceCounts = function(resources)
 {
-    if (resources.food !== undefined)
-        this.resourceCount.food = resources.food;
-    if (resources.wood !== undefined)
-        this.resourceCount.wood = resources.wood;
-    if (resources.stone !== undefined)
-        this.resourceCount.stone = resources.stone;
-    if (resources.metal !== undefined)
-        this.resourceCount.metal = resources.metal;
+    for (let res in resources)
+        if (this.resourceCount[res])
+            this.resourceCount[res] = resources[res];
 };
 
 Player.prototype.GetResourceCounts = function()
 {
     return this.resourceCount;
@@ -295 +289 @@
         return false;
     }
 
     // Subtract the resources
     for (var type in amounts)
-        this.resourceCount[type] -= amounts[type];
+        if (this.resourceCount[type])
+            this.resourceCount[type] -= amounts[type];
 
     return true;
 };
 
 Player.prototype.TrySubtractResources = function(amounts)
@@ -344 +339 @@
     for (var resource in tradingGoods)
         sumProba += tradingGoods[resource];
     if (sumProba != 100)    // consistency check
     {
         error("Player.js SetTradingGoods: " + uneval(tradingGoods));
-        tradingGoods = { "food": 20, "wood":20, "stone":30, "metal":30 };
+        let first = true;
+        for (let res of Resources.GetCodes())
+            if (first)
+            {
+                tradingGoods[res] = 100;
+                first = false;
+            }
+            else
+                tradingGoods[res] = 0;
     }
 
     this.tradingGoods = [];
     for (var resource in tradingGoods)
         this.tradingGoods.push( {"goods": resource, "proba": tradingGoods[resource]} );

binaries/data/mods/public/simulation/components/ProductionQueue.js

@@ -1 +1 @@
 var g_ProgressInterval = 1000;
 const MAX_QUEUE_SIZE = 16;
 
 function ProductionQueue() {}
 
+ProductionQueue.prototype.ResourceSchema = Resources.BuildSchema("nonNegativeDecimal", [ "time" ]);
+
 ProductionQueue.prototype.Schema =
     "<a:help>Allows the building to train new units and research technologies</a:help>" +
     "<a:example>" +
         "<BatchTimeModifier>0.7</BatchTimeModifier>" +
         "<Entities datatype='tokens'>" +
@@ -29 +31 @@
             "</attribute>" +
             "<text/>" +
         "</element>" +
     "</optional>" +
     "<element name='TechCostMultiplier' a:help='Multiplier to modify ressources cost and research time of technologies searched in this building.'>" +
-        "<interleave>" +
-            "<element name='food'><ref name='nonNegativeDecimal'/></element>" +
-            "<element name='wood'><ref name='nonNegativeDecimal'/></element>" +
-            "<element name='stone'><ref name='nonNegativeDecimal'/></element>" +
-            "<element name='metal'><ref name='nonNegativeDecimal'/></element>" +
-            "<element name='time'><ref name='nonNegativeDecimal'/></element>" +
-        "</interleave>" +
+        ProductionQueue.prototype.ResourceSchema +
     "</element>";
 
 ProductionQueue.prototype.Init = function()
 {
     this.nextID = 1;
@@ -258 +254 @@
 ProductionQueue.prototype.AddBatch = function(templateName, type, count, metadata)
 {
     // TODO: there should probably be a limit on the number of queued batches
     // TODO: there should be a way for the GUI to determine whether it's going
     // to be possible to add a batch (based on resource costs and length limits)
-    var cmpPlayer = QueryOwnerInterface(this.entity);
+    let cmpPlayer = QueryOwnerInterface(this.entity);
+    let resCodes = Resources.GetCodes();
 
     if (this.queue.length < MAX_QUEUE_SIZE)
     {
         
         if (type == "unit")
@@ -291 +288 @@
             var costs = {};
             var totalCosts = {};
             var buildTime = ApplyValueModificationsToTemplate("Cost/BuildTime", +template.Cost.BuildTime, cmpPlayer.GetPlayerID(), template);
             var time = timeMult * buildTime;
 
-            for (var r in template.Cost.Resources)
+            for (let res in template.Cost.Resources)
             {
-                costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +template.Cost.Resources[r], cmpPlayer.GetPlayerID(), template);
-                totalCosts[r] = Math.floor(count * costs[r]);
+                let cost = +template.Cost.Resources[res];
+                if (resCodes.indexOf(res) < 0)
+                    continue;
+                costs[res] = ApplyValueModificationsToTemplate("Cost/Resources/"+res, cost, cmpPlayer.GetPlayerID(), template);
+                totalCosts[res] = Math.floor(count * costs[res]);
             }
 
             var population = ApplyValueModificationsToTemplate("Cost/Population",  +template.Cost.Population, cmpPlayer.GetPlayerID(), template);
 
             // TrySubtractResources should report error to player (they ran out of resources)
@@ -339 +339 @@
                 return;
             var cmpPlayer = QueryOwnerInterface(this.entity);
             let techCostMultiplier = this.GetTechCostMultiplier();
             let time =  techCostMultiplier.time * template.researchTime * cmpPlayer.GetCheatTimeMultiplier();
 
-            var cost = {};
+            let cost = {};
             for (let res in template.cost)
-                cost[res] = Math.floor(techCostMultiplier[res] * template.cost[res]);
+            {
+                if (resCodes.indexOf(res) < 0)
+                    continue;
+                cost[res] = Math.floor((techCostMultiplier[res] ? techCostMultiplier[res] : 1) * template.cost[res]);
+            }
 
             // TrySubtractResources should report error to player (they ran out of resources)
             if (!cmpPlayer.TrySubtractResources(cost))
                 return;
             
@@ -359 +363 @@
             this.queue.push({
                 "id": this.nextID++,
                 "player": cmpPlayer.GetPlayerID(),
                 "count": 1,
                 "technologyTemplate": templateName,
-                "resources": deepcopy(template.cost), // need to copy to avoid serialization problems
+                "resources": cost,
                 "productionStarted": false,
                 "timeTotal": time*1000,
                 "timeRemaining": time*1000,
             });
             
@@ -431 +435 @@
         }
 
         // Refund the resource cost for this batch
         var totalCosts = {};
         var cmpStatisticsTracker = QueryPlayerIDInterface(item.player, IID_StatisticsTracker);
-        for each (var r in ["food", "wood", "stone", "metal"])
+        for (let r of Resources.GetCodes())
         {
+            if (!item.resources[r])
+                continue;
             totalCosts[r] = Math.floor(item.count * item.resources[r]);
             if (cmpStatisticsTracker)
                 cmpStatisticsTracker.IncreaseResourceUsedCounter(r, -totalCosts[r]);
         }
         

binaries/data/mods/public/simulation/components/ResourceDropsite.js

@@ -1 +1 @@
 function ResourceDropsite() {}
 
+ResourceDropsite.prototype.ResourceChoiceSchema = Resources.BuildChoicesSchema();
+
 ResourceDropsite.prototype.Schema =
     "<element name='Types'>" +
         "<list>" +
             "<zeroOrMore>" +
-                "<choice>" +
-                    "<value>food</value>" +
-                    "<value>wood</value>" +
-                    "<value>stone</value>" +
-                    "<value>metal</value>" +
-                "</choice>" +
+                ResourceDropsite.prototype.ResourceChoiceSchema +
             "</zeroOrMore>" +
         "</list>" +
     "</element>" +
     "<element name='Sharable' a:help='Allows allies to use this entity.'>" +
         "<data type='boolean'/>" +
@@ -22 +19 @@
     this.sharable = this.template.Sharable == "true";
     this.shared = this.sharable;
 };
 
 /**
- * Returns the list of resource types accepted by this dropsite.
+ * Returns the list of resource types accepted by this dropsite,
+ * as defined by it being referred to in the template and the resource being enabled.
  */
 ResourceDropsite.prototype.GetTypes = function()
 {
-    let types = ApplyValueModificationsToEntity("ResourceDropsite/Types", this.template.Types, this.entity);
-    return types ? types.split(/\s+/) : [];
+    let typesTok = ApplyValueModificationsToEntity("ResourceDropsite/Types", this.template.Types, this.entity);
+    let typesArr = [];
+    let resources = Resources.GetCodes();
+
+    for (let type of typesTok.split(/\s+/))
+        if (resources.indexOf(type.toLowerCase()) > -1)
+            typesArr.push(type);
+
+    return typesArr;
 };
 
 /**
  * Returns whether this dropsite accepts the given generic type of resource.
  */

binaries/data/mods/public/simulation/components/ResourceGatherer.js

@@ -1 +1 @@
 function ResourceGatherer() {}
 
+ResourceGatherer.prototype.ResourcesSchema = Resources.BuildSchema("positiveDecimal", [ "treasure" ], true);
+ResourceGatherer.prototype.CapacitiesSchema = Resources.BuildSchema("positiveDecimal");
+
 ResourceGatherer.prototype.Schema =
     "<a:help>Lets the unit gather resources from entities that have the ResourceSupply component.</a:help>" +
     "<a:example>" +
         "<MaxDistance>2.0</MaxDistance>" +
         "<BaseSpeed>1.0</BaseSpeed>" +
@@ -23 +26 @@
     "</element>" +
     "<element name='BaseSpeed' a:help='Base resource-gathering rate (in resource units per second)'>" +
         "<ref name='positiveDecimal'/>" +
     "</element>" +
     "<element name='Rates' a:help='Per-resource-type gather rate multipliers. If a resource type is not specified then it cannot be gathered by this unit'>" +
-        "<interleave>" +
-            "<optional><element name='food' a:help='Food gather rate (may be overridden by \"food.*\" subtypes)'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='wood' a:help='Wood gather rate'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='stone' a:help='Stone gather rate'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='metal' a:help='Metal gather rate'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='treasure' a:help='Treasure gather rate (only presense on value makes sense, size is only used to determine the delay before gathering, so it should be set to 1)'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='food.fish' a:help='Fish gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='food.fruit' a:help='Fruit gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='food.grain' a:help='Grain gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='food.meat' a:help='Meat gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='food.milk' a:help='Milk gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='wood.tree' a:help='Tree gather rate (overrides \"wood\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='wood.ruins' a:help='Tree gather rate (overrides \"wood\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='stone.rock' a:help='Rock gather rate (overrides \"stone\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='stone.ruins' a:help='Rock gather rate (overrides \"stone\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='metal.ore' a:help='Ore gather rate (overrides \"metal\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='treasure.food' a:help='Food treasure gather rate (overrides \"treasure\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='treasure.wood' a:help='Wood treasure gather rate (overrides \"treasure\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='treasure.stone' a:help='Stone treasure gather rate (overrides \"treasure\")'><ref name='positiveDecimal'/></element></optional>" +
-            "<optional><element name='treasure.metal' a:help='Metal treasure gather rate (overrides \"treasure\")'><ref name='positiveDecimal'/></element></optional>" +
-        "</interleave>" +
+        ResourceGatherer.prototype.ResourcesSchema +
     "</element>" +
     "<element name='Capacities' a:help='Per-resource-type maximum carrying capacity'>" +
-        "<interleave>" +
-            "<element name='food' a:help='Food capacity'><ref name='positiveDecimal'/></element>" +
-            "<element name='wood' a:help='Wood capacity'><ref name='positiveDecimal'/></element>" +
-            "<element name='stone' a:help='Stone capacity'><ref name='positiveDecimal'/></element>" +
-            "<element name='metal' a:help='Metal capacity'><ref name='positiveDecimal'/></element>" +
-        "</interleave>" +
+        ResourceGatherer.prototype.CapacitiesSchema +
     "</element>";
 
 ResourceGatherer.prototype.Init = function()
 {
     this.carrying = {}; // { generic type: integer amount currently carried }
@@ -135 +113 @@
     this.baseSpeed = multiplier * ApplyValueModificationsToEntity("ResourceGatherer/BaseSpeed", +this.template.BaseSpeed, this.entity);
 
     this.rates = {};
     for (let r in this.template.Rates)
     {
+        let type = r.split(".");
+        let res = Resources.GetResource(type[0]);
+        
+        if (!res && type[0] !== "treasure" || (type.length > 1 && res.subtypes.indexOf(type[1]) < 0))
+            continue;
+        
         let rate = ApplyValueModificationsToEntity("ResourceGatherer/Rates/" + r, +this.template.Rates[r], this.entity);
         this.rates[r] = rate * this.baseSpeed;
     }
 
     this.capacities = {};
@@ -172 +156 @@
     // maybe this should depend on the unit or target or something?
 };
 
 /**
  * Try to gather treasure
- * @return 'true' if treasure is successfully gathered and 'false' in the other case
+ * @return 'true' if treasure is successfully gathered and 'false' if not
  */
 ResourceGatherer.prototype.TryInstantGather = function(target)
 {
     let cmpResourceSupply = Engine.QueryInterface(target, IID_ResourceSupply);
     let type = cmpResourceSupply.GetType();

binaries/data/mods/public/simulation/components/ResourceSupply.js

@@ -1 +1 @@
 function ResourceSupply() {}
 
+ResourceSupply.prototype.ResourceChoiceSchema = Resources.BuildChoicesSchema(true, true);
+
 ResourceSupply.prototype.Schema =
     "<a:help>Provides a supply of one particular type of resource.</a:help>" +
     "<a:example>" +
         "<Amount>1000</Amount>" +
         "<Type>food.meat</Type>" +
@@ -10 +12 @@
         "<data type='boolean'/>" +
     "</element>" +
     "<element name='Amount' a:help='Amount of resources available from this entity'>" +
         "<choice><data type='nonNegativeInteger'/><value>Infinity</value></choice>" +
     "</element>" +
-    "<element name='Type' a:help='Type of resources'>" +
-        "<choice>" +
-            "<value>wood.tree</value>" +
-            "<value>wood.ruins</value>" +
-            "<value>stone.rock</value>" +
-            "<value>stone.ruins</value>" +
-            "<value>metal.ore</value>" +
-            "<value>food.fish</value>" +
-            "<value>food.fruit</value>" +
-            "<value>food.grain</value>" +
-            "<value>food.meat</value>" +
-            "<value>food.milk</value>" +
-            "<value>treasure.wood</value>" +
-            "<value>treasure.stone</value>" +
-            "<value>treasure.metal</value>" +
-            "<value>treasure.food</value>" +
-        "</choice>" +
+    "<element name='Type' a:help='Type and Subtype of resource available from this entity'>" +
+        ResourceSupply.prototype.ResourceChoiceSchema +
     "</element>" +
     "<element name='MaxGatherers' a:help='Amount of gatherers who can gather resources from this entity at the same time'>" +
         "<data type='nonNegativeInteger'/>" +
     "</element>" +
     "<optional>" +
@@ -43 +30 @@
 {
     // Current resource amount (non-negative)
     this.amount = this.GetMaxAmount();
 
     this.gatherers = [];    // list of IDs for each players
-    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager); // system component so that's safe.
-    var numPlayers = cmpPlayerManager.GetNumPlayers();
-    for (var i = 0; i <= numPlayers; ++i)   // use "<=" because we want Gaia too.
+    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager); // system component so that's safe.
+    let numPlayers = cmpPlayerManager.GetNumPlayers();
+    for (let i = 0; i <= numPlayers; ++i)   // use "<=" because we want Gaia too.
         this.gatherers.push([]);
 
     this.infinite = !isFinite(+this.template.Amount);
 
-    [this.type,this.subType] = this.template.Type.split('.');
-    this.cachedType = { "generic" : this.type, "specific" : this.subType };
+    [this.type, this.subtype] = this.template.Type.split('.');
+    let resData = Resources.GetResource(this.type);
+    if (this.type === "treasure")
+        resData = { "subtypes": Resources.GetCodes() };
+
+    // Remove entity from gameworld if the resource supplied by this entity is disabled or not valid.
+    if (!resData || resData.subtypes.indexOf(this.subtype) === -1)
+        Engine.DestroyEntity(this.entity);
 
+    this.cachedType = { "generic" : this.type, "specific" : this.subtype };
 };
 
 ResourceSupply.prototype.IsInfinite = function()
 {
     return this.infinite;

binaries/data/mods/public/simulation/components/ResourceTrickle.js

@@ -1 +1 @@
 function ResourceTrickle() {}
 
+ResourceTrickle.prototype.ResourcesSchema = Resources.BuildSchema("nonNegativeDecimal");
+
 ResourceTrickle.prototype.Schema = 
     "<a:help>Controls the resource trickle ability of the unit.</a:help>" +
     "<element name='Rates' a:help='Trickle Rates'>" +
-        "<interleave>" +
-            "<optional>" +
-                "<element name='food' a:help='Food given to the player every interval'>" +
-                    "<ref name='nonNegativeDecimal'/>" +
-                "</element>" +
-            "</optional>" +
-            "<optional>" +
-                "<element name='wood' a:help='Wood given to the player every interval'>" +
-                    "<ref name='nonNegativeDecimal'/>" +
-                "</element>" +
-            "</optional>" +
-            "<optional>" +
-                "<element name='stone' a:help='Stone given to the player every interval'>" +
-                    "<ref name='nonNegativeDecimal'/>" +
-                "</element>" +
-            "</optional>" +
-            "<optional>" +
-                "<element name='metal' a:help='Metal given to the player every interval'>" +
-                    "<ref name='nonNegativeDecimal'/>" +
-                "</element>" +
-            "</optional>" +
-        "</interleave>" +
+        ResourceTrickle.prototype.ResourcesSchema +
     "</element>" +
     "<element name='Interval' a:help='Number of miliseconds must pass for the player to gain the next trickle.'>" +
         "<ref name='nonNegativeDecimal'/>" +
     "</element>";
 
@@ -43 +24 @@
     return interval;
 };
 
 ResourceTrickle.prototype.GetRates = function()
 {
-    var rates = {};
-    for (var resource in this.template.Rates)
+    let rates = {};
+    let resCodes = Resources.GetCodes();
+    for (let resource in this.template.Rates)
+    {
+        if (resCodes.indexOf(resource) < 0)
+            continue;
         rates[resource] = ApplyValueModificationsToEntity("ResourceTrickle/Rates/"+resource, +this.template.Rates[resource], this.entity);
+    }
 
     return rates;
 };
 
 // Do the actual work here
 ResourceTrickle.prototype.Trickle = function(data, lateness)
 {
-    var cmpPlayer = QueryOwnerInterface(this.entity);
-    if (!cmpPlayer)
-        return;
-
-    var rates = this.GetRates();
-    for (var resource in rates)
-        cmpPlayer.AddResource(resource, rates[resource]);
+    let cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
+    if (cmpPlayer)
+        cmpPlayer.AddResources(this.GetRates());
 };
 
 Engine.RegisterComponentType(IID_ResourceTrickle, "ResourceTrickle", ResourceTrickle);

binaries/data/mods/public/simulation/components/StatisticsTracker.js

@@ -103 +103 @@
         "total": 0
     };
     this.buildingsCapturedValue = 0;
 
     this.resourcesGathered = {
-        "food": 0,
-        "wood": 0,
-        "metal": 0,
-        "stone": 0,
         "vegetarianFood": 0
     };
-    this.resourcesUsed = {
-        "food": 0,
-        "wood": 0,
-        "metal": 0,
-        "stone": 0
-    };
-    this.resourcesSold = {
-        "food": 0,
-        "wood": 0,
-        "metal": 0,
-        "stone": 0
-    };
-    this.resourcesBought = {
-        "food": 0,
-        "wood": 0,
-        "metal": 0,
-        "stone": 0
-    };
+    this.resourcesUsed = {};
+    this.resourcesSold = {};
+    this.resourcesBought = {};
+    for (let res of Resources.GetCodes())
+    {
+        this.resourcesGathered[res] = 0;
+        this.resourcesUsed[res] = 0;
+        this.resourcesSold[res] = 0;
+        this.resourcesBought[res] = 0;
+    }
 
     this.tributesSent = 0;
     this.tributesReceived = 0;
     this.tradeIncome = 0;
     this.treasuresCollected = 0;
@@ -345 +333 @@
  * @param type Generic type of resource (string)
  * @param amount Amount of resource, which should be added (integer)
  */
 StatisticsTracker.prototype.IncreaseResourceUsedCounter = function(type, amount)
 {
-    this.resourcesUsed[type] += amount;
+    if (typeof this.resourcesUsed[type] === "number")
+        this.resourcesUsed[type] += amount;
 };
 
 StatisticsTracker.prototype.IncreaseTreasuresCollectedCounter = function()
 {
     ++this.treasuresCollected;

binaries/data/mods/public/simulation/components/Trader.js

@@ -2 +2 @@
 // resources a trader gets
 
 // Additional gain for ships for each garrisoned trader, in percents
 const GARRISONED_TRADER_ADDITION = 20;
 
-// Array of resource names
-const RESOURCES = ["food", "wood", "stone", "metal"];
-
 function Trader() {}
 
 Trader.prototype.Schema =
     "<a:help>Lets the unit generate resouces while moving between markets (or docks in case of water trading).</a:help>" +
     "<a:example>" +

binaries/data/mods/public/simulation/data/resources/food.json

@@ +1 @@
+{
+    "code": "food",
+    "name": "Food",
+    "subtypes": {
+        "fish": "Fish",
+        "fruit": "Fruit",
+        "grain": "Grain",
+        "meat": "Meat",
+        "milk": "Milk"
+    },
+    "truePrice": 100,
+    "enabled": true
+}

binaries/data/mods/public/simulation/data/resources/metal.json

@@ +1 @@
+{
+    "code": "metal",
+    "name": "Metal",
+    "subtypes": {
+        "ore": "Ore"
+    },
+    "truePrice": 100,
+    "aiAnalysis": {
+        "decreaseFactor": 90.0,
+        "influenceMapGroup": 1
+    },
+    "enabled": true
+}

binaries/data/mods/public/simulation/data/resources/stone.json

@@ +1 @@
+{
+    "code": "stone",
+    "name": "Stone",
+    "subtypes": {
+        "rock": "Rock",
+        "ruins": "Ruins"
+    },
+    "truePrice": 100,
+    "aiAnalysis": {
+        "decreaseFactor": 90.0,
+        "influenceMapGroup": 1
+    },
+    "enabled": true
+}

binaries/data/mods/public/simulation/data/resources/wood.json

@@ +1 @@
+{
+    "code": "wood",
+    "name": "Wood",
+    "subtypes": {
+        "tree": "Tree",
+        "ruins": "Ruins"
+    },
+    "truePrice": 100,
+    "aiAnalysis": {
+        "decreaseFactor": 50.0,
+        "influenceMapGroup": 0
+    },
+    "enabled": true
+}

binaries/data/mods/public/simulation/helpers/Resources.js

@@ +1 @@
+/**
+ * Resource handling helper script
+ *
+ */
+
+var Resources = {};
+
+/**
+ * Loads all readable resource data into internal stores
+ */
+Resources.LoadData = function()
+{
+    this.resourceData = [];
+    this.resourceCodes = [];
+
+    let jsonFiles = Engine.FindJSONFiles("resources", false);
+    for (let filename of jsonFiles)
+    {
+        let data = Engine.ReadJSONFile("resources/"+filename+".json");
+        if (!data)
+            continue;
+
+        data.subtypeNames = data.subtypes;
+        data.subtypes = Object.keys(data.subtypes);
+
+        this.resourceData.push(data);
+        if (data.enabled)
+            this.resourceCodes.push(data.code);
+    }
+};
+
+/**
+ * Returns all resource data
+ */
+Resources.GetData = function()
+{
+    if (!this.resourceData)
+        this.LoadData();
+
+    return this.resourceData.filter((resource) => { return resource.enabled });
+};
+
+/**
+ * Returns data of a single resource. Only returns data about valid and enabled resources.
+ * 
+ * @param type Resource generic type
+ * @return The resource data if found, else false
+ */
+Resources.GetResource = function(type)
+{
+    let data = this.GetData();
+    type = type.toLowerCase();
+
+    return data.find((resource) => { return resource.code == type; }) || false;
+};
+
+/**
+ * Returns an array of codes belonging to valid resources
+ * 
+ * @return Array of generic resource type codes
+ */
+Resources.GetCodes = function()
+{
+    if (!this.resourceData)
+        this.LoadData();
+
+    return this.resourceCodes;
+};
+
+/**
+ * Returns an object containing untranslated resource names mapped to
+ * resource codes. Includes subtypes.
+ */
+Resources.GetNames = function()
+{
+    let names = {};
+    for (let res of this.GetData())
+    {
+        names[res.code] = res.name;
+        for (let subres of res.subtypes)
+            names[subres] = res.subtypeNames[subres]
+    }
+    return names;
+};
+
+/**
+ * Builds a RelaxRNG schema based on currently valid elements.
+ * 
+ * To prevent validation errors, disabled resources are included in the schema.
+ * 
+ * @param datatype The datatype of the element
+ * @param additional Array of additional data elements. Time, xp, treasure, etc.
+ * @param subtypes If true, resource subtypes will be included as well.
+ * @return RelaxNG schema string
+ */
+Resources.BuildSchema = function(datatype, additional = [], subtypes = false)
+{
+    if (!datatype)
+        return "";
+
+    if (!this.resourceData)
+        this.LoadData();
+
+    switch (datatype)
+    {
+    case "decimal":
+    case "nonNegativeDecimal":
+    case "positiveDecimal":
+        datatype = "<ref name='" + datatype + "'/>";
+        break;
+
+    default:
+        datatype = "<data type='" + datatype + "'/>";
+    }
+
+    let resCodes = this.resourceData.map((resource) => { return resource.code });
+    let schema = "<interleave>";
+    for (let res of resCodes.concat(additional))
+        schema +=
+            "<optional>" +
+                "<element name='" + res + "'>" +
+                    datatype +
+                "</element>" +
+            "</optional>";
+
+    if (!subtypes)
+        return schema + "</interleave>";
+
+    for (let res of this.resourceData)
+        for (let subtype of res.subtypes)
+            schema +=
+                "<optional>" +
+                    "<element name='" + res.code + "." + subtype + "'>" +
+                        datatype +
+                    "</element>" +
+                "</optional>";
+
+    if (additional.indexOf("treasure") !== -1)
+        for (let res of resCodes)
+            schema +=
+                "<optional>" +
+                    "<element name='" + "treasure." + res + "'>" +
+                        datatype +
+                    "</element>" +
+                "</optional>";
+
+    return schema + "</interleave>";
+}
+
+/**
+ * Builds the value choices for a RelaxNG `<choice></choice>` object, based on currently valid resources.
+ * 
+ * @oaram subtypes If set to true, the choices returned will be resource subtypes, rather than main types
+ * @param treasure If set to true, the pseudo resource 'treasure' (or its subtypes) will be included
+ * @return String of RelaxNG Schema `<choice/>` values.
+ */
+Resources.BuildChoicesSchema = function(subtypes = false, treasure = false)
+{
+    if (!this.resourceData)
+        this.LoadData();
+
+    let schema = "<choice>";
+
+    if (!subtypes)
+    {
+        let resCodes = this.resourceData.map((resource) => { return resource.code });
+        treasure = treasure ? [ "treasure" ] : [];
+        for (let res of resCodes.concat(treasure))
+            schema += "<value>" + res + "</value>";
+    }
+    else
+        for (let res of this.resourceData)
+        {
+            for (let subtype of res.subtypes)
+                schema += "<value>" + res.code + "." + subtype + "</value>";
+            if (treasure)
+                schema += "<value>" + "treasure." + res.code + "</value>";
+        }
+
+    return schema + "</choice>";
+}
+
+Engine.RegisterGlobal("Resources", Resources);