Skip to content
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

Release 1.4.2 #201

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Release 1.4.2 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80f588
Antimatter costs in Science Sandbox
ChrisAdderley Oct 18, 2024
d5082d2
Merge branch 'dev' of https://github.com/post-kerbin-mining-corporati…
ChrisAdderley Oct 18, 2024
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
5 changes: 1 addition & 4 deletions GameData/FarFutureTechnologies/FFTSettings.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
FFTSETTINGS
{
// Emit debug messages for modules
debugModules = True

// The cost of Antimatter per unit in science
antimatterScienceCostPerUnit = 1000.0
debugModules = False
}
4 changes: 2 additions & 2 deletions GameData/FarFutureTechnologies/Localization/en-us.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,8 @@ Localization
// UI/FACTORY
// -----------------------
#LOC_FFT_AntimatterManager_PanelTitle = Antimatter Tanks
#LOC_FFT_AntimatterManager_ScienceText = <<1>> Science
#LOC_FFT_AntimatterManager_AntimatterText = <<1>> Antimatter
#LOC_FFT_AntimatterManager_ScienceText = -<<1>> Science
#LOC_FFT_AntimatterManager_AntimatterText = +<<1>> Antimatter
#LOC_FFT_AntimatterManager_DescriptionText = <color=#3c688a><b><<1>></b></color> Science is required to create enough Antimatter to load the tanks. Proceed?

// SETTINGS
Expand Down
Binary file modified GameData/FarFutureTechnologies/Plugins/FarFutureTechnologies.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"MAJOR":1,
"MINOR":4,
"PATCH":1,
"PATCH":2,
"BUILD":0
},
"KSP_VERSION":
Expand Down
8 changes: 3 additions & 5 deletions Source/FarFutureTechnologies/Modules/ModuleAntimatterTank.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,12 @@ void OnDestroy()
/// </summary>
protected void OnVesselRollout(ShipConstruct node)
{
if (HighLogic.CurrentGame.Mode == Game.Modes.SCIENCE_SANDBOX || HighLogic.CurrentGame.Mode == Game.Modes.CAREER && FarFutureTechnologiesSettings_Antimatter.AntimatterCostsScience)
if ((HighLogic.CurrentGame.Mode == Game.Modes.SCIENCE_SANDBOX || HighLogic.CurrentGame.Mode == Game.Modes.CAREER) && FarFutureTechnologiesSettings_Antimatter.AntimatterCostsScience)
{
if (FarFutureTechnologySettings.DebugModules)
Utils.Log(String.Format("[ModuleAntimatterTank]: Doing rollout actions"));
double shipAM = 0d;
double shipMaxAM = 0d;
// Determine need for power
part.GetConnectedResourceTotals(PartResourceLibrary.Instance.GetDefinition(FuelName).id, ResourceFlowMode.NO_FLOW, out shipAM, out shipMaxAM, true);

part.GetConnectedResourceTotals(PartResourceLibrary.Instance.GetDefinition(FuelName).id, ResourceFlowMode.NO_FLOW, out double shipAM, out double shipMaxAM, true);

double amToAdd = shipAM;
// Clean out the AM
Expand Down
4 changes: 2 additions & 2 deletions Source/FarFutureTechnologies/UI/AntimatterWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public void AddTank( float amount)
totalAntimatterLoad += amount;
totalScienceCost = FarFutureTechnologiesSettings_Antimatter.AntimatterScienceCostPerUnit * totalAntimatterLoad;

scienceText.text = Localizer.Format("#LOC_FFT_AntimatterManager_ScienceText", totalScienceCost.ToString("+F0;-F0;0"));
antimatterText.text = Localizer.Format("#LOC_FFT_AntimatterManager_AntimatterText", totalAntimatterLoad.ToString("+0;-0;0"));
scienceText.text = Localizer.Format("#LOC_FFT_AntimatterManager_ScienceText", totalScienceCost.ToString("F2"));
antimatterText.text = Localizer.Format("#LOC_FFT_AntimatterManager_AntimatterText", totalAntimatterLoad.ToString("F2"));
descriptionText.text = Localizer.Format("#LOC_FFT_AntimatterManager_DescriptionText", totalScienceCost.ToString());
}
}
Expand Down
6 changes: 6 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
1.4.2
-----
- Fixed Antimatter Costs Science setting only working in Career vs Science mode
- Fixed an extra F in the Antimatter Loading window and tweaked the decimals displayed
- Removed antimatter cost from settings config file in case it confuses people

1.4.1
-----
- Updated Waterfall to 0.10.3
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=============================
FAR FUTURE TECHNOLOGIES 1.4.0
FAR FUTURE TECHNOLOGIES 1.4.2
=============================

This is a pack containing far-future but likely possible spacecraft technologies. These might not be possible today, but the physics works out, and might be feasible within the next 100 years.
Expand All @@ -15,7 +15,7 @@ Required:
- CryoTanks (1.6.6)
- DynamicBatteryStorage (2.3.3)
- SystemHeat (0.7.5)
- Waterfall (0.10.2)
- Waterfall (0.10.3)
- SpaceDust (0.5.4)

Recommended
Expand Down
Loading