Ticket #23: barter_2011_08_30.diff

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

@@ -999 +999 @@
     inputState = INPUT_BUILDING_PLACEMENT;
 }
 
+// Called by GUI when user clicks exchange resources button
+function exchangeResources(command)
+{
+    Engine.PostNetworkCommand({"type": "barter", "action": command.action, "resource": command.resource});
+}
+
+
 // Batch training:
 // When the user shift-clicks, we set these variables and switch to INPUT_BATCHTRAINING
 // When the user releases shift, or clicks on a different training button, we create the batched units

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

@@ -119 +119 @@
     if (guiName == "Selection")
     {
         if (numberOfItems > 16)
-                numberOfItems =  16;
+            numberOfItems = 16;
     }
     else if (guiName == "Formation")
     {
         if (numberOfItems > 16)
-                numberOfItems =  16;
+            numberOfItems = 16;
     }   
     else if (guiName == "Stance")
     {
         if (numberOfItems > 5)
-                numberOfItems =  5;
+            numberOfItems = 5;
     }
     else if (guiName == "Queue")
     {
@@ -150 +150 @@
     }
     else if (numberOfItems > 24)
     {
-        numberOfItems =  24;
+        numberOfItems = 24;
     }
 
     var i;
@@ -321 +321 @@
     {
         layoutButtonRowCentered(0, guiName, 0, numButtons, COMMANDS_PANEL_WIDTH);
     }
-    else
+    // exclude case when there is only barter buttons on training panel,
+    // which is processed separatedly in addBarterButtonsToTrainingPanel function
+    else if (!(guiName == "Training" && numButtons == 0))
     {
         for (var i = 0; i < numRows; i++)
             layoutButtonRow(i, guiName, buttonSideLength, buttonSpacer, rowLength*i, rowLength*(i+1) );
@@ -336 +338 @@
         panel.size = size;
     }
 
-    // Hide any buttons we're no longer using
-    for (i = numButtons; i < g_unitPanelButtons[guiName]; ++i)
-        getGUIObjectByName("unit"+guiName+"Button["+i+"]").hidden = true;
+    if (guiName == "Training" && unitEntState.barterMarket)
+    {
+        addBarterButtonsToTrainingPanel(usedPanels, unitEntState, numButtons);
+    }
+    else
+    {
+        // Hide any buttons we're no longer using
+        for (i = numButtons; i < g_unitPanelButtons[guiName]; ++i)
+            getGUIObjectByName("unit"+guiName+"Button["+i+"]").hidden = true;
 
-    g_unitPanelButtons[guiName] = numButtons;
+        g_unitPanelButtons[guiName] = numButtons;
+    }
 }
 
+// add barter buttons to training panel to next row after last row with trainable units
+function addBarterButtonsToTrainingPanel(usedPanels, unitEntState, newButtonsCount)
+{
+    var previousButtonsCount = g_unitPanelButtons["Training"];
+    var rowLength = 8;
+    // index of row where we are going to add barter buttons
+    var rowIndex = 0;
+    // if Training panel have some buttons, calculate row index
+    // for barter buttons
+    if (newButtonsCount > 0)
+    {
+        rowIndex = Math.ceil(newButtonsCount / rowLength);
+    }
+
+    for (var i = 0; i < 6; i++)
+    {
+        var action = ["buy", "sell"][Math.floor(i/3)];
+        var resource = ["food", "wood", "stone"][i%3];
+
+        var buttonIndex = i + rowLength*rowIndex;
+
+        var button = getGUIObjectByName("unitTrainingButton["+buttonIndex+"]");
+        button.hidden = false;
+        button.tooltip = action + " 100 " + resource + " for " + unitEntState.barterPrices[action][resource] + " metal";
+        var command = { "action": action, "resource": resource };
+        button.onpress = (function(e) { return function() { exchangeResources(e) } })(command);
+        
+        var icon = getGUIObjectByName("unitTrainingIcon["+buttonIndex+"]");
+        icon.sprite = "stretched:session/actions/" + action + "_" + resource + ".png";
+    }
+
+    var buttonSideLength = getGUIObjectByName("unitTrainingButton[0]").size.bottom;
+    var buttonSpacer = buttonSideLength+1;
+    layoutButtonRow(rowIndex, "Training", buttonSideLength, buttonSpacer, rowLength*rowIndex, rowLength*(rowIndex+1));
+
+    // Hide any buttons we're no longer using
+    // hide buttons between last unit train button and first barter button
+    for (i = newButtonsCount; i < rowIndex * rowLength; ++i)
+        getGUIObjectByName("unitTrainingButton["+i+"]").hidden = true;
+    // hide buttons after last barter button
+    for (i = rowLength*rowIndex + 6; i < previousButtonsCount; ++i)
+        getGUIObjectByName("unitTrainingButton["+i+"]").hidden = true;
+    // update number of buttons, we suppose that all rows before one with barter buttons
+    // are fully filled (indeed there can be some empty places) and barter buttons row
+    // always have 6 buttons
+    g_unitPanelButtons["Training"] = rowIndex * rowLength + 6;
+}
+
 // Updates right Unit Commands Panel - runs in the main session loop via updateSelectionDetails()
 function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, selection)
 {
@@ -411 +468 @@
                 function (trainEntType) { addToTrainingQueue(entState.id, trainEntType); } );
 //          isInvisible = false;
         }
