Ticket #3934: resource_agnostic-v8.patch

new file inaries/data/mods/public/globalscripts/Resources.js

@@ +1 @@
+/**
+ * Since the AI context can't access JSON functions, it gets passed an object
+ * containing the information from `GuiInterface.js::GetSimulationState()`.
+ */
+function Resources()
+{
+    let jsonFiles = [];
+    // Simulation context
+    if (Engine.FindJSONFiles)
+    {
+        jsonFiles = Engine.FindJSONFiles("resources", false);
+        for (let file in jsonFiles)
+            jsonFiles[file] = "resources/" + jsonFiles[file] + ".json";
+    }
+    // GUI context
+    else if (Engine.BuildDirEntList)
+        jsonFiles = Engine.BuildDirEntList("simulation/data/resources/", "*.json", false);
+    else
+    {
+        error("Resources: JSON functions are not available");
+        return;
+    }
+
+    this.resourceData = [];
+    this.resourceCodes = [];
+
+    for (let filename of jsonFiles)
+    {
+        let data = Engine.ReadJSONFile(filename);
+        if (!data)
+            continue;
+
+        this.resourceData.push(data);
+        if (data.enabled)
+            this.resourceCodes.push(data.code);
+    }
+
+    let resSort = (a, b) =>
+        a.order < b.order ? -1 :
+        a.order > b.order ? +1 : 0;
+
+    this.resourceData.sort(resSort);
+    this.resourceCodes.sort((a, b) => resSort(
+        this.resourceData.find(resource => resource.code == a),
+        this.resourceData.find(resource => resource.code == b)
+    ));
+};
+
+Resources.prototype.GetData = function()
+{
+    return this.resourceData.filter(resource => resource.enabled);
+};
+
+Resources.prototype.GetResource = function(type)
+{
+    let lType = type.toLowerCase();
+    return this.GetData().find(resource => resource.code == lType);
+};
+
+Resources.prototype.GetCodes = function()
+{
+    return this.resourceCodes;
+};
+
+/**
+ * Returns an object containing untranslated resource names mapped to
+ * resource codes. Includes subtypes.
+ */
+Resources.prototype.GetNames = function()
+{
+    let names = {};
+    for (let res of this.GetData())
+    {
+        names[res.code] = res.name;
+        for (let subres in res.subtypes)
+            names[subres] = res.subtypes[subres]
+    }
+    return names;
+};

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

@@ -245 +245 @@
 
     g_LastNickNotification = timeNow;
 }
