diff --git a/.gitignore b/.gitignore index 729c0934..186134b5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,40 @@ WarpPlugin.dll *.mu *.mbm *.ogg -*.psd \ No newline at end of file +*.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 \ No newline at end of file diff --git a/OpenResourceSystem/ORSHelper.cs b/OpenResourceSystem/ORSHelper.cs index 7cdfabd8..c1c811d7 100644 --- a/OpenResourceSystem/ORSHelper.cs +++ b/OpenResourceSystem/ORSHelper.cs @@ -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 prl = new List(); List parts = new List(); - 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; diff --git a/OpenResourceSystem/ORSResourceManager.cs b/OpenResourceSystem/ORSResourceManager.cs index f2c117ec..4f420042 100644 --- a/OpenResourceSystem/ORSResourceManager.cs +++ b/OpenResourceSystem/ORSResourceManager.cs @@ -107,7 +107,8 @@ public double managedPowerSupply(ORSResourceSupplier pm, double power) { public double getSpareResourceCapacity() { partresources = new List(); - 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; @@ -180,7 +181,8 @@ public void update() { //stored power List partresources = new List(); - 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) { @@ -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 partresources2 = new List (); - 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; diff --git a/OpenResourceSystem/OpenResourceSystem.csproj b/OpenResourceSystem/OpenResourceSystem.csproj index fe4502ae..17475bd8 100644 --- a/OpenResourceSystem/OpenResourceSystem.csproj +++ b/OpenResourceSystem/OpenResourceSystem.csproj @@ -32,17 +32,16 @@ - C:\Games\Kerbal Space Program 0.23\KSP_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll - - C:\Games\Kerbal Space Program 0.23\KSP_Data\Managed\UnityEngine.dll + ..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll