From d46a145330e1c78351b899eab8c843d203d45aff Mon Sep 17 00:00:00 2001 From: uriyuzhui <59517291+uriyuzhui@users.noreply.github.com> Date: Sat, 17 Aug 2024 13:17:45 +0800 Subject: [PATCH 1/4] Make targeted moon landing easier --- .../CrewedMoonLandingTargeted.cfg | 165 ++++++++++++++++-- 1 file changed, 149 insertions(+), 16 deletions(-) diff --git a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg index 309c0b9e058..81f86ffdace 100644 --- a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg +++ b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg @@ -8,7 +8,7 @@ CONTRACT_TYPE description = Program: Crewed Lunar Exploration
Type: CAPSTONE


Design and launch a spacecraft with at least one crew member to land at a specific location on the Moon. Explore the area for at least @/LandDur and then return safely to Earth.&br;&br;Number of Contracts Completed: @index / @maxCompletions - genericDescription = Launch a crewed single-person spacecraft and land it on a specific lunar biome. Explore the area for the specified amount of time and then return safely to Earth. + genericDescription = Launch a spacecraft with at least one crew member and land it on a specific lunar biome. Explore the area for the specified amount of time and then return safely to Earth. synopsis = Land a crew on a specific biome on the Moon and return safely to Earth @@ -28,12 +28,12 @@ CONTRACT_TYPE targetBody = Moon // ************ REWARDS ************ - prestige = Trivial // 1.0x + prestige = Trivial // 1.0x advanceFunds = 0 rewardScience = 0 rewardFunds = 0 failureFunds = 0 - rewardReputation = 1000+(250 * @/index) + rewardReputation = 750+(250 * @/index) failureReputation = 0 @@ -153,7 +153,7 @@ CONTRACT_TYPE { name = vesselGroup type = VesselParameterGroup - title = Crewed lunar landing + title = Crewed targeted lunar landing PARAMETER { @@ -221,14 +221,15 @@ CONTRACT_TYPE { name = TargetedLanding type = Any + completeInSequence = true PARAMETER { name = Mare Tranquillitatis type = VisitWaypoint index = 0 - distance = 1000.0 - title = Land within 1km of @/String11 + distance = 25000.0 + title = Land within 25km of @/String11 showMessages = true disableOnStateChange = true hideChildren = true @@ -239,8 +240,8 @@ CONTRACT_TYPE name = Oceanus Procellarum type = VisitWaypoint index = 1 - distance = 1000.0 - title = Land within 1km of @/String12 + distance = 25000.0 + title = Land within 25km of @/String12 showMessages = true disableOnStateChange = true hideChildren = true @@ -251,8 +252,8 @@ CONTRACT_TYPE name = Fra Mauro type = VisitWaypoint index = 2 - distance = 1000.0 - title = Land within 1km of @/String14 + distance = 25000.0 + title = Land within 25km of @/String14 showMessages = true disableOnStateChange = true hideChildren = true @@ -263,8 +264,8 @@ CONTRACT_TYPE name = Hadley-Apennines type = VisitWaypoint index = 3 - distance = 1000.0 - title = Land within 1km of @/String15 + distance = 25000.0 + title = Land within 25km of @/String15 showMessages = true disableOnStateChange = true hideChildren = true @@ -275,8 +276,8 @@ CONTRACT_TYPE name = Descartes type = VisitWaypoint index = 4 - distance = 1000.0 - title = Land within 1km of @/String16 + distance = 25000.0 + title = Land within 25km of @/String16 showMessages = true disableOnStateChange = true hideChildren = true @@ -287,8 +288,8 @@ CONTRACT_TYPE name = Taurus-Littrow type = VisitWaypoint index = 5 - distance = 1000.0 - title = Land within 1km of @/String17 + distance = 25000.0 + title = Land within 25km of @/String17 showMessages = true disableOnStateChange = true hideChildren = true @@ -306,6 +307,138 @@ CONTRACT_TYPE } } + PARAMETER + { + name = OptVesselGroup + type = VesselParameterGroup + title = Demonstrate precision landing and land within 3km of target locations + rewardReputation = 50 + rewardScience = 5 + optional = true + hideChildren = false + + PARAMETER + { + name = LandCrewed + type = All + title = Land the crewed lander + disableOnStateChange = true + hideChildren = true + + PARAMETER + { + title = Have at least 1 crewmember on board + name = TwoCrew + type = HasCrew + minCrew = 1 + crewOnly = true + hideChildren = true + } + + PARAMETER + { + title = Land the crewed lander + name = ReachState + type = ReachState + targetBody = Moon + disableOnStateChange = true + situation = LANDED + hideChildren = true + } + } + + + PARAMETER + { + title = Land within 3km of target locations + name = TargetedLandingOptional + type = Any + hideChildren = true + completeInSequence = true + + PARAMETER + { + name = Mare Tranquillitatis + type = VisitWaypoint + index = 0 + distance = 3000.0 + title = Land within 3km of @/String11 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + + PARAMETER + { + name = Oceanus Procellarum + type = VisitWaypoint + index = 1 + distance = 3000.0 + title = Land within 3km of @/String12 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + + PARAMETER + { + name = Fra Mauro + type = VisitWaypoint + index = 2 + distance = 3000.0 + title = Land within 3km of @/String14 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + + PARAMETER + { + name = Hadley-Apennines + type = VisitWaypoint + index = 3 + distance = 3000.0 + title = Land within 3km of @/String15 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + + PARAMETER + { + name = Descartes + type = VisitWaypoint + index = 4 + distance = 3000.0 + title = Land within 3km of @/String16 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + + PARAMETER + { + name = Taurus-Littrow + type = VisitWaypoint + index = 5 + distance = 3000.0 + title = Land within 3km of @/String17 + showMessages = true + disableOnStateChange = true + hideChildren = true + } + } + + PARAMETER + { + name = ReturnHome + type = RP1ReturnHome + title = Return home safely + hideChildren = true + completeInSequence = true + } + } + BEHAVIOUR { name = WaypointGenerator From d38e1acc119d1f750ffac42e6674294a2bcec8cc Mon Sep 17 00:00:00 2001 From: uriyuzhui <59517291+uriyuzhui@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:56:22 +0800 Subject: [PATCH 2/4] Reduce requirement to 10km; require VisitWayPoint while landed; other text fixes --- .../CrewedMoonLandingTargeted.cfg | 314 +++++++++--------- 1 file changed, 150 insertions(+), 164 deletions(-) diff --git a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg index 81f86ffdace..2d2b809d930 100644 --- a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg +++ b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg @@ -205,6 +205,79 @@ CONTRACT_TYPE targetBody = Moon situation = LANDED } + + PARAMETER + { + title = Land within 3km of ANY target location + name = TargetedLanding + type = Any + + PARAMETER + { + name = Mare Tranquillitatis + type = VisitWaypoint + index = 0 + distance = 10000.0 + title = Land within 10km of @/String11 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Oceanus Procellarum + type = VisitWaypoint + index = 1 + distance = 10000.0 + title = Land within 10km of @/String12 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Fra Mauro + type = VisitWaypoint + index = 2 + distance = 10000.0 + title = Land within 10km of @/String14 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Hadley-Apennines + type = VisitWaypoint + index = 3 + distance = 10000.0 + title = Land within 10km of @/String15 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Descartes + type = VisitWaypoint + index = 4 + distance = 10000.0 + title = Land within 10km of @/String16 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Taurus-Littrow + type = VisitWaypoint + index = 5 + distance = 10000.0 + title = Land within 10km of @/String17 + showMessages = true + hideChildren = true + } + } PARAMETER { @@ -216,85 +289,6 @@ CONTRACT_TYPE completionText = Exploration completed, you may return to Earth when ready. } } - - PARAMETER - { - name = TargetedLanding - type = Any - completeInSequence = true - - PARAMETER - { - name = Mare Tranquillitatis - type = VisitWaypoint - index = 0 - distance = 25000.0 - title = Land within 25km of @/String11 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Oceanus Procellarum - type = VisitWaypoint - index = 1 - distance = 25000.0 - title = Land within 25km of @/String12 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Fra Mauro - type = VisitWaypoint - index = 2 - distance = 25000.0 - title = Land within 25km of @/String14 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Hadley-Apennines - type = VisitWaypoint - index = 3 - distance = 25000.0 - title = Land within 25km of @/String15 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Descartes - type = VisitWaypoint - index = 4 - distance = 25000.0 - title = Land within 25km of @/String16 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Taurus-Littrow - type = VisitWaypoint - index = 5 - distance = 25000.0 - title = Land within 25km of @/String17 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - } } PARAMETER @@ -311,7 +305,7 @@ CONTRACT_TYPE { name = OptVesselGroup type = VesselParameterGroup - title = Demonstrate precision landing and land within 3km of target locations + title = Demonstrate precision landing and land within 3km of ANY target location rewardReputation = 50 rewardScience = 5 optional = true @@ -321,7 +315,7 @@ CONTRACT_TYPE { name = LandCrewed type = All - title = Land the crewed lander + title = Land a crewed vessel within 3km of one of ANY target locations disableOnStateChange = true hideChildren = true @@ -341,92 +335,84 @@ CONTRACT_TYPE name = ReachState type = ReachState targetBody = Moon - disableOnStateChange = true situation = LANDED hideChildren = true } - } - - - PARAMETER - { - title = Land within 3km of target locations - name = TargetedLandingOptional - type = Any - hideChildren = true - completeInSequence = true - - PARAMETER - { - name = Mare Tranquillitatis - type = VisitWaypoint - index = 0 - distance = 3000.0 - title = Land within 3km of @/String11 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Oceanus Procellarum - type = VisitWaypoint - index = 1 - distance = 3000.0 - title = Land within 3km of @/String12 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Fra Mauro - type = VisitWaypoint - index = 2 - distance = 3000.0 - title = Land within 3km of @/String14 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Hadley-Apennines - type = VisitWaypoint - index = 3 - distance = 3000.0 - title = Land within 3km of @/String15 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Descartes - type = VisitWaypoint - index = 4 - distance = 3000.0 - title = Land within 3km of @/String16 - showMessages = true - disableOnStateChange = true - hideChildren = true - } - - PARAMETER - { - name = Taurus-Littrow - type = VisitWaypoint - index = 5 - distance = 3000.0 - title = Land within 3km of @/String17 - showMessages = true - disableOnStateChange = true - hideChildren = true - } + + PARAMETER + { + title = Land within 3km of ANY target location + name = TargetedLandingOptional + type = Any + hideChildren = true + completeInSequence = true + + PARAMETER + { + name = Mare Tranquillitatis + type = VisitWaypoint + index = 0 + distance = 3000.0 + title = Land within 3km of @/String11 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Oceanus Procellarum + type = VisitWaypoint + index = 1 + distance = 3000.0 + title = Land within 3km of @/String12 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Fra Mauro + type = VisitWaypoint + index = 2 + distance = 3000.0 + title = Land within 3km of @/String14 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Hadley-Apennines + type = VisitWaypoint + index = 3 + distance = 3000.0 + title = Land within 3km of @/String15 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Descartes + type = VisitWaypoint + index = 4 + distance = 3000.0 + title = Land within 3km of @/String16 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Taurus-Littrow + type = VisitWaypoint + index = 5 + distance = 3000.0 + title = Land within 3km of @/String17 + showMessages = true + hideChildren = true + } + } } PARAMETER From 3ad95a63e4c04b27236cccab432ff856c9836a48 Mon Sep 17 00:00:00 2001 From: uriyuzhui <59517291+uriyuzhui@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:12:25 +0800 Subject: [PATCH 3/4] Remove duplicated HasCrew parameter --- .../Lunar Crewed/CrewedMoonLandingTargeted.cfg | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg index 2d2b809d930..1080f9e2783 100644 --- a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg +++ b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg @@ -163,15 +163,6 @@ CONTRACT_TYPE hideChildren = true } - PARAMETER - { - name = TwoCrew - type = HasCrew - minCrew = 1 - crewOnly = true - title = Have at least 1 crewmember on board - hideChildren = true - } PARAMETER { @@ -208,7 +199,7 @@ CONTRACT_TYPE PARAMETER { - title = Land within 3km of ANY target location + title = Land near ANY target location name = TargetedLanding type = Any @@ -305,7 +296,7 @@ CONTRACT_TYPE { name = OptVesselGroup type = VesselParameterGroup - title = Demonstrate precision landing and land within 3km of ANY target location + title = Demonstrate precision landing rewardReputation = 50 rewardScience = 5 optional = true @@ -315,7 +306,7 @@ CONTRACT_TYPE { name = LandCrewed type = All - title = Land a crewed vessel within 3km of one of ANY target locations + title = Land a crewed vessel within 3km of ANY target location disableOnStateChange = true hideChildren = true From fe5033a0e1a409e6262b933a21d4944f261acd91 Mon Sep 17 00:00:00 2001 From: uriyuzhui <59517291+uriyuzhui@users.noreply.github.com> Date: Tue, 20 Aug 2024 02:48:51 +0800 Subject: [PATCH 4/4] fix indentation and minor text changes --- .../CrewedMoonLandingTargeted.cfg | 294 +++++++++--------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg index 1080f9e2783..7d1dfdfbbc4 100644 --- a/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg +++ b/GameData/RP-1/Contracts/Lunar Crewed/CrewedMoonLandingTargeted.cfg @@ -28,7 +28,7 @@ CONTRACT_TYPE targetBody = Moon // ************ REWARDS ************ - prestige = Trivial // 1.0x + prestige = Trivial // 1.0x advanceFunds = 0 rewardScience = 0 rewardFunds = 0 @@ -197,78 +197,78 @@ CONTRACT_TYPE situation = LANDED } - PARAMETER - { - title = Land near ANY target location - name = TargetedLanding - type = Any - - PARAMETER - { - name = Mare Tranquillitatis - type = VisitWaypoint - index = 0 - distance = 10000.0 - title = Land within 10km of @/String11 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Oceanus Procellarum - type = VisitWaypoint - index = 1 - distance = 10000.0 - title = Land within 10km of @/String12 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Fra Mauro - type = VisitWaypoint - index = 2 - distance = 10000.0 - title = Land within 10km of @/String14 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Hadley-Apennines - type = VisitWaypoint - index = 3 - distance = 10000.0 - title = Land within 10km of @/String15 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Descartes - type = VisitWaypoint - index = 4 - distance = 10000.0 - title = Land within 10km of @/String16 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Taurus-Littrow - type = VisitWaypoint - index = 5 - distance = 10000.0 - title = Land within 10km of @/String17 - showMessages = true - hideChildren = true - } - } + PARAMETER + { + title = Land within 10km of ANY target location + name = TargetedLanding + type = Any + + PARAMETER + { + name = Mare Tranquillitatis + type = VisitWaypoint + index = 0 + distance = 10000.0 + title = Land within 10km of @/String11 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Oceanus Procellarum + type = VisitWaypoint + index = 1 + distance = 10000.0 + title = Land within 10km of @/String12 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Fra Mauro + type = VisitWaypoint + index = 2 + distance = 10000.0 + title = Land within 10km of @/String14 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Hadley-Apennines + type = VisitWaypoint + index = 3 + distance = 10000.0 + title = Land within 10km of @/String15 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Descartes + type = VisitWaypoint + index = 4 + distance = 10000.0 + title = Land within 10km of @/String16 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Taurus-Littrow + type = VisitWaypoint + index = 5 + distance = 10000.0 + title = Land within 10km of @/String17 + showMessages = true + hideChildren = true + } + } PARAMETER { @@ -330,80 +330,80 @@ CONTRACT_TYPE hideChildren = true } - PARAMETER - { - title = Land within 3km of ANY target location - name = TargetedLandingOptional - type = Any - hideChildren = true - completeInSequence = true - - PARAMETER - { - name = Mare Tranquillitatis - type = VisitWaypoint - index = 0 - distance = 3000.0 - title = Land within 3km of @/String11 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Oceanus Procellarum - type = VisitWaypoint - index = 1 - distance = 3000.0 - title = Land within 3km of @/String12 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Fra Mauro - type = VisitWaypoint - index = 2 - distance = 3000.0 - title = Land within 3km of @/String14 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Hadley-Apennines - type = VisitWaypoint - index = 3 - distance = 3000.0 - title = Land within 3km of @/String15 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Descartes - type = VisitWaypoint - index = 4 - distance = 3000.0 - title = Land within 3km of @/String16 - showMessages = true - hideChildren = true - } - - PARAMETER - { - name = Taurus-Littrow - type = VisitWaypoint - index = 5 - distance = 3000.0 - title = Land within 3km of @/String17 - showMessages = true - hideChildren = true - } - } + PARAMETER + { + title = Land within 3km of ANY target location + name = TargetedLandingOptional + type = Any + hideChildren = true + completeInSequence = true + + PARAMETER + { + name = Mare Tranquillitatis + type = VisitWaypoint + index = 0 + distance = 3000.0 + title = Land within 3km of @/String11 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Oceanus Procellarum + type = VisitWaypoint + index = 1 + distance = 3000.0 + title = Land within 3km of @/String12 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Fra Mauro + type = VisitWaypoint + index = 2 + distance = 3000.0 + title = Land within 3km of @/String14 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Hadley-Apennines + type = VisitWaypoint + index = 3 + distance = 3000.0 + title = Land within 3km of @/String15 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Descartes + type = VisitWaypoint + index = 4 + distance = 3000.0 + title = Land within 3km of @/String16 + showMessages = true + hideChildren = true + } + + PARAMETER + { + name = Taurus-Littrow + type = VisitWaypoint + index = 5 + distance = 3000.0 + title = Land within 3km of @/String17 + showMessages = true + hideChildren = true + } + } } PARAMETER