+
+/**
+ * Horizontally spaces objects within a parent
+ *
+ * @param margin The gap, in px, between the objects
+ */
+function horizontallySpaceObjects(parentName, margin=0)
+{
+    let objects = Engine.GetGUIObjectByName(parentName).children;
+    for (let i = 0; i < objects.length; ++i)
+    {
+        let size = objects[i].size;
+        let width = size.right - size.left;
+        size.left = i * (width + margin) + margin;
+        size.right = (i + 1) * (width + margin);
+        objects[i].size = size;
+    }
+}
+
+/**
+ * Hide all children after a certain index
+ *
+ * @param idx - The index from which to start
+ */
+function hideRemaining(parentName, start = 0)
+{
+    let objects = Engine.GetGUIObjectByName(parentName).children;
+
+    for (let i = start; i < objects.length; ++i)
+        objects[i].hidden = true;
+}

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);
 }
 
 /**
@@ -81 +13 @@
         .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)

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

@@ -339 +339 @@
 
     return costs;
 }
+
 function getGatherTooltip(template)
 {
     if (!template.gather)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <object name="diplomacyDialogPanel"
-    size="50%-300 50%-200 50%+300 50%+150"
+    size="50%-260 50%-200 50%+260 50%+150"
     type="image"
     hidden="true"
     sprite="ModernDialog"
@@ -11 +11 @@
     </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">
@@ -23 +23 @@
         <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>
@@ -48 +48 @@
                 <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"/>
+                <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">

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

@@ -22 +22 @@
 // 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";
 
+const BARTER_RESOURCE_AMOUNT_TO_SELL = 100;
+const BARTER_BUNCH_MULTIPLIER = 5;
+const BARTER_ACTIONS = ["Sell", "Buy"];
+var g_BarterSell;
+
 var g_IsMenuOpen = false;
 
 var g_IsDiplomacyOpen = false;
@@ -228 +230 @@
     Engine.GetGUIObjectByName("chatDialogPanel").hidden = true;
 }
 
+function resizeDiplomacyDialog()
+{
+    let dialog = Engine.GetGUIObjectByName("diplomacyDialogPanel");
+    let size = dialog.size;
+    let width = size.right - size.left;
+
+    let tribSize = Engine.GetGUIObjectByName("diplomacyPlayer[0]_tribute[0]").size;
+    width += g_ResourceData.GetCodes().length * (tribSize.right - tribSize.left);
+
+    size.left = -width / 2;
+    size.right = width / 2;
+    dialog.size = size;
+}
+
 function openDiplomacy()
 {
     closeOpenDialogs();
@@ -255 +271 @@
         diplomacyFormatTributeButtons(i, myself || playerInactive);
         diplomacyFormatAttackRequestButton(i, myself || playerInactive || isCeasefireActive || !hasAllies || !g_Players[i].isEnemy[g_ViewedPlayer]);
     }
-
     Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }
 
@@ -306 +321 @@
 
 function diplomacyFormatTributeButtons(i, hidden)
 {
-    for (let resource of RESOURCES)
+    let resNames = g_ResourceData.GetNames();
+    let resCodes = g_ResourceData.GetCodes();
+    let r = 0;
+    for (let resCode of resCodes)
     {
-        let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
+        let button = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]_tribute["+r+"]");
+        if (!button)
+            break;
+        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, resNames[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;
@@ -328 +351 @@
                 }
 
                 let amounts = {};
-                for (let type of RESOURCES)
-                    amounts[type] = 0;
-                amounts[resource] = 100 * multiplier;
+                for (let res of resCodes)
+                    amounts[res] = 0;
+                amounts[resCode] = 100 * multiplier;
 
-                button.tooltip = formatTributeTooltip(i, resource, amounts[resource]);
+                button.tooltip = formatTributeTooltip(i, resNames[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, resNames[resCode], 100);
                 };
 
                 if (!isBatchTrainPressed)
                     g_FlushTributing();
             };
-        })(i, resource, button);
+        })(i, resCode, button);
     }
 }
 
@@ -378 +401 @@
         openDiplomacy();
 }
 
+function resizeTradeDialog()
+{
+    let dialog = Engine.GetGUIObjectByName("tradeDialogPanel");
+    let size = dialog.size;
+    let width = size.right - size.left;
+
+    let tradeSize = Engine.GetGUIObjectByName("tradeResource[0]").size;
+    width += g_ResourceData.GetCodes().length * (tradeSize.right - tradeSize.left);
+
+    size.left = -width / 2;
+    size.right = width / 2;
+    dialog.size = size;
+}
+
 function openTrade()
 {
     closeOpenDialogs();
@@ -387 +424 @@
 
     g_IsTradeOpen = true;
 
-    var updateButtons = function()
+    let updateTradeButtons = function()
     {
-        for (var res in button)
+        for (let res in button)
         {
             button[res].label.caption = proba[res] + "%";
 
@@ -399 +436 @@
         }
     };
 
-    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 = g_ResourceData.GetCodes();
+    let selec = resCodes[0];
+    hideRemaining("tradeResources", resCodes.length);
+    Engine.GetGUIObjectByName("tradeHelp").hidden = false;
+
+    let maxTradeResources = Engine.GetGUIObjectByName("tradeResources").children.length;
+    let maxBarterResources = Engine.GetGUIObjectByName("barterResources").children.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 resCode = resCodes[i];
+
+        // Barter
+        let barterButton = {};
+        for (let a of ["Buy", "Sell"])
+            barterButton[a] = Engine.GetGUIObjectByName("barter" + a + "Button[" + i + "]");
+
+        if (!g_BarterSell)
+            g_BarterSell = g_ResourceData.GetCodes()[0];
+
+        let resource = getLocalizedResourceName(g_ResourceData.GetNames()[resCode], "withinSentence");
+        barterButton.Buy.tooltip = sprintf(translate("Buy %(resource)s"), { "resource": resource });
+        barterButton.Sell.tooltip = sprintf(translate("Sell %(resource)s"), { "resource": resource });
+
+        barterButton.Sell.onPress = function() {
+            g_BarterSell = resCode;
+        };
+
+        setPanelObjectPosition(Engine.GetGUIObjectByName("barterResource[" + i + "]"), i, maxBarterResources);
+
+        // Trade
+        let tradeResource = Engine.GetGUIObjectByName("tradeResource["+i+"]");
+        if (!tradeResource)
+            break;
+
+        setPanelObjectPosition(tradeResource, i, maxTradeResources);
+
+        let icon = Engine.GetGUIObjectByName("tradeResourceIcon["+i+"]");
+        icon.sprite = "stretched:session/icons/resources/" + resCode + ".png";
 
+        let buttonUp = Engine.GetGUIObjectByName("tradeArrowUp["+i+"]");
+        let buttonDn = Engine.GetGUIObjectByName("tradeArrowDn["+i+"]");
+
+        button[resCode] = {
+            "up": buttonUp,
+            "dn": buttonDn,
+            "label": Engine.GetGUIObjectByName("tradeResourceText["+i+"]"),
+            "sel": Engine.GetGUIObjectByName("tradeResourceSelection["+i+"]")
+        };
+
+        proba[resCode] = proba[resCode] || 0;
+
+        let buttonResource = Engine.GetGUIObjectByName("tradeResourceButton["+i+"]");
         buttonResource.enabled = controlsPlayer(g_ViewedPlayer);
         buttonResource.onpress = (function(resource){
             return function() {
                 if (Engine.HotkeyIsPressed("session.fulltradeswap"))
                 {
-                    for (var ress of RESOURCES)
-                        proba[ress] = 0;
+                    for (let res of resCodes)
+                        proba[res] = 0;
                     proba[resource] = 100;
                     Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
                 }
                 selec = resource;
-                updateButtons();
+                updateTradeButtons();
             };
-        })(resource);
+        })(resCode);
 
         buttonUp.enabled = controlsPlayer(g_ViewedPlayer);
         buttonUp.onpress = (function(resource){
@@ -445 +512 @@
                 proba[resource] += Math.min(STEP, proba[selec]);
                 proba[selec]    -= Math.min(STEP, proba[selec]);
                 Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
-                updateButtons();
+                updateTradeButtons();
             };
-        })(resource);
+        })(resCode);
 
         buttonDn.enabled = controlsPlayer(g_ViewedPlayer);
         buttonDn.onpress = (function(resource){
@@ -455 +522 @@
                 proba[selec]    += Math.min(STEP, proba[resource]);
                 proba[resource] -= Math.min(STEP, proba[resource]);
                 Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
-                updateButtons();
+                updateTradeButtons();
             };
-        })(resource);
+        })(resCode);
     }
-    updateButtons();
+    updateTradeButtons();
 
     let traderNumber = Engine.GuiInterfaceCall("GetTraderNumber", g_ViewedPlayer);
-    Engine.GetGUIObjectByName("landTraders").caption = getIdleLandTradersText(traderNumber);
-    Engine.GetGUIObjectByName("shipTraders").caption = getIdleShipTradersText(traderNumber);
-
+    Engine.GetGUIObjectByName("traders").caption = getIdleLandTradersText(traderNumber) + "\n\n" + getIdleShipTradersText(traderNumber);
     Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false;
 }
 
+function updateBarterButtons()
+{
+    let resCodes = g_ResourceData.GetCodes();
+    if (!g_BarterSell)
+        g_BarterSell = resCodes[0];
+
+    let canBarter = Engine.GuiInterfaceCall("PlayerCanBarter", g_ViewedPlayer);
+    Engine.GetGUIObjectByName("barterNoMarketsMessage").hidden = canBarter;
+    Engine.GetGUIObjectByName("barterResources").hidden = !canBarter;
+    if (!canBarter)
+        return;
+
+    for (let i = 0; i < resCodes.length; ++i)
+    {
+        let resCode = resCodes[i];
+        let barterButton = {};
+        let barterIcon = {};
+        let barterAmount = {};
+        for (let a of ["Buy", "Sell"])
+        {
+            barterButton[a] = Engine.GetGUIObjectByName("barter" + a + "Button[" + i + "]");
+            barterIcon[a] = Engine.GetGUIObjectByName("barter" + a + "Icon[" + i + "]");
+            barterAmount[a] = Engine.GetGUIObjectByName("barter" + a + "Amount[" + i + "]");
+        }
+        let selectionIcon = Engine.GetGUIObjectByName("barterSellSelection[" + i + "]");
+
+
+        let amountToSell = BARTER_RESOURCE_AMOUNT_TO_SELL;
+        if (Engine.HotkeyIsPressed("session.massbarter"))
+            amountToSell *= BARTER_BUNCH_MULTIPLIER;
+
+        let isSelected = resCode == g_BarterSell;
+        let grayscale = isSelected ? "color: 0 0 0 100:grayscale:" : "";
+
+        // do we have enough of this resource to sell?
+        let neededRes = {};
+        neededRes[resCode] = amountToSell;
+        let canSellCurrent = Engine.GuiInterfaceCall("GetNeededResources", {
+            "cost": neededRes,
+            "player": g_ViewedPlayer,
+        }) ? "color:255 0 0 80:" : "";
+
+        // Let's see if we have enough resources to barter.
+        neededRes = {};
+        neededRes[g_BarterSell] = amountToSell;
+        let canBuyAny = Engine.GuiInterfaceCall("GetNeededResources", {
+            "cost": neededRes,
+            "player": g_ViewedPlayer,
+        }) ? "color:255 0 0 80:" : "";
+
+        barterIcon.Sell.sprite = canSellCurrent + "stretched:" + grayscale + "session/icons/resources/" + resCode + ".png";
+        barterIcon.Buy.sprite = canBuyAny + "stretched:" + grayscale + "session/icons/resources/" + resCode + ".png";
+
+        barterAmount.Sell.caption = "-" + amountToSell;
+        let prices = Engine.GuiInterfaceCall("GetBarterPrices");
+        barterAmount.Buy.caption = "+" + Math.round(prices.sell[g_BarterSell] / prices.buy[resCode] * amountToSell);
+
+        barterButton.Buy.onPress = function() { 
+            Engine.PostNetworkCommand({
+                "type": "barter",
+                "sell": g_BarterSell,
+                "buy": resCode,
+                "amount": amountToSell
+            });
+        };
+
+        barterButton.Buy.hidden = isSelected;
+        barterButton.Buy.enabled = controlsPlayer(g_ViewedPlayer);
+        barterButton.Sell.hidden = false;
+        selectionIcon.hidden = !isSelected;
+    }
+};
+
 function getIdleLandTradersText(traderNumber)
 {
     let active = traderNumber.landTrader.trading;

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

@@ -12 +12 @@
 
 function getResourceTypeDisplayName(resourceType)
 {
-    let resourceCode = resourceType.generic;
-    if (resourceCode == "treasure")
-        return getLocalizedResourceName(resourceType.specific, "firstWord");
-    else
-        return getLocalizedResourceName(resourceCode, "firstWord");
+    return getLocalizedResourceName(
+        g_ResourceData.GetNames()[
+            resourceType.generic == "treasure" ?
+                resourceType.specific :
+                resourceType.generic
+        ],
+        "firstWord");
 }
 
 // Updates the health bar of garrisoned units

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

@@ -84 +84 @@
     }
 };
 
-g_SelectionPanels.Barter = {
-    "getMaxNumberOfItems": function()
-    {
-        return 4;
-    },
-    "rowLength": 4,
-    "getItems": function(unitEntState, selection)
-    {
-        if (!unitEntState.barterMarket)
-            return [];
-        // ["food", "wood", "stone", "metal"]
-        return BARTER_RESOURCES;
-    },
-    "setupButton": function(data)
-    {
-        // data.item is the resource name in this case
-        let button = {};
-        let icon = {};
-        let amount = {};
-        for (let a of BARTER_ACTIONS)
-        {
-            button[a] = Engine.GetGUIObjectByName("unitBarter" + a + "Button[" + data.i + "]");
-            icon[a] = Engine.GetGUIObjectByName("unitBarter" + a + "Icon[" + data.i + "]");
-            amount[a] = Engine.GetGUIObjectByName("unitBarter" + a + "Amount[" + data.i + "]");
-        }
-        let selectionIcon = Engine.GetGUIObjectByName("unitBarterSellSelection[" + data.i + "]");
-
-        let amountToSell = BARTER_RESOURCE_AMOUNT_TO_SELL;
-        if (Engine.HotkeyIsPressed("session.massbarter"))
-            amountToSell *= BARTER_BUNCH_MULTIPLIER;
-
-        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");
-        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;
-            updateSelectionDetails();
-        };
-
-        button.Buy.onPress = function() {
-            Engine.PostNetworkCommand({
-                "type": "barter",
-                "sell": g_BarterSell,
-                "buy": data.item,
-                "amount": amountToSell
-            });
-        };
-
-        let isSelected = data.item == g_BarterSell;
-        let grayscale = isSelected ? "color: 0 0 0 100:grayscale:" : "";
-
-        // do we have enough of this resource to sell?
-        let neededRes = {};
-        neededRes[data.item] = amountToSell;
-        let canSellCurrent = Engine.GuiInterfaceCall("GetNeededResources", {
-            "cost": neededRes,
-            "player": data.unitEntState.player
-        }) ? "color:255 0 0 80:" : "";
-
-        // Let's see if we have enough resources to barter.
-        neededRes = {};
-        neededRes[g_BarterSell] = amountToSell;
-        let canBuyAny = Engine.GuiInterfaceCall("GetNeededResources", {
-            "cost": neededRes,
-            "player": data.unitEntState.player
-        }) ? "color:255 0 0 80:" : "";
-
-        icon.Sell.sprite = canSellCurrent + "stretched:" + grayscale + "session/icons/resources/" + data.item + ".png";
-        icon.Buy.sprite = canBuyAny + "stretched:" + grayscale + "session/icons/resources/" + data.item + ".png";
-
-        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);
-        return true;
-    }
-};
-
 g_SelectionPanels.Command = {
     "getMaxNumberOfItems": function()
     {
@@ -1144 +1058 @@
  */
 let g_PanelsOrder = [
     // LEFT PANE
-    "Barter", // Must always be visible on markets
     "Garrison", // More important than Formation, as you want to see the garrisoned units in ships
     "Alert",
     "Formation",

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

@@ -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))

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

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="unitBarterPanel"
-    size="6 36 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>
-</object>

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

