Skip to content

Negative production points #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aqpanaciy merged 1 commit into from
Feb 10, 2024
Merged

Negative production points #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Perpetuum/Services/ProductionEngine/Facilities/Mill.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
10 changes: 8 additions & 2 deletions src/Perpetuum/Services/ProductionEngine/Facilities/ProductionFacility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Perpetuum/Services/ProductionEngine/Facilities/Prototyper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Perpetuum/Services/ProductionEngine/Facilities/Refinery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 1 addition & 5 deletions src/Perpetuum/Services/ProductionEngine/Facilities/Repair.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/Perpetuum/Services/ProductionEngine/Facilities/Reprocessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/Perpetuum/Services/ProductionEngine/Facilities/ResearchLab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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 );
Expand Down
6 changes: 3 additions & 3 deletions src/Perpetuum/Services/ProductionEngine/PBSFacilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down