Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix Lunar Mapper Contracts #2083

Merged
merged 4 commits into from
Jul 1, 2023
Merged

Fix Lunar Mapper Contracts #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e80fae
Update Lunar Mapper contracts w/ RP1CollectSci parameters
Jul 1, 2023
62c3388
Remove Leftover Data & Behavior nodes from older version of contract.
Jul 1, 2023
34a393f
Missed another leftover
Jul 1, 2023
500c27d
Missed yet another leftover
Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiter.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,9 @@ CONTRACT_TYPE
name = IncrementTheCount
type = Expression

CONTRACT_OFFERED
{
LunarOrbiter_Completion = ($LunarOrbiter_Completion + 0) == 0 ? (UniversalTime() - 60 * 86400) : ($LunarOrbiter_Completion + 0)
}
CONTRACT_COMPLETED_SUCCESS
{
LunarOrbiter_Count = $LunarOrbiter_Count + 1
LunarOrbiter_Completion = UniversalTime()
}
}

Expand Down Expand Up @@ -105,14 +100,13 @@ CONTRACT_TYPE
PARAMETER
{
name = Visible Imager
type = PartValidation
part = RO-BasicTVCamera
part = RO-ImprovedTVCamera
part = RO-AdvancedImager
part = RO-HIRES
minCount = 1
title = Have at least 1 Visible Imaging Device of Level 2 or higher
hideChildren = true
type = RP1CollectScience
targetBody = Moon
experiment = RP0visibleImaging2
situation = InSpaceLow
fractionComplete = 1
minSubjectsToComplete = 1
title = Have at least 1 Visible Imaging Device of Level 2 or higher & collect science in at least 1 biome
}

PARAMETER
Expand All @@ -137,16 +131,5 @@ CONTRACT_TYPE
completionText = Stable Orbit: Confirmed
}
}

PARAMETER
{
name = CollectScience
type = CollectScience
targetBody = Moon
recoveryMethod = RecoverOrTransmit
experiment = RP0visibleImaging2
title = Collect Science from around the Moon and transmit it to the KSC
hideChildren = true
}
}
}
28 changes: 8 additions & 20 deletions GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiterOptional.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ CONTRACT_TYPE
{
name = IncrementTheCount
type = Expression

CONTRACT_COMPLETED_SUCCESS
{
LunarOrbiterOptional_Count = $LunarOrbiterOptional_Count + 1
Expand Down Expand Up @@ -108,14 +108,13 @@ CONTRACT_TYPE
PARAMETER
{
name = Visible Imager
type = PartValidation
part = RO-BasicTVCamera
part = RO-ImprovedTVCamera
part = RO-AdvancedImager
part = RO-HIRES
minCount = 1
title = Have at least 1 Visible Imaging Device of Level 2 or higher
hideChildren = true
type = RP1CollectScience
targetBody = Moon
experiment = RP0visibleImaging2
situation = InSpaceLow
fractionComplete = 1
minSubjectsToComplete = 1
title = Have at least 1 Visible Imaging Device of Level 2 or higher & collect science in at least 1 biome
}

PARAMETER
Expand All @@ -140,16 +139,5 @@ CONTRACT_TYPE
completionText = Stable Orbit: Confirmed
}
}

PARAMETER
{
name = CollectScience
type = CollectScience
targetBody = Moon
recoveryMethod = RecoverOrTransmit
experiment = RP0visibleImaging2
title = Collect Science from around the Moon and transmit it to the KSC
hideChildren = true
}
}
}