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: 7229d4480b1b
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: 886fb76d8b69
Choose a head ref
  • 2 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 1, 2017

  1. Adjusting contracts

    Adding cooldowns to x-planes high and suborbital, setting reasonable minimums to sounding rockets just as a safety net for players who don't start the game off with the new ones
    ppboyle committed Aug 1, 2017
    Copy the full SHA
    083c573 View commit details

Commits on Aug 4, 2017

  1. Merge pull request #740 from ppboyle/Developmental

    Adjusting contracts
    pap1723 authored Aug 4, 2017
    Copy the full SHA
    886fb76 View commit details
13 changes: 13 additions & 0 deletions GameData/RP-0/Contracts/Human Contracts/Suborbital Crewed.cfg
Original file line number Diff line number Diff line change
@@ -53,6 +53,19 @@ CONTRACT_TYPE
title = Has not compeleted @contractType Contract
invertRequirement = true
}
REQUIREMENT
{
name = CompleteCrewedSuborbital
type = CompleteContract

contractType = CrewedSuborbital

minCount = 0

//complete before we can attempt again.
cooldownDuration = 4d
}


PARAMETER
{
14 changes: 1 addition & 13 deletions GameData/RP-0/Contracts/Sounding Rockets/SoundingAltitude.cfg
Original file line number Diff line number Diff line change
@@ -35,21 +35,9 @@ CONTRACT_TYPE
DATA
{
type = float
soundingMaxAlt = $RP0_SoundingMaxAltitudeKM
soundingMaxAlt = ($RP0_SoundingMaxAltitudeKM,100)
}

DATA
{
type = float
soundingDifficulty = $RP0_SoundingDifficulty
}

DATA
{
type = float
maxDifficulty = @soundingDifficulty > (60 * @targetAltitudeKM) ? @soundingDifficulty : (60 * @targetAltitudeKM )

}

DATA
{
12 changes: 6 additions & 6 deletions GameData/RP-0/Contracts/Sounding Rockets/SoundingDifficult.cfg
Original file line number Diff line number Diff line change
@@ -34,13 +34,13 @@ CONTRACT_TYPE
DATA
{
type = float
soundingDifficulty = $RP0_SoundingDifficulty
soundingDifficulty = Max($RP0_SoundingDifficulty, 6000)
}

DATA
{
type = float
soundingMaxAlt = $RP0_SoundingMaxAltitudeKM
soundingMaxAlt = Max($RP0_SoundingMaxAltitudeKM, 100)
}

DATA
@@ -198,7 +198,7 @@ CONTRACT_TYPE

minCount = 0

complete before we can attempt again.
//complete before we can attempt again.
cooldownDuration = 4d
}

@@ -211,7 +211,7 @@ CONTRACT_TYPE

minCount = 0

complete before we can attempt again.
//complete before we can attempt again.
cooldownDuration = 4d
}

@@ -224,7 +224,7 @@ CONTRACT_TYPE

minCount = 0

complete before we can attempt again.
//complete before we can attempt again.
cooldownDuration = 4d
}

@@ -237,7 +237,7 @@ CONTRACT_TYPE

minCount = 0

complete before we can attempt again.
//complete before we can attempt again.
cooldownDuration = 4d
}

4 changes: 2 additions & 2 deletions GameData/RP-0/Contracts/Sounding Rockets/SoundingEasy.cfg
Original file line number Diff line number Diff line change
@@ -34,13 +34,13 @@ CONTRACT_TYPE
DATA
{
type = float
soundingDifficulty = $RP0_SoundingDifficulty
soundingDifficulty = Max($RP0_SoundingDifficulty,6000)
}

DATA
{
type = float
soundingMaxAlt = $RP0_SoundingMaxAltitudeKM
soundingMaxAlt = Max(100,$RP0_SoundingMaxAltitudeKM)
}

DATA
Original file line number Diff line number Diff line change
@@ -34,13 +34,13 @@ CONTRACT_TYPE
DATA
{
type = float
soundingDifficulty = $RP0_SoundingDifficulty
soundingDifficulty = Max($RP0_SoundingDifficulty,6000)
}

DATA
{
type = float
soundingMaxAlt = $RP0_SoundingMaxAltitudeKM
soundingMaxAlt = Max($RP0_SoundingMaxAltitudeKM,100)
}

DATA
14 changes: 14 additions & 0 deletions GameData/RP-0/Contracts/X-Planes/CrewedHighAtmo.cfg
Original file line number Diff line number Diff line change
@@ -55,6 +55,20 @@ CONTRACT_TYPE
contractType = BreakSoundBarrier
title = Complete @contractType Contract
}

REQUIREMENT
{
name = CompleteCrewedReachSpace
type = CompleteContract

contractType = CrewedReachSpace

minCount = 0

//complete before we can attempt again.
cooldownDuration = 4d
}


PARAMETER
{
14 changes: 14 additions & 0 deletions GameData/RP-0/Contracts/X-Planes/CrewedHighAtmoLate.cfg
Original file line number Diff line number Diff line change
@@ -49,6 +49,20 @@ CONTRACT_TYPE
type = CompleteContract
contractType = BreakSoundBarrier
}

REQUIREMENT
{
name = CompleteCrewedSpaceLate
type = CompleteContract

contractType = CrewedSpaceLate

minCount = 0

//complete before we can attempt again.
cooldownDuration = 4d
}


PARAMETER
{