Merge pull request #320 from post-kerbin-mining-corporation/dev

Release 2.0.11
post-kerbin-mining-corporation · Aug 14, 2024 · 3117e71 · 3117e71
2 parents fe12a22 + 63ea29e
commit 3117e71
Show file tree

Hide file tree

Showing 17 changed files with 249 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,22 @@
 
-# Specific items for packaging scripts
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
 *.pyc
 .idea/
 build/

diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,13 +8,13 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.2.1
+    version: 4.2.3
     location: s3
   B9PartSwitch:
-    version: 2.18.0
+    version: 2.20.0
     location: s3
   NearFutureProps:
-    tag: 0.7.1
+    tag: 0.7.2
     location: github
     repository: post-kerbin-mining-corporation/NearFutureProps
 deploy:

diff --git a/GameData/StationPartsExpansionRedux/Localization/en-us.cfg b/GameData/StationPartsExpansionRedux/Localization/en-us.cfg
@@ -2,6 +2,15 @@ Localization
 {
   en-us
   {
+    // Subcategories
+    #LOC_SSPX_subcategory_crewCentrifuges = Centrifuges
+    #LOC_SSPX_subcategory_baseFrames = Base Frames
+    #LOC_SSPX_subcategory_cupolas = Cupolas
+    #LOC_SSPX_subcategory_crewUtility =  Station Utility
+    #LOC_SSPX_subcategory_crewTubes = Station Connectors
+    #LOC_SSPX_subcategory_crewAdapters = Station Adapters
+    #LOC_SSPX_subcategory_crewHubs = Station Hubs
+
     // Manufacturers
     #LOC_SSPX_manufacturer_kerbalmax_title = Kerbalmax Industries
     #LOC_SSPX_manufacturer_pkmc_title = Post-Kerbin Mining Corporation

diff --git a/...nPartsExpansionRedux/Parts/Extendable/extendable-375/sspx-expandable-centrifuge-375-1.cfg b/...nPartsExpansionRedux/Parts/Extendable/extendable-375/sspx-expandable-centrifuge-375-1.cfg
@@ -312,6 +312,7 @@ PART
     name = ModuleB9PartSwitch
     moduleID = endcapSwitch2
     switcherDescription = #LOC_SSPX_Switcher_EndcapsLower_Name
+    affectDragCubes = false
 
      SUBTYPE
     {

diff --git a/...nPartsExpansionRedux/Parts/Extendable/extendable-375/sspx-expandable-centrifuge-375-2.cfg b/...nPartsExpansionRedux/Parts/Extendable/extendable-375/sspx-expandable-centrifuge-375-2.cfg
@@ -315,6 +315,7 @@ PART
     name = ModuleB9PartSwitch
     moduleID = endcapSwitch2
     switcherDescription = #LOC_SSPX_Switcher_EndcapsLower_Name
+    affectDragCubes = false
 
      SUBTYPE
     {

diff --git a/...ationPartsExpansionRedux/Parts/Extendable/extendable-5/sspx-expandable-centrifuge-5-1.cfg b/...ationPartsExpansionRedux/Parts/Extendable/extendable-5/sspx-expandable-centrifuge-5-1.cfg
@@ -275,6 +275,8 @@ PART
     name = ModuleB9PartSwitch
     moduleID = endcapSwitch2
     switcherDescription = #LOC_SSPX_Switcher_EndcapsLower_Name
+    affectDragCubes = false
+
     SUBTYPE
     {
       name = BlackHandles

diff --git a/GameData/StationPartsExpansionRedux/Parts/Ground/adjusting-base/sspx-adjusting-base-25-1.mu b/GameData/StationPartsExpansionRedux/Parts/Ground/adjusting-base/sspx-adjusting-base-25-1.mu
diff --git a/GameData/StationPartsExpansionRedux/Parts/Rigid/station-25/sspx-adapter-125-25-1.cfg b/GameData/StationPartsExpansionRedux/Parts/Rigid/station-25/sspx-adapter-125-25-1.cfg
@@ -65,12 +65,6 @@ PART
 	breakingTorque = 150
 	maxTemp = 2000
 	fuelCrossFeed = True
-	 MODULE
-	{
-		name = ModuleB9DisableTransform
-		transform = 125EndcapBlackBare
-		transform = 125EndcapWhiteBare
-	}
 
   MODULE
   {

diff --git a/GameData/StationPartsExpansionRedux/Parts/Rigid/station-25/sspx-habitation-25-1.cfg b/GameData/StationPartsExpansionRedux/Parts/Rigid/station-25/sspx-habitation-25-1.cfg
@@ -407,16 +407,15 @@ PART
 	MODULE
 	{
 		name = ModuleScienceContainer
-
 		reviewActionName = #autoLOC_502201 //#autoLOC_502201 = Review Stored Data
 		storeActionName = #autoLOC_502202 //#autoLOC_502202 = Store Experiments
-		evaOnlyStorage = True
+	  evaOnlyStorage = True
 		storageRange = 4.0
 	}
 	MODULE
 	{
-      	name = ModuleExperienceManagement
-      	costPerKerbal = 0
+    name = ModuleExperienceManagement
+    costPerKerbal = 0
 	}
 	MODULE
 	{

diff --git a/GameData/StationPartsExpansionRedux/Parts/Rigid/station-5/sspx-dome-cupola-5-1.mu b/GameData/StationPartsExpansionRedux/Parts/Rigid/station-5/sspx-dome-cupola-5-1.mu
diff --git a/GameData/StationPartsExpansionRedux/Parts/Rigid/station-5/sspx-dome-greenhouse-5-1.mu b/GameData/StationPartsExpansionRedux/Parts/Rigid/station-5/sspx-dome-greenhouse-5-1.mu
diff --git a/...ationPartsExpansionRedux/Patches/VABOrganizer/StationPartsExpansionReduxSubcategories.cfg b/...ationPartsExpansionRedux/Patches/VABOrganizer/StationPartsExpansionReduxSubcategories.cfg
@@ -0,0 +1,51 @@
+/// Adds new categories
+ORGANIZERSUBCATEGORY
+{
+  name = baseFrames
+  Label = #LOC_SSPX_subcategory_baseFrames
+  Priority = 35
+  CategoryPriority = 45
+}
+ORGANIZERSUBCATEGORY
+{
+  name = crewCentrifuges
+  Label = #LOC_SSPX_subcategory_crewCentrifuges
+  Priority = 87
+  CategoryPriority = 70
+}
+ORGANIZERSUBCATEGORY
+{
+  name = cupolas
+  Label = #LOC_SSPX_subcategory_cupolas
+  Priority = 22
+  CategoryPriority = 0
+}
+ORGANIZERSUBCATEGORY
+{
+  name = crewUtility
+  Label = #LOC_SSPX_subcategory_crewUtility
+  Priority = 88
+  CategoryPriority = 70
+}
+ORGANIZERSUBCATEGORY
+{
+  name = crewTubes
+  Label = #LOC_SSPX_subcategory_crewTubes
+  Priority = 88
+  CategoryPriority = 50
+}
+ORGANIZERSUBCATEGORY
+{
+  name = crewAdapters
+  Label = #LOC_SSPX_subcategory_crewAdapters
+  Priority = 15
+  CategoryPriority = 20
+}
+ORGANIZERSUBCATEGORY
+{
+  name = crewHubs
+  Label = #LOC_SSPX_subcategory_crewHubs
+  Priority = 110
+  CategoryPriority = 20
+}
+
diff --git a/...tsExpansionRedux/Patches/VABOrganizer/StationPartsExpansionReduxSubcategoryAssignment.cfg b/...tsExpansionRedux/Patches/VABOrganizer/StationPartsExpansionReduxSubcategoryAssignment.cfg
@@ -0,0 +1,141 @@
+// Crew storage
+@PART[sspx-inflatable-hab-125-1,sspx-inflatable-hab-125-2,sspx-inflatable-hab-125-3,sspx-inflatable-hab-25-1,sspx-inflatable-hab-25-2,sspx-habitation-125-1,sspx-habitation-1875-1,sspx-habitation-1875-2,sspx-habitation-25-1,sspx-habitation-375-1,sspx-habitation-375-2,sspx-habitation-375-3,sspx-habitation-5-1,sspx-habitation-5-2,sspx-dome-habitation-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewHabitation
+  }
+}
+/// Centrifuges
+@PART[sspx-inflatable-centrifuge-125-1,sspx-inflatable-centrifuge-125-2,sspx-inflatable-centrifuge-25-1,sspx-expandable-centrifuge-375-1,sspx-expandable-centrifuge-375-2,sspx-expandable-centrifuge-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewCentrifuges
+  }
+}
+/// Base frames
+@PART[sspx-adjusting-base-125-1,sspx-adjusting-base-1875-1,sspx-adjusting-base-25-1,sspx-adjusting-base-375-1,sspx-adjusting-base-5-1,sspx-adjusting-base-cradle-125-1,sspx-adjusting-base-cradle-1875-1,sspx-adjusting-base-cradle-25-1,sspx-adjusting-base-cradle-375-1,sspx-adjusting-base-cradle-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = baseFrames
+  }
+}
+/// Station cores
+@PART[sspx-core-125-1,sspx-core-1875-1,sspx-core-1875-1,sspx-core-25-1,sspx-core-375-1,sspx-core-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = station
+  }
+}
+/// Cupolas
+@PART[sspx-cupola-125-1,sspx-cupola-1875-1,sspx-cupola-375-1,sspx-dome-cupola-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = cupolas
+  }
+}
+/// Miscellany
+@PART[sspx-utility-125-1,sspx-utility-1875-1,sspx-observation-25-1,sspx-dome-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewUtility
+  }
+}
+// Cargo containers
+@PART[sspx-cargo-container-25-1,sspx-cargo-container-25-2,sspx-cargo-container-375-1,sspx-cargo-container-375-2,sspx-cargo-container-375-3,sspx-cargo-container-25-3,sspx-logistics-5-1,sspx-logistics-5-2,sspx-cargo-container-radial-small-1,sspx-cargo-container-radial-small-2,sspx-cargo-container-radial-small-3,sspx-cargo-container-radial-medium-1,sspx-cargo-container-radial-medium-2,sspx-cargo-container-radial-medium-3,sspx-cargo-container-radial-huge-1,sspx-cargo-container-radial-huge-2]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = cargoContainers
+  }
+}
+// Extensible docking port
+@PART[sspx-docking-125-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = dockingPorts
+  }
+}
+// Cargo stowage bays
+@PART[sspx-cargo-125-1,sspx-cargo-25-1,sspx-cargo-25-2]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = serviceBays
+  }
+}
+/// Labs
+@PART[sspx-science-1875-1,sspx-lab-375-1,sspx-lab-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = labs
+  }
+}
+/// Basically the telescope
+@PART[sspx-cupola-telescope-125-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = science
+  }
+}
+/// Greenhouses
+@PART[sspx-cupola-greenhouse-125-1,sspx-greenhouse-25-1,sspx-aquaculture-375-1,sspx-greenhouse-375-1,sspx-greenhouse-5-1,sspx-dome-greenhouse-5-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = greenhouses
+  }
+}
+/// Airlocks
+@PART[sspx-airlock-125-1,sspx-airlock-25-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = airlocks
+  }
+}
+@PART[sspx-attach-125-1,sspx-tube-125-1,sspx-tube-125-2,sspx-tube-125-3,sspx-tube-1875-1,sspx-tube-1875-2,sspx-tube-1875-3,sspx-tube-1875-angled-1,sspx-attach-1875-1,sspx-attach-25-1,sspx-tube-25-1,sspx-tube-25-2,sspx-tube-25-3,sspx-tube-375-1,sspx-tube-375-2,sspx-tube-375-3,sspx-attach-375-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewTubes
+  }
+}
+@PART[sspx-adapter-125-25-1,sspx-adapter-125-25-2,sspx-adapter-25-1875-1,sspx-adapter-1875-125-1,sspx-adapter-1875-125-2,sspx-adapter-1875-0625-1,sspx-adapter-25-375-1,sspx-adapter-25-375-2,sspx-adapter-0625-125-1,sspx-adapter-375-5-1,sspx-adapter-375-5-2]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewAdapters
+  }
+}
+@PART[sspx-hub-125-1,sspx-hub-1875-1,sspx-hub-25-1]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = crewHubs
+  }
+}
+@PART[sspx-lab-pallet-1,sspx-lab-pallet-2]:FOR[StationPartsExpansionRedux]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = girders
+  }
+}
+
+/// Put the cupola in the right place
+@PART[cupola]:NEEDS[VABOrganizer]:AFTER[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = cupolas
+  }
+}
diff --git a/GameData/StationPartsExpansionRedux/Versioning/StationPartsExpansionRedux.version b/GameData/StationPartsExpansionRedux/Versioning/StationPartsExpansionRedux.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":2,
         "MINOR":0,
