Skip to content

Commit 1951263

Browse files
confusingbitsconfusingbits
committed
Resolved API change with part.GetConnectedResources
Rough adjustment of part costs for ksp v0.24 career mode
1 parent 2500b0b commit 1951263

75 files changed

Lines changed: 95 additions & 94 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎FNPlugin/AlcubierreDrive.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void ActivateWarpDrive() {
107107
}
108108

109109
var resources = new List<PartResource>();
110-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, resources);
110+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, PartResourceLibrary.Instance.GetDefinition("ExoticMatter").resourceFlowMode, resources);
111111
float electrical_current_available = 0;
112112
for (int i = 0; i < resources.Count; ++i) {
113113
electrical_current_available += (float)resources.ElementAt(i).amount;
@@ -453,7 +453,7 @@ public override void OnFixedUpdate() {
453453
float currentExoticMatter = 0;
454454
float maxExoticMatter = 0;
455455
List<PartResource> partresources = new List<PartResource>();
456-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, partresources);
456+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, PartResourceLibrary.Instance.GetDefinition("ExoticMatter").resourceFlowMode, partresources);
457457
foreach (PartResource partresource in partresources) {
458458
currentExoticMatter += (float)partresource.amount;
459459
maxExoticMatter += (float)partresource.maxAmount;
@@ -470,7 +470,7 @@ public override void OnFixedUpdate() {
470470
if (!IsEnabled) {
471471
//ChargeStatus = "";
472472
var resources = new List<PartResource>();
473-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, resources);
473+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ExoticMatter").id, PartResourceLibrary.Instance.GetDefinition("ExoticMatter").resourceFlowMode, resources);
474474
float electrical_current_available = 0;
475475
for (int i = 0; i < resources.Count; ++i) {
476476
electrical_current_available += (float)resources.ElementAt(i).amount;

‎FNPlugin/ComputerCore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public override void OnUpdate() {
132132
Fields["scienceRate"].guiActive = isupgraded;
133133

134134
List<PartResource> partresources = new List<PartResource>();
135-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Science").id, partresources);
135+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Science").id, PartResourceLibrary.Instance.GetDefinition("Science").resourceFlowMode, partresources);
136136
float currentscience = 0;
137137
foreach (PartResource partresource in partresources) {
138138
currentscience += (float)partresource.amount;

‎FNPlugin/ElectricEngineController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public override void OnUpdate() {
228228
float maxpropellant = 0;
229229

230230
List<PartResource> partresources = new List<PartResource>();
231-
part.GetConnectedResources(curEngineT.propellants[0].id, partresources);
231+
part.GetConnectedResources(curEngineT.propellants[0].id, PartResourceLibrary.Instance.GetDefinition(curEngineT.propellants[0].name).resourceFlowMode, partresources);
232232

233233
foreach (PartResource partresource in partresources) {
234234
currentpropellant += (float)partresource.amount;
@@ -361,7 +361,7 @@ public override void OnFixedUpdate() {
361361
float vacuum_plasma_needed = 0;
362362
float vacuum_plasma_current = 0;
363363
List<PartResource> vacuum_resources = new List<PartResource>();
364-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("VacuumPlasma").id, vacuum_resources);
364+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("VacuumPlasma").id, PartResourceLibrary.Instance.GetDefinition("VacuumPlasma").resourceFlowMode, vacuum_resources);
365365

366366
foreach (PartResource partresource in vacuum_resources) {
367367
vacuum_plasma_needed += (float)(partresource.maxAmount-partresource.amount);
@@ -425,7 +425,7 @@ public void evaluateMaxThrust() {
425425
}
426426

427427
List<PartResource> partresources = new List<PartResource>();
428-
part.GetConnectedResources(curEngine.propellants[0].id, partresources);
428+
part.GetConnectedResources(curEngine.propellants[0].id, PartResourceLibrary.Instance.GetDefinition(curEngine.propellants[0].name).resourceFlowMode, partresources);
429429

430430
//if(!isupgraded) {
431431
if (partresources.Count == 0 && fuel_mode != 0) {

‎FNPlugin/FNAntimatterReactor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public override string GetInfo() {
2020

2121
protected override double consumeReactorResource(double resource) {
2222
List<PartResource> antimatter_resources = new List<PartResource>();
23-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, antimatter_resources);
23+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, PartResourceLibrary.Instance.GetDefinition("Antimatter").resourceFlowMode, antimatter_resources);
2424
double antimatter_provided = 0;
2525
foreach (PartResource antimatter_resource in antimatter_resources) {
2626
double antimatter_consumed_here = Math.Min(antimatter_resource.amount, resource);
@@ -33,7 +33,7 @@ protected override double consumeReactorResource(double resource) {
3333

3434
protected override double returnReactorResource(double resource) {
3535
List<PartResource> antimatter_resources = new List<PartResource>();
36-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, antimatter_resources);
36+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, PartResourceLibrary.Instance.GetDefinition("Antimatter").resourceFlowMode, antimatter_resources);
3737
double antimatter_returned = 0;
3838
foreach (PartResource antimatter_resource in antimatter_resources) {
3939
double antimatter_returned_here = Math.Min(antimatter_resource.maxAmount - antimatter_resource.amount, resource);

‎FNPlugin/FNInfraredTelescope.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public override void OnFixedUpdate() {
143143
}
144144

145145
List<PartResource> prl = new List<PartResource>();
146-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("LqdHelium").id, prl);
146+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("LqdHelium").id, PartResourceLibrary.Instance.GetDefinition("LqdHelium").resourceFlowMode, prl);
147147
double max_helium = 0;
148148
double cur_helium = 0;
149149
double helium_fraction = 0;

‎FNPlugin/FNNozzleController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void updatePropellantBar() {
202202
float maxpropellant = 0;
203203

204204
List<PartResource> partresources = new List<PartResource>();
205-
part.GetConnectedResources(myAttachedEngine.propellants[0].id, partresources);
205+
part.GetConnectedResources(myAttachedEngine.propellants[0].id, PartResourceLibrary.Instance.GetDefinition(myAttachedEngine.propellants[0].name).resourceFlowMode, partresources);
206206

207207
foreach (PartResource partresource in partresources) {
208208
currentpropellant += (float) partresource.amount;
@@ -280,7 +280,7 @@ public void setupPropellants() {
280280
curEngine_propellants_list = myAttachedEngine.propellants;
281281
foreach (Propellant curEngine_propellant in curEngine_propellants_list) {
282282
List<PartResource> partresources = new List<PartResource>();
283-
part.GetConnectedResources(curEngine_propellant.id, partresources);
283+
part.GetConnectedResources(curEngine_propellant.id, PartResourceLibrary.Instance.GetDefinition(curEngine_propellant.name).resourceFlowMode, partresources);
284284

285285
if (partresources.Count == 0 || !PartResourceLibrary.Instance.resourceDefinitions.Contains(list_of_propellants[0].name)) {
286286
next_propellant = true;
@@ -562,7 +562,7 @@ public static double getIntakeAvailable(Vessel vess, string resourcename) {
562562
}
563563

564564
List<PartResource> partresources = new List<PartResource> ();
565-
vess.rootPart.GetConnectedResources (PartResourceLibrary.Instance.GetDefinition (resourcename).id, partresources);
565+
vess.rootPart.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition(resourcename).id, PartResourceLibrary.Instance.GetDefinition(resourcename).resourceFlowMode, partresources);
566566
double currentintakeatm = 0;
567567
foreach (PartResource partresource in partresources) {
568568
currentintakeatm += partresource.amount;

‎FNPlugin/FNNozzleControllerFX.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void updatePropellantBar() {
178178
float maxpropellant = 0;
179179

180180
List<PartResource> partresources = new List<PartResource>();
181-
part.GetConnectedResources(myAttachedEngine.propellants[0].id, partresources);
181+
part.GetConnectedResources(myAttachedEngine.propellants[0].id, PartResourceLibrary.Instance.GetDefinition(myAttachedEngine.propellants[0].name).resourceFlowMode, partresources);
182182

183183
foreach (PartResource partresource in partresources) {
184184
currentpropellant += (float) partresource.amount;
@@ -254,7 +254,7 @@ public void setupPropellants() {
254254
curEngine_propellants_list = myAttachedEngine.propellants;
255255
foreach(Propellant curEngine_propellant in curEngine_propellants_list) {
256256
List<PartResource> partresources = new List<PartResource>();
257-
part.GetConnectedResources(curEngine_propellant.id, partresources);
257+
part.GetConnectedResources(curEngine_propellant.id, PartResourceLibrary.Instance.GetDefinition(curEngine_propellant.name).resourceFlowMode, partresources);
258258

259259
if (partresources.Count == 0 || !PartResourceLibrary.Instance.resourceDefinitions.Contains(list_of_propellants[0].name)) {
260260
next_propellant = true;
@@ -479,7 +479,7 @@ public static double getIntakeAvailable(Vessel vess, string resourcename) {
479479
}
480480

481481
List<PartResource> partresources = new List<PartResource> ();
482-
vess.rootPart.GetConnectedResources (PartResourceLibrary.Instance.GetDefinition (resourcename).id, partresources);
482+
vess.rootPart.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition(resourcename).id, PartResourceLibrary.Instance.GetDefinition(resourcename).resourceFlowMode, partresources);
483483
double currentintakeatm = 0;
484484
foreach (PartResource partresource in partresources) {
485485
currentintakeatm += partresource.amount;

‎FNPlugin/FNNuclearReactor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void ManualShutdown() {
3737
[KSPEvent(guiName = "Refuel UF4", externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 3.0f)]
3838
public void RefuelUranium() {
3939
List<PartResource> uf6_resources = new List<PartResource>();
40-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("UF4").id, uf6_resources);
40+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("UF4").id, PartResourceLibrary.Instance.GetDefinition("UF4").resourceFlowMode, uf6_resources);
4141
double spare_capacity_for_uf6 = Math.Max(uf4.maxAmount - uf4.amount - actinides.amount, 0);
4242
foreach (PartResource uf6_resource in uf6_resources) {
4343
if (uf6_resource.part.FindModulesImplementing<FNNuclearReactor>().Count == 0) {
@@ -53,7 +53,7 @@ public void RefuelUranium() {
5353
[KSPEvent(guiName = "Refuel ThF4", externalToEVAOnly = true, guiActiveUnfocused = true, unfocusedRange = 3.0f)]
5454
public void RefuelThorium() {
5555
List<PartResource> th4_resources = new List<PartResource>();
56-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ThF4").id, th4_resources);
56+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ThF4").id, PartResourceLibrary.Instance.GetDefinition("ThF4").resourceFlowMode, th4_resources);
5757
double spare_capacity_for_thf4 = Math.Max(thf4.maxAmount - thf4.amount - actinides.amount, 0);
5858
foreach (PartResource thf4_resource in th4_resources) {
5959
if (thf4_resource.part.FindModulesImplementing<FNNuclearReactor>().Count == 0) {
@@ -245,7 +245,7 @@ protected void setUraniumFuel() {
245245

246246
protected void defuelThorium() {
247247
List<PartResource> swap_resource_list = new List<PartResource>();
248-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ThF4").id, swap_resource_list);
248+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("ThF4").id, PartResourceLibrary.Instance.GetDefinition("ThF4").resourceFlowMode, swap_resource_list);
249249
foreach (PartResource thf4_resource in swap_resource_list) {
250250
if (thf4_resource.part.FindModulesImplementing<FNNuclearReactor>().Count == 0) {
251251
double spare_capacity_for_thf4 = thf4_resource.maxAmount - thf4_resource.amount;
@@ -258,7 +258,7 @@ protected void defuelThorium() {
258258

259259
protected void defuelUranium() {
260260
List<PartResource> swap_resource_list = new List<PartResource>();
261-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("UF4").id, swap_resource_list);
261+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("UF4").id, PartResourceLibrary.Instance.GetDefinition("UF4").resourceFlowMode, swap_resource_list);
262262
foreach (PartResource uf6_resource in swap_resource_list) {
263263
if (uf6_resource.part.FindModulesImplementing<FNNuclearReactor>().Count == 0) {
264264
double spare_capacity_for_uf6 = uf6_resource.maxAmount - uf6_resource.amount;

‎FNPlugin/FNReactor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,14 @@ public override void OnStart(PartModule.StartState state) {
256256
if (breedtritium) {
257257
tritium_rate = (float)(ThermalPower / 1000.0f / GameConstants.tritiumBreedRate) * (1 - chargedParticleRatio);
258258
List<PartResource> lithium_resources = new List<PartResource>();
259-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Lithium").id, lithium_resources);
259+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Lithium").id, PartResourceLibrary.Instance.GetDefinition("Lithium").resourceFlowMode, lithium_resources);
260260
double lithium_current_amount = 0;
261261
foreach (PartResource lithium_resource in lithium_resources) {
262262
lithium_current_amount += lithium_resource.amount;
263263
}
264264

265265
List<PartResource> tritium_resources = new List<PartResource>();
266-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Tritium").id, tritium_resources);
266+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Tritium").id, PartResourceLibrary.Instance.GetDefinition("Tritium").resourceFlowMode, tritium_resources);
267267
double tritium_missing_amount = 0;
268268
foreach (PartResource tritium_resource in tritium_resources) {
269269
tritium_missing_amount += tritium_resource.maxAmount - tritium_resource.amount;

‎FNPlugin/ScienceModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public override void OnStart(PartModule.StartState state) {
192192
double time_diff = now - last_active_time;
193193

194194
List<PartResource> partresources = new List<PartResource>();
195-
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, partresources);
195+
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition("Antimatter").id, PartResourceLibrary.Instance.GetDefinition("Antimatter").resourceFlowMode, partresources);
196196
float currentAntimatter_missing = 0;
197197
foreach (PartResource partresource in partresources) {
198198
currentAntimatter_missing += (float)(partresource.maxAmount - partresource.amount);

0 commit comments

Comments
 (0)