Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-RO/RP-1
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8f7d9d663f6
Choose a base ref
...
head repository: KSP-RO/RP-1
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c4d05dd4260
Choose a head ref
  • 2 commits
  • 14 files changed
  • 1 contributor

Commits on Jan 17, 2019

  1. Updated KCT Preset to Properly Support parts with Underscores

    Also cleaned up the formatting a little bit.
    pap1723 committed Jan 17, 2019
    Copy the full SHA
    447280a View commit details
  2. Updated Module Tags to provide information about Rollout Costs

    The Module Tags we have are what "multiplies" the cost of the rollout costs to be more expensive based on the type of part. That information used to be hidden from the player. It is now displayed as part of the Module Tag Tooltip in the Right Click Menu.
    pap1723 committed Jan 17, 2019
    Copy the full SHA
    4c4d05d View commit details
72 changes: 36 additions & 36 deletions GameData/RP-0/KCT_Presets/RP0_KCTPresets.cfg
Original file line number Diff line number Diff line change
@@ -10,41 +10,41 @@ KCT_Preset
sandbox = True
KCT_Preset_General
{
Enabled = True
BuildTimes = True
ReconditioningTimes = True
ReconditioningBlocksPad = True
TechUnlockTimes = True
KSCUpgradeTimes = True
TechUpgrades = True
SharedUpgradePool = True
StartingPoints = 0,500,5000
MaxRushClicks = 5
RushMultiplier = 1.0
Enabled = True
BuildTimes = True
ReconditioningTimes = True
ReconditioningBlocksPad = True
TechUnlockTimes = True
KSCUpgradeTimes = True
TechUpgrades = True
SharedUpgradePool = True
StartingPoints = 0,500,5000
MaxRushClicks = 5
RushMultiplier = 1.0
}
KCT_Preset_Time
{
OverallMultiplier = 25
BuildEffect = 1
InventoryEffect = 100
ReconditioningEffect = 576
MaxReconditioning = 1350000000
RolloutReconSplit = 0.75
OverallMultiplier = 25
BuildEffect = 1
InventoryEffect = 100
ReconditioningEffect = 576
MaxReconditioning = 1350000000
RolloutReconSplit = 0.75
}
KCT_Preset_Formula
{
NodeFormula = (((2.25+(0.025*((min([N],30)^2)+min([N],30)))+(max(0,([N]-30))*1.5)) / 86400 / 365) * sign(-[I]) * (1+([R] * 0.25))) // 0.75 science/year, + 0.05 to 1.5 sci per upgrade (levels at 30), only one rate, and 1/1.25/1.5x etc from R&D upgrades.
UpgradeFundsFormula = 30000
UpgradeScienceFormula = -1
UpgradeFundsFormula = 30000
UpgradeScienceFormula = -1
ResearchFormula = -1
EffectivePartFormula = [PV]*[MV]*(min([C]/([I] + ([B]*(max([U]*0.125,1)+1))), [C]))
ProceduralPartFormula = [MV] * ((([C]-[A]) + ([A]*10/max([I],1))) / max([B]*(max([U]*0.125,1)+1),1))
BPFormula = (5000 + ([E]*20))*[O]*2
KSCUpgradeFormula = (([C]*0.2)^(0.75))*200*[O]
ReconditioningFormula = abs([RE]-[S])*(([BP]-(5000*[O]*2)) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+4)^2) * 0.00012)*2*[O]
BuildRateFormula = (1+([L]*0.25))*((([I]+1)*((0.00125*((min([N],15)^2)+min([N],15)))+(max(0,([N]-15))*0.05))) + max(0.05-[I], 0))*sign([L]-[I])
UpgradeResetFormula = -1
InventorySaleFormula = 0
ProceduralPartFormula = [MV] * ((([C]-[A]) + ([A]*10/max([I],1))) / max([B]*(max([U]*0.125,1)+1),1))
BPFormula = (5000 + ([E]*20))*[O]*2
KSCUpgradeFormula = (([C]*0.2)^(0.75))*200*[O]
ReconditioningFormula = abs([RE]-[S])*(([BP]-(5000*[O]*2)) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+4)^2) * 0.00012)*2*[O]
BuildRateFormula = (1+([L]*0.25))*((([I]+1)*((0.00125*((min([N],15)^2)+min([N],15)))+(max(0,([N]-15))*0.05))) + max(0.05-[I], 0))*sign([L]-[I])
UpgradeResetFormula = -1
InventorySaleFormula = 0
RolloutCostFormula = (((([L]+1)^2.5)*200)-180) + (([BP]-(5000*[O]*2)) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+12)^1.2) * 0.00011)
NewLaunchPadCostFormula = 25000*(0.75 + ([N]^1.25)*.25)
}
@@ -60,11 +60,11 @@ KCT_Preset
orbitaiespod = 0.141667
moduldesspod = 0.141667
// Break down Vostok pod costs: 30% shield, 10% avionics, 60% habitable. Assumes the part is just the spherical bit. 2460kg of which 837kg is heat shield (source: Wikipedia). More shield than a 'headlamp' pod because it's covered all over. RCS is in the propulsion module.
IronVostok_Crew_A = 0.1375 // (0.3 * 2 + 0.1 * 3 + 0.6 * 4) / (2 * 3 * 4) = 3.3 / 24
rn_vostok_sc = 0.1375
IronVostok.Crew.A = 0.1375 // (0.3 * 2 + 0.1 * 3 + 0.6 * 4) / (2 * 3 * 4) = 3.3 / 24
rn.vostok.sc = 0.1375
// for Voskhod use same numbers as Vostok (same outer mould line, so probably similar enough)
Voskhod_Crew_A = 0.1375
rn_voskhod_sc = 0.1375
Voskhod.Crew.A = 0.1375
rn.voskhod.sc = 0.1375
// Break down Gemini pod costs: 20% shield, 10% avionics, 70% habitable. RCS is in a separate part
FASAGeminiPod2 = 0.145833 // (0.2 * 2 + 0.1 * 3 + 0.7 * 4) / (2 * 3 * 4) = 3.5 / 24
FASAGeminiPod2White = 0.145833
@@ -77,18 +77,18 @@ KCT_Preset
// same goes for DECQ Soyuz mod
// TODO SSTU-SC-*-* - find someone who uses SSTU and knows which part is which
// Break down Apollo CM costs: 20% shield, 5% avionics, 5% RCS, 70% habitable.
bluedog_Apollo_Block2_Capsule = 0.141667 // same numbers as mk1pod
FASAApollo_CM = 0.141667
bluedog_Apollo_Block3_Capsule = 0.141667
bluedog.Apollo.Block2.Capsule = 0.141667 // same numbers as mk1pod
FASAApollo.CM = 0.141667
bluedog.Apollo.Block3.Capsule = 0.141667
// Mk1-2 pod: it's basically Apollo, so use the same numbers
Mark1-2Pod = 0.141667
// Apollo Block III MM. Assuming this is the one from Eyes, it's a crew can with docking controls... let's say 10% avionics, 90% habitable
bluedog_Apollo_Block3_MissionModule = 0.325 // (0.1 * 3 + 0.9 * 4) / (3 * 4) = 3.9 / 12
bluedog.Apollo.Block3.MissionModule = 0.325 // (0.1 * 3 + 0.9 * 4) / (3 * 4) = 3.9 / 12
// Rover command seat: 50% avionics, 50% habitable (?)
WBI_ATVSeat = 0.291667 // (0.5 * 3 + 0.5 * 4) / (3 * 4) = 3.5 / 12
WBI.ATVSeat = 0.291667 // (0.5 * 3 + 0.5 * 4) / (3 * 4) = 3.5 / 12
// TKS VA: 20% shield, 5% avionics, 5% RCS, 70% habitable.
MK2VApod = 0.141667 // same numbers as mk1pod
rn_va_capsule = 0.141667
rn.va.capsule = 0.141667
SSTU-SC-C-CM = 0.141667
SSTU-SC-C-CMX = 0.141667
// TODO "mk3-9pod" from Near Future Spacecraft, find someone who uses it and knows what it looks like
5 changes: 4 additions & 1 deletion Source/ModuleTag/DecreaseA.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagDecreaseA : ModuleTag
{
public override string GetInfo()
{
return "Contains equipment that is easy to ready for launch";
string str = string.Empty;
str = "Contains equipment that is easy to get ready for launch. Currently this does not multiply Rollout Costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/DecreaseB.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagDecreaseB : ModuleTag
{
public override string GetInfo()
{
return "Contains equipment that is very easy to ready for launch";
string str = string.Empty;
str = "Contains equipment that is very easy to get ready for launch. Currently this does not multiply Rollout Costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/EngineLiquidPF.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagEngineLiquidPF : ModuleTag
{
public override string GetInfo()
{
return "Contains a pressure-fed liquid rocket engine";
string str = string.Empty;
str = "Contains a pressure-fed liquid rocket engine that requires some additional testing. Overall this will increase the rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.75</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/EngineLiquidTurbo.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagEngineLiquidTurbo : ModuleTag
{
public override string GetInfo()
{
return "Contains a pump-fed liquid rocket engine";
string str = string.Empty;
str = "Contains a pump-fed liquid rocket engine. The turbopump is a very complicated piece of machinery that requires extensive testing. Overall this will increase the rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 4.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/EngineSolid.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagEngineSolid : ModuleTag
{
public override string GetInfo()
{
return "Contains a solid rocket motor";
string str = string.Empty;
str = "Contains a solid rocket motor. These do not multiply the rollout costs as they are much easier to integrate and test than liquid engines.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/Habitable.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagHabitable : ModuleTag
{
public override string GetInfo()
{
return "Contains habitable volume";
string str = string.Empty;
str = "Contains habitable volume which requires extensive integration and testing of safety features. This greatly affects the overall rollout cost.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 4.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/HumanRated.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagHumanRated : ModuleTag
{
public override string GetInfo()
{
return "Contains human-rated equipment";
string str = string.Empty;
str = "Contains human-rated equipment that requires more time for integration and testing. Overall this raises the rollout costs by a VERY large amount.\n\n" +
"<b><color=orange>Rollout Cost: Cost of ALL Parts * 1.5</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/Instruments.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagInstruments : ModuleTag
{
public override string GetInfo()
{
return "Contains scientific instruments";
string str = string.Empty;
str = "Contains scientific instruments. Currently, these do not multiply rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/Nuclear.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagNuclear : ModuleTag
{
public override string GetInfo()
{
return "Contains radioactive elements";
string str = string.Empty;
str = "Contains radioactive elements that must be carefully handled and integrated. Additional permits need to be secure increasing rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 5.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/Reentry.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagReentry : ModuleTag
{
public override string GetInfo()
{
return "Contains reentry equipment";
string str = string.Empty;
str = "Contains reentry equipment that needs proper integration and testing for safety. It will increase the overall rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 2.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/TankBalloon.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagTankBalloon : ModuleTag
{
public override string GetInfo()
{
return "Contains a balloon tank";
string str = string.Empty;
str = "Contains a Balloon Tank which are very difficult to handle properly and must be pressurized properly at all times increasing the overall rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 2.0</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/TankServiceModule.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagTankServiceModule : ModuleTag
{
public override string GetInfo()
{
return "Contains a service module tank";
string str = string.Empty;
str = "Contains a Service Module Fuel Tank. These tanks are specially designed to hold many different resources so it increases the overall rollout cost.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 2.5</color></b>";
return str;
}
}
}
5 changes: 4 additions & 1 deletion Source/ModuleTag/Toxic.cs
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ public class ModuleTagToxic : ModuleTag
{
public override string GetInfo()
{
return "Uses toxic propellants";
string str = string.Empty;
str = "Uses toxic propellants that need to be handled carefully prior to launch. Currently, these do not multiply rollout costs.\n\n" +
"<b><color=orange>Rollout Cost: Cost of This Part * 1.0</color></b>";
return str;
}
}
}