@@ -130 +130 @@
 var g_TemplateData = {};
 var g_TemplateDataWithoutLocalization = {};
 var g_TechnologyData = {};
+var g_ResourceData = new Resources();
 
 /**
  * Top coordinate of the research list.
@@ -268 +269 @@
     let gameSpeedIdx = g_GameSpeeds.Speed.indexOf(Engine.GetSimRate());
     gameSpeed.selected = gameSpeedIdx != -1 ? gameSpeedIdx : g_GameSpeeds.Default;
     gameSpeed.onSelectionChange = function() { changeGameSpeed(+this.list_data[this.selected]); };
+
     initMenuPosition();
+    resizeDiplomacyDialog();
+    resizeTradeDialog();
 
     for (let slot in Engine.GetGUIObjectByName("unitHeroPanel").children)
         initGUIHeroes(slot);
@@ -474 +478 @@
     let viewPlayer = Engine.GetGUIObjectByName("viewPlayer");
     viewPlayer.hidden = !g_IsObserver && !g_DevSettings.changePerspective;
 
-    Engine.GetGUIObjectByName("food").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("wood").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("stone").hidden = !isPlayer;
-    Engine.GetGUIObjectByName("metal").hidden = !isPlayer;
+    let resCodes = g_ResourceData.GetCodes();
+    let r = 0;
+    for (let res of resCodes)
+    {
+        if (!Engine.GetGUIObjectByName("resource["+r+"]"))
+        {
+            warn("Current GUI limits prevent displaying more than " + r + " resources at the top of the screen");
+            break;
+        }
+        Engine.GetGUIObjectByName("resource["+r+"]_icon").sprite = "stretched:session/icons/resources/" + res + ".png";
+        Engine.GetGUIObjectByName("resource["+r+"]").hidden = !isPlayer;
+        ++r;
+    }
+    horizontallySpaceObjects("resourceCounts", 0);
+    hideRemaining("resourceCounts", r);
+
+    let resPop = Engine.GetGUIObjectByName("population");
+    let resPopSize = resPop.size;
+    resPopSize.left = Engine.GetGUIObjectByName("resource["+ (r-1) +"]").size.right;
+    resPop.size = resPopSize;
+
     Engine.GetGUIObjectByName("population").hidden = !isPlayer;
     Engine.GetGUIObjectByName("diplomacyButton1").hidden = !isPlayer;
     Engine.GetGUIObjectByName("tradeButton1").hidden = !isPlayer;
@@ -547 +568 @@
             "disconnected": g_Disconnected,
             "isReplay": g_IsReplay,
             "replayDirectory": !g_HasRejoined && replayDirectory,
-            "replaySelectionData": g_ReplaySelectionData
+            "replaySelectionData": g_ReplaySelectionData,
         }
     });
 }
@@ -714 +735 @@
     updateBuildingPlacementPreview();
     updateTimeNotifications();
     updateIdleWorkerButton();
+    updateBarterButtons();
 
     if (g_ViewedPlayer > 0)
     {
@@ -948 +970 @@
     if (!playerState)
         return;
 
-    for (let res of RESOURCES)
+    let resCodes = g_ResourceData.GetCodes();
+    let resNames = g_ResourceData.GetNames();
+    for (let r = 0; r < resCodes.length; ++r)
     {
-        Engine.GetGUIObjectByName("resource_" + res).caption = Math.floor(playerState.resourceCounts[res]);
-        Engine.GetGUIObjectByName(res).tooltip = getLocalizedResourceName(res, "firstWord") + getAllyStatTooltip(res);
+        if (!Engine.GetGUIObjectByName("resource["+r+"]"))
+            break;
+        let res = resCodes[r];
+        Engine.GetGUIObjectByName("resource["+r+"]").tooltip = getLocalizedResourceName(resNames[res], "firstWord") + getAllyStatTooltip(res);
+        Engine.GetGUIObjectByName("resource["+r+"]_count").caption = Math.floor(playerState.resourceCounts[res]);
     }
 
     Engine.GetGUIObjectByName("resourcePop").caption = sprintf(translate("%(popCount)s/%(popLimit)s"), playerState);

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

@@ -111 +111 @@
 
         <!-- Supplemental Details Panel (Left of Selection Details) -->
         <object
-            size="50%-304 100%-170 50%-110 100%"
+            size="50%-304 100%-172 50%-110 100%"
             name="supplementalSelectionDetails"
             type="image"
             sprite="supplementalDetailsPanel"

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

@@ -7 +7 @@
 >
     <!-- TODO make the button less ugly -->
     <object size="0 0 100% 100%" name="tradeButtonImage" type="image" sprite="stretched:session/icons/economics.png" ghost="true"/>
-    <translatableAttribute id="tooltip">Trade</translatableAttribute>
+    <translatableAttribute id="tooltip">Barter &amp; Trade</translatableAttribute>
     <action on="Press">
         toggleTrade();
     </action>

deleted file binaries/data/mods/public/gui/session/top_panel/resource_food.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="food" size="10 0 100 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_food"/>
-</object>

deleted file binaries/data/mods/public/gui/session/top_panel/resource_metal.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="metal" size="280 0 370 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_metal"/>
-</object>

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 size="0 -4 40 34" type="image" sprite="stretched:session/icons/resources/population.png" ghost="true"/>
+
+<object name="population" size="0 0 50%-52 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
+    <object size="0 -2 40 38" 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>

deleted file binaries/data/mods/public/gui/session/top_panel/resource_stone.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="stone" size="190 0 280 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_stone"/>
-</object>

deleted file binaries/data/mods/public/gui/session/top_panel/resource_wood.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="wood" size="100 0 190 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_wood"/>
-</object>

new file inaries/data/mods/public/gui/session/top_panel/resources.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<object size="0 0 50%-90-52 100%" name="resourceCounts">
+    <repeat count="5">
+        <object name="resource[n]" size="0 0 75.6 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
+            <object size="0 -2 40 38" type="image" name="resource[n]_icon" ghost="true"/>
+            <object size="28 0 100%-2 100%-2" type="text" style="resourceText" name="resource[n]_count"/>
+        </object>
+    </repeat>
+</object>

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="tradeDialogPanel"
-    size="50%-250 50%-130 50%+250 50%+100"
+    size="50%-80 50%-280 50%+80 50%+136"
     type="image"
     hidden="true"
     sprite="ModernDialog"
+    z="100"
 >
     <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">
-        <translatableAttribute id="caption">Trade</translatableAttribute>
+        <translatableAttribute id="caption">Barter &amp; Trade Goods</translatableAttribute>
     </object>
 
-    <!-- Trading goods -->
-    <object name="tradeGoods" size="20 50 100%-20 82">
-        <object name="tradeHeader" size="0 0 180 100%" type="text" style="ModernLabelText" text_align="left" ghost="true">
-            <translatableAttribute id="caption">Trading goods selection:</translatableAttribute>
+
+    <!-- Barter Goods -->
+    <object size="24 24 100%-24 33%">
+
+        <object name="barterHeader" size="8 0 100% 32" type="text" style="ModernLeftLabelText">
+            <translatableAttribute id="caption">Barter</translatableAttribute>
         </object>
+        <object size="0 28 100% 29" type="image" sprite="ModernGoldLine"/>
+
+        <object size="0 38 100% 38+84">
+
+            <object size="0 0 60 41" type="text" style="ModernRightLabelText">
+                <translatableAttribute id="caption">Sell:</translatableAttribute>
+            </object>
+
+            <object size="0 100%-41 60 100%" type="text" style="ModernRightLabelText">
+                <translatableAttribute id="caption">Buy:</translatableAttribute>
+            </object>
+
+            <object size="72 0 100% 100%" type="text" style="ModernLabelText" name="barterNoMarketsMessage">
+                <translatableAttribute id="caption">No Markets Available</translatableAttribute>
+            </object>
+
+            <object name="barterResources" size="72 0 100% 100%">
+                <repeat count="8">
+                    <object name="barterResource[n]" size="0 0 58 100%">
+
+                        <!-- Sell -->
+                        <object name="barterSellButton[n]" style="iconButton" type="button" size="0 0 41 41" tooltip_style="sessionToolTipBottomBold" hidden="true">
+                            <object name="barterSellIcon[n]" type="image" ghost="true" size="3 3 100%-3 100%-3"/>
+                            <object name="barterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+                            <object name="barterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 100%-3 100%-3" sprite="stretched:session/icons/corners.png"/>
+                        </object>
+
+                        <!-- Buy -->
+                        <object name="barterBuyButton[n]" style="iconButton" type="button" size="0 100%-41 41 100%" tooltip_style="sessionToolTipBottomBold" hidden="true">
+                            <object name="barterBuyIcon[n]" type="image" ghost="true" size="3 3 100%-3 100%-3"/>
+                            <object name="barterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
+                        </object>
 
-        <object size="180 0 100% 100%">
-            <repeat count="4">
-                <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"/>
-                    </object>
-                    <object name="tradeArrowUp[n]" size="36 0 52 50%" type="button" style="iconButton">
-                        <object type="image" ghost="true" sprite="StoneArrowUp"/>
                     </object>
-                    <object name="tradeArrowDn[n]" size="36 50% 52 100%" type="button" style="iconButton">
-                        <object type="image" ghost="true" sprite="StoneArrowDn"/>
+                </repeat>
+            </object>
+
+        </object>
+    </object>
+
+    <!-- Trading goods -->
+    <object size="24 33%+32 100%-24 100%-64">
+
+        <object name="tradeHeader" size="8 0 100% 32" type="text" style="ModernLeftLabelText">
+            <translatableAttribute id="caption">Trade</translatableAttribute>
+        </object>
+        <object size="0 28 100% 29" type="image" sprite="ModernGoldLine"/>
+
+        <object name="tradeGoods" size="0 38 100% 38+32">
+
+            <object size="0 0 60 100%" type="text" style="ModernRightLabelText">
+                <translatableAttribute id="caption">Goods:</translatableAttribute>
+            </object>
+
+            <object size="72 0 100% 100%" name="tradeResources">
+                <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"/>
+                        </object>
+                        <object name="tradeArrowUp[n]" size="36 0 52 50%" type="button" style="iconButton">
+                            <object type="image" ghost="true" sprite="StoneArrowUp"/>
+                        </object>
+                        <object name="tradeArrowDn[n]" size="36 50% 52 100%" type="button" style="iconButton">
+                            <object type="image" ghost="true" sprite="StoneArrowDn"/>
+                        </object>
+
                     </object>
-                </object>
-            </repeat>
+                </repeat>
+            </object>
+
             <object name="tradeHelp" size="100%-24 4 100% 28" enabled="false" type="button" style="StoneButton" tooltip_style="sessionToolTipBold">
                 <object size="20% 15% 80% 75%" type="image" ghost="true" sprite="iconInfoWhite"/>
             </object>
+
         </object>
-    </object>
 
-    <object name="tradeStatistics" size="20 90 100%-20 168">
-        <object name="landTraders" size="0 0 100% 50%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
-        <object name="shipTraders" size="0 50% 100% 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
+        <object name="traders" size="8 88 100% 100%" type="text" style="ModernLeftTabLabelText"/>
+
     </object>
 
     <object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">

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

@@ -1208 +1208 @@
                 return false;
 
             return {
-                "tooltip": translate("Select trading goods"),
+                "tooltip": translate("Barter & Trade"),
                 "icon": "economics.png"
             };
         },

binaries/data/mods/public/gui/structree/draw.js

@@ -112 +112 @@
                 if (p>c)
                     c = p;
 
-                hideRemaining("phase["+i+"]_struct["+s+"]_row["+r+"]_prod[", p, "]");
+                hideRemaining("phase["+i+"]_struct["+s+"]_row["+r+"]", p);
             }
 
             let size = thisEle.size;
@@ -132 +132 @@
                 phaEle.size = size;
             }
             ++r;
-            hideRemaining("phase["+i+"]_struct["+s+"]_row[", r, "]");
+            hideRemaining("phase["+i+"]_struct["+s+"]_rows", r);
             ++s;
         }
-        hideRemaining("phase["+i+"]_struct[", s, "]");
+        hideRemaining("phase["+i+"]", s);
         ++i;
     }
 
@@ -179 +179 @@
                 ++p;
             }
         }
-        hideRemaining("trainer["+t+"]_prod[", p, "]");
+        hideRemaining("trainer["+t+"]_row", p);
 
         let size = thisEle.size;
         size.right = size.left + Math.max(p*24, defWidth) + 4;
@@ -193 +193 @@
         phaEle.size = size;
         ++t;
     }
-    hideRemaining("trainer[", t, "]");
+    hideRemaining("trainers", t);
 
     let size = Engine.GetGUIObjectByName("display_tree").size;
     size.right = t > 0 ? -124 : -4;
@@ -235 +235 @@
     return size;
 }
 
-function hideRemaining(prefix, idx, suffix)
-{
-    let obj = Engine.GetGUIObjectByName(prefix + idx + suffix);
-    while (obj)
-    {
-        obj.hidden = true;
-        ++idx;
-        obj = Engine.GetGUIObjectByName(prefix + idx + suffix);
-    }
-}
-
-
 /**
  * Positions certain elements that only need to be positioned once
  * (as <repeat> does not reposition automatically).
@@ -283 +271 @@
             prodBarIcon.sprite = "stretched:session/portraits/"+g_ParsedData.phases[phaseList[i+j]].icon;
         }
         // Hide remaining prod bars
-        hideRemaining("phase["+i+"]_bar[", j-1, "]");
+        hideRemaining("phase["+i+"]_bars", j-1);
 
         let s = 0;
         let ele = Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]");
@@ -334 +322 @@
         g_DrawLimits[pha].structQuant = s;
         ++i;
     }
-    hideRemaining("phase[", i, "]");
-    hideRemaining("phase[", i, "]_bar");
+    hideRemaining("phase_rows", i);
+    hideRemaining("phase_ident", i);
 
     let t = 0;
     let ele = Engine.GetGUIObjectByName("trainer["+t+"]");

binaries/data/mods/public/gui/structree/load.js

@@ -5 +5 @@
  */
 function getGatherRates(templateName)
 {
-    // TODO: It would be nice to use the gather rates present in the templates
-    // instead of hard-coding the possible rates here.
-
-    // We ignore ruins here, as those are not that common and would skew the results
-    var types = {
-        "food": ["food", "food.fish", "food.fruit", "food.grain", "food.meat", "food.milk"],
-        "wood": ["wood", "wood.tree"],
-        "stone": ["stone", "stone.rock"],
-        "metal": ["metal", "metal.ore"]
-    };
-    var rates = {};
+    let rates = {};
 
-    for (let type in types)
+    for (let resource of g_ResourceData.GetData())
     {
+        let types = [resource.code];
+        for (let subtype in resource.subtypes)
+            // We ignore ruins as those are not that common and skew the results
+            if (subtype !== "ruins")
+                types.push(resource.code + "." + subtype);
+
         let count, rate;
-        [rate, count] = types[type].reduce(function(sum, t) {
+        [rate, count] = types.reduce((sum, t) => {
                 let r = +fetchValue(templateName, "ResourceGatherer/Rates/"+t);
                 return [sum[0] + (r > 0 ? r : 0), sum[1] + (r > 0 ? 1 : 0)];
             }, [0, 0]);
 
         if (rate > 0)
-            rates[type] = Math.round(rate / count * 100) / 100;
+            rates[resource.code] = +(rate / count).toFixed(1);
     }
 
     if (!Object.keys(rates).length)

binaries/data/mods/public/gui/structree/rows.xml

@@ -9 +9 @@
                     <object type="image" style="StructIcon" name="phase[k]_struct[s]_icon"
                         sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
                     />
-                    <repeat count="4" var="r">
-                        <object name="phase[k]_struct[s]_row[r]">
-                            <repeat count="24" var="p">
-                                <object type="image" style="ProdBox" name="phase[k]_struct[s]_row[r]_prod[p]"/>
-                            </repeat>
-                        </object>
-                    </repeat>
+                    <object name="phase[k]_struct[s]_rows">
+                        <repeat count="4" var="r">
+                            <object name="phase[k]_struct[s]_row[r]">
+                                <repeat count="24" var="p">
+                                    <object type="image" style="ProdBox" name="phase[k]_struct[s]_row[r]_prod[p]"/>
+                                </repeat>
+                            </object>
+                        </repeat>
+                    </object>
                 </object>
             </repeat>
         </object>

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

@@ -9 +9 @@
 var g_CivData = {};
 var g_SelectedCiv = "";
 var g_CallbackSet = false;
+var g_ResourceData = new Resources();
 
 /**
  * Initialize the dropdown containing all the available civs

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

@@ -64 +64 @@
 
         <!-- Structure Tree display -->
         <object size="0 54+64 100%-124 100%-54" name="display_tree">
-            <repeat count="4" var="n">
-                <object name="phase[n]_phase" type="image"/>
-                <object name="phase[n]_bar">
-                    <repeat count="4" var="k">
-                        <object name="phase[n]_bar[k]" type="image" sprite="ProdBar">
-                            <object name="phase[n]_bar[k]_icon" type="image" size="2 2 20 20"/>
+            <object name="phase_ident">
+                <repeat count="4" var="n">
+                    <object>
+                        <object name="phase[n]_phase" type="image"/>
+                        <object name="phase[n]_bars">
+                            <repeat count="4" var="k">
+                                <object name="phase[n]_bar[k]" type="image" sprite="ProdBar">
+                                    <object name="phase[n]_bar[k]_icon" type="image" size="2 2 20 20"/>
+                                </object>
+                            </repeat>
                         </object>
-                    </repeat>
-                </object>
-            </repeat>
+                    </object>
+                </repeat>
+            </object>
 
             <object type="image" style="TreeDisplay" size="48+16+8 0 100%-12 100%">
                 <include file="gui/structree/rows.xml"/>
@@ -93 +97 @@
                 <translatableAttribute id="caption">Trainer Units</translatableAttribute>
             </object>
 
-            <object type="image" style="TreeDisplay" size="0 24 100% 100%">
+            <object type="image" style="TreeDisplay" size="0 24 100% 100%" name="trainers">
                 <repeat count="3" var="t">
                     <object type="image" style="StructBox" name="trainer[t]">
                         <object type="text" style="StructNameSpecific" name="trainer[t]_name"/>

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

@@ -63 +63 @@
 {
     for (let w in counters)
     {
+        if (!Engine.GetGUIObjectByName(idGUI + "[" + w + "]"))
+            break;
         let fn = counters[w].fn;
         Engine.GetGUIObjectByName(idGUI + "[" + w + "]").caption = fn && fn(playerState, w);
     }
@@ -250 +252 @@
 
 function calculateResources(playerState, position)
 {
-    let type = g_ResourcesTypes[position];
+    let type = g_ResourceData.GetCodes()[position];
 
     return formatIncome(
         playerState.statistics.resourcesGathered[type],
@@ -262 +264 @@
     let totalGathered = 0;
     let totalUsed = 0;
 
-    for (let type of g_ResourcesTypes)
+    for (let type of g_ResourceData.GetCodes())
     {
         totalGathered += playerState.statistics.resourcesGathered[type];
         totalUsed += playerState.statistics.resourcesUsed[type] - playerState.statistics.resourcesSold[type];
@@ -330 +332 @@
 
 function calculateResourceExchanged(playerState, position)
 {
-    let type = g_ResourcesTypes[position];
+    let type = g_ResourceData.GetCodes()[position];
 
     return formatIncome(
         playerState.statistics.resourcesBought[type],

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

@@ -92 +92 @@
     "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)"),
@@ -121 +117 @@
             }, // 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 },
@@ -135 +127 @@
     "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 }
         ],
@@ -206 +190 @@
             headerGUIName = "Heading[" + (h - 1) + "]";
 
         let headerGUI = Engine.GetGUIObjectByName(headerGUIName);
+        if (!headerGUI)
+            break;
         headerGUI.caption = headings[h].caption;
         headerGUI.size = left + " " + headings[h].yStart + " " + (left + headings[h].width) + " 100%";
         headerGUI.hidden = false;
@@ -249 +235 @@
         for (let w in counters)
         {
             counterObject = Engine.GetGUIObjectByName("valueData[" + p + "][" + w + "]");
+            if (!counterObject)
+                break;
             counterObject.size = left + " " + counters[w].verticalOffset + " " + (left + counters[w].width) + " 100%";
             counterObject.hidden = false;
             left += counters[w].width;
@@ -264 +252 @@
             for (let w in counters)
             {
                 counterObject = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]");
+                if (!counterObject)
+                    break;
                 counterObject.size = left + " " + counters[w].verticalOffset + " " + (left + counters[w].width) + " 100%";
                 counterObject.hidden = false;
 

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;
@@ -17 +17 @@
 
 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"]';
@@ -34 +33 @@
 // Count players without team (or all if teams are not displayed)
 var g_WithoutTeam = 0;
 var g_GameData;
+var g_ResourceData = new Resources();
 
 function selectPanel(panel)
 {
@@ -242 +242 @@
     else
         g_Teams = false;
 
+    // Resource names and counters
+    let resHeads = [];
+    let tradeHeads = [];
+    let resPanel = g_ScorePanelsData.resources;
+    let tradePanel = g_ScorePanelsData.market;
+    let resNames = g_ResourceData.GetNames();
+    let resCodes = g_ResourceData.GetCodes();
+    for (let code of resCodes)
+    {
+        resHeads.push({
+            "caption": translateWithContext("firstWord", resNames[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", resNames[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 * resCodes.length + 110;
+    tradePanel.headings.splice.apply(tradePanel.headings, [1, 0].concat(tradeHeads));
+
     // Erase teams data if teams are not displayed
     if (!g_Teams)
     {

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

@@ -103 +103 @@
                 <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>
@@ -124 +124 @@
                                 </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>
@@ -132 +132 @@
                         </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>
@@ -147 +147 @@
                         </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>

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

@@ -289 +289 @@
                     }
                 }
             },
-            {
+            {
                 "extractor": "json",
                 "filemasks": [
                     "gui/credits/texts/**.json"
@@ -559 +559 @@
                         "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"
+                }
             }
         ]
     },

binaries/data/mods/public/simulation/ai/common-api/resources.js

@@ -9 +9 @@
     this.population = population > 0 ? population : 0;
 };
 
-m.Resources.prototype.types = []; // This array will be filled in SharedScript.init
+// This array will be filled in SharedScript.init
+m.Resources.prototype.types = [];
 
 m.Resources.prototype.reset = function()
 {

binaries/data/mods/public/simulation/ai/common-api/shared.js

@@ -180 +180 @@
     this.accessibility.init(state, this.terrainAnalyzer);
 
     // Setup resources
-    this.resourceTypes = { "food": 0, "wood": 1, "stone": 2, "metal": 2 };
-    this.resourceList = [];
-    for (let res in this.resourceTypes)
-        this.resourceList.push(res);
-    m.Resources.prototype.types = this.resourceList;
+    this.resourceInfo = state.resources;
+    m.Resources.prototype.types = state.resources.codes;
     // Resource types: 0 = not used for resource maps
-    //                 1 = abondant resource with small amount each
+    //                 1 = abundant resource with small amount each
     //                 2 = spare resource, but huge amount each
     // The following maps are defined in TerrainAnalysis.js and are used for some building placement (cc, dropsites)
     // They are updated by checking for create and destroy events for all resources
@@ -197 +194 @@
     this.ccResourceMaps = {}; // Contains maps showing the density of resources, optimized for CC placement.
     this.createResourceMaps();
 
-    /** Keep in sync with gui/common/l10n.js */
-    this.resourceNames = {
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "food": markForTranslationWithContext("withinSentence", "Food"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "wood": markForTranslationWithContext("withinSentence", "Wood"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "metal": markForTranslationWithContext("withinSentence", "Metal"),
-        // Translation: Word as used in the middle of a sentence (which may require using lowercase for your language).
-        "stone": markForTranslationWithContext("withinSentence", "Stone"),
-    };
-
     this.gameState = {};
     for (let i in this._players)
     {

binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js

@@ -383 +383 @@
 /** creates a map of resource density */
 m.SharedScript.prototype.createResourceMaps = function()
 {
-    for (let resource of this.resourceList)
+    for (let resource of this.resourceInfo.codes)
     {
-        if (this.resourceTypes[resource] !== 1 && this.resourceTypes[resource] !== 2)
+        if (this.resourceInfo.aiInfluenceGroups[resource] === 0)
             continue;
         // if there is no resourceMap create one with an influence for everything with that resource
         if (this.resourceMaps[resource])
@@ -405 +405 @@
         let cellSize = this.resourceMaps[resource].cellSize;
         let x = Math.floor(ent.position()[0] / cellSize);
         let z = Math.floor(ent.position()[1] / cellSize);
-        let type = this.resourceTypes[resource];
-        let strength = Math.floor(ent.resourceSupplyMax()/this.normalizationFactor[type]);
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2, "constant");
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2);
-        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[type]/cellSize, strength, "constant");
+        let grp = this.resourceInfo.aiInfluenceGroups[resource];
+        let strength = Math.floor(ent.resourceSupplyMax() / this.normalizationFactor[grp]);
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2, "constant");
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2);
+        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[grp] / cellSize, strength, "constant");
     }
 };
 
