wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix to the upgrade commit, including one by fatherbushido. Refs #2706

Browse Source 
This was SVN commit r18470.
This commit is contained in:
wraitii 2016-07-02 16:05:56 +00:00
parent 967a500d37
commit f468ac936b
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/gui/session/selection_panels.js
View File

@ -1059,7 +1059,7 @@ g_SelectionPanels.Upgrade = {
if (data.item.requiredTechnology)
technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", {
"tech": requiredTechnology,
"tech": data.item.requiredTechnology,
"player": data.unitEntState.player
});
@ -1131,8 +1131,11 @@ g_SelectionPanels.Upgrade = {
let progressOverlay = Engine.GetGUIObjectByName("unitUpgradeProgressSlider[" + data.i + "]");
if (isUpgrading)
progressOverlay.size.top = progressOverlay.size.left + Math.round(progress * (progressOverlay.size.right - progressOverlay.size.left));
{
let size = progressOverlay.size;
size.top = size.left + Math.round(progress * (size.right - size.left));
progressOverlay.size = size;
}
progressOverlay.hidden = !isUpgrading;
let index = data.i + getNumberOfRightPanelButtons();

22
binaries/data/mods/public/simulation/components/Upgrade.js
View File

@ -21,7 +21,7 @@ Upgrade.prototype.Schema =
"</element>" +
"</optional>" +
"<optional>" +
"<element name='Time' a:help='Time required to upgrade this entity, in milliseconds'>" +
"<element name='Time' a:help='Time required to upgrade this entity, in seconds'>" +
"<data type='nonNegativeInteger'/>" +
"</element>" +
"</optional>" +
@ -76,8 +76,7 @@ Upgrade.prototype.Init = function()
// This will also deal with the "OnDestroy" case.
Upgrade.prototype.OnOwnershipChanged = function(msg)
{
this.CancelUpgrade();
this.CancelUpgrade(msg.from);
if (msg.to !== -1)
this.owner = msg.to;
};
@ -132,12 +131,12 @@ Upgrade.prototype.GetUpgrades = function()
if (choice.Time)
{
hasCosts = true;
cost.time = ApplyValueModificationsToTemplate("Upgrade/Time", +choice.Time/1000.0, this.owner, entType);
cost.time = ApplyValueModificationsToTemplate("Upgrade/Time", +choice.Time, this.owner, entType);
}
ret.push({
"entity": entType,
"icon": choice.Icon || undefined,
"cost": hasCosts,
"cost": hasCosts ? cost : undefined,
"tooltip": choice.Tooltip || undefined,
"requiredTechnology": this.GetRequiredTechnology(option),
});
@ -242,17 +241,14 @@ Upgrade.prototype.Upgrade = function(template)
return true;
};
Upgrade.prototype.CancelUpgrade = function()
Upgrade.prototype.CancelUpgrade = function(owner = undefined)
{
if (!this.IsUpgrading())
return;
let cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
let cmpPlayer = owner ? QueryPlayerIDInterface(owner, IID_Player) : QueryOwnerInterface(this.entity, IID_Player);
if (cmpPlayer)
{
let costs = this.GetResourceCosts(this.upgrading);
cmpPlayer.AddResources(costs);
}
cmpPlayer.AddResources(this.GetResourceCosts(this.upgrading));
this.ChangeUpgradedEntityCount(-1);
@ -279,7 +275,7 @@ Upgrade.prototype.GetProgress = function()
{
if (!this.IsUpgrading())
return undefined;
return this.GetUpgradeTime() == 0 ? 1 : this.elapsedTime / this.GetUpgradeTime();
return this.GetUpgradeTime() == 0 ? 1 : Math.min(this.elapsedTime / 1000.0 / this.GetUpgradeTime(), 1.0);
};
Upgrade.prototype.SetElapsedTime = function(time)
@ -289,7 +285,7 @@ Upgrade.prototype.SetElapsedTime = function(time)
Upgrade.prototype.UpgradeProgress = function(data, lateness)
{
if (this.elapsedTime < this.GetUpgradeTime())
if (this.elapsedTime/1000.0 < this.GetUpgradeTime())
{
this.SetElapsedTime(this.GetElapsedTime() + UPGRADING_PROGRESS_INTERVAL + lateness);
return;

2
binaries/data/mods/public/simulation/helpers/Commands.js
View File

@ -714,7 +714,7 @@ var g_Commands = {
{
let cmpUpgrade = Engine.QueryInterface(ent, IID_Upgrade);
if (cmpUpgrade)
cmpUpgrade.CancelUpgrade(data.cmpPlayer);
cmpUpgrade.CancelUpgrade(data.cmpPlayer.playerID);
}
},

2
binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
View File

@ -51,7 +51,7 @@
<stone>0</stone>
<wood>20</wood>
</Cost>
<Time>5000</Time>
<Time>5</Time>
</Gate>
</Upgrade>
</Entity>

2
binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
View File

@ -46,7 +46,7 @@
<Cost>
<stone>60</stone>
</Cost>
<Time>10000</Time>
<Time>10</Time>
</Gate>
</Upgrade>
</Entity>