+        else if (entState.barterMarket)
+        {
+            setupUnitPanel("Training", usedPanels, entState, [], null);
+        }
 
         if (entState.training && entState.training.queue.length)
             setupUnitPanel("Queue", usedPanels, entState, entState.training.queue,

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

@@ -319 +319 @@
         }
         break;
 
+    case "barter":
+        var cmpPlayerBarter = Engine.QueryInterface(playerEnt, IID_PlayerBarter);
+        cmpPlayerBarter.ExchangeResources(cmd.action, cmd.resource);
+        break;
+
     default:
         error("Ignoring unrecognised command type '" + cmd.type + "'");
     }

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

@@ -132 +132 @@
             "classes": cmpIdentity.GetClassesList(),
             "selectionGroupName": cmpIdentity.GetSelectionGroupName()
         };
+
+        if (cmpIdentity.GetClassesList().indexOf("BarterMarket") != -1)
+        {
+            ret.barterMarket = true;
+            var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+            var playerEntity = cmpPlayerManager.GetPlayerByID(player);
+            var cmpPlayerBarter = Engine.QueryInterface(playerEntity, IID_PlayerBarter);
+            ret.barterPrices = cmpPlayerBarter.GetPrices();
+        }
     }
     
     var cmpPosition = Engine.QueryInterface(ent, IID_Position);

binaries/data/mods/public/simulation/components/interfaces/PlayerBarter.js

@@ +1 @@
+Engine.RegisterInterface("PlayerBarter");

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

@@ -81 +81 @@
                         "<value>Civic</value>" +
                         "<value>CivCentre</value>" +
                         "<value>Economic</value>" +
+                        "<value>BarterMarket</value>" +
                         "<value>Defensive</value>" +
                         "<value>Village</value>" +
                         "<value>Town</value>" +

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