@@ -420 +420 @@
  */
 m.SharedScript.prototype.updateResourceMaps = function(events)
 {
-    for (let resource of this.resourceList)
+    for (let resource of this.resourceInfo.codes)
     {
-        if (this.resourceTypes[resource] !== 1 && this.resourceTypes[resource] !== 2)
+        if (this.resourceInfo.aiInfluenceGroups[resource] === 0)
             continue;
         // if there is no resourceMap create one with an influence for everything with that resource
         if (this.resourceMaps[resource])
@@ -447 +447 @@
         let cellSize = this.resourceMaps[resource].cellSize;
         let x = Math.floor(ent.position()[0] / cellSize);
         let z = Math.floor(ent.position()[1] / cellSize);
-        let type = this.resourceTypes[resource];
-        let strength = -Math.floor(ent.resourceSupplyMax()/this.normalizationFactor[type]);
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2, "constant");
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2);
-        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[type]/cellSize, strength, "constant");
+        let grp = this.resourceInfo.aiInfluenceGroups[resource];
+        let strength = -Math.floor(ent.resourceSupplyMax() / this.normalizationFactor[grp]);
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2, "constant");
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2);
+        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[grp] / cellSize, strength, "constant");
     }
     for (let e of events.Create)
     {
@@ -466 +466 @@
         let cellSize = this.resourceMaps[resource].cellSize;
         let x = Math.floor(ent.position()[0] / cellSize);
         let z = Math.floor(ent.position()[1] / cellSize);
-        let type = this.resourceTypes[resource];
-        let strength = Math.floor(ent.resourceSupplyMax()/this.normalizationFactor[type]);
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2, "constant");
-        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[type]/cellSize, strength/2);
-        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[type]/cellSize, strength, "constant");
+        let grp = this.resourceInfo.aiInfluenceGroups[resource];
+        let strength = Math.floor(ent.resourceSupplyMax() / this.normalizationFactor[grp]);
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2, "constant");
+        this.resourceMaps[resource].addInfluence(x, z, this.influenceRadius[grp] / cellSize, strength/2);
+        this.ccResourceMaps[resource].addInfluence(x, z, this.ccInfluenceRadius[grp] / cellSize, strength, "constant");
     }
 };
 

