Skip to content

Commit

Permalink
CRAFT Breaking Update!!! Fixed the ComSat and WeatherSat Payloads
Browse files Browse the repository at this point in the history
* When we first created the contracts for ComSats and WeatherSats was for 1.2.2 RP-0. The tanks were 100% utilization at the time so that is what the sizes of the Payloads were based on.
* With the change of the Service Module tanks to be 50% utilization, the resulting satellite requirements are too large.
* All Payload requirements have been halved
* All payouts have been properly adjusted
* The Payload resources are now 2x as dense and expensive as before to keep the mass and costs accurate
* NavSat payload was not touched as it was added afterwards
* Nerfed the ScanSat contract payouts as they were too high
pap1723 committed Jan 15, 2019
1 parent 3683f08 commit 404962b
Showing 20 changed files with 202 additions and 191 deletions.
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ CONTRACT_TYPE


prestige = Trivial // 1.0x
advanceFunds = (12000 + (@AdvComSat/HasComSatPayload/minQuantity)) * (1 + Max(@AdvComSat/ReachSpecificOrbit/index, 1) * 0.4)
advanceFunds = (12000 + ((@AdvComSat/HasComSatPayload/minQuantity)*2)) * (1 + Max(@AdvComSat/ReachSpecificOrbit/index, 1) * 0.4)
rewardScience = 0
rewardReputation = Round(1 + (@advanceFunds / 500))
rewardFunds = (@advanceFunds * 1.33)
@@ -117,7 +117,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Pow(Random(0.5,1.5) * (0.3 + UnlockedTech().Count() / 100),2)*2500,1)
minQuantity = Round((Pow(Random(0.5,1.5) * (0.3 + UnlockedTech().Count() / 100),2)*2500)/2,1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -108,8 +108,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 625
title = Have a ComSatPayload of at least 625 units on the craft
minQuantity = 315
title = Have a ComSatPayload of at least 315 units on the craft
}
PARAMETER
{
@@ -165,8 +165,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 625
title = Have a ComSatPayload of at least 625 units on the craft
minQuantity = 315
title = Have a ComSatPayload of at least 315 units on the craft
}
PARAMETER
{
@@ -222,8 +222,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 625
title = Have a ComSatPayload of at least 625 units on the craft
minQuantity = 315
title = Have a ComSatPayload of at least 315 units on the craft
}
PARAMETER
{
@@ -279,8 +279,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 625
title = Have a ComSatPayload of at least 625 units on the craft
minQuantity = 315
title = Have a ComSatPayload of at least 315 units on the craft
}
PARAMETER
{
266 changes: 133 additions & 133 deletions GameData/RP-0/Contracts/Advanced Satellites/IridiumNEXT.cfg

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ CONTRACT_TYPE

// ************ REWARDS ************
prestige = Trivial // 1.0x
advanceFunds = 5000 + @EarlyComSat/HasComSatPayload/minQuantity
advanceFunds = 5000 + (@EarlyComSat/HasComSatPayload/minQuantity * 2)
rewardScience = 0
rewardReputation = 5
rewardFunds = 10000.0 + (((@EarlyComSat/Orbit/minPeA)+(@EarlyComSat/Orbit/minApA))/2)*0.005 + @EarlyComSat/HasComSatPayload/minQuantity
rewardFunds = 10000.0 + (((@EarlyComSat/Orbit/minPeA)+(@EarlyComSat/Orbit/minApA))/2)*0.005 + (@EarlyComSat/HasComSatPayload/minQuantity * 2)
failureReputation = 2
failureFunds = @advanceFunds * 1.5

@@ -91,7 +91,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(300,1000),1)
minQuantity = Round(Random(150,500),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 5000
rewardScience = 0
rewardReputation = 5
rewardFunds = 10000.0 + @TestComSat/Orbit/minPeA*0.005 + @TestComSat/HasComSatPayload/minQuantity
rewardFunds = 10000.0 + @TestComSat/Orbit/minPeA*0.005 + (@TestComSat/HasComSatPayload/minQuantity)*2
failureReputation = 2
failureFunds = @advanceFunds * 1.5

@@ -90,7 +90,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(150,250),1)
minQuantity = Round(Random(75,125),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -96,8 +96,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
@@ -148,8 +148,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
@@ -200,8 +200,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -101,8 +101,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
@@ -161,8 +161,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
@@ -221,8 +221,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
@@ -281,8 +281,8 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = 250
title = Have a ComSatPayload of at least 250 units on the craft
minQuantity = 125
title = Have a ComSatPayload of at least 125 units on the craft
}
PARAMETER
6 changes: 3 additions & 3 deletions GameData/RP-0/Contracts/Early Satellites/First Com Sat.cfg
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@ CONTRACT_TYPE


