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.

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

Rewrite some contract parameter titles to make them consistent across all contracts #2526

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ CONTRACT_TYPE
PARAMETER
{
name = GenerateEC
title = Have positive energy balance
title = Generate Electric Charge
type = ResourceConsumption
resource = ElectricCharge
minRate = -1000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ CONTRACT_TYPE
PARAMETER
{
name = GenerateEC
title = Have positive energy balance
title = Generate Electric Charge
type = ResourceConsumption
resource = ElectricCharge
minRate = -1000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ CONTRACT_TYPE
PARAMETER
{
name = GenerateEC
title = Have positive energy balance
title = Generate Electric Charge
type = ResourceConsumption
resource = ElectricCharge
minRate = -1000000
Expand Down
2 changes: 1 addition & 1 deletion GameData/RP-1/Contracts/Early Lunar Probes/LunarFlyby.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have power
title = Craft must have Electric Charge
disableOnStateChange = false
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have power
title = Craft must have Electric Charge
disableOnStateChange = false
}
PARAMETER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have power
title = Craft must have Electric Charge
disableOnStateChange = false
}
PARAMETER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have ElectricCharge after one day
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have ElectricCharge after one day
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have ElectricCharge after one day
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ CONTRACT_TYPE
PARAMETER
{
name = GenerateEC
title = Have positive energy balance
title = Generate Electric Charge
type = ResourceConsumption
resource = ElectricCharge
minRate = -1000000
Expand All @@ -147,10 +147,11 @@ CONTRACT_TYPE

PARAMETER
{
name = HasEC
name = HasPower
type = HasResource
resource = ElectricCharge
minQuantity = 100
minQuantity = 1.0
title = Craft must have Electric Charge
completeInSequence = true
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ CONTRACT_TYPE
}
PARAMETER
{
name = HasPower
title = Have a positive energy balance
name = GenerateEC
title = Generate Electric Charge
type = ResourceConsumption
resource = ElectricCharge
minRate = -1.0
minRate = -1000000
maxRate = 0.00001
}
PARAMETER
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 45 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
4 changes: 2 additions & 2 deletions GameData/RP-1/Contracts/Earth Observation 1/EOSCorona.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 8 hours
title = Craft must have Electric Charge
hideChildren = true
}

Expand All @@ -102,7 +102,7 @@ CONTRACT_TYPE
experimentID = RP0photos1a
}
}
title = Carry a Basic Film Camera
title = Carry film from Basic Film Camera
}

PARAMETER
Expand Down
4 changes: 2 additions & 2 deletions GameData/RP-1/Contracts/Earth Observation 1/EOSCoronaRep.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Carry Electric Charge for 2 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand All @@ -120,7 +120,7 @@ CONTRACT_TYPE
experimentID = RP0photos2
}
}
title = Carry an Improved Film Camera
title = Carry film from Improved Film Camera
}
PARAMETER
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 45 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
4 changes: 2 additions & 2 deletions GameData/RP-1/Contracts/Earth Observation 1/EOSGrav1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ CONTRACT_TYPE
{
name = OrbitSequence
type = Sequence
title = Survive in orbit for 2 months and transmit science
title = Survive in orbit for 2 months (60 days) and transmit science

PARAMETER
{
name = HasPower
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 60 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
2 changes: 1 addition & 1 deletion GameData/RP-1/Contracts/Earth Observation 1/EOSIRRad1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 7 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
4 changes: 2 additions & 2 deletions GameData/RP-1/Contracts/Earth Observation 1/EOSIRRad2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 14 days
title = Craft must have Electric Charge
hideChildren = true
}
PARAMETER
Expand Down Expand Up @@ -139,4 +139,4 @@ CONTRACT_TYPE
minSubjectsToComplete = 4
title = Transmit 75% of LEO infrared radiometry data from at least 4 biomes
}
}
}
2 changes: 1 addition & 1 deletion GameData/RP-1/Contracts/Earth Observation 1/EOSIRRad3.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 30 days
title = Craft must have Electric Charge
hideChildren = true
}
PARAMETER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge for 14 days
title = Craft must have Electric Charge
hideChildren = true
}

Expand Down
2 changes: 1 addition & 1 deletion GameData/RP-1/Contracts/Mars/Deimos Flyby.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have power
title = Craft must have Electric Charge
disableOnStateChange = false
}
}
Expand Down
9 changes: 9 additions & 0 deletions GameData/RP-1/Contracts/Mars/MarsFlyby.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ CONTRACT_TYPE
title = Flyby Mars within 20,000 km
hideChildren = true
}
PARAMETER
{
name = HasPower
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have Electric Charge
disableOnStateChange = false
}
PARAMETER
{
name = CollectSpaceScience
Expand Down
2 changes: 1 addition & 1 deletion GameData/RP-1/Contracts/Mars/Phobos Flyby.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CONTRACT_TYPE
type = HasResource
resource = ElectricCharge
minQuantity = 1.0
title = Craft must have power
title = Craft must have Electric Charge
disableOnStateChange = false
}
}
Expand Down