Skip to content
This repository was archived by the owner on Oct 26, 2020. It is now read-only.

Commit 653b18e

Browse files
magico13magico13
committed
Compile for KSP 1.4.1. Move NIMBY Beacons file to PluginData
1 parent 18c6451 commit 653b18e

File tree

11 files changed

+37
-43
lines changed

11 files changed

+37
-43
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,6 @@ FakesAssemblies/
186186
# LightSwitch generated files
187187
GeneratedArtifacts/
188188
_Pvt_Extensions/
189-
ModelManifest.xml
189+
ModelManifest.xml
190+
/.vs/Modlets/v15/Server/sqlite3
191+
/.vs/slnx.sqlite

‎Dated_QuickSaves/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("DatedQuickSaves")]
13-
[assembly: AssemblyCopyright("Copyright © 2017")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.4.0")]
36-
[assembly: AssemblyFileVersion("1.1.4.0")]
35+
[assembly: AssemblyVersion("1.1.5.0")]
36+
[assembly: AssemblyFileVersion("1.1.5.0")]

‎EditorTime/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("EditorTime")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.5.0")]
36-
[assembly: AssemblyFileVersion("1.0.5.0")]
35+
[assembly: AssemblyVersion("1.0.6.0")]
36+
[assembly: AssemblyFileVersion("1.0.6.0")]

‎GameData/NIMBY/.version

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"NAME":"NIMBY",
3-
"VERSION":"1.1.0.0",
3+
"VERSION":"1.1.1.0",
44
"KSP_VERSION":{
55
"MAJOR":1,
6-
"MINOR":3,
7-
"PATCH":0
6+
"MINOR":4,
7+
"PATCH":1
88
},
99
"KSP_VERSION_MIN":{
1010
"MAJOR":1,
11-
"MINOR":2,
12-
"PATCH":2
11+
"MINOR":4,
12+
"PATCH":0
1313
},
1414
"KSP_VERSION_MAX":{
1515
"MAJOR":1,
16-
"MINOR":3,
17-
"PATCH":0
16+
"MINOR":4,
17+
"PATCH":8
1818
}
1919
}

‎NotInMyBackYard/NotInMyBackYard.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class NotInMyBackYard : MonoBehaviour
1717
public void Start()
1818
{
1919
//initialize beacons
20-
LoadBeacons(KSPUtil.ApplicationRootPath+"/GameData/NIMBY/Beacons.cfg", true);
20+
LoadBeacons(KSPUtil.ApplicationRootPath+"/GameData/NIMBY/PluginData/Beacons.cfg", true);
2121
}
2222

2323
public void LoadBeacons(string beaconFile, bool createIfNotExists = false)
@@ -105,12 +105,16 @@ public IList<IBeacon> GetAllBeacons()
105105
//find all vessels that have a mobile beacon module
106106
foreach (Vessel vessel in FlightGlobals.Vessels)
107107
{
108+
if (vessel == FlightGlobals.ActiveVessel)
109+
{
110+
continue;
111+
}
108112
//make sure it's active
109113
IEnumerable<ModuleMobileRecoveryBeacon> modules;
110114
if (vessel.loaded && (modules = vessel.Parts.Select(p => p.Modules.GetModule<ModuleMobileRecoveryBeacon>())) != null)
111115
{
112116
Debug.Log($"[NIMBY] {vessel.GetDisplayName()} has module");
113-
IBeacon active = modules.FirstOrDefault(m => m.Active);
117+
IBeacon active = modules?.FirstOrDefault(m => m?.Active ?? false);
114118
if (active != null)
115119
{
116120
Debug.Log($"[NIMBY] Module is Active.");

‎NotInMyBackYard/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("NotInMyBackYard")]
13-
[assembly: AssemblyCopyright("Copyright © 2017")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.0.0")]
36-
[assembly: AssemblyFileVersion("1.1.0.0")]
35+
[assembly: AssemblyVersion("1.1.1.0")]
36+
[assembly: AssemblyFileVersion("1.1.1.0")]

‎Sensible_Screenshot/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("SensibleScreenshot")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.3.0")]
36-
[assembly: AssemblyFileVersion("1.2.3.0")]
35+
[assembly: AssemblyVersion("1.2.4.0")]
36+
[assembly: AssemblyFileVersion("1.2.4.0")]

‎ShipSaveSplicer/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("ShipSaveSplicer")]
13-
[assembly: AssemblyCopyright("Copyright © 2017")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.3.0")]
36-
[assembly: AssemblyFileVersion("1.1.3.0")]
35+
[assembly: AssemblyVersion("1.1.4.0")]
36+
[assembly: AssemblyFileVersion("1.1.4.0")]

‎ShipSaveSplicer/ShipSaveSplicer.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ public void OnClick()
6565
SpaceTracking trackingStation = (SpaceTracking)FindObjectOfType(typeof(SpaceTracking));
6666
Vessel selectedVessel = trackingStation.SelectedVessel;
6767

68-
//1.2 made this non-private
69-
//foreach (FieldInfo f in trackingStation.GetType().GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
70-
//{
71-
// if (f.FieldType == typeof(Vessel))
72-
// {
73-
// //FYI: the first one (0) is the currently selected vessel
74-
// //The second one (1) is the one that the mouse is hovering over
75-
// selectedVessel = f.GetValue(trackingStation) as Vessel;
76-
// break;
77-
// }
78-
//}
79-
8068
if (ctrlHeld || includeCrew) //ctrl or modifier held
8169
{
8270
OpenImportWindow();

‎TreeToppler/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("TreeToppler")]
13-
[assembly: AssemblyCopyright("Copyright © 2017")]
13+
[assembly: AssemblyCopyright("Copyright © 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.2.0")]
36-
[assembly: AssemblyFileVersion("1.1.2.0")]
35+
[assembly: AssemblyVersion("1.1.3.0")]
36+
[assembly: AssemblyFileVersion("1.1.3.0")]

0 commit comments

Comments
 (0)