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: 1804d93560ef
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: b80a6ce2e4e2
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Dec 8, 2018

  1. Crew Science Testing

    * Still a failure, but there might be another option
    pap1723 committed Dec 8, 2018
    Copy the full SHA
    5e8b5be View commit details
  2. Source Build Updates

    pap1723 committed Dec 8, 2018
    Copy the full SHA
    b80a6ce View commit details
12 changes: 6 additions & 6 deletions Notes/Science/CrewScience/CrewLabAdder.cfg
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ RESOURCE_DEFINITION
//**********************************************************************************
// BASIC CAPSULES
//**********************************************************************************
@PART[orbitaiespod|moduldesspod|FASAMercuryPod|mk1pod|IronVostok_Crew_A|Mark2Cockpit|Mark1Cockpit|KerbCan]:FOR[RP-0]
@PART[orbitaiespod|moduldesspod|FASAMercuryPod|mk1pod|IronVostok_Crew_A|Mark2Cockpit|Mark1Cockpit|KerbCan]:FOR[zzzRP-0]
{
MODULE
{
@@ -61,14 +61,14 @@ RESOURCE_DEFINITION
opsViewTitle = Basic Capsule Configuration
resourcesToKeep = ElectricCharge;Food;Oxygen;Water;CarbonDioxide;Waste;WasteWater;LithiumHydroxide;Ablator;CharredAblator;HTP;NTO;MMH
resourcesToKeep = Ablator;CarbonDioxide;CharredAblator;ElectricCharge;Food;HTP;HTPB;LithiumHydroxide;MMH;NTO;Oxygen;PSPC;Waste;WasteWater;Water
}
}
//**********************************************************************************
// SECOND GEN CAPSULES
//**********************************************************************************
@PART[FASAGeminiPod2|FASAGeminiPod2White|K2Pod|Voskhod_Crew_A|RO-Mk1CrewModule|RO-Mk1CockpitInline|RO-Mk1Cockpit]:FOR[RP-0]
@PART[FASAGeminiPod2|FASAGeminiPod2White|K2Pod|Voskhod_Crew_A|RO-Mk1CrewModule|RO-Mk1CockpitInline|RO-Mk1Cockpit]:FOR[zzzRP-0]
{
MODULE
{
@@ -89,14 +89,14 @@ RESOURCE_DEFINITION
opsViewTitle = Second Generation Capsule Configuration
resourcesToKeep = ElectricCharge;Food;Oxygen;Water;CarbonDioxide;Waste;WasteWater;LithiumHydroxide;Ablator;CharredAblator;HTP;NTO;MMH
resourcesToKeep = Ablator;CarbonDioxide;CharredAblator;ElectricCharge;Food;HTP;HTPB;LithiumHydroxide;MMH;NTO;Oxygen;PSPC;Waste;WasteWater;Water
}
}
//**********************************************************************************
// MATURE CAPSULES
//**********************************************************************************
@PART[FASAGeminiBigG|FASAGeminiBigGWhite|SSTU-SC-A-OM|bluedog_Apollo_Block2_Capsule|FASAApollo_CM|SSTU-SC-B-CM|Mark1-2Pod|rn_lok_bo|t_af_bo|SSTU-SC-B-CMX|rn_astp_bo|bluedog_Apollo_Block3_Capsule|MK2VApod|rn_va_capsule|SOYUZ_orbitalSegment|mk3-9pod|SSTU-SC-C-CM|SSTU-SC-C-CMX|XOrionPodXbb31|XOrionPodX|inlineCmdPod|CST-100?capsule|MK1CrewCabin|mk2Cockpit_Standard|mk2Cockpit_Inline|mk2CrewCabin|mk3Cockpit_Shuttle]:FOR[RP-0]
@PART[FASAGeminiBigG|FASAGeminiBigGWhite|SSTU-SC-A-OM|bluedog_Apollo_Block2_Capsule|FASAApollo_CM|SSTU-SC-B-CM|Mark1-2Pod|rn_lok_bo|t_af_bo|SSTU-SC-B-CMX|rn_astp_bo|bluedog_Apollo_Block3_Capsule|MK2VApod|rn_va_capsule|SOYUZ_orbitalSegment|mk3-9pod|SSTU-SC-C-CM|SSTU-SC-C-CMX|XOrionPodXbb31|XOrionPodX|inlineCmdPod|CST-100?capsule|MK1CrewCabin|mk2Cockpit_Standard|mk2Cockpit_Inline|mk2CrewCabin|mk3Cockpit_Shuttle]:FOR[zzzRP-0]
{
MODULE
{
@@ -117,6 +117,6 @@ RESOURCE_DEFINITION
opsViewTitle = Mature Capsule Configuration
resourcesToKeep = ElectricCharge;Food;Oxygen;Water;CarbonDioxide;Waste;WasteWater;LithiumHydroxide;Ablator;CharredAblator;HTP;NTO;MMH
resourcesToKeep = Ablator;CarbonDioxide;CharredAblator;ElectricCharge;Food;HTP;HTPB;LithiumHydroxide;MMH;NTO;Oxygen;PSPC;Waste;WasteWater;Water
}
}
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ EXPERIMENT_DEFINITION
requireAtmosphere = False
situationMask = 16
biomeMask = 0
description = Crew photgraphs of land and ocean areas for geologic, geographic, and oceanographic study for evaluation of various film types<b>This experiment can be completed 3 times. NOTE: This experiment takes 12 hours.</b>
description = Crew photographs of land and ocean areas for geologic, geographic, and oceanographic study for evaluation of various film types<b>This experiment can be completed 3 times. NOTE: This experiment takes 12 hours.</b>
mass = 0.008
techRequired = start
cost = 0
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ EXPERIMENT_DEFINITION
requireAtmosphere = False
situationMask = 16
biomeMask = 0
description = To study the deasibility and operational value of start occulting measurements in the development of a simple, accurate, and self-contained navigational capability by measuring the time stars dip behind an established horizon.<b>This experiment can be completed twice. NOTE: This experiment takes 24 hours.</b>
description = To study the feasibility and operational value of star occulting measurements in the development of a simple, accurate, and self-contained navigational capability by measuring the time stars dip behind an established horizon.<b>This experiment can be completed twice. NOTE: This experiment takes 24 hours.</b>
mass = 0.008
techRequired = earlyFlightControl
cost = 0
@@ -110,7 +110,7 @@ EXPERIMENT_DEFINITION
requireAtmosphere = False
situationMask = 16
biomeMask = 0
description = This experiment is designed to explore the possibility of the existence of a graviational field effect on cells exposed to microgravity situations. These irregularites would be easier to explore in simple cell systems.<b> This experiment can be completed once. NOTE: This experiment takes 3 hours.</b>
description = This experiment is designed to explore the possibility of the existence of a gravitational field effect on cells exposed to microgravity situations. These irregularities would be easier to explore in simple cell systems.<b> This experiment can be completed once. NOTE: This experiment takes 3 hours.</b>
mass = 0.001
techRequired = materialsScienceHuman
cost = 0
@@ -158,7 +158,7 @@ EXPERIMENT_DEFINITION
requireAtmosphere = False
situationMask = 16
biomeMask = 0
description = The objectives of this experiment are to assess the crew's state of alertness, levels of conciousness, and depth of sleep during flight.<b>This experiment can be completed twice. NOTE: This experiment takes 72 hours.</b>
description = The objectives of this experiment are to assess the crew's state of alertness, levels of consciousness, and depth of sleep during flight.<b>This experiment can be completed twice. NOTE: This experiment takes 72 hours.</b>
mass = 0
techRequired = start
cost = 0
@@ -169,7 +169,7 @@ EXPERIMENT_DEFINITION
situations = ORBITING
RESULTS
{
default = The crewmembers were able to sleep, but more long term studies are probably a good idea.
default = The crew members were able to sleep, but more long term studies are probably a good idea.
}
}
EXPERIMENT_DEFINITION
4 changes: 2 additions & 2 deletions Notes/Science/CrewScience/LabConfigs.cfg
Original file line number Diff line number Diff line change
@@ -247,7 +247,7 @@ RP0-LAB-TEMPLATE
}
}

