Merge pull request #377 from ihsoft/next

Release v1.27
ihsoft · Dec 24, 2020 · a20ada1 · a20ada1
2 parents db770d0 + 229fcf9
commit a20ada1
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.27 (December 23rd, 2020):
+* [Enhancement] Check for colliders when node attaching a part.
+* [Enhancement] Add KIS inventory to the stock inventory parts: SEQ-9 & SEQ-24.
+* [Enhancement] Allow the new stock modules to be stackable.
+* [Enhancement #376] The new stock ground lights won't align properly on deploy.
+* [Fix #374] Some stock science parts cannot be added into the KIS inventory.
+* [Fix #375] Make the dropped KIS parts visible to the stock inventory system.
+
 # 1.26 (July 18th, 2020):
 * [Change] Switch to `MiniAVC-V2`.
 * [Enhancement] Add a new fun part: Snacks!

diff --git a/Deps/CommunityCategoryKit/CCK.dll b/Deps/CommunityCategoryKit/CCK.dll
diff --git a/Deps/CommunityCategoryKit/CCK.version b/Deps/CommunityCategoryKit/CCK.version
@@ -25,7 +25,7 @@
     "VERSION": {
         "BUILD": 0, 
         "MAJOR": 5, 
-        "MINOR": 1, 
+        "MINOR": 2, 
         "PATCH": 0
     }
 }
diff --git a/Deps/CommunityCategoryKit/CHANGELOG.txt b/Deps/CommunityCategoryKit/CHANGELOG.txt
@@ -1,3 +1,7 @@
+5.2.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
 4.3.0 - 2019.10.28
 ------------------
 KSP 1.8.x Compatibility

diff --git a/Deps/CommunityCategoryKit/common-filters.cfg b/Deps/CommunityCategoryKit/common-filters.cfg
@@ -8,7 +8,8 @@ CCKCommonFilterConfig
   {
     name = Containers
     tag = cck-containers
-    normalIcon = CommunityCategoryKit/icons/Containers
+    normalIcon = CommunityCategoryKit/icons/Containers_N
+    selectedIcon = CommunityCategoryKit/icons/Containers_S
     usedByMod = Kerbal Inventory System (KIS)
     usedByMod = Kerbal Attachment System (KAS)
   }

diff --git a/Deps/CommunityCategoryKit/icons/Containers_N.png b/Deps/CommunityCategoryKit/icons/Containers_N.png
diff --git a/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png b/...CommunityCategoryKit/icons/Containers.png → ...mmunityCategoryKit/icons/Containers_S.png
diff --git a/KIS.version b/KIS.version
@@ -19,9 +19,9 @@
     "NAME": "Kerbal Inventory System", 
     "URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version", 
     "VERSION": {
-        "BUILD": 42051, 
+        "BUILD": 37622, 
         "MAJOR": 1, 
-        "MINOR": 26, 
-        "PATCH": 7504
+        "MINOR": 27, 
+        "PATCH": 7662
     }
 }
diff --git a/Patches/MM-StockParts.cfg b/Patches/MM-StockParts.cfg
@@ -60,3 +60,53 @@
 		meshPath = mount
 	}
 }
+
+@PART[cargoContainer]
+{
+	MODULE
+	{
+		name = ModuleKISInventory
+		maxVolume = 650
+		externalAccess = true
+		internalAccess = true
+		slotsX = 3
+		slotsY = 4
+		slotSize = 50
+		itemIconResolution = 128
+		selfIconResolution = 128
+		openSndPath = KIS/Sounds/containerOpen
+		closeSndPath = KIS/Sounds/containerClose
+		defaultMoveSndPath = KIS/Sounds/itemMove
+	}
+	@tags ^= :^:cck-containers :
+}
+
+@PART[CargoStorageUnit]
+{
+	MODULE
+	{
+		name = ModuleKISInventory
+		maxVolume = 2500
+		externalAccess = true
+		internalAccess = true
+		slotsX = 7
+		slotsY = 5
+		slotSize = 50
+		itemIconResolution = 128
+		selfIconResolution = 128
+		openSndPath = KIS/Sounds/containerOpen
+		closeSndPath = KIS/Sounds/containerClose
+		defaultMoveSndPath = KIS/Sounds/itemMove
+	}
+	@tags ^= :^:cck-containers :
+}
+
+@PART[groundLight1]
+{
+	node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
+}
+
+@PART[groundLight2]
+{
+	node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
+}
diff --git a/Source/KISAddonPickup.cs b/Source/KISAddonPickup.cs
@@ -1544,7 +1544,7 @@ bool CheckCanGrabRealPart(Part part) {
       }
     }
     // Don't grab stock game's ground experiments.
