Skip to content

Patch for 0.24.2 #50

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch for 0.24.2 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 37 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,40 @@ WarpPlugin.dll
*.mu
*.mbm
*.ogg
*.psd
*.psd

#OS junk files
[Tt]humbs.db
*.DS_Store

#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
*.opensdf
*.unsuccessfulbuild
ipch/
[Oo]bj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad

#MonoDevelop
*.pidb
3 changes: 2 additions & 1 deletion OpenResourceSystem/ORSHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public static float fixedRequestResource(Part part, string resourcename, float r
public static double fixedRequestResource(Part part, string resourcename, double resource_amount) {
List<PartResource> prl = new List<PartResource>();
List<Part> parts = new List<Part>();
part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition(resourcename).id, prl);
var part_res = PartResourceLibrary.Instance.GetDefinition(resourcename);
part.GetConnectedResources(part_res.id, part_res.resourceFlowMode, prl);
ResourceFlowMode flow = PartResourceLibrary.Instance.GetDefinition(resourcename).resourceFlowMode;
prl = prl.Where(p => p.flowState == true).ToList();
double max_available = 0;
Expand Down
9 changes: 6 additions & 3 deletions OpenResourceSystem/ORSResourceManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ public double managedPowerSupply(ORSResourceSupplier pm, double power) {

public double getSpareResourceCapacity() {
partresources = new List<PartResource>();
my_part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition(resource_name).id, partresources);
var part_res = PartResourceLibrary.Instance.GetDefinition(resource_name);
my_part.GetConnectedResources(part_res.id, part_res.resourceFlowMode, partresources);
double spare_capacity = 0;
foreach (PartResource partresource in partresources) {
spare_capacity += partresource.maxAmount - partresource.amount;
Expand Down Expand Up @@ -180,7 +181,8 @@ public void update() {

//stored power
List<PartResource> partresources = new List<PartResource>();
my_part.GetConnectedResources(PartResourceLibrary.Instance.GetDefinition(resource_name).id, partresources);
var part_res = PartResourceLibrary.Instance.GetDefinition(resource_name);
my_part.GetConnectedResources(part_res.id, part_res.resourceFlowMode, partresources);
double currentmegajoules = 0;
double maxmegajoules = 0;
foreach (PartResource partresource in partresources) {
Expand Down Expand Up @@ -216,7 +218,8 @@ public void update() {
//Prioritise supplying stock ElectricCharge resource
if (String.Equals(this.resource_name,ORSResourceManager.FNRESOURCE_MEGAJOULES) && stored_stable_supply > 0) {
List<PartResource> partresources2 = new List<PartResource> ();
my_part.GetConnectedResources (PartResourceLibrary.Instance.GetDefinition ("ElectricCharge").id, partresources2);
var part_resource = PartResourceLibrary.Instance.GetDefinition("ElectricCharge");
my_part.GetConnectedResources(part_resource.id, part_resource.resourceFlowMode, partresources2);
double stock_electric_charge_needed = 0;
foreach (PartResource partresource in partresources2) {
stock_electric_charge_needed += partresource.maxAmount - partresource.amount;
Expand Down
5 changes: 2 additions & 3 deletions OpenResourceSystem/OpenResourceSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>C:\Games\Kerbal Space Program 0.23\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>C:\Games\Kerbal Space Program 0.23\KSP_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down