1.32

KSP 1.0 Update
SirDiazo · Apr 28, 2015 · bfda7e1 · bfda7e1
1 parent 86399a3
commit bfda7e1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/AGExt/AGExt.csproj b/AGExt/AGExt.csproj
@@ -25,26 +25,29 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\0.90 Dev\GameData\Diazo\AGExt\</OutputPath>
+    <OutputPath>..\..\..\1.0 Dev\GameData\Diazo\AGExt\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\0.90 Dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+    <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\1.0 dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\..\..\0.90 Dev\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+    <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\1.0 dev\KSP_Data\Managed\Assembly-CSharp-firstpass.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">
-      <HintPath>..\..\..\0.90 Dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\1.0 dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/AGExt/Editor.cs b/AGExt/Editor.cs
@@ -159,7 +159,7 @@ public Vector2 Draw(Vector2 position)
             public void DrawSettingsWinEditor(int WindowID)
             {
 
-                if (GUI.Button(new Rect(10, 25, 130, 25), "Reset Windows",AGXBtnStyle))
+                if (GUI.Button(new Rect(10, 25, 130, 25), "Reset Windows", AGXBtnStyle))
                 {
                     KeySetWin.x = 250;
                     KeySetWin.y = 250;
@@ -546,6 +546,7 @@ public void Start()
                 GameEvents.onPartAttach.Add(PartAttaching);// this game event only fires for part removed, not child parts
                 GameEvents.onPartRemove.Add(PartRemove);
                 GameEvents.onEditorShipModified.Add(VesselChanged);
+                GameEvents.onEditorLoad.Add(OnShipLoad);
                 isDirectAction = new Dictionary<int, bool>();
                 CurrentVesselActions.Clear();
                 EditorLoadFromFile();
@@ -555,7 +556,7 @@ public void Start()
                 //print("Loading now");
                 //EditorActionGroups.Instance.groupActionsList.AddValueChangedDelegate(OnGroupActionsListChange);
                 LoadFinished = true;
-                Debug.Log("AGX Editor Start Okay");
+                //Debug.Log("AGX Editor Start Okay");
             }
             catch (Exception e)
             {
@@ -564,6 +565,21 @@ public void Start()
             }
         }
 
+        public void OnShipLoad(ShipConstruct ship ,CraftBrowser.LoadType loadType)
+        {
+            if (loadType == CraftBrowser.LoadType.Normal)
+            {
+                CurrentVesselActions.Clear();
+                //EditorLoadFromFile();
+                EditorLoadFromNode();
+                //Debug.Log("AGX Ship Load of type NORMAL detected");
+            }
+            else
+            {
+                Debug.Log("AGX Ship Load of type MERGE detected");
+            }
+        }
+
         //public void OnGroupActionsListChange(IUIObject obj)
         //{
         //    print("List change " + obj.GetType());
@@ -1155,6 +1171,7 @@ public void OnDisable()
             GameEvents.onPartAttach.Remove(PartAttaching);
             GameEvents.onPartRemove.Remove(PartRemove);
             GameEvents.onEditorShipModified.Remove(VesselChanged);
+            GameEvents.onEditorLoad.Remove(OnShipLoad);
             //GameEvents.onGameSceneLoadRequested.Remove(LeavingEditor);
 
 
@@ -2374,7 +2391,7 @@ public void SelParts(int WindowID)
 
 
                                     //if (Checking.Count == 0)
-                                    if(!CurrentVesselActions.Contains(ToAdd))
+                                    if (!CurrentVesselActions.Contains(ToAdd))
                                     {
 
                                         CurrentVesselActions.Add(ToAdd);
@@ -2726,7 +2743,7 @@ public void RefreshDefaultActionsList()
                     }
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Debug.Log("AGX RefDefActsList Error " + errLine + " " + e);
             }
@@ -2751,7 +2768,7 @@ public void RefreshDefaultActionsListType()
                     }
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Debug.Log("AGX RefDefActsListType Error " + errLine + " " + e);
             }
@@ -3960,7 +3977,7 @@ public void MonitorDefaultActions()
                     }
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Debug.Log("AGX Monitor Default Actions Error " + errLine + " " + e);
             }

diff --git a/AGExt/Flight.cs b/AGExt/Flight.cs
@@ -5832,7 +5832,7 @@ public static List<AGXAction> CheckActionsActiveActualCode(List<AGXAction> actsL
                     {
                         if (agAct.ba.name == "OnAction")
                         {
-                            //print((string)agAct.ba.listParent.module.Fields.GetValue("storedGearState"));
+                            //print((string)agAct.ba.listParent.module.Fields.GetValue("gearState") + " gear test");
                             if ((string)agAct.ba.listParent.module.Fields.GetValue("storedGearState") == "DEPLOYED")
                             {
                                 agAct.activated = true;

diff --git a/AGExt/Instantly.cs b/AGExt/Instantly.cs
@@ -13,7 +13,7 @@ public class AGXMainMenu :PartModule
         //abandoned module, no longer needed for key rebinding
         public void Start()
         {
-            print("AGExt Ver. 1.31h loaded");
+            print("AGExt Ver. 1.32 loaded");
 
 
         }