diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/Mill.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/Mill.cs index be60dc61f..be5b3cc6b 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/Mill.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/Mill.cs @@ -91,7 +91,7 @@ public override double GetTimeExtensionBonus(Character character) private int GetAdditiveComponentForMaterial(Character character) { var extensionPoint = GetMaterialExtensionBonus(character); - var standingPoints = GetStandingOfOwnerToCharacter(character) * 20; + var standingPoints = GetStandingPoints(character); var facilityPoints = GetFacilityPoint(); return (int)(facilityPoints + standingPoints + extensionPoint); @@ -101,7 +101,7 @@ private int GetAdditiveComponentForMaterial(Character character) private int GetAdditiveComponentForTime(Character character) { var extensionComponent = GetTimeExtensionBonus(character); - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var facilityPoints = GetFacilityPoint(); return (int)(facilityPoints + extensionComponent + standingComponent); diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/ProductionFacility.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/ProductionFacility.cs index c0aa128bf..8895a41c5 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/ProductionFacility.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/ProductionFacility.cs @@ -218,9 +218,15 @@ public virtual bool IsOpen } } - private int GetStandingPoints(Character character) + protected int GetStandingPoints(Character character) { - return (int)( GetStandingOfOwnerToCharacter(character)*20); + var standing = GetStandingOfOwnerToCharacter(character); + if (standing < 0.0) + { + standing = 0.0; + } + + return (int)(standing * 20); } //Overload method for price/sec diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/Prototyper.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/Prototyper.cs index b9fd22aa8..34151e596 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/Prototyper.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/Prototyper.cs @@ -172,7 +172,7 @@ public long CalculatePrototypePrice(int prototypeTime, int targetDefinition) private int GetAdditiveComponentForMaterial(Character character) { var extensionComponent = GetMaterialExtensionBonus(character); - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var facilityPoints = GetFacilityPoint(); return (int) (extensionComponent + facilityPoints + standingComponent); @@ -181,7 +181,7 @@ private int GetAdditiveComponentForMaterial(Character character) private int GetAdditiveComponentForTime(Character character) { var extensionComponent = GetTimeExtensionBonus(character); - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var facilityPoints = GetFacilityPoint(); return (int)(extensionComponent + facilityPoints + standingComponent); diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/Refinery.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/Refinery.cs index b15d36fcf..f1964a2de 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/Refinery.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/Refinery.cs @@ -84,7 +84,7 @@ private int GetAdditiveComponent(Character character) { var extensionPoints = GetMaterialExtensionBonus(character); var refinerypoints = GetFacilityPoint(); - var standingPoints = GetStandingOfOwnerToCharacter(character) * 20; + var standingPoints = GetStandingPoints(character); return (int)( extensionPoints + refinerypoints + standingPoints); } diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/Repair.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/Repair.cs index 209d0f811..1de39dd2d 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/Repair.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/Repair.cs @@ -33,11 +33,7 @@ public override ProductionFacilityType FacilityType private int GetAdditiveComponent(Character character) { - var standing = GetStandingOfOwnerToCharacter(character); - if (standing < 0.0) - standing = 0.0; - - var standingComponent = standing * 20; + var standingComponent = GetStandingPoints(character); var extensionComponent = GetMaterialExtensionBonus(character); var facilityPoints = GetFacilityPoint(); diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/Reprocessor.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/Reprocessor.cs index 78a081fe1..d1687f3b0 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/Reprocessor.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/Reprocessor.cs @@ -39,7 +39,7 @@ public override ProductionFacilityType FacilityType private int GetAdditiveComponent(Character character) { var extensionBonus = GetMaterialExtensionBonus(character); - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var facilityComponent = GetFacilityPoint(); return (int) (standingComponent + extensionBonus + facilityComponent); diff --git a/src/Perpetuum/Services/ProductionEngine/Facilities/ResearchLab.cs b/src/Perpetuum/Services/ProductionEngine/Facilities/ResearchLab.cs index d9b9c3da0..9703594f5 100644 --- a/src/Perpetuum/Services/ProductionEngine/Facilities/ResearchLab.cs +++ b/src/Perpetuum/Services/ProductionEngine/Facilities/ResearchLab.cs @@ -50,7 +50,7 @@ private int GetAdditiveComponent(Character character) { var basePoints = GetFacilityPoint(); var extensionPoints = GetMaterialExtensionBonus(character); - var standingPoints = GetStandingOfOwnerToCharacter(character) * 20; + var standingPoints = GetStandingPoints(character); return (int) (basePoints + extensionPoints + standingPoints); } @@ -59,7 +59,7 @@ private int GetAdditiveComponentForTime(Character character) { var basePoints = GetFacilityPoint(); var extensionPoints = GetTimeExtensionBonus(character); - var standingPoints = GetStandingOfOwnerToCharacter(character) * 20; + var standingPoints = GetStandingPoints(character); return (int)(basePoints + extensionPoints + standingPoints); } @@ -68,7 +68,7 @@ private int GetAdditiveComponentForTimeWithLevelDifference(Character character, { var basePoints = GetFacilityPoint(); var extensionPoints = GetTimeExtensionBonus(character); - var standingPoints = GetStandingOfOwnerToCharacter(character) * 20; + var standingPoints = GetStandingPoints(character); var levelDifferencePoints = levelDifference * 5; return (int)(basePoints + extensionPoints + standingPoints + levelDifferencePoints ); diff --git a/src/Perpetuum/Services/ProductionEngine/PBSFacilities.cs b/src/Perpetuum/Services/ProductionEngine/PBSFacilities.cs index 79754aab9..123e23dfd 100644 --- a/src/Perpetuum/Services/ProductionEngine/PBSFacilities.cs +++ b/src/Perpetuum/Services/ProductionEngine/PBSFacilities.cs @@ -423,7 +423,7 @@ protected override void InitConnected() private int GetAdditiveComponent(Character character) { - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var extensionComponent = GetMaterialExtensionBonus(character); var facilityComponent = GetFacilityPoint(); @@ -729,7 +729,7 @@ public ProductionInProgress StartCPRGForge(Character character, long sourceEid, private int GetAdditiveComponentForTime(Character character) { - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var extensionComponent = GetMaterialExtensionBonus(character); var facilityPoints = GetFacilityPoint(); @@ -826,7 +826,7 @@ protected override int GetFacilityPoint() private int GetAdditiveComponentForPoints(Character character) { var extensionComponent = GetPointExtensionBonus(character); - var standingComponent = GetStandingOfOwnerToCharacter(character) * 20; + var standingComponent = GetStandingPoints(character); var facilityPoints = GetFacilityPoint(); return (int) (extensionComponent + standingComponent + facilityPoints);