-
Notifications
You must be signed in to change notification settings - Fork 219
Crewed Mars Program #2422
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.
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
Open
CXG-2827
wants to merge
24
commits into
KSP-RO:master
Choose a base branch
from
CXG-2827:CrewedMars
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,070
−544
Open
Crewed Mars Program #2422
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
3912bd8
Add Program and base folder edits
CXG-2827 baebbbe
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 86d6f0a
Altered Program and Contracts
CXG-2827 bbd32a1
Crewed Mars Program and Contract Further Tweaks
CXG-2827 93bb04c
Corrected Contract Group and Tweaked Program
CXG-2827 dc3d8bc
Fix contracts again
CXG-2827 f61a4ab
Contract Fixes once again
CXG-2827 d1855af
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 05a01ef
Further tweaks to Program and Contracts
CXG-2827 d08a2dd
Mars Crewed Contract Corrections
CXG-2827 060fc2b
Tweaks Continue
CXG-2827 26b7e1d
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 5b9522c
Working Crewed Sample Science and Reduced Program Funding
CXG-2827 68a0333
Fixed Crewed Mars Landing Error
CXG-2827 546af23
missing brackets
CXG-2827 9ec1a79
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 fb69683
Working mars sample return contract
CXG-2827 3a69513
Updated Crewed Mars Contracts
CXG-2827 5b40fd7
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 4776567
Updated Funding and Curve
CXG-2827 d7082b7
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 806c769
Contract Edits and Gating Mars Landing
CXG-2827 4203db9
Removed Orbit Gating Added Flag Planting
CXG-2827 9d152e6
Formatting fixes
CXG-2827 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
104 changes: 104 additions & 0 deletions
104
GameData/RP-1/Contracts/Mars Crewed/DeimosLandingCrew.cfg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
CONTRACT_TYPE | ||
{ | ||
name = DeimosLandingCrew | ||
title = Deimos Landing (Crewed) | ||
group = CrewedMarsExp | ||
agent = Flag Planting | ||
|
||
description = <b>Program: Crewed Mars Exploration<br>Type: <color=blue>Optional</color></b><br><br>Some of our scientists and engineers believe that we should land humans on Deimos as part of the mission architecture for Mars.&br;&br;Design a mission that will successfully land at least two humans on Deimos and return safely to Earth. | ||
|
||
synopsis = Send a crew to land on the surface of Deimos and return home safely | ||
|
||
completedMessage = Congratulations! Landing on Deimos is an amazing accomplishment! | ||
|
||
sortKey = 1611 | ||
|
||
cancellable = true | ||
declinable = true | ||
autoAccept = false | ||
minExpiry = 0 | ||
maxExpiry = 0 | ||
maxCompletions = 0 | ||
maxSimultaneous = 1 | ||
deadline = 0 | ||
|
||
targetBody = Deimos | ||
|
||
|
||
|
||
prestige = Trivial // 1.0x | ||
advanceFunds = 0 | ||
rewardScience = 0 | ||
rewardReputation = 1500 | ||
rewardFunds = 0 | ||
failureReputation = 0 | ||
failureFunds = 0 | ||
|
||
// ************ REQUIREMENTS ************ | ||
|
||
REQUIREMENT | ||
{ | ||
name = ProgramActive | ||
type = ProgramActive | ||
program = CrewedMarsExp | ||
} | ||
|
||
PARAMETER | ||
{ | ||
name = vesselGroup | ||
type = VesselParameterGroup | ||
title = Crewed Deimos Landing | ||
define = CrewedDeimosLanding | ||
|
||
PARAMETER | ||
{ | ||
name = TwoCrew | ||
type = HasCrew | ||
minCrew = 2 | ||
maxCrew = 99 | ||
title = Have at least 2 crewmembers on board | ||
hideChildren = true | ||
} | ||
PARAMETER | ||
{ | ||
name = LandCrewed | ||
type = All | ||
title = Land the crewed lander | ||
|
||
PARAMETER | ||
{ | ||
name = TwoCrew | ||
type = HasCrew | ||
minCrew = 2 | ||
maxCrew = 99 | ||
title = Have at least 2 crewmembers on board | ||
hideChildren = true | ||
} | ||
PARAMETER | ||
{ | ||
name = ReachState | ||
type = ReachState | ||
targetBody = Deimos | ||
situation = LANDED | ||
PARAMETER | ||
{ | ||
name = Duration | ||
type = Duration | ||
duration = 12h | ||
preWaitText = Land on Deimos. | ||
waitingText = Exploring... | ||
completionText = Exploration completed, you may return to Earth when ready. | ||
} | ||
} | ||
disableOnStateChange = true | ||
} | ||
PARAMETER | ||
{ | ||
name = ReturnHome | ||
type = RP1ReturnHome | ||
title = Return Home Safely | ||
hideChildren = true | ||
completeInSequence = true | ||
} | ||
} | ||
} |
135 changes: 135 additions & 0 deletions
135
GameData/RP-1/Contracts/Mars Crewed/FirstCrewedMarsLanding.cfg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
CONTRACT_TYPE | ||
{ | ||
name = FirstCrewedMarsLanding | ||
title = First Crewed Mars Landing | ||
group = CrewedMarsExp | ||
agent = Flag Planting | ||
|
||
description = <b>Program: Crewed Mars Exploration<br>Type: <color=green>Required</color></b><br><br>We want to put "Boots on the Ground" and explore the surface of Mars with humans. This mission will be the most ambitious, complex and expensive mission ever undertaken by our space agency.&br;&br;Design a mission that will successfully land at least two humans on Mars, stay for at least 30 days and return safely to Earth. | ||
|
||
synopsis = Send a crew to land on the surface of Mars and return home safely | ||
|
||
completedMessage = Congratulations! Human beings have set foot on another planet in our Solar System. The monumental task that you have accomplished is something to be proud of! | ||
|
||
sortKey = 1605 | ||
|
||
cancellable = true | ||
declinable = false | ||
autoAccept = false | ||
minExpiry = 0 | ||
maxExpiry = 0 | ||
maxCompletions = 1 | ||
maxSimultaneous = 1 | ||
deadline = 0 | ||
|
||
targetBody = Mars | ||
|
||
|
||
|
||
prestige = Trivial // 1.0x | ||
advanceFunds = 0 | ||
rewardScience = 0 | ||
rewardReputation = 4000 | ||
rewardFunds = 0 | ||
failureReputation = 0 | ||
failureFunds = 0 | ||
|
||
// ************ REQUIREMENTS ************ | ||
|
||
REQUIREMENT | ||
{ | ||
name = ProgramActive | ||
type = ProgramActive | ||
program = CrewedMarsExp | ||
} | ||
|
||
REQUIREMENT | ||
{ | ||
name = CompleteContract | ||
type = CompleteContract | ||
contractType = CrewedPhobosLandingSurfaceScience | ||
invertRequirement = true | ||
} | ||
|
||
REQUIREMENT | ||
{ | ||
name = AcceptContract | ||
type = AcceptContract | ||
contractType = CrewedPhobosLandingSurfaceScience | ||
invertRequirement = true | ||
} | ||
|
||
REQUIREMENT | ||
{ | ||
name = CompleteContract | ||
type = CompleteContract | ||
contractType = MarsRoboticSampleReturn | ||
invertRequirement = true | ||
} | ||
|
||
REQUIREMENT | ||
{ | ||
name = AcceptContract | ||
type = AcceptContract | ||
contractType = MarsRoboticSampleReturn | ||
invertRequirement = true | ||
} | ||
PARAMETER | ||
{ | ||
name = vesselGroup | ||
type = VesselParameterGroup | ||
title = First Crewed Mars Landing | ||
define = CrewedMarsLanding | ||
|
||
PARAMETER | ||
{ | ||
name = TwoCrew | ||
type = HasCrew | ||
minCrew = 2 | ||
maxCrew = 99 | ||
title = Have at least 2 crewmembers on board | ||
hideChildren = true | ||
} | ||
PARAMETER | ||
{ | ||
name = LandCrewed | ||
type = All | ||
title = Land the crewed lander | ||
PARAMETER | ||
{ | ||
name = TwoCrew | ||
type = HasCrew | ||
minCrew = 2 | ||
maxCrew = 99 | ||
title = Have at least 2 crewmembers on board | ||
hideChildren = true | ||
} | ||
PARAMETER | ||
{ | ||
name = ReachState | ||
type = ReachState | ||
targetBody = Mars | ||
situation = LANDED | ||
PARAMETER | ||
{ | ||
name = Duration | ||
type = Duration | ||
duration = 30d | ||
preWaitText = Land on Mars. | ||
waitingText = Exploring... | ||
completionText = Exploration completed, you may return to Earth when ready. | ||
} | ||
} | ||
disableOnStateChange = true | ||
} | ||
PARAMETER | ||
{ | ||
name = PlantFlagOnMars | ||
type = PlantFlag | ||
targetBody = Mars | ||
title = Plant a flag on Mars! Don't forget the picture | ||
hideChildren = true | ||
disableOnStateChange = true | ||
} | ||
} | ||
} |
104 changes: 104 additions & 0 deletions
104
GameData/RP-1/Contracts/Mars Crewed/FirstCrewedMarsOrbit.cfg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
CONTRACT_TYPE | ||
{ | ||
name = FirstCrewedMarsOrbit | ||
title = First Crewed Mars Orbit | ||
group = CrewedMarsExp | ||
agent = Flag Planting | ||
|
||
description = <b>Program: Crewed Mars Exploration<br>Type: <color=green>Required</color></b><br><br>Design and successfully launch a craft that can carry at least four crew into orbit around Mars and return them safely to Earth. | ||
|
||
synopsis = Fly the first Crewed Mars Orbit mission | ||
|
||
completedMessage = Congratulations on safely returning the first humans to orbit around Mars! | ||
|
||
sortKey = 1603 | ||
|
||
cancellable = true | ||
declinable = false | ||
autoAccept = false | ||
minExpiry = 0 | ||
maxExpiry = 0 | ||
maxCompletions = 1 | ||
maxSimultaneous = 1 | ||
deadline = 0 | ||
|
||
targetBody = Mars | ||
|
||
|
||
|
||
prestige = Trivial // 1.0x | ||
advanceFunds = 0 | ||
rewardScience = 0 | ||
rewardReputation = 1000 | ||
rewardFunds = 0 | ||
failureReputation = 0 | ||
failureFunds = 0 | ||
|
||
// ************ REQUIREMENTS ************ | ||
|
||
REQUIREMENT | ||
{ | ||
name = ProgramActive | ||
type = ProgramActive | ||
program = CrewedMarsExp | ||
} | ||
|
||
|
||
// ************ PARAMETERS ************ | ||
|
||
PARAMETER | ||
{ | ||
name = VesselGroup | ||
type = VesselParameterGroup | ||
title = First crewed orbit of @targetBody | ||
|
||
PARAMETER | ||
{ | ||
name = NewVessel | ||
type = NewVessel | ||
title = Launch a new vessel | ||
hideChildren = true | ||
} | ||
|
||
PARAMETER | ||
{ | ||
name = HasCrew | ||
type = HasCrew | ||
minCrew = 4 | ||
crewOnly = true | ||
title = Have at least 4 crew members on board | ||
hideChildren = true | ||
} | ||
|
||
PARAMETER | ||
{ | ||
name = MarsOrbit | ||
title = Reach orbit of the Mars with a maximum pe of 400 km and a maximum ap of 600 km and hold it for at least 7 days | ||
type = Orbit | ||
maxPeA = 400000 // relatively circular | ||
maxApA = 600000 // relatively circular | ||
targetBody = Mars | ||
disableOnStateChange = true | ||
completeInSequence = true | ||
|
||
PARAMETER | ||
{ | ||
name = Duration | ||
type = Duration | ||
duration = 7d | ||
preWaitText = Reach specified orbit | ||
waitingText = Orbiting... | ||
completionText = Orbits are complete, you may return to Earth when ready | ||
} | ||
} | ||
PARAMETER | ||
{ | ||
name = ReturnHome | ||
type = RP1ReturnHome | ||
title = Return Home Safely | ||
hideChildren = true | ||
completeInSequence = true | ||
} | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.