Fixed Microdawn not showing up when Restock is installed

Fixed microsats generating nullrefs when retracting antenna in editor
linuxgurugamer · Jan 31, 2022 · 7738216 · 7738216
1 parent 869f541
commit 7738216
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 46 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -73,6 +73,9 @@
 	Adjusted packetInterval, packetSize & packetResourceCost for the data transmitters in the two microsatellites
 	Fixed the names in the advanced science microsat for the experiments
 
+4.0.0.4 
+	Fixed Microdawn not showing up when Restock is installed
+	Fixed microsats generating nullrefs when retracting antenna in editor
 
 TODO
 	Update all language files for missing fields
diff --git a/GameData/UniversalStorage2/Parts/Science/AdvancedMicroSatWedge.cfg b/GameData/UniversalStorage2/Parts/Science/AdvancedMicroSatWedge.cfg
@@ -48,6 +48,26 @@ PART
 	// Contains any special functionality for this part
 	/+
 
+				MODULE
+			{
+				name = USAnimateGeneric
+				dragModuleIndex = 1
+				primaryAnimationName = LSubsatAntenna
+				primaryAvailableInEVA = false
+				primaryAvailableInVessel = true
+				primaryAvailableInEditor = false
+				primaryActionAvailable = true
+				combinedAvailableInEVA = false
+				combinedAvailableInVessel = true
+				combinedAvailableInEditor = false
+				combinedActionAvailable = true
+
+				UseDoorObstructions = false
+				ObstructionDebugLines = false
+
+				primaryStartEventGUIName = #autoLOC_US_DeployAntenna
+				primaryEndEventGUIName = #autoLOC_US_RetractAntenna
+			}
 
 		// KIS
 		// Adds KIS functionality when KIS is installed
@@ -116,24 +136,6 @@ PART
 			//	
 			//}
 
-			//MODULE
-			//{
-			//	name = USAnimateGeneric
-			//	dragModuleIndex = 1
-			//	primaryAnimationName = LSubsatAntenna
-			//	primaryAvailableInEVA = true
-			//	primaryAvailableInVessel = true
-			//	primaryAvailableInEditor = true
-			//	primaryActionAvailable = true
-			//	combinedAvailableInEVA = true
-			//	combinedAvailableInVessel = true
-			//	combinedAvailableInEditor = true
-			//	combinedActionAvailable = true
-			//	
-			//	UseDoorObstructions = false
-			//	ObstructionDebugLines = false
-			//	
-			//}
 
 			MODULE
 			{
@@ -224,17 +226,18 @@ PART
 		}
 	}
 
-	MODULE
-	{
-		name = ModuleDeployableAntenna
-		showStatus = false
-		isTracking = false				
-		windResistance = 1
-		animationName = LSubsatAntenna
-		extendActionName = #autoLOC_6002398 //#autoLOC_6002398 = Extend <<1>>
-		retractActionName = #autoLOC_6002399 //#autoLOC_6002399 = Retract <<1>>
-		extendpanelsActionName = #autoLOC_6002400 //#autoLOC_6002400 = Toggle <<1>>
-	}
+	//MODULE
+	//{
+	//	name = ModuleDeployableAntenna
+	//	showStatus = false
+	//	isTracking = false				
+	//	windResistance = 1
+	//	animationName = LSubsatAntenna
+	//	pivotName =
+	//	extendActionName = #autoLOC_6002398 //#autoLOC_6002398 = Extend <<1>>
+	//	retractActionName = #autoLOC_6002399 //#autoLOC_6002399 = Retract <<1>>
+	//	extendpanelsActionName = #autoLOC_6002400 //#autoLOC_6002400 = Toggle <<1>>
+	//}
 
 	MODULE
 	{
@@ -245,6 +248,7 @@ PART
 		packetResourceCost = 0.05
 		requiredResource = ElectricCharge
 		antennaPower = 500000
+		DeployFxModules = 0
 		antennaCombinable = False
 	}
 

