Added cancel option to delayed Kaboom.

russnash · Dec 26, 2014 · 3b0440a · 3b0440a
1 parent c24fde3
commit 3b0440a
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 6 deletions.
diff --git a/GameData/Kaboom/plugins/Kaboom.dll b/GameData/Kaboom/plugins/Kaboom.dll
diff --git a/Kaboom-1.1.0.zip b/Kaboom-1.1.0.zip
diff --git a/Source/Kaboom.v12.suo b/Source/Kaboom.v12.suo
diff --git a/Source/Kaboom/Kaboom.cs b/Source/Kaboom/Kaboom.cs
@@ -17,12 +17,18 @@ public class Kaboom : PartModule
         [KSPField(isPersistant = true)]
         public double kaboomTime;
 
-        [KSPEvent(guiActive = true, guiActiveUnfocused = true, unfocusedRange = 2f, guiName = "Kaboom!")]
+        [KSPEvent(guiActive = true, guiActiveUnfocused = true, unfocusedRange = 5f, guiName = "Kaboom!", active = true)]
         public void KaboomEvent()
         {
             KaboomIt();
         }
 
+        [KSPEvent(guiActive = true, guiActiveUnfocused = true, unfocusedRange = 5f, guiName = "Cancel Kaboom!", active = false)]
+        public void CancelKaboomEvent()
+        {
+            CancelKaboomIt();
+        }
+
         [KSPAction("Kaboom!")]
         public void KaboomAction(KSPActionParam param)
         {
@@ -31,6 +37,8 @@ public void KaboomAction(KSPActionParam param)
 
         private void KaboomIt()
         {
+            Events["CancelKaboomEvent"].active = true;
+            Events["KaboomEvent"].active = false;
             part.force_activate();
 
             if (delay == 0)
@@ -39,14 +47,23 @@ private void KaboomIt()
             }
             else
             {
+                ScreenMessages.PostScreenMessage("Kaboom set for " + delay + " seconds.", 5.0f, ScreenMessageStyle.UPPER_CENTER);
                 kaboomTime = Planetarium.GetUniversalTime() + delay;
                 timerActive = true;
             }
         }
 
+        private void CancelKaboomIt()
+        {
+            Events["CancelKaboomEvent"].active = false;
+            Events["KaboomEvent"].active = true;
+            ScreenMessages.PostScreenMessage("Kaboom cancelled.", 5.0f, ScreenMessageStyle.UPPER_CENTER);
+            timerActive = false;
+        }
+
         public override void OnUpdate()
         {
-            base.OnFixedUpdate();
+            base.OnUpdate();
             if (timerActive)
             {
                 if (Planetarium.GetUniversalTime() >= kaboomTime)

diff --git a/Source/Kaboom/Kaboom.csproj b/Source/Kaboom/Kaboom.csproj
@@ -31,8 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\..\..\..\KSP_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+    <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\KSP_MOD\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -41,8 +42,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\..\..\KSP_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\KSP_MOD\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Kaboom/bin/Debug/Kaboom.dll b/Source/Kaboom/bin/Debug/Kaboom.dll
diff --git a/...m/bin/Debug/Assembly-CSharp-firstpass.dll → ...bin/Release/Assembly-CSharp-firstpass.dll b/...m/bin/Debug/Assembly-CSharp-firstpass.dll → ...bin/Release/Assembly-CSharp-firstpass.dll
diff --git a/Source/Kaboom/bin/Debug/Assembly-CSharp.dll → ...ce/Kaboom/bin/Release/Assembly-CSharp.dll b/Source/Kaboom/bin/Debug/Assembly-CSharp.dll → ...ce/Kaboom/bin/Release/Assembly-CSharp.dll
diff --git a/Source/Kaboom/bin/Release/Kaboom.dll b/Source/Kaboom/bin/Release/Kaboom.dll
diff --git a/Source/Kaboom/obj/Debug/Kaboom.pdb → Source/Kaboom/bin/Release/Kaboom.pdb b/Source/Kaboom/obj/Debug/Kaboom.pdb → Source/Kaboom/bin/Release/Kaboom.pdb
diff --git a/Source/Kaboom/bin/Debug/Mono.Cecil.dll → Source/Kaboom/bin/Release/Mono.Cecil.dll b/Source/Kaboom/bin/Debug/Mono.Cecil.dll → Source/Kaboom/bin/Release/Mono.Cecil.dll
diff --git a/Source/Kaboom/bin/Debug/Mono.Security.dll → Source/Kaboom/bin/Release/Mono.Security.dll b/Source/Kaboom/bin/Debug/Mono.Security.dll → Source/Kaboom/bin/Release/Mono.Security.dll
diff --git a/Source/Kaboom/bin/Debug/TDx.TDxInput.dll → Source/Kaboom/bin/Release/TDx.TDxInput.dll b/Source/Kaboom/bin/Debug/TDx.TDxInput.dll → Source/Kaboom/bin/Release/TDx.TDxInput.dll
diff --git a/Source/Kaboom/bin/Debug/UnityEngine.dll → Source/Kaboom/bin/Release/UnityEngine.dll b/Source/Kaboom/bin/Debug/UnityEngine.dll → Source/Kaboom/bin/Release/UnityEngine.dll
diff --git a/Source/Kaboom/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Source/Kaboom/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Source/Kaboom/obj/Debug/Kaboom.dll b/Source/Kaboom/obj/Debug/Kaboom.dll
diff --git a/Source/Kaboom/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Source/Kaboom/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Source/Kaboom/obj/Release/Kaboom.csproj.FileListAbsolute.txt b/Source/Kaboom/obj/Release/Kaboom.csproj.FileListAbsolute.txt
@@ -0,0 +1,11 @@
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Kaboom.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Kaboom.pdb
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Assembly-CSharp.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\UnityEngine.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Assembly-CSharp-firstpass.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\TDx.TDxInput.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Mono.Cecil.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\bin\Release\Mono.Security.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\obj\Release\Kaboom.csprojResolveAssemblyReference.cache
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\obj\Release\Kaboom.dll
+C:\Users\Russ\Documents\GitHub\Kaboom\Source\Kaboom\obj\Release\Kaboom.pdb
diff --git a/...boom.csprojResolveAssemblyReference.cache → ...boom.csprojResolveAssemblyReference.cache b/...boom.csprojResolveAssemblyReference.cache → ...boom.csprojResolveAssemblyReference.cache
diff --git a/Source/Kaboom/obj/Release/Kaboom.dll b/Source/Kaboom/obj/Release/Kaboom.dll
diff --git a/Source/Kaboom/bin/Debug/Kaboom.pdb → Source/Kaboom/obj/Release/Kaboom.pdb b/Source/Kaboom/bin/Debug/Kaboom.pdb → Source/Kaboom/obj/Release/Kaboom.pdb