Skip to content

Commit

Permalink
V1.1
Browse files Browse the repository at this point in the history
Fix for KSP 1.0.x
Part Nodes fixed
Compile against .NET 3.5 framework
  • Loading branch information
Jamie Leighton committed May 20, 2015
1 parent 66e55f5 commit 81629aa
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 25 deletions.
Binary file added DeepFreeze.zip
Binary file not shown.
1 change: 0 additions & 1 deletion DeepFreeze/DeepFreeze.version

This file was deleted.

2 changes: 1 addition & 1 deletion DeepFreeze/Parts/CryoFreezer/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mesh = model
rescaleFactor = 1

node_stack_top = 0.0, 1.830905, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.830905, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.830905, 0.0, 0.0, -1.0, 0.0, 2


TechRequired = specializedConstruction
Expand Down
Binary file modified DeepFreeze/Plugins/DeepFreeze.dll
Binary file not shown.
10 changes: 7 additions & 3 deletions Source/DeeFreezeEvents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using DeepFreezer;


namespace DeepFreezer
Expand All @@ -29,6 +27,7 @@ public void DeepFreezeEventAdd()
GameEvents.onVesselTerminated.Add(this.onVesselTerminated);
GameEvents.onVesselWillDestroy.Add(this.onVesselWillDestroy);
eventAdded = true;
Debug.Log("DeepFreezeEventAdd ended");
}


Expand Down Expand Up @@ -58,7 +57,7 @@ public void OnVesselRecoveryRequested(Vessel vessel)

