Fix Space Dust conflict with OAO parts

Fixes #1231
CobaltWolf · Jun 17, 2022 · 193ca5e · 193ca5e
1 parent c51ed4e
commit 193ca5e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/Gamedata/Bluedog_DB/Compatibility/SpaceDust/SpaceDust.cfg b/Gamedata/Bluedog_DB/Compatibility/SpaceDust/SpaceDust.cfg
@@ -1,5 +1,13 @@
-@PART[bluedog_OAO3_PEP_instrument]:NEEDS[SpaceDust]
++PART[bluedog_OAO3_PEP_instrument]:NEEDS[SpaceDust]
 {
+	@name= bluedog_OAO3_PEP_instrument_SD
+	@title = AOO-WPE "Bentham" Advanced Ultraviolet Telescope (Space Dust)
+	@real_title = OAO-PEP "Copernicus" Ultraviolet Instrument Package (Space Dust)
+	@description = Resource detection capabilities via SpaceDust. Can detect Liquid Hydrogen and Oxidizer but not pinpoint distributions.
+	@real_description = Resource detection capabilities via SpaceDust. Can detect Liquid Hydrogen and Oxidizer but not pinpoint distributions.
+
+	-MODULE[DMModuleScienceAnimateGeneric],*{}
+
 	MODULE
 	{
 		name = ModuleSpaceDustTelescope
@@ -24,13 +32,18 @@
 		}
 	}
 }
-@PART[bluedog_OAO3_PEP_instrument]:FOR[zzzzBluedog_DB]:NEEDS[SpaceDust]
-{
-	@description ^= :(.)$:$0\n<#3EA99F>Resource detection capabilities via SpaceDust. Can detect Liquid Hydrogen and Oxidizer but not pinpoint distributions.</color>:
-}
 
-@PART[bluedog_OAO_WEP_instrument]:NEEDS[SpaceDust]
+
++PART[bluedog_OAO_WEP_instrument]:NEEDS[SpaceDust]
 {
+	@name= bluedog_OAO_WEP_instrument_SD
+	@title = AOO-WPE "Marquette" Ultraviolet Telescope (Space Dust)
+	@real_title = OAO-WEP Ultraviolet Instrument Package (Space Dust)
+	@description = Resource detection capabilities via SpaceDust. Can detect Oxidizer but not pinpoint distributions.
+	@real_description = Resource detection capabilities via SpaceDust. Can detect Oxidizer but not pinpoint distributions.
+
+	-MODULE[DMModuleScienceAnimateGeneric],*{}
+
 	MODULE
 	{
 		name = ModuleSpaceDustTelescope
@@ -50,13 +63,18 @@
 		}
 	}
 }
-@PART[bluedog_OAO_WEP_instrument]:FOR[zzzzBluedog_DB]
-{
-	@description ^= :(.)$:$0\n<#3EA99F>Resource detection capabilities via SpaceDust. Can detect Oxidizer but not pinpoint distributions.</color>:
-}
 
-@PART[bluedog_OAO_SAO_instrument]:NEEDS[SpaceDust]
+
++PART[bluedog_OAO_SAO_instrument]:NEEDS[SpaceDust]
 {
+	@name= bluedog_OAO_SAO_instrument_SD
+	@title = AOO-OSA "Smithson" Secondary Telescope (Space Dust)
+	@real_title = OAO-SAO Secondary Instrument Package (Space Dust)
+	@description = Resource detection capabilities via SpaceDust. Can detect Liquid Fuel but not pinpoint distributions.
+	@real_description = Resource detection capabilities via SpaceDust. Can detect Liquid Fuel but not pinpoint distributions.
+	-MODULE[DMModuleScienceAnimateGeneric],*{}
+
+
 	MODULE
 	{
 		name = ModuleSpaceDustTelescope
@@ -76,7 +94,3 @@
 		}
 	}
 }
-@PART[bluedog_OAO_SAO_instrument]:FOR[zzzzBluedog_DB]:NEEDS[SpaceDust]
-{
-	@description ^= :(.)$:$0\n<#3EA99F>Resource detection capabilities via SpaceDust. Can detect Liquid Fuel but not pinpoint distributions.</color>:
-}
diff --git a/Gamedata/Bluedog_DB/Parts/ProbeExpansion/OAO/bluedog_OAO3_PEP_instrument.cfg b/Gamedata/Bluedog_DB/Parts/ProbeExpansion/OAO/bluedog_OAO3_PEP_instrument.cfg
@@ -34,7 +34,7 @@ PART
 	vesselType = Probe
 	bulkheadProfiles = size00, size0
 
-	tags = OAO AOO Science telescope ultraviolet UV spectro telescope observatory copernicus xray 
+	tags = OAO AOO Science telescope ultraviolet UV spectro telescope observatory copernicus xray
 
 	techtag = OAO
 
@@ -46,7 +46,7 @@ PART
 		animSpeed = 1						//Speed to play animation
 		endEventGUIName = Retract				//Title of retract animation event/action group
 		showEndEvent = true					//Do you want to show the retract event/action group - only displayed in-flight after deploy event triggered
-		startEventGUIName = Deploy				//Title of deploy animation event/action group
+		startEventGUIName = deploy				//Title of deploy animation event/action group
 		showStartEvent = true					//Do you want to show the deploy event/action group
 		toggleEventGUIName = Toggle 				//Title of toggle animation event/action group - Plays deploy or retract animation based on current state - Is reversible while playing
 		showToggleEvent = false					//Do you want to show the toggle event/action group - not recommended to be used together with deploy/retract events, too many unnecessary buttons

diff --git a/Gamedata/Bluedog_DB/changelog.txt b/Gamedata/Bluedog_DB/changelog.txt
@@ -14,6 +14,7 @@ Bug fixes
 - Fix LM top hatch textures
 - Fix LM EVA antenna animation
 - fix Star motor level 3 and E1 engine upgrades
+- Fix Space Dust bug with OAO instruments. Dedicated Space Dust versions of the instruments are now used instead.
 
 v1.10.2
 New Content and features