binaries/data/mods/public/simulation/ai/petra/baseManager.js

@@ -55 +55 @@
     this.dropsites = {};
     this.dropsiteSupplies = {};
     this.gatherers = {};
-    for (let res of gameState.sharedScript.resourceList)
+    for (let res of gameState.sharedScript.resourceInfo.codes)
     {
         this.dropsiteSupplies[res] = { "nearby": [], "medium": [], "faraway": [] };
         this.gatherers[res] = { "nextCheck": 0, "used": 0, "lost": 0 };
@@ -434 +434 @@
 /** check our resource levels and react accordingly */
 m.BaseManager.prototype.checkResourceLevels = function (gameState, queues)
 {
-    for (let type of gameState.sharedScript.resourceList)
+    for (let type of gameState.sharedScript.resourceInfo.codes)
     {
         if (type === "food")
         {

binaries/data/mods/public/simulation/ai/petra/chatHelper.js

@@ -17 +17 @@
         "message": message,
         "translateMessage": true,
         "translateParameters": ["_player_"],
-        "parameters": {"_player_": player}
+        "parameters": { "_player_": player }
     });
 };
 
@@ -45 +45 @@
         "message": message,
         "translateMessage": true,
         "translateParameters": ["_player_"],
-        "parameters": {"_player_": player}
+        "parameters": { "_player_": player }
     };
     if (other !== undefined)
     {
@@ -71 +71 @@
         "message": message,
         "translateMessage": true,
         "translateParameters": ["_player_"],
-        "parameters": {"_player_": player}
+        "parameters": { "_player_": player }
     });
 };
 