// ************ REWARDS ************
prestige = Trivial // 1.0x
advanceFunds = 5000
prestige = Trivial
advanceFunds = 5000 + (@FirstComSat/HasNavSatPayload/minQuantity * 2)

This comment has been minimized.

Copy link
@ec429

ec429 Jan 15, 2019

Contributor

HasComSatPayload, perhaps?

rewardScience = 0
rewardReputation = 5
rewardFunds = 15000
@@ -81,7 +81,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(150,170),1)
minQuantity = Round(Random(75,85),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
2 changes: 1 addition & 1 deletion GameData/RP-0/Contracts/Early Satellites/First Nav Sat.cfg
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ CONTRACT_TYPE

// ************ REWARDS ************
prestige = Trivial // 1.0x
advanceFunds = 5000
advanceFunds = 5000 + (@FirstNavSat/HasNavSatPayload/minQuantity * 2)
rewardScience = 0
rewardReputation = 5
rewardFunds = 10000
4 changes: 2 additions & 2 deletions GameData/RP-0/Contracts/Early Satellites/Geostationary.cfg
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ CONTRACT_TYPE
// ************ REWARDS ************
prestige = Significant // 1.25x
advanceFunds = 10000
advanceFunds = 10000 + (@first_GEOUncrewed/HasComSatPayload/minQuantity * 4)
rewardScience = 0
rewardReputation = 20
rewardFunds = 50000
@@ -72,7 +72,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(10,50),1)
minQuantity = Round(Random(5,25),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 7500
rewardScience = 0
rewardReputation = 5
rewardFunds = 20000 + @VesselGroup/HasComSatPayload/minQuantity
rewardFunds = 20000 + (@VesselGroup/HasComSatPayload/minQuantity * 2)
failureReputation = 2
failureFunds = @advanceFunds * 1.5

@@ -93,7 +93,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(150,250),1)
minQuantity = Round(Random(75,125),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
4 changes: 2 additions & 2 deletions GameData/RP-0/Contracts/Early Satellites/Tundra Satellite.cfg
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 10000
rewardScience = 0
rewardReputation = 10
rewardFunds = 35000 + (@VesselGroup/HasComSatPayload/minQuantity * 2)
rewardFunds = 35000 + (@VesselGroup/HasComSatPayload/minQuantity * 4)
failureReputation = 5
failureFunds = @advanceFunds * 1.5
@@ -94,7 +94,7 @@ CONTRACT_TYPE
name = HasComSatPayload
type = HasResource
resource = ComSatPayload
minQuantity = Round(Random(38,125),1)
minQuantity = Round(Random(20,63),1)
title = Have a ComSatPayload of at least @minQuantity units on the craft
}
PARAMETER
8 changes: 4 additions & 4 deletions GameData/RP-0/Contracts/RP0_Contract_Resources.cfg
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = ComSatPayload
density = 0.0004
unitCost = 0.05
density = 0.0008
unitCost = 0.10
flowMode = NO_FLOW
transfer = NONE
isTweakable = true
@@ -25,8 +25,8 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = WeatherSatPayload
density = 0.0004
unitCost = 0.05
density = 0.0008
unitCost = 0.10
flowMode = NO_FLOW
transfer = NONE
isTweakable = true
6 changes: 3 additions & 3 deletions GameData/RP-0/Contracts/SCANSat.cfg
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

@deadline = 365 * @/targetBody1.Multiplier() // 1 year * mult

@advanceFunds = Random(1000, 3000.0) + 5000.0 * @/targetBody1.Multiplier()
@advanceFunds = Random(1000, 3000.0) + 5000.0 * (@/targetBody1.Multiplier() / 2)
@rewardFunds = @advanceFunds
@failureFunds = @advanceFunds * 1.5

@@ -34,7 +34,7 @@

@deadline = 365 * @/targetBody3.Multiplier() // 1 year * mult

@advanceFunds = Random(5000, 10000.0) + 10000.0 * @/targetBody3.Multiplier()
@advanceFunds = Random(5000, 10000.0) + 10000.0 * (@/targetBody3.Multiplier() / 2)
@rewardFunds = @advanceFunds
@failureFunds = @advanceFunds * 1.5

@@ -59,7 +59,7 @@

@deadline = 365 * @/targetBody2.Multiplier() // 1 year * mult

@advanceFunds = Random(5000, 10000.0) + 10000.0 * @/targetBody2.Multiplier()
@advanceFunds = Random(5000, 10000.0) + 10000.0 * (@/targetBody2.Multiplier() / 2)
@rewardFunds = @advanceFunds
@failureFunds = @advanceFunds * 1.5

4 changes: 2 additions & 2 deletions GameData/RP-0/Contracts/Weather Sats/Early Weather Sats.cfg
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 15000
rewardScience = 0
rewardReputation = 10
rewardFunds = 5000
rewardFunds = 5000 + @EarlyWeatherSats/HasWeatherSatPayload/minQuantity * 4
failureReputation = 10
failureFunds = @advanceFunds * 1.5