// Mature Campsules
// Mature Capsules
RP0-LAB-TEMPLATE
{
name = RP0-MatureCapsule
@@ -263,7 +263,7 @@ RP0-LAB-TEMPLATE
templateTags = RP0
logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/MOLELab
glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/MOLELab
description = The mature capsules are castly improved over both of the previous generations of capsules we have used. These capsules allow us to have three crewmembers and can run very advanced experiments.
description = The mature capsules are costly, but have improved over both of the previous generations of capsules we have used. These capsules allow us to have three crew members and can run very advanced experiments.
toolTipTitle = Mature Capsule
enableMPLModules = false
includeModuleInfo = true
1 change: 1 addition & 0 deletions Source/RP0.csproj
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@
<Compile Include="Tooling\ModuleTooling.cs" />
<Compile Include="Tooling\ModuleToolingPFSide.cs" />
<Compile Include="Tooling\ModuleToolingGeneric.cs" />
<Compile Include="Tooling\ModuleToolingSSTUTank.cs" />
<Compile Include="Tooling\ToolingDatabase.cs" />
<Compile Include="Tooling\ToolingScenario.cs" />
<Compile Include="Tooling\ModuleToolingPTank.cs" />
Binary file modified Source/Tech Tree/RP-1Parts.accdb
Binary file not shown.
Binary file modified Source/Tech Tree/SOLIDS Cost Comparisons KCT Formula.xlsx
Binary file not shown.