@@ -90 +90 @@
         "type": "aichat",
         "message": message,
         "translateMessage": true,
-        "translateParameters": {"resource": "withinSentence"},
-        "parameters": {"resource": gameState.sharedScript.resourceNames[resource]}
+        "translateParameters": { "resource": "withinSentence" },
+        "parameters": { "resource": gameState.sharedScript.resourceInfo.names[resource] }
     });
 };
 
@@ -109 +109 @@
         "message": message,
         "translateMessage": true,
         "translateParameters": ["_player_"],
-        "parameters": {"_player_": player}
+        "parameters": { "_player_": player }
     });
 };
 

binaries/data/mods/public/simulation/ai/petra/config.js

@@ -103 +103 @@
         "defensive": 0.5
     };
 
-    this.resources = ["food", "wood", "stone", "metal"];
+    // See m.QueueManager.prototype.wantedGatherRates()
+    this.queues =
+    {
+        "firstTurn": {
+            "food": 10,
+            "wood": 10,
+            "default": 0
+        },
+        "short": {
+            "food": 200,
+            "wood": 200,
+            "default": 100
+        },
+        "medium": {
+            "default": 0
+        },
+        "long": {
+            "default": 0
+        }
+    };
 };
 
 m.Config.prototype.setConfig = function(gameState)

binaries/data/mods/public/simulation/ai/petra/headquarters.js

@@ -69 +69 @@
     this.navalMap = false;
     this.navalRegions = {};
 