-    if (part.Modules.OfType<ModuleGroundPart>().Any()) {
+    if (ModuleKISInventory.forbiddenParts.Contains(part.name)) {
       ReportCheckError(GrabNotOkStatusTooltipTxt, CannotPickupGroundExperimentTooltipTxt);
       return false;
     }

diff --git a/Source/KIS_Shared.cs b/Source/KIS_Shared.cs
@@ -116,7 +116,7 @@ public static void CleanupExternalLinks(Vessel vessel) {
   public static void RenameAssemblyVessel(Part part, Vessel sourceVessel = null) {
     if (sourceVessel == null || part.vessel.parts.Count == 1) {
       // Make a lone part vessel name.
-      part.vessel.vesselType = VesselType.Unknown;
+      part.vessel.vesselType = VesselType.DroppedPart;
       part.vessel.vesselName = part.partInfo.title;
       ModuleKISInventory inv = part.GetComponent<ModuleKISInventory>();
       if (inv && inv.invName.Length > 0) {
@@ -1066,10 +1066,9 @@ static IEnumerator WaitAndMakeLonePart(Part newPart, OnPartReady onPartReady) {
       DebugEx.Warning("Part {0} has died before fully instantiating", newPart);
       yield break;
     }
+    newVessel.vesselType = VesselType.DroppedPart;
 
-    if (onPartReady != null) {
-      onPartReady(newPart);
-    }
+    onPartReady?.Invoke(newPart);
   }
 }
 

diff --git a/Source/ModuleKISInventory.cs b/Source/ModuleKISInventory.cs
@@ -562,10 +562,13 @@ public enum InventoryType {
   public static bool debugContextMenu;
 
   [PersistentField("Editor/PodInventory/addToAllSeats", isCollection = true)]
-  public static List<String> defaultItemsForAllSeats = new List<string>();
+  public static List<string> defaultItemsForAllSeats = new List<string>();
 
   [PersistentField("Editor/PodInventory/addToTheFirstSeatOnly", isCollection = true)]
-  public static List<String> defaultItemsForTheFirstSeat = new List<string>();
+  public static List<string> defaultItemsForTheFirstSeat = new List<string>();
+
+  [PersistentField("Compatibility/forbiddenPart", isCollection = true)]
+  public static List<string> forbiddenParts = new List<string>();
   #endregion
 
   #region Context menu events/actions
@@ -1064,7 +1067,7 @@ public KIS_Item AddItem(ConfigNode partNode, int slot = -1) {
   /// </param>
   /// <returns>The created slot or <c>null</c> if part cannot be added to the inventory.</returns>
   public KIS_Item AddItem(Part p, int qty = 1, int slot = -1) {
-    if (p.Modules.OfType<ModuleCargoPart>().Any()) {
+    if (forbiddenParts.Contains(p.name)) {
       ScreenMessaging.ShowPriorityScreenMessage(CannotAddGroundSciencePartMsg);
       UISounds.PlayBipWrong();
       return null;

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -27,6 +27,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion ("1.26.*")]
-[assembly: AssemblyInformationalVersion ("1.25 for KSP v1")]
-[assembly: KSPAssembly ("KIS", 1, 26)]
+[assembly: AssemblyVersion ("1.27.*")]
+[assembly: AssemblyInformationalVersion ("1.27 for KSP v1")]
+[assembly: KSPAssembly ("KIS", 1, 27)]
diff --git a/Tools/make_binary.cmd b/Tools/make_binary.cmd
@@ -1,4 +1,3 @@
 @echo off
-REM Until new major version of C# is released the build number in the path will keep counting.
-REM KIS *requires* .NET compiler version 4.0 or higher. Don't get confused with KSP run-time requirement of 3.5.
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild ..\Source\KIS.csproj /t:Clean,Build /p:Configuration=Release
+REM To get the latest MSBuild command line compiler go to: https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\amd64\MSBuild.exe" ..\Source\KIS.csproj /t:Clean,Build /p:Configuration=Release
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -4,4 +4,4 @@
 --github=ihsoft/KIS
 --versions=latest_all_builds
 --title=KIS {tag}
---archive=../KIS_v1.26.zip
+--archive=../KIS_v1.27.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=KIS v{tag}
---archive=../KIS_v1.26.zip
+--archive=../KIS_v1.27.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --github=ihsoft/KIS
 --ksp_version=latest
---archive=../KIS_v1.26.zip
+--archive=../KIS_v1.27.zip
diff --git a/settings.cfg b/settings.cfg
@@ -30,6 +30,17 @@ KISConfig
 	{
 		partAlignToolKey = // Put a keyboard event to enable (e.g. "&K" - Alt+K).
 	}
+	Compatibility
+	{
+		forbiddenPart = DeployedCentralStation
+		forbiddenPart = DeployedGoExOb
+		forbiddenPart = DeployedIONExp
+		forbiddenPart = DeployedRTG
+		forbiddenPart = DeployedSatDish
+		forbiddenPart = DeployedSeismicSensor
+		forbiddenPart = DeployedSolarPanel
+		forbiddenPart = DeployedWeatherStn
+	}
 	EquipAliases
 	{
 		alias = aliasLeftPalm,**/bn_l_mid_a01
@@ -42,7 +53,7 @@ KISConfig
 	}
         Editor
 	{
-		// Defines a mosue/keyboard combination to start parts dragging in the editor.
+		// Defines a mouse/keyboard combination to start parts dragging in the editor.
 		// Even thiough you can set own modifiers, the mopuse button must always be LMB.
 		// Usual KeyboardEvent modifiers are allowed: #, $, %, and &.
 		editorPartGrabAction = mouse0
@@ -127,6 +138,7 @@ KISConfig
 		moduleName = ModuleDeployableRadiator 
 		moduleName = ModuleLandingLeg // lets you repair legs by stacking
 		moduleName = ModuleJettison  // stock, engine fairings
+		moduleName = ModuleCargoPart
 		// KAS //
 		moduleName = KASModuleStrut
 		moduleName = KASModulePort