@@ +1 @@
+// true price of 100 resource in metal (for case if some resource is more worth)
+const TRUE_PRICES = { "food": 100, "wood": 100, "stone": 100 };
+
+// constant part of price different between true price and buy/sell price
+// in percents
+// buy price equal to true price plus constant difference
+// sell price equal to true price minus constant difference
+const CONSTANT_DIFFERENCE = 25;
+
+// additional difference of prices, added after each deal to specified resource price
+// in percents
+const DIFFERENCE_PER_DEAL = 5;
+
+// price difference which restored each restore timer tick
+// in percents
+const DIFFERENCE_RESTORE = 2;
+
+// interval of timer which slowly restore prices after deals
+const RESTORE_TIMER_INTERVAL = 5000;
+
+function PlayerBarter() {}
+
+PlayerBarter.prototype.Schema =
+    "<a:component type='system'/><empty/>";
+
+PlayerBarter.prototype.Init = function()
+{
+    this.priceDifferences = {};
+    for each (var resource in ["food", "wood", "stone"])
+        this.priceDifferences[resource] = 0;
+    this.restoreTimer = undefined;
+};
+
+PlayerBarter.prototype.GetPrices = function()
+{
+    var prices = { "buy": {}, "sell": {} };
+    for each (var resource in ["food", "wood", "stone"])
+    {
+        prices["buy"][resource] = Math.round(TRUE_PRICES[resource] * (100 + CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100);
+        prices["sell"][resource] = Math.round(TRUE_PRICES[resource] * (100 - CONSTANT_DIFFERENCE + this.priceDifferences[resource]) / 100);
+    }
+    return prices;
+};
+
+PlayerBarter.prototype.ExchangeResources = function(action, resource)
+{
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    var amountsToSubtract = { 
+        "food": 0,
+        "wood": 0,
+        "stone": 0,
+        "metal": 0
+    };
+    var prices = this.GetPrices();
+    switch (action)
+    {
+    case "buy":
+        amountsToSubtract["metal"] = prices["buy"][resource];
+        if (cmpPlayer.TrySubtractResources(amountsToSubtract))
+        {
+            cmpPlayer.AddResource(resource, 100);
+            if (this.priceDifferences[resource] + DIFFERENCE_PER_DEAL < 100 - CONSTANT_DIFFERENCE)
+                this.priceDifferences[resource] += DIFFERENCE_PER_DEAL;
+        }
+        break;
+    case "sell":
+        amountsToSubtract[resource] = 100;
+        if (cmpPlayer.TrySubtractResources(amountsToSubtract))
+        {
+            cmpPlayer.AddResource("metal", prices["sell"][resource]);
+            if (this.priceDifferences[resource] - DIFFERENCE_PER_DEAL > CONSTANT_DIFFERENCE - 100)
+                this.priceDifferences[resource] -= DIFFERENCE_PER_DEAL;
+        }
+        break;
+    }
+    if (this.restoreTimer == undefined)
+    {
+        var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+        this.restoreTimer = cmpTimer.SetTimeout(this.entity, IID_PlayerBarter, "ProgressTimeout", RESTORE_TIMER_INTERVAL, {});
+    }
+};
+
+PlayerBarter.prototype.ProgressTimeout = function(data)
+{
+    this.restoreTimer = undefined;
+
+    var needRestore = false;
+    for each (var resource in ["food", "wood", "stone"])
+    {
+        // calculate value to restore, it should be:
+        //  DIFFERENCE_RESTORE if this.priceDifferences[resource] < 0
+        //  -DIFFERENCE_RESTORE if this.priceDifferences[resource] > 0
+        //  this.priceDifferences[resource] if it's modulus less than DIFFERENCE_RESTORE
+        var differenceRestore = -Math.min(DIFFERENCE_RESTORE, Math.max(-DIFFERENCE_RESTORE, this.priceDifferences[resource]));
+        this.priceDifferences[resource] += differenceRestore;
+        // if price difference still exists then set flag to run timer again
+        if (this.priceDifferences[resource] != 0)
+            needRestore = true;
+    }
+
+    if (needRestore)
+    {
+        var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+        this.restoreTimer = cmpTimer.SetTimeout(this.entity, IID_PlayerBarter, "ProgressTimeout", RESTORE_TIMER_INTERVAL, data);
+    }
+}
+
+Engine.RegisterComponentType(IID_PlayerBarter, "PlayerBarter", PlayerBarter);
+

binaries/data/mods/public/simulation/templates/special/player.xml

@@ -9 +9 @@
     </Limits>
   </BuildLimits>
   <Player/>
+  <PlayerBarter/>
   <StatisticsTracker/>
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml

@@ -23 +23 @@
   </Health>
   <Identity>
     <GenericName>Market</GenericName>
-    <Tooltip>Create Trade units and Barter resources. (Currently a useless structure)</Tooltip>
-    <Classes datatype="tokens">Town</Classes>
+    <Tooltip>Create Trade units and Barter resources.</Tooltip>
+    <Classes datatype="tokens">Town BarterMarket</Classes>
     <Icon>structures/market.png</Icon>
   </Identity>
   <Obstruction>