-    for (let res of gameState.sharedScript.resourceList)
+    for (let res of gameState.sharedScript.resourceInfo.codes)
     {
         this.wantedRates[res] = 0;
         this.currentRates[res] = 0;
@@ -653 +653 @@
 m.HQ.prototype.getTotalResourceLevel = function(gameState)
 {
     let total = {};
-    for (let res of gameState.sharedScript.resourceList)
+    for (let res of gameState.sharedScript.resourceInfo.codes)
         total[res] = 0;
     for (let base of this.baseManagers)
         for (let res in total)

binaries/data/mods/public/simulation/ai/petra/queueManager.js

@@ -84 +84 @@
     if (gameState.ai.playedTurn === 0)
     {
         let ret = {};
-        for (let res of gameState.sharedScript.resourceList)
-            ret[res] = (res === "food" || res === "wood" ) ? 10 : 0;
+        for (let res of gameState.sharedScript.resourceInfo.codes)
+            ret[res] = this.Config.queues.firstTurn[res] || this.Config.queues.firstTurn.default;
         return ret;
     }
 
@@ -97 +97 @@
     let totalShort = {};
     let totalMedium = {};
     let totalLong = {};
-    for (let res of gameState.sharedScript.resourceList)
+    for (let res of gameState.sharedScript.resourceInfo.codes)
     {
-        totalShort[res] = (res === "food" || res === "wood" ) ? 200 : 100;
-        totalMedium[res] = 0;
-        totalLong[res] = 0;
+        totalShort[res] = this.Config.queues.short[res] || this.Config.queues.short.default;
+        totalMedium[res] = this.Config.queues.medium[res] || this.Config.queues.medium.default;
+        totalLong[res] = this.Config.queues.long[res] || this.Config.queues.long.default;
     }
     let total;
     //queueArrays because it's faster.
@@ -133 +133 @@
     // global rates
     let rates = {};
     let diff;
-    for (let res of gameState.sharedScript.resourceList)
+    for (let res of gameState.sharedScript.resourceInfo.codes)
     {
         if (current[res] > 0)
         {

binaries/data/mods/public/simulation/ai/petra/researchManager.js

@@ -100 +100 @@
             let cost = template.cost;
             let costMax = 0;
             for (let res in cost)
-                costMax = Math.max(costMax, Math.max(cost[res]-available[res], 0));
+                if (gameState.sharedScript.resourceInfo.codes.indexOf(res))
+                    costMax = Math.max(costMax, Math.max(cost[res]-available[res], 0));
             if (10*numWorkers < costMax)
                 continue;
         }

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

@@ -1 @@
-// True price of 100 units of resource (for case if some resource is more worth).
+// The "true price" is a base price of 100 units of resource (for the case of some resources being of more worth than others).
 // With current bartering system only relative values makes sense
 // so if for example stone is two times more expensive than wood,
 // there will 2:1 exchange rate.
-const TRUE_PRICES = { "food": 100, "wood": 100, "stone": 100, "metal": 100 };
-
+//
 // Constant part of price difference between true price and buy/sell price.
 // In percents.
 // Buy price equal to true price plus constant difference.
@@ -21 +20 @@
 // Interval of timer which slowly restore prices after deals
 const RESTORE_TIMER_INTERVAL = 5000;
 
-// Array of resource names
-const RESOURCES = ["food", "wood", "stone", "metal"];
-
 function Barter() {}
 
 Barter.prototype.Schema =
@@ -32 +28 @@
 Barter.prototype.Init = function()
 {
     this.priceDifferences = {};
-    for (var resource of RESOURCES)
+    for (let resource of Resources.GetCodes())
         this.priceDifferences[resource] = 0;
     this.restoreTimer = undefined;
 };
@@ -40 +36 @@
 Barter.prototype.GetPrices = function()
 {
     var prices = { "buy": {}, "sell": {} };
-    for (var resource of RESOURCES)
+    for (let resource of Resources.GetCodes())
     {
-        prices["buy"][resource] = TRUE_PRICES[resource] * (100 + CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100;
-        prices["sell"][resource] = TRUE_PRICES[resource] * (100 - CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100;
+        let truePrice = Resources.GetResource(resource).truePrice;
+        prices.buy[resource] = truePrice * (100 + CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100;
+        prices.sell[resource] = truePrice * (100 - CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100;
     }
     return prices;
 };
@@ -71 +68 @@
         warn("ExchangeResources: incorrect amount: " + uneval(amount));
         return;
     }
-    if (RESOURCES.indexOf(resourceToSell) == -1)
+    let availResources = Resources.GetCodes();
+    if (availResources.indexOf(resourceToSell) == -1)
     {
         warn("ExchangeResources: incorrect resource to sell: " + uneval(resourceToSell));
         return;
     }
-    if (RESOURCES.indexOf(resourceToBuy) == -1)
+    if (availResources.indexOf(resourceToBuy) == -1)
     {
         warn("ExchangeResources: incorrect resource to buy: " + uneval(resourceToBuy));
         return;
@@ -123 +121 @@
 Barter.prototype.ProgressTimeout = function(data)
 {
     var needRestore = false;
-    for (var resource of RESOURCES)
+    for (let resource of Resources.GetCodes())
     {
         // Calculate value to restore, it should be limited to [-DIFFERENCE_RESTORE; DIFFERENCE_RESTORE] interval
         var differenceRestore = Math.min(DIFFERENCE_RESTORE, Math.max(-DIFFERENCE_RESTORE, this.priceDifferences[resource]));

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

@@ -19 +19 @@
     "<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'>" +
+        Resources.BuildSchema("nonNegativeDecimal") +
     "</element>";
 
 Cost.prototype.Init = function()
@@ -70 +65 @@
     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)
+    {
+        if (resCodes.indexOf(res) < 0)
+            continue;
+        costs[res] = ApplyValueModificationsToTemplate("Cost/Resources/"+res, +this.template.Resources[res], owner, entityTemplate);
+    }
+
     return costs;
 };
 

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

@@ -152 +152 @@
     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(),
+        "aiInfluenceGroups": {}
+    };
+    for (let res of ret.resources.codes)
+        ret.resources.aiInfluenceGroups[res] = Resources.GetResource(res).aiAnalysisInfluenceGroup || 0;
+
     // Add basic statistics to each player
     for (let i = 0; i < numPlayers; ++i)
     {
@@ -1269 +1278 @@
 
     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)
@@ -1545 +1556 @@
             // 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;
+            for (let res of Resources.GetCodes().concat("population", "populationBonus", "time"))
+                result.cost[res] = tplData.cost[res];
         }
 
         let canAfford = true;
@@ -1932 +1938 @@
     return QueryPlayerIDInterface(player).GetTradingGoods();
 };
 
+GuiInterface.prototype.GetBarterPrices = function()
+{
+    return Engine.QueryInterface(SYSTEM_ENTITY, IID_Barter).GetPrices();
+};
+
+GuiInterface.prototype.PlayerCanBarter = function(player)
+{
+    let playerEnt = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetPlayerByID(player);
+    return Engine.QueryInterface(SYSTEM_ENTITY, IID_Barter).PlayerHasMarket(playerEnt);
+};
+
 GuiInterface.prototype.OnGlobalEntityRenamed = function(msg)
 {
     this.renamedEntities.push(msg);
@@ -1996 +2013 @@
 
     "GetTraderNumber": 1,
     "GetTradingGoods": 1,
+    "GetBarterPrices": 1,
+    "PlayerCanBarter": 1,
 };
 
 GuiInterface.prototype.ScriptCall = function(player, name, args)

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

@@ -1 +1 @@
 function Loot() {}
 
 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>" +
+    Resources.BuildSchema("nonNegativeInteger", ["xp"]);
 
 Loot.prototype.Serialize = null; // we have no dynamic state to save
 
@@ -26 +17 @@
 
 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

@@ -18 +18 @@
     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"
@@ -44 +34 @@
     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 = [];
+
+    // Initial resources and trading goods probability in steps of 5
+    let resCodes = Resources.GetCodes();
+    let quotient = Math.floor(20 / resCodes.length);
+    let remainder = 20 % resCodes.length;
+    for (let i in resCodes)
+    {
+        let res = resCodes[i];
+        this.resourceCount[res] = 300;
+        this.resourceNames[res] = Resources.GetResource(res).name;
+        this.tradingGoods.push({
+            "goods":  res,
+            "proba": 5 * (quotient + (+i < remainder ? 1 : 0))
+        });
+    }
 };
 
 Player.prototype.SetPlayerID = function(id)
@@ -197 +197 @@
 
 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()
@@ -297 +292 @@
 
     // Subtract the resources
     for (var type in amounts)
-        this.resourceCount[type] -= amounts[type];
+        if (this.resourceCount[type])
+            this.resourceCount[type] -= amounts[type];
 
     return true;
 };
@@ -340 +336 @@
 
 Player.prototype.SetTradingGoods = function(tradingGoods)
 {
-    var sumProba = 0;
-    for (var resource in tradingGoods)
+    let resCodes = Resources.GetCodes();
+    let sumProba = 0;
+    for (let resource in tradingGoods)
+    {
+        if (resCodes.indexOf(resource) == -1)
+        {
+            error("Invalid trading goods: " + uneval(tradingGoods));
+            return;
+        }
         sumProba += tradingGoods[resource];
-    if (sumProba != 100)    // consistency check
+    }
+
+    if (sumProba != 100)
     {
-        error("Player.js SetTradingGoods: " + uneval(tradingGoods));
-        tradingGoods = { "food": 20, "wood":20, "stone":30, "metal":30 };
+        error("Invalid trading goods: " + uneval(tradingGoods));
+        return;
     }
 
     this.tradingGoods = [];
-    for (var resource in tradingGoods)
-        this.tradingGoods.push( {"goods": resource, "proba": tradingGoods[resource]} );
+    for (let resource in tradingGoods)
+        this.tradingGoods.push({
+            "goods": resource,
+            "proba": tradingGoods[resource]
+        });
 };
 
 Player.prototype.GetState = function()

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

@@ -31 +31 @@
         "</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>" +
+        Resources.BuildSchema("nonNegativeDecimal", ["time"]) +
     "</element>";
 
 ProductionQueue.prototype.Init = function()
@@ -260 +254 @@
     // 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)
     {
@@ -293 +288 @@
             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]);
+                if (resCodes.indexOf(res) < 0)
+                    continue;
+                costs[res] = ApplyValueModificationsToTemplate("Cost/Resources/"+res, +template.Cost.Resources[res], cmpPlayer.GetPlayerID(), template);
+                totalCosts[res] = Math.floor(count * costs[res]);
             }
 
             var population = ApplyValueModificationsToTemplate("Cost/Population",  +template.Cost.Population, cmpPlayer.GetPlayerID(), template);
@@ -337 +334 @@
             var template = cmpDataTemplateManager.GetTechnologyTemplate(templateName);
             if (!template)
                 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] || 1) * template.cost[res]);
+            }
 
             // TrySubtractResources should report error to player (they ran out of resources)
             if (!cmpPlayer.TrySubtractResources(cost))
@@ -361 +361 @@
                 "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,
@@ -433 +433 @@
         // 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

@@ -4 +4 @@
     "<element name='Types'>" +
         "<list>" +
             "<zeroOrMore>" +
