From fb9d0adc927e39b9df7855d13d2e3ff02018fae5 Mon Sep 17 00:00:00 2001 From: zephyr Date: Tue, 11 Jan 2022 16:57:50 -0800 Subject: [PATCH 1/4] added unbalanced contract resources 'research payload' and processed 'payload' --- .../RP-0/Contracts/RP0_Contract_Resources.cfg | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg index a09caff83d5..e60a6c7e1d6 100644 --- a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg +++ b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg @@ -46,6 +46,31 @@ RESOURCE_DEFINITION volume = 1 } +// ================================================================= +// Resources related to the station science mechanics +// ================================================================= + +RESOURCE_DEFINITION +{ + name = ResearchPayload + density = 0.001 + unitCost = 0.0 // FIXME (Kerbalism 3.14 fixed the cost bug) + flowMode = ALL_VESSEL + transfer = NONE + isTweakable = true + volume = 100 +} + +RESOURCE_DEFINITION +{ + name = ProcessedPayload + density = 0.005 + unitCost = 0.0 // FIXME (Kerbalism 3.14 fixed the cost bug) + flowMode = ALL_VESSEL + transfer = NONE + isTweakable = true + volume = 10 +} @TANK_DEFINITION[Fuselage|ServiceModule]:FOR[RP-0]:NEEDS[RealFuels] @@ -59,6 +84,22 @@ RESOURCE_DEFINITION { -addPayload = DEL TANK + { + name = ResearchPayload + utilization = 1 + fillable = True + amount = 0.0 + maxAmount = 0.0 + } + TANK + { + name = ProcessedPayload + utilization = 1 + fillable = True + amount = 0.0 + maxAmount = 0.0 + } + TANK { name = ComSatPayload utilization = 1 From efba8879d93e8afbebfaf48d9136b37f8496ba50 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 9 Jun 2022 02:03:29 -0500 Subject: [PATCH 2/4] Make ProcessedPayload fillable = false so it does not get added to tanks --- GameData/RP-0/Contracts/RP0_Contract_Resources.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg index e60a6c7e1d6..aabd2295ffb 100644 --- a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg +++ b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg @@ -69,6 +69,7 @@ RESOURCE_DEFINITION flowMode = ALL_VESSEL transfer = NONE isTweakable = true + fillable = false volume = 10 } From 8c88765b9991e82d9041c9b5e5c47ad5aba8bf7c Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 9 Jun 2022 13:47:41 -0500 Subject: [PATCH 3/4] Fix the Station Life Support Contract to offer when BELOW threshold --- GameData/RP-0/Contracts/Space Stations/Life Support Station.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameData/RP-0/Contracts/Space Stations/Life Support Station.cfg b/GameData/RP-0/Contracts/Space Stations/Life Support Station.cfg index c0fe0ec865e..5222c41cf20 100644 --- a/GameData/RP-0/Contracts/Space Stations/Life Support Station.cfg +++ b/GameData/RP-0/Contracts/Space Stations/Life Support Station.cfg @@ -46,7 +46,7 @@ CONTRACT_TYPE { type = Vessel requiredValue = true - targetVessel1 = AllVessels().Where(v => v.VesselType() == Station && v.FreeDockingPorts()>0 && (v.ResourceCapacity(Food) / v.ResourceQuantity(Food))>0.26 || (v.ResourceCapacity(Water) / v.ResourceQuantity(Water))>0.26 || (v.ResourceCapacity(Oxygen) / v.ResourceQuantity(Oxygen))>0.26).Random() + targetVessel1 = AllVessels().Where(v => v.VesselType() == Station && v.FreeDockingPorts()>0 && (v.ResourceCapacity(Food) / v.ResourceQuantity(Food))<0.26 || (v.ResourceCapacity(Water) / v.ResourceQuantity(Water))<0.26 || (v.ResourceCapacity(Oxygen) / v.ResourceQuantity(Oxygen))<0.26).Random() title = Must have an open Docking Port and 25% or less of Life Support Supplies } DATA From 0bc4e0469b5975bc0270cae3b4b4eb64a30f5c23 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 9 Jun 2022 13:48:27 -0500 Subject: [PATCH 4/4] CRAFT BREAKING: Add a cost to ResearchPayload and make it not compressed in tanks --- GameData/RP-0/Contracts/RP0_Contract_Resources.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg index aabd2295ffb..380876b6f38 100644 --- a/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg +++ b/GameData/RP-0/Contracts/RP0_Contract_Resources.cfg @@ -54,18 +54,18 @@ RESOURCE_DEFINITION { name = ResearchPayload density = 0.001 - unitCost = 0.0 // FIXME (Kerbalism 3.14 fixed the cost bug) + unitCost = 2.0 flowMode = ALL_VESSEL transfer = NONE isTweakable = true - volume = 100 + volume = 1 } RESOURCE_DEFINITION { name = ProcessedPayload density = 0.005 - unitCost = 0.0 // FIXME (Kerbalism 3.14 fixed the cost bug) + unitCost = 0.0 flowMode = ALL_VESSEL transfer = NONE isTweakable = true