7.3 Pre - 1.2 Compatibility Fixes

snjo · Sep 14, 2016 · 632e3cd · 632e3cd
1 parent 2c761e9
commit 632e3cd
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 61 deletions.
diff --git a/Firespitter/Firespitter.csproj b/Firespitter/Firespitter.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\KSP_DEV\GameData\Firespitter\Plugins\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -33,25 +33,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Assembly-CSharp-firstpass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="KSPUtil">
-      <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\KSPUtil.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="UnityEngine">
       <HintPath>..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
@@ -157,7 +153,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy Firespitter.dll D:\Dropbox\KSP_DEV\GameData\Firespitter\Plugins</PostBuildEvent>
+    <PostBuildEvent>"D:\Games\pdb2mdb\pdb2mdb.exe" "$(TargetFileName)"
+</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Firespitter/Properties/AssemblyInfo.cs b/Firespitter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.1.*")]
+[assembly: AssemblyVersion("7.3.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Firespitter/aero/FSwingBase.cs b/Firespitter/aero/FSwingBase.cs
@@ -157,7 +157,7 @@ public virtual bool isMaster()
     private Vector3 ctrllSrfDefRot = new Vector3();
     private Vector3 flapDefRot = new Vector3();
 
-    private ControlSurface stockWingModule;
+    private ModuleControlSurface stockWingModule;
     private FSliftSurface mainLift;
     private float mainLiftAreaDefault;
 
@@ -475,7 +475,7 @@ public override void OnStart(PartModule.StartState state)
             if (affectStockWingModule)
             {
                 //Debug.Log("FSwing: getting stock wing module");
-                stockWingModule = part as ControlSurface;
+                stockWingModule = part.FindModuleImplementing<ModuleControlSurface>();
                 if (stockWingModule != null)
                 {
                     //Debug.Log("FSwing: success");

diff --git a/Firespitter/aero/FSwingletRangeAdjustment.cs b/Firespitter/aero/FSwingletRangeAdjustment.cs
@@ -5,7 +5,7 @@
 public class FSwingletRangeAdjustment : PartModule
 {
     private float defaultRange;
-    ControlSurface winglet = new ControlSurface();
+    ModuleControlSurface winglet = new ModuleControlSurface();
     private bool FARActive = false;
 
     [KSPField]
@@ -115,7 +115,7 @@ public override void OnStart(PartModule.StartState state)
         else
         {
             //winglet = part.Modules.OfType<ControlSurface>().FirstOrDefault();
-            winglet = part as ControlSurface;
+            winglet = part.FindModuleImplementing<ModuleControlSurface>();
             defaultRange = winglet.ctrlSurfaceRange;
             if (!currentControlRangeSet)
             {

diff --git a/Firespitter/cockpit/FSfuelGauge.cs b/Firespitter/cockpit/FSfuelGauge.cs
@@ -60,9 +60,11 @@ private void getResourceList()
         resourceList.Clear();
         vesselNumParts = vessel.Parts.Count;        
         foreach (Part part in vessel.parts)
-        {            
-            foreach (PartResource resource in part.Resources)
-            {                
+        {
+            var rCount = part.Resources.Count;
+            for (int i = 0; 0 < rCount; ++i)
+            {
+                var resource = part.Resources[i];
                 if (resource.resourceName == resourceName)
                 {
                     resourceList.Add(resource);

diff --git a/Firespitter/cockpit/FSmonitorInterface.cs b/Firespitter/cockpit/FSmonitorInterface.cs
@@ -189,8 +189,10 @@ private void getResourceList()
             vesselNumParts = vessel.Parts.Count;
             foreach (Part part in vessel.parts)
             {
-                foreach (PartResource resource in part.Resources)
+                var rCount = part.Resources.Count;
+                for (int i = 0; 0 < rCount; ++i)
                 {
+                    var resource = part.Resources[i];
                     if (!resourceDictionary.ContainsKey(resource.resourceName))
                     {
                         resourceDictionary.Add(resource.resourceName, new Vector2d(resource.amount, resource.maxAmount));

diff --git a/Firespitter/customization/FSfuelSwitch.cs b/Firespitter/customization/FSfuelSwitch.cs
@@ -182,12 +182,12 @@ private void assignResourcesToPart(bool calledByPlayer)
 
         private void setupTankInPart(Part currentPart, bool calledByPlayer)
         {
-            currentPart.Resources.list.Clear();
+            currentPart.Resources.dict = new DictionaryValueList<int, PartResource>();
             PartResource[] partResources = currentPart.GetComponents<PartResource>();
-            for (int i = 0; i < partResources.Length; i++)
-            {
-                DestroyImmediate(partResources[i]);
-            }            
+            //for (int i = 0; i < partResources.Length; i++)
+            //{
+            //    DestroyImmediate(partResources[i]);
+            //}            
 
             for (int tankCount = 0; tankCount < tankList.Count; tankCount++)
             {
@@ -220,7 +220,7 @@ private void setupTankInPart(Part currentPart, bool calledByPlayer)
                     }
                 }
             }
-            currentPart.Resources.UpdateList();
+
             updateWeight(currentPart, selectedTankSetup);
             updateCost();
         }

diff --git a/Firespitter/tools/FSversionCheck.cs b/Firespitter/tools/FSversionCheck.cs
@@ -1,38 +1,38 @@
 using UnityEngine;
 using System.Reflection;
 
-    [KSPAddon(KSPAddon.Startup.MainMenu, true)]
-    public class FSversionCheck : MonoBehaviour
-    {
-        static int CompatibleWithMajor = 1;
-        static int CompatibleWithMinor = 0;
-        static int CompatibleWithRevision = 5;
-        static System.Version FSversion;
+    //[KSPAddon(KSPAddon.Startup.MainMenu, true)]
+    //public class FSversionCheck : MonoBehaviour
+    //{
+    //    static int CompatibleWithMajor = 1;
+    //    static int CompatibleWithMinor = 0;
+    //    static int CompatibleWithRevision = 5;
+    //    static System.Version FSversion;
 
-        public void Start()
-        {
-            FSversion = Assembly.GetExecutingAssembly().GetName().Version;            
-            Debug.Log("firespitter.dll version: " + FSversion.ToString() + ", compiled for KSP " + CompatibleWithMajor + "." + CompatibleWithMinor + "." + CompatibleWithRevision);
-        }
+    //    public void Start()
+    //    {
+    //        FSversion = Assembly.GetExecutingAssembly().GetName().Version;            
+    //        Debug.Log("firespitter.dll version: " + FSversion.ToString() + ", compiled for KSP " + CompatibleWithMajor + "." + CompatibleWithMinor + "." + CompatibleWithRevision);
+    //    }
 
-        public static bool IsCompatible()
-        {                        
+    //    public static bool IsCompatible()
+    //    {                        
 
-            if (Versioning.version_major != CompatibleWithMajor
-                ||
-                Versioning.version_minor != CompatibleWithMinor
-                ||
-                Versioning.Revision != CompatibleWithRevision)
-            {
-                //warnPlayer();
-                return false;
-            }
-            else
-                return true;
-        }
+    //        if (Versioning.version_major != CompatibleWithMajor
+    //            ||
+    //            Versioning.version_minor != CompatibleWithMinor
+    //            ||
+    //            Versioning.Revision != CompatibleWithRevision)
+    //        {
+    //            //warnPlayer();
+    //            return false;
+    //        }
+    //        else
+    //            return true;
+    //    }
 
-        internal static bool IsUnityCompatible()
-        {
-            return true;
-        }
-    }
+    //    internal static bool IsUnityCompatible()
+    //    {
+    //        return true;
+    //    }
+    //}
diff --git a/Firespitter/wheel/FSexternalLandingGearControl.cs b/Firespitter/wheel/FSexternalLandingGearControl.cs
@@ -1,12 +1,16 @@
 
+using ModuleWheels;
+
 public class FSexternalLandingGearControl : PartModule
 {
-    private ModuleLandingGear gear;
+    private ModuleWheelDeployment gear;
+    private ModuleWheelBrakes brakes;
 
     public override void OnStart(PartModule.StartState state)
     {
         base.OnStart(state);
-        gear = part.GetComponent<ModuleLandingGear>();
+        gear = part.GetComponent<ModuleWheelDeployment>();
+        brakes = part.GetComponent<ModuleWheelBrakes>();
         if (gear != null)
         {
             gear.Events["LowerLandingGear"].guiActiveUnfocused = true;
@@ -19,18 +23,18 @@ public override void OnStart(PartModule.StartState state)
     [KSPEvent(name = "brakesOn", guiActive = true, active = true, guiName = "Brakes On", externalToEVAOnly = true, unfocusedRange = 6f, guiActiveUnfocused = true)]
     public void brakesOnEvent()
     {
-        if (gear != null)
+        if (gear != null && brakes != null)
         {
-            gear.brakesEngaged = true;
+            brakes.BrakeAction(new KSPActionParam(KSPActionGroup.Brakes, KSPActionType.Activate));
         }
     }
 
     [KSPEvent(name = "brakesOff", guiActive = true, active = true, guiName = "Brakes Off", externalToEVAOnly = true, unfocusedRange = 6f, guiActiveUnfocused = true)]
     public void brakesOffEvent()
     {
-        if (gear != null)
+        if (gear != null && brakes != null)
         {
-            gear.brakesEngaged = false;
+            brakes.BrakeAction(new KSPActionParam(KSPActionGroup.Brakes, KSPActionType.Deactivate));
         }
     }