-                "<choice>" +
-                    "<value>food</value>" +
-                    "<value>wood</value>" +
-                    "<value>stone</value>" +
-                    "<value>metal</value>" +
-                "</choice>" +
+                Resources.BuildChoicesSchema() +
             "</zeroOrMore>" +
         "</list>" +
     "</element>" +
@@ -24 +19 @@
 };
 
 /**
- * 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 resources = Resources.GetCodes();
+    return types.split(/\s+/).filter(type => resources.indexOf(type.toLowerCase()) != -1);
 };
 
 /**

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

@@ -25 +25 @@
         "<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>" +
+        Resources.BuildSchema("positiveDecimal", ["treasure"], true) +
     "</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>" +
+        Resources.BuildSchema("positiveDecimal") +
     "</element>";
 
 ResourceGatherer.prototype.Init = function()
@@ -137 +112 @@
     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[type[1]])
+            continue;
+
         let rate = ApplyValueModificationsToEntity("ResourceGatherer/Rates/" + r, +this.template.Rates[r], this.entity);
         this.rates[r] = rate * this.baseSpeed;
     }
@@ -174 +155 @@
 
 /**
  * Try to gather treasure
- * @return 'true' if treasure is successfully gathered and 'false' in the other case
+ * @return 'true' if treasure is successfully gathered, otherwise 'false'
  */
 ResourceGatherer.prototype.TryInstantGather = function(target)
 {

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

@@ -12 +12 @@
     "<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'>" +
+        Resources.BuildChoicesSchema(true, true) +
     "</element>" +
     "<element name='MaxGatherers' a:help='Amount of gatherers who can gather resources from this entity at the same time'>" +
         "<data type='nonNegativeInteger'/>" +
@@ -45 +30 @@
     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.GetNames() };
 
+    // Remove entity from gameworld if the resource supplied by this entity is disabled or not valid.
+    if (!resData || !resData.subtypes[this.subtype])
+        Engine.DestroyEntity(this.entity);
+
+    this.cachedType = { "generic": this.type, "specific": this.subtype };
 };
 
 ResourceSupply.prototype.IsInfinite = function()

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

@@ -3 +3 @@
 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>" +
+        Resources.BuildSchema("nonNegativeDecimal") +
     "</element>" +
     "<element name='Interval' a:help='Number of miliseconds must pass for the player to gain the next trickle.'>" +
         "<ref name='nonNegativeDecimal'/>" +
@@ -45 +24 @@
 
 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;
 };
@@ -55 +39 @@
 // 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

@@ -105 +105 @@
     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;
@@ -347 +335 @@
  */
 StatisticsTracker.prototype.IncreaseResourceUsedCounter = function(type, amount)
 {
-    this.resourcesUsed[type] += amount;
+    if (typeof this.resourcesUsed[type] === "number")
+        this.resourcesUsed[type] += amount;
 };
 
 StatisticsTracker.prototype.IncreaseTreasuresCollectedCounter = function()

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

@@ -4 +4 @@
 // 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 =

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

@@ -29 +29 @@
                     "<element name='Cost' a:help='Resource cost to upgrade this unit'>" +
                         "<oneOrMore>" +
                             "<choice>" +
-                                "<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>" +
+                                Resources.BuildSchema("nonNegativeInteger") +
                             "</choice>" +
                         "</oneOrMore>" +
                     "</element>" +

binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js

@@ -33 +33 @@
 Engine.LoadComponentScript("interfaces/BuildingAI.js");
 Engine.LoadComponentScript("GuiInterface.js");
 
+Resources = {
+    "GetCodes": () => ["food", "metal", "stone", "wood"],
+    "GetNames": () => ({
+        "food": "Food",
+        "metal": "Metal",
+        "stone": "Stone",
+        "wood": "Wood"
+    }),
+    "GetResource": () => ({}),
+};
+
 var cmp = ConstructComponent(SYSTEM_ENTITY, "GuiInterface");
 
 
@@ -330 +341 @@
     circularMap: false,
     timeElapsed: 0,
     gameType: "conquest",
-    barterPrices: {buy: {food: 150}, sell: {food: 25}}
+    "barterPrices": {
+        "buy": { "food": 150 },
+        "sell": { "food": 25 }
+    },
+    "resources": {
+        "codes": ["food", "metal", "stone", "wood"],
+        "names": {
+            "food": "Food",
+            "metal": "Metal",
+            "stone": "Stone",
+            "wood": "Wood",
+        },
+        "aiInfluenceGroups": {
+            "food": 0,
+            "metal": 0,
+            "stone": 0,
+            "wood": 0,
+        }
+    },
 });
 
 TS_ASSERT_UNEVAL_EQUALS(cmp.GetExtendedSimulationState(), {
@@ -449 +478 @@
     circularMap: false,
     timeElapsed: 0,
     gameType: "conquest",
-    barterPrices: {buy: {food: 150}, sell: {food: 25}}
+    "barterPrices": {
+        "buy": { "food": 150 },
+        "sell": { "food": 25 }
+    },
+    resources: {
+        codes: ["food", "metal", "stone", "wood"],
+        names: {
+            "food": "Food",
+            "metal": "Metal",
+            "stone": "Stone",
+            "wood": "Wood",
+        },
+        aiInfluenceGroups: {
+            "food": 0,
+            "metal": 0,
+            "stone": 0,
+            "wood": 0,
+        }
+    },
 });
 
 

binaries/data/mods/public/simulation/components/tests/test_Player.js

@@ -3 +3 @@
 Engine.LoadComponentScript("interfaces/TechnologyManager.js");
 Engine.LoadComponentScript("Player.js");
 
+Resources = {
+    "GetCodes": () => ["food", "metal", "stone", "wood"],
+    "GetResource": () => ({}),
+};
+
 var cmpPlayer = ConstructComponent(10, "Player");
 
 TS_ASSERT_EQUALS(cmpPlayer.GetPopulationCount(), 0);

new file inaries/data/mods/public/simulation/data/resources/food.json

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

new file inaries/data/mods/public/simulation/data/resources/metal.json

@@ +1 @@
+{
+    "code": "metal",
+    "name": "Metal",
+    "order": 4,
+    "subtypes": {
+        "ore": "Ore"
+    },
+    "truePrice": 100,
+    "aiAnalysisInfluenceGroup": 2,
+    "enabled": true
+}

new file inaries/data/mods/public/simulation/data/resources/stone.json

@@ +1 @@
+{
+    "code": "stone",
+    "name": "Stone",
+    "order": 3,
+    "subtypes": {
+        "rock": "Rock",
+        "ruins": "Ruins"
+    },
+    "truePrice": 100,
+    "aiAnalysisInfluenceGroup": 2,
+    "enabled": true
+}

new file inaries/data/mods/public/simulation/data/resources/wood.json

@@ +1 @@
+{
+    "code": "wood",
+    "name": "Wood",
+    "order": 2,
+    "subtypes": {
+        "tree": "Tree",
+        "ruins": "Ruins"
+    },
+    "truePrice": 100,
+    "aiAnalysisInfluenceGroup": 1,
+    "enabled": true
+}

new file inaries/data/mods/public/simulation/helpers/Resources.js

@@ +1 @@
+/**
+ * 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.prototype.BuildSchema = function(datatype, additional = [], subtypes = false)
+{
+    if (!datatype)
+        return "";
+
+    switch (datatype)
+    {
+    case "decimal":
+    case "nonNegativeDecimal":
+    case "positiveDecimal":
+        datatype = "<ref name='" + datatype + "'/>";
+        break;
+
+    default:
+        datatype = "<data type='" + datatype + "'/>";
+    }
+
+    let resCodes = this.resourceData.map(resource => resource.code);
+    let schema = "";
+    for (let res of resCodes.concat(additional))
+        schema +=
+            "<optional>" +
+                "<element name='" + res + "'>" +
+                    datatype +
+                "</element>" +
+            "</optional>";
+
+    if (!subtypes)
+        return "<interleave>" + schema + "</interleave>";
+
+    for (let res of this.resourceData)
+        for (let subtype in 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 "<interleave>" + 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.prototype.BuildChoicesSchema = function(subtypes = false, treasure = false)
+{
+    let schema = "";
+
+    if (!subtypes)
+    {
+        let resCodes = this.resourceData.map(resource => resource.code);
+        if (treasure)
+            resCodes.push("treasure");
+        for (let res of resCodes)
+            schema += "<value>" + res + "</value>";
+    }
+    else
+        for (let res of this.resourceData)
+        {
+            for (let subtype in res.subtypes)
+                schema += "<value>" + res.code + "." + subtype + "</value>";
+            if (treasure)
+                schema += "<value>" + "treasure." + res.code + "</value>";
+        }
+
+    return "<choice>" + schema + "</choice>";
+}
+
+Resources = new Resources();