-        "PATCH":10,
+        "PATCH":11,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":12,
-        "PATCH":3
+        "PATCH":5
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ A complete and total rebuild of my old Stockalike Station Parts Expansion projec
 
 ### Required
 These components are required for the mod to function and are bundled as part of any download:
-* [ModuleManager (4.2.1)](https://github.com/sarbian/ModuleManager)
-* [B9PartSwitch (2.18.0)](https://github.com/blowfishpro/B9PartSwitch)
-* [Near Future Props (0.7.1)](https://github.com/ChrisAdderley/NearFutureProps)
+* [ModuleManager (4.2.3)](https://github.com/sarbian/ModuleManager)
+* [B9PartSwitch (2.20.0)](https://github.com/blowfishpro/B9PartSwitch)
+* [Near Future Props (0.7.2)](https://github.com/ChrisAdderley/NearFutureProps)
 
 ## Installation
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+v2.0.11
+-------
+- Updated ModuleManger to 4.2.3
+- Updated NearFutureProps to 0.7.2
+- Updated B9PartSwitch to 2.20.0
+- Fixed missing flag for ignoring drag cubes on a couple of endcap switchers (gotmachine)
+- Fixed harmless warning about missing transforms on sspx-adapter-125-25-1
+- Fixed warnings about missing textures on 2 Dome modules
+- Fixed missing piston widget on 2.5m base cradle
+- VABOrganizer compat
+
 v2.0.10
 -------
 - Fix EPL patch incorrect target

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 =====================================
-STATION PARTS EXPANSION REDUX v2.0.10
+STATION PARTS EXPANSION REDUX v2.0.11
 =====================================
 
 This pack provides a set of new space and ground station parts. New parts exist in all size classes from 1.25m to 5.0m. Rigid station parts are provided as well as expandable centrifuges and habitats. Ground bases are served with auto-leveling bases and extendable docking crew tubes.
@@ -13,9 +13,9 @@ DEPENDENCIES
 ============
 
 Required:
-- ModuleManager (4.2.1)
-- B9PartSwitch (2.18.0)
-- NearFutureProps (0.7.1)
+- ModuleManager (4.2.3)
+- B9PartSwitch (2.20.0)
+- NearFutureProps (0.7.2)
 
 Optional
 - RescuePodValidator