public void onVesselRecovered(ProtoVessel vessel)
{
//Debug.Log("onVesselRecovered");
Debug.Log("onVesselRecovered");
List<ProtoPartSnapshot> partList = vessel.protoPartSnapshots;
foreach (ProtoPartSnapshot a in partList)
{
Expand All @@ -81,6 +80,7 @@ public void onVesselRecovered(ProtoVessel vessel)

public void onVesselTerminated(ProtoVessel vessel)
{
Debug.Log("onVesselTerminated");
List<ProtoPartSnapshot> partList = vessel.protoPartSnapshots;
foreach (ProtoPartSnapshot a in partList)
{
Expand All @@ -100,6 +100,7 @@ public void onVesselTerminated(ProtoVessel vessel)

public void onVesselWillDestroy(Vessel vessel)
{
Debug.Log("onVesselWillDestroy");
ProtoVessel pvessel;
pvessel = vessel.protoVessel;
List<ProtoPartSnapshot> partList = pvessel.protoPartSnapshots;
Expand All @@ -123,9 +124,11 @@ public void onVesselWillDestroy(Vessel vessel)

public void ThawFrozenCrew(String FrozenCrew)
{
Debug.Log("ThawFrozenCrew");
List<String> StoredCrew = FrozenCrew.Split(',').ToList();
foreach (string frozenkerbal in StoredCrew)
{
Debug.Log("frozenkerbal =" + frozenkerbal);
foreach (ProtoCrewMember kerbal in HighLogic.CurrentGame.CrewRoster.Crew) //There's probably a more efficient way to find Protocrewmember from the CrewRoster
{
if (kerbal.name == frozenkerbal)
Expand All @@ -138,6 +141,7 @@ public void ThawFrozenCrew(String FrozenCrew)
}
public void KillFrozenCrew(string FrozenCrew)
{
Debug.Log("KillFrozenCrew");
List<String> StoredCrew = FrozenCrew.Split(',').ToList();
foreach (string frozenkerbal in StoredCrew)
{
Expand Down
11 changes: 5 additions & 6 deletions Source/DeepFreeze.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DeepFreeze</RootNamespace>
<AssemblyName>DeepFreeze</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -31,25 +32,23 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>C:\KSP-Dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\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:\KSP-Dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DeeFreezeEvents.cs" />
<Compile Include="DeepFreezer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<None Include="utilities.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand Down
27 changes: 15 additions & 12 deletions Source/DeepFreezer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Linq;
using System.Text;
using UnityEngine;
using DeepFreezer;


namespace DeepFreezer
Expand All @@ -14,12 +13,12 @@ class DeepFreeze : MonoBehaviour

public void Start()
{
//Debug.Log("Start called");
Debug.Log("Start called");
if (!DeepFreezeEvents.instance.eventAdded)
//{
{
DeepFreezeEvents.instance.DeepFreezeEventAdd();
Debug.Log("!DeepFreezeEvents.instance.eventAdded");
// }
}
}


Expand All @@ -28,7 +27,7 @@ public class DeepFreezer : PartModule
{
private float lastUpdate = 0.0f;

private float updatetnterval = .5f;
private float updatetnterval = .5f;


[KSPField(isPersistant = true, guiActive = false, guiName = "FC")] //This string value is the names of frozen crew, it is turned into a list called StoredCrew during loaded. We keep this string current and it get's saved to the persistant.sfs on save.
Expand Down Expand Up @@ -142,13 +141,14 @@ public void FixedUpdate()

public override void OnLoad(ConfigNode node)
{
Debug.Log("onLoad");
//ChargeRequired = 3000;
//ChargeRate = 20;
Int32.TryParse(node.GetValue("ChargeRequired"), out ChargeRequired);
Int32.TryParse(node.GetValue("ChargeRate"), out ChargeRate);
IsCrewableWhenFull = Convert.ToBoolean(node.GetValue("IsCrewableWhenFull"));
FrozenCrew = node.GetValue("FrozenCrew");
//Debug.Log(FrozenCrew);
Debug.Log(FrozenCrew);
LoadFrozenCrew();
}

Expand Down Expand Up @@ -183,11 +183,11 @@ public override void OnStart(PartModule.StartState state)
public override void OnSave(ConfigNode node)
{
node.SetValue("FrozenCrew", FrozenCrew);
//Debug.Log("OnSave: " + node);
Debug.Log("OnSave: " + node);
}
public override void OnInactive()
{
//Debug.Log("OnInactive" + FrozenCrew);
Debug.Log("OnInactive" + FrozenCrew);
part.CrewCapacity = StoredCrew.Count;
foreach (var crewmember in StoredCrew)
{
Expand All @@ -211,6 +211,7 @@ public override void OnInactive()

private void UpdateEvents()
{
//Debug.Log("UpdateEvents");
UpdateCounts();
Events.Clear();
if (!IsThawActive && !IsFreezeActive)
Expand All @@ -220,6 +221,7 @@ private void UpdateEvents()
part.CrewCapacity = 1;
foreach (var CrewMember in part.protoModuleCrew)
{
//Debug.Log("Add freeze event " + CrewMember.name);
Events.Add(new BaseEvent(Events, "Freeze " + CrewMember.name, () =>
{
if ((FreezerSize - StoredCrew.Count) > 0 && part.protoModuleCrew.Contains(CrewMember))
Expand All @@ -242,6 +244,7 @@ private void UpdateEvents()
if ((part.protoModuleCrew.Count < part.CrewCapacity) || part.CrewCapacity <= 0)
foreach (var frozenkerbal in StoredCrew)
{
//Debug.Log("Add thaw event " + frozenkerbal);
Events.Add(new BaseEvent(Events, "Thaw" + frozenkerbal, () =>
{
if (StoredCrew.Contains(frozenkerbal))
Expand All @@ -266,13 +269,13 @@ private void UpdateEvents()
public void FreezeKerbal(ProtoCrewMember CrewMember)
{

//Debug.Log("Freeze kerbal called");
Debug.Log("Freeze kerbal called");
part.CrewCapacity = 0;
part.RemoveCrewmember(CrewMember);
ActiveKerbal = CrewMember;
IsFreezeActive = true;
ScreenMessages.PostScreenMessage("Starting Freeze", 5.0f, ScreenMessageStyle.UPPER_CENTER);
//Debug.Log("FrozenCrew =" + FrozenCrew);
Debug.Log("FrozenCrew =" + FrozenCrew);
UpdateCounts();
Events.Clear();
hatch_lock.Play();
Expand Down Expand Up @@ -324,12 +327,12 @@ public void ThawKerbalConfirm(String frozenkerbal)
part.CrewCapacity = 1;
part.AddCrewmember(kerbal);
ScreenMessages.PostScreenMessage(kerbal.name + " thawed out.", 5.0f, ScreenMessageStyle.UPPER_CENTER);
//Debug.Log(StoredCrew.Remove(kerbal.name));
Debug.Log(StoredCrew.Remove(kerbal.name));
ToThawKerbal = null;
IsThawActive = false;

FrozenCrew = String.Join(",", StoredCrew.ToArray());
//Debug.Log("FrozenCrew =" + FrozenCrew);
Debug.Log("FrozenCrew =" + FrozenCrew);
UpdateCounts();
Events.Clear();
ding_ding.Play();
Expand Down
4 changes: 2 additions & 2 deletions Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]

0 comments on commit 81629aa

Please sign in to comment.