mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-21 07:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #221, the resources shouldn't be substracted now when a unit is looted.

Browse Source 
This was SVN commit r6591.
This commit is contained in:
freenity
2009-01-03 19:02:04 +00:00
parent 220b05ba08
commit 4d869facab
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/scripts/entity_functions.js
+2 -17
View File
@@ -911,22 +911,9 @@ function damage( dmg, inflictor )
if (this.traits.loot.xp)
inflictor.traits.promotion.curr = parseInt(inflictor.traits.promotion.curr) + parseInt(this.traits.loot.xp);
// Notify player.
/*if (inflictor.traits.id.specific)
console.write(inflictor.traits.id.specific + " has earned " + this.traits.loot.xp + " upgrade points!");
else
console.write("One of your units has earned " + this.traits.loot.xp + " upgrade points!");
*/
// If he now has maximum upgrade points for his rank,
if (inflictor.traits.promotion.curr >= inflictor.traits.promotion.req)
{
// Notify the player.
/*if (inflictor.traits.id.specific)
console.write(inflictor.traits.id.specific + " has gained a promotion!");
else
console.write("One of your units has gained a promotion!");*/
// Reset his upgrade points.
inflictor.traits.promotion.curr = 0;
@@ -943,7 +930,8 @@ function damage( dmg, inflictor )
if ( inflictor.actions.loot.resources )
{
// Give the inflictor his resources.
this.player.resources[loot.toString()] -= parseInt(this.traits.loot[loot.toString()]);
//commenting because of #221
//this.player.resources[loot.toString()] -= parseInt(this.traits.loot[loot.toString()]);
}
break;
}
@@ -1438,9 +1426,6 @@ function entityStartProduction( evt )
default:
// Deduct the given quantity of resources.
this.player.resources[resource.toString()] -= parseInt(pool[resource]);
/*console.write ("Spent " + pool[resource] + " " + resource + " to purchase " +
template.traits.id.generic);*/
break;
}
}