ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-22 12:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recycling reward accounts for upgraded structures. Credit to AlienBird.

Browse source
This commit is contained in:
pierow 2021-01-04 13:29:27 -05:00
parent d4e91fd005
commit ba32308dbc
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
main/source/mod/AvHBaseBuildable.cpp
View file

@ -821,7 +821,36 @@ void AvHBaseBuildable::RecycleComplete()
bool theIsEnergyTech = AvHSHUGetDoesTechCostEnergy(this->mMessageID);
ASSERT(!theIsEnergyTech);
float thePointsBack = GetGameRules()->GetCostForMessageID(this->mMessageID)*thePercentage;
float thePointsBack = this->mMessageID;
switch (this->mMessageID)
{
// Marine Structures
case BUILD_INFANTRYPORTAL: thePointsBack = BALANCE_VAR(kInfantryPortalCost); break;
case BUILD_RESOURCES: thePointsBack = BALANCE_VAR(kResourceTowerCost); break;
case BUILD_TURRET_FACTORY: thePointsBack = BALANCE_VAR(kTurretFactoryCost); break;
case TURRET_FACTORY_UPGRADE: thePointsBack = BALANCE_VAR(kTurretFactoryUpgradeCost) + BALANCE_VAR(kTurretFactoryCost); break;
case BUILD_ARMSLAB: thePointsBack = BALANCE_VAR(kArmsLabCost); break;
case BUILD_PROTOTYPE_LAB: thePointsBack = BALANCE_VAR(kPrototypeLabCost); break;
case BUILD_ARMORY: thePointsBack = BALANCE_VAR(kArmoryCost); break;
case ARMORY_UPGRADE: thePointsBack = BALANCE_VAR(kArmoryUpgradeCost) + BALANCE_VAR(kArmoryCost); break;
case BUILD_OBSERVATORY: thePointsBack = BALANCE_VAR(kObservatoryCost); break;
case BUILD_PHASEGATE: thePointsBack = BALANCE_VAR(kPhaseGateCost); break;
case BUILD_TURRET: thePointsBack = BALANCE_VAR(kSentryCost); break;
case BUILD_SIEGE: thePointsBack = BALANCE_VAR(kSiegeCost); break;
case BUILD_COMMANDSTATION: thePointsBack = BALANCE_VAR(kCommandStationCost); break;
}
if (GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_11))
{
thePointsBack += BALANCE_VAR(kElectricalUpgradeResearchCost);
}
thePointsBack = thePointsBack * thePercentage;
//The old way of calculating Resource Costs for marine structures did not take into account upgrades that the building had and it's original value
//float thePointsBack = GetGameRules()->GetCostForMessageID(this->mMessageID)*thePercentage;
theTeam->SetTeamResources(theTeam->GetTeamResources() + thePointsBack);
// Play "+ resources" event