diff --git a/GameData/UniversalStorage2/Parts/Science/BasicMicroSatWedge.cfg b/GameData/UniversalStorage2/Parts/Science/BasicMicroSatWedge.cfg
@@ -48,6 +48,25 @@ PART
 	// Contains any special functionality for this part
 	/+
 
+			MODULE
+			{
+				name = USAnimateGeneric
+				dragModuleIndex = 1
+				primaryAnimationName = AntDeploy
+				primaryAvailableInEVA = false
+				primaryAvailableInVessel = true
+				primaryAvailableInEditor = false
+				primaryActionAvailable = true
+				combinedAvailableInEVA = false
+				combinedAvailableInVessel = true
+				combinedAvailableInEditor = false
+				combinedActionAvailable = true
+
+				UseDoorObstructions = false
+				ObstructionDebugLines = false
+				primaryStartEventGUIName = #autoLOC_US_DeployAntenna
+				primaryEndEventGUIName = #autoLOC_US_RetractAntenna
+			}
 
 		// KIS
 		// Adds KIS functionality when KIS is installed
@@ -131,17 +150,17 @@ PART
 				}
 			}
 
-			MODULE
-			{
-				name = ModuleDeployableAntenna
-				showStatus = false
-				isTracking = false				
-				windResistance = 1
-				animationName = AntDeploy
-				extendActionName = #autoLOC_6002398 //#autoLOC_6002398 = Extend <<1>>
-				retractActionName = #autoLOC_6002399 //#autoLOC_6002399 = Retract <<1>>
-				extendpanelsActionName = #autoLOC_6002400 //#autoLOC_6002400 = Toggle <<1>>
-			}
+			//MODULE
+			//{
+			//	name = ModuleDeployableAntenna
+			//	showStatus = false
+			//	isTracking = false				
+			//	windResistance = 1
+			//	animationName = AntDeploy
+			//	extendActionName = #autoLOC_6002398 //#autoLOC_6002398 = Extend <<1>>
+			//	retractActionName = #autoLOC_6002399 //#autoLOC_6002399 = Retract <<1>>
+			//	extendpanelsActionName = #autoLOC_6002400 //#autoLOC_6002400 = Toggle <<1>>
+			//}
 
 			MODULE
 			{
@@ -152,6 +171,7 @@ PART
 				packetResourceCost = 0.1
 				requiredResource = ElectricCharge
 				antennaPower = 50000
+				DeployFxModules = 0
 				antennaCombinable = False
 			}
 

diff --git a/GameData/UniversalStorage2/Patches/MicroDawn.cfg b/GameData/UniversalStorage2/Patches/MicroDawn.cfg
@@ -1,4 +1,4 @@
-+PART[ionEngine]
++PART[ionEngine]:FINAL
 {
     @name = miniIonEngine
 

diff --git a/GameData/UniversalStorage2/UniversalStorage2.version b/GameData/UniversalStorage2/UniversalStorage2.version
@@ -7,7 +7,7 @@
     "MAJOR": 4,
     "MINOR": 0,
     "PATCH": 0,
-    "BUILD": 1
+    "BUILD": 3
   },
   "KSP_VERSION": {
     "MAJOR": 1,

diff --git a/USSourceDev/UniversalStorage/AssemblyVersion.cs b/USSourceDev/UniversalStorage/AssemblyVersion.cs
@@ -10,6 +10,6 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("4.0.0.2")]
- [assembly: AssemblyFileVersion("4.0.0.2")]
- [assembly: AssemblyInformationalVersion("v4.0.0.2")]
+ [assembly: AssemblyVersion("4.0.0.3")]
+ [assembly: AssemblyFileVersion("4.0.0.3")]
+ [assembly: AssemblyInformationalVersion("v4.0.0.3")]
diff --git a/UniversalStorage2.version b/UniversalStorage2.version
@@ -7,7 +7,7 @@
     "MAJOR": 4,
     "MINOR": 0,
     "PATCH": 0,
-    "BUILD": 3
+    "BUILD": 4
   },
   "KSP_VERSION": {
     "MAJOR": 1,