@@ -81,7 +81,7 @@ CONTRACT_TYPE
name = HasWeatherSatPayload
type = HasResource
resource = WeatherSatPayload
minQuantity = Round(Random(25,100),1)
minQuantity = Round(Random(12,50),1)
title = Have a WeatherSatPayload of at least @minQuantity units on the craft
}
PARAMETER
4 changes: 2 additions & 2 deletions GameData/RP-0/Contracts/Weather Sats/First Weather Sat.cfg
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 10000
rewardScience = 0
rewardReputation = 10
rewardFunds = 5000
rewardFunds = 5000 + @FirstWeatherSat/HasWeatherSatPayload/minQuantity * 4
failureReputation = 10
failureFunds = @advanceFunds * 1.5

@@ -72,7 +72,7 @@ CONTRACT_TYPE
name = HasWeatherSatPayload
type = HasResource
resource = WeatherSatPayload
minQuantity = Round(Random(10,50),1)
minQuantity = Round(Random(5,25),1)
title = Have a WeatherSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -24,10 +24,10 @@ CONTRACT_TYPE
targetBody = HomeWorld()

prestige = Significant // 1.25x
advanceFunds = (12500 * Pow(1 + (@GEOWeather/HasWeatherSatPayload/minQuantity / 1000), 1.25)) / 2
advanceFunds = (12500 * Pow(1 + ((@GEOWeather/HasWeatherSatPayload/minQuantity * 2) / 1000), 1.25)) / 2
rewardScience = 0
rewardReputation = 15
rewardFunds = 12500 * Pow(1 + (@GEOWeather/HasWeatherSatPayload/minQuantity / 1000), 1.25)
rewardFunds = 12500 * Pow(1 + ((@GEOWeather/HasWeatherSatPayload/minQuantity * 2) / 1000), 1.25)
failureReputation = 15
failureFunds = @advanceFunds * 1.5

@@ -79,7 +79,7 @@ CONTRACT_TYPE
name = HasWeatherSatPayload
type = HasResource
resource = WeatherSatPayload
minQuantity = Round(Random(500,1650),1)
minQuantity = Round(Random(250,825),1)
title = Have a WeatherSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ CONTRACT_TYPE
advanceFunds = 15000
rewardScience = 0
rewardReputation = 10
rewardFunds = 10000 + @SecondGenWeather/HasWeatherSatPayload/minQuantity * 2
rewardFunds = 10000 + @SecondGenWeather/HasWeatherSatPayload/minQuantity * 4
failureReputation = 10
failureFunds = @advanceFunds * 1.5

@@ -89,7 +89,7 @@ CONTRACT_TYPE
name = HasWeatherSatPayload
type = HasResource
resource = WeatherSatPayload
minQuantity = Round(Random(100,400),1)
minQuantity = Round(Random(50,200),1)
title = Have a WeatherSatPayload of at least @minQuantity units on the craft
}
PARAMETER
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ CONTRACT_TYPE


prestige = Significant // 1.25x
advanceFunds = (7000 * Pow(1 + (@SunSyncWeather/HasWeatherSatPayload/minQuantity / 1000), 1.25)) / 2
advanceFunds = (7000 * Pow(1 + ((@SunSyncWeather/HasWeatherSatPayload/minQuantity * 2) / 1000), 1.25)) / 2
rewardScience = 0
rewardReputation = 10
rewardFunds = 7000 * Pow(1 + (@SunSyncWeather/HasWeatherSatPayload/minQuantity / 1000), 1.25)
rewardFunds = 7000 * Pow(1 + ((@SunSyncWeather/HasWeatherSatPayload/minQuantity * 2) / 1000), 1.25)
failureReputation = 10
failureFunds = @advanceFunds * 1.5

@@ -103,7 +103,7 @@ CONTRACT_TYPE
name = HasWeatherSatPayload
type = HasResource
resource = WeatherSatPayload
minQuantity = Round(Random(500,1000),1)
minQuantity = Round(Random(250,500),1)
title = Have a WeatherSatPayload of at least @minQuantity units on the craft
}
PARAMETER
11 changes: 11 additions & 0 deletions Source/Avionics/Class1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;

This comment has been minimized.

Copy link
@ec429

ec429 Jan 15, 2019

Contributor

Slipped into this commit by accident?

using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace RP0.Avionics
{
class Class1
{
}
}

2 comments on commit 404962b

@ec429
Copy link
Contributor

@ec429 ec429 commented on 404962b Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit does too many different things. See http://esr.ibiblio.org/?p=4824 for relevant guidance.

@pap1723
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it sure did slip in there in accident

Please sign in to comment.