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: 782734fdb980
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: 1c5cb31c0a3f
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 8, 2017

  1. Sounding Rocket fixes

    Fixed sounding altitude errors
    Set sounding density to .5 g/cc
    Made all contracts read density to make further changes easier.
    ppboyle committed Aug 8, 2017
    Copy the full SHA
    a77089b View commit details
  2. Merge pull request #744 from ppboyle/Developmental

    Sounding Rocket fixes
    NathanKell authored Aug 8, 2017
    Copy the full SHA
    1c5cb31 View commit details
2 changes: 1 addition & 1 deletion GameData/RP-0/Contracts/RP0_Contract_Resources.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
RESOURCE_DEFINITION
{
name = SoundingPayload
density = 0.0002
density = 0.0005
unitCost = 0.05
flowMode = ALL_VESSEL
transfer = PUMP
16 changes: 15 additions & 1 deletion GameData/RP-0/Contracts/Sounding Rockets/SoundingAltitude.cfg
Original file line number Diff line number Diff line change
@@ -35,9 +35,16 @@ CONTRACT_TYPE
DATA
{
type = float
soundingMaxAlt = MAX($RP0_SoundingMaxAltitudeKM,100)
soundingMaxAlt = Max($RP0_SoundingMaxAltitudeKM,100)
}

DATA
{
type = float
soundingDifficulty = Max($RP0_SoundingDifficulty, 6000)
}



DATA
{
@@ -57,6 +64,13 @@ CONTRACT_TYPE
type = int
targetAltitudeKM = int( Min(6000, @targetAltitudeKMInternal))
}

DATA
{
type = float
maxDifficulty = Max( @soundingDifficulty , @targetAltitudeKM * 60 )
title = Get New Max Difficulty
}

DATA
{ //Counts our techs and divides by 100
12 changes: 9 additions & 3 deletions GameData/RP-0/Contracts/Sounding Rockets/SoundingDifficult.cfg
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ CONTRACT_TYPE
DATA
{
type = float
maxDifficulty = Min( @maxDifficultyMultiplier * @soundingDifficulty , 1060 * 6000 )
maxDifficulty = Min( @maxDifficultyMultiplier * @soundingDifficulty , 660 * 6000 )
title = Get New Target Difficulty
}

@@ -99,9 +99,15 @@ CONTRACT_TYPE
}

DATA
{// based on a density of .2 g/cc
{
type = float
payloadUnitsPerKg = 1.0 /(1000.0 * Resource(SoundingPayload).Density())
}

DATA
{
type = int
targetPayloadUnits = int( @targetPayload * 5 )
targetPayloadUnits = int( @targetPayload * @payloadUnitsPerKg )
title = Deliver this many units of payload
}

10 changes: 8 additions & 2 deletions GameData/RP-0/Contracts/Sounding Rockets/SoundingEasy.cfg
Original file line number Diff line number Diff line change
@@ -87,9 +87,15 @@ CONTRACT_TYPE
}

DATA
{// based on a density of .2 g/cc
{
type = float
payloadUnitsPerKg = 1.0 /(1000.0 * Resource(SoundingPayload).Density())
}

DATA
{
type = int
targetPayloadUnits = int( @targetPayload * 5 )
targetPayloadUnits = int( @targetPayload * @payloadUnitsPerKg )
title = Deliver this many units of payload
}

Original file line number Diff line number Diff line change
@@ -87,9 +87,15 @@ CONTRACT_TYPE
}

DATA
{// based on a density of .2 g/cc
{
type = float
payloadUnitsPerKg = 1.0 /(1000.0 * Resource(SoundingPayload).Density())
}

DATA
{
type = int
targetPayloadUnits = int( @targetPayload * 5 )
targetPayloadUnits = int( @targetPayload * @payloadUnitsPerKg )
title = Deliver this many units of payload
}