New BD update compatibility

Compatibility with sidam variants and such
Spartwo · May 9, 2023 · c9d28cd · c9d28cd
1 parent 5165180
commit c9d28cd
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 22 deletions.
diff --git a/GameData/TURD/TU_BD_Associated_Recolour/TU_BDAssociated_Default.cfg b/GameData/TURD/TU_BD_Associated_Recolour/TU_BDAssociated_Default.cfg
@@ -16,7 +16,7 @@
 	{
 		mesh = TLS
 
-		//texture = _MainTex,TURD/TU_BD_Associated_Recolour/Submods/ChemicalLaser/Mk1Structural
+		//texture = _MainTex,TURD/TU_BD_Associated_Recolour/ChemicalLaser/Mk1Structural
 		texture = _MainTex,BDArmoryExtended/Parts/ChemicalLaser/Mk1Structural
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
@@ -42,7 +42,7 @@
 		mesh = Barrels
 		mesh = loader
 
-		//texture = _MainTex,TURD/TU_BD_Associated_Recolour/Submods/Palash/Palash_mount
+		//texture = _MainTex,TURD/TU_BD_Associated_Recolour/Palash/Palash_mount
 		texture = _MainTex,BDArmoryExtended/Parts/Palash/Palash_mount
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
@@ -78,8 +78,30 @@
 		mesh = Scope
 		mesh = ScopeBase
 
-		texture = _MainTex,TURD/TU_BD_Associated_Recolour/Submods/Eland/Keopard2A6Des
+		texture = _MainTex,TURD/TU_BD_Associated_Recolour/Eland/Keopard2A6Des
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 	}
 }
+
+
+@PART[BDA_EJ200]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory&AirplanePlus]
+{
+	@MODULE[KSPTextureSwitch],0
+	{
+	}
+}
++KSP_TEXTURE_SET[Stock_Default]:NEEDS[TexturesUnlimited]
+{
+	@name = BDArmory_EJ200_Default
+	@MATERIAL
+	{
+		mesh = jet
+
+		texture = _MainTex,AirplanePlus/Parts/Engine/Modern/F5jet/f5jetTex
+		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
+		texture = _Emissive,AirplanePlus/Parts/Engine/Modern/F5jet/f5jetemissive
+		//texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
+	}
+}
+
diff --git a/GameData/TURD/TU_BD_Associated_Recolour/TU_BDAssociated_Recolour.cfg b/GameData/TURD/TU_BD_Associated_Recolour/TU_BDAssociated_Recolour.cfg
@@ -26,8 +26,8 @@
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 		texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
-		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/Submods/ChemicalLaser/ChemLaser_Spec
-		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/Submods/ChemicalLaser/ChemLaser_Paint
+		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/ChemicalLaser/ChemLaser_Spec
+		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/ChemicalLaser/ChemLaser_Paint
 	}
 }
 
@@ -55,12 +55,12 @@
 		vector = _MetalNorm,0.475,0.475,0.475
 		vector = _SmoothnessNorm,0.475,0.475,0.475
 
-	    texture = _MainTex,TURD/TU_BD_Associated_Recolour/Submods/Palash/Palash_mount
+	    texture = _MainTex,TURD/TU_BD_Associated_Recolour/Palash/Palash_mount
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 		texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
-		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/Submods/Palash/APS_Spec
-		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/Submods/Palash/APS_Paint
+		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/Palash/APS_Spec
+		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/Palash/APS_Paint
 	}
 }
 
@@ -98,11 +98,39 @@
 		vector = _MetalNorm,0.475,0.475,0.475
 		vector = _SmoothnessNorm,0.475,0.475,0.475
 
-		texture = _MainTex,TURD/TU_BD_Associated_Recolour/Submods/Eland/Keopard2A6Des
+		texture = _MainTex,TURD/TU_BD_Associated_Recolour/Eland/Keopard2A6Des
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 		texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
-		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/Submods/Eland/Eland_Spec
-		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/Submods/Eland/Eland_Paint
+		texture = _MetallicGlossMap,TURD/TU_BD_Associated_Recolour/Eland/Eland_Spec
+		texture = _MaskTex,TURD/TU_BD_Associated_Recolour/Eland/Eland_Paint
+	}
+}
+
+
+@PART[BDA_EJ200]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory&AirplanePlus]
+{
+	@MODULE[KSPTextureSwitch],0
+	{
+		texture = BDArmory_F5BD_Paint
+	}
+}
++KSP_TEXTURE_SET[MWNN_Stock_Paint]:NEEDS[TexturesUnlimited]
+{
+	@name = BDArmory_F5BD_Paint
+	@MATERIAL
+	{
+		mesh = jet
+
+		vector = _DiffuseNorm,0.74,0.6,0.5
+		vector = _MetalNorm,0.45,0.35,0.25
+		vector = _SmoothnessNorm,0.45,0.35,0.25
+
+		texture = _MainTex,AirplanePlus/Parts/Engine/Modern/F5jet/f5jetTex
+		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
+		texture = _Emissive,AirplanePlus/Parts/Engine/Modern/F5jet/f5jetemissive
+		texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
+		texture = _MetallicGlossMap,TURD/TU_APP_Recolour/Engine/Modern/F5Jet/180_f5jettex_Spec
+		texture = _MaskTex,TURD/TU_APP_Recolour/Engine/Modern/F5Jet/180_f5jettex_Paint
 	}
 }
diff --git a/GameData/TURD/TU_BD_Recolour/Fixes.cfg b/GameData/TURD/TU_BD_Recolour/Fixes.cfg
@@ -9,14 +9,17 @@
   	}
 }
 
-@PART[bahaGoalKeeper]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
+//Known issue that this patch breaks muzzle effects
+//Bahutmo name objects challenge(impossible)
+@PART[bahaGoalKeeper]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&!BDArmory]
 {
   	!mesh = DELETE
   	!MODEL {}
   	MODEL
   	{
-    		model = TURD/TU_BD_Recolour/GoalKeepers/mk3Model
+    		model = TURD/TU_BD_Recolour/Turrets/GoalKeepers/mk3Model
   	}
 }
 
 
+
diff --git a/GameData/TURD/TU_BD_Recolour/TU_BDArmory_Default.cfg b/GameData/TURD/TU_BD_Recolour/TU_BDArmory_Default.cfg
@@ -1368,12 +1368,31 @@
 
 @PART[bahaSidamTurret]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
 {
-	MODULE
+
+	@MODULE[ModulePartVariants]
 	{
-		name = KSPTextureSwitch
-		sectionName = Appearance
-		currentTextureSet = BDArmory_Sidam_Default
-		textureSet = BDArmory_Sidam_Default
+		@VARIANT[Default]
+		{
+			EXTRA_INFO
+			{
+				textureSet = BDArmory_Sidam_Default
+			}
+		}
+		@VARIANT[White]
+		{
+			EXTRA_INFO
+			{
+				textureSet = BDArmory_Sidam_White
+			}
+		}
+	}
+	%MODULE[TUPartVariant]
+	{
+		%name = TUPartVariant
+	}
+	%MODULE[SSTURecolorGUI]
+	{
+		%name = SSTURecolorGUI
 	}
 }
 +KSP_TEXTURE_SET[Stock_Default]:NEEDS[TexturesUnlimited]
@@ -1405,6 +1424,35 @@
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 	}
 }
++KSP_TEXTURE_SET[Stock_Default]:NEEDS[TexturesUnlimited]
+{
+	@name = BDArmory_Sidam_White
+	@MATERIAL
+	{
+		//first part with good naming conventions
+		mesh = SL_Barrel
+		mesh = SU_Barrel
+		mesh = PL_Barrel
+		mesh = PU_Barrel
+		mesh = GunMounts
+		mesh = SL_Hatch
+		mesh = SU_Hatch
+		mesh = PL_Hatch
+		mesh = PU_Hatch
+		//maybe not
+		mesh = SL_Damper
+		mesh = SU_Damper
+		mesh = PL_Damper
+		mesh = PU_Damper
+		//base
+		mesh = Turret
+		mesh = Turret_Base
+
+		texture = _MainTex,BDArmory/Parts/Sidam/SIDAM_White
+		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
+		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
+	}
+}
 
 @PART[towLauncherTurret]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
 {
@@ -1554,6 +1602,7 @@
 	}
 }
 
+
 //all boxes
 @PART[baha20mmAmmo]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
 {

diff --git a/GameData/TURD/TU_BD_Recolour/TU_BDArmory_Recolour.cfg b/GameData/TURD/TU_BD_Recolour/TU_BDArmory_Recolour.cfg
@@ -1751,9 +1751,20 @@
 
 @PART[bahaSidamTurret]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
 {
-	@MODULE[KSPTextureSwitch],0
+	@MODULE[ModulePartVariants]
 	{
-		textureSet = BDArmory_Sidam_Paint
+		VARIANT
+		{
+			name = BDArmory_Sidam_Paint
+			// themeName = Bob_Ross_1
+			displayName = Paint
+			primaryColor = #00ff00
+			secondaryColor = #ff0000
+			EXTRA_INFO
+			{
+				textureSet = BDArmory_Sidam_Paint_Mask
+			}
+		}
 	}
 	%MODULE[SSTURecolorGUI]
 	{
@@ -1762,7 +1773,7 @@
 }
 +KSP_TEXTURE_SET[MWNN_Stock_Paint]:NEEDS[TexturesUnlimited]
 {
-	@name = BDArmory_Sidam_Paint
+	@name = BDArmory_Sidam_Paint_Mask
 	@MATERIAL
 	{
 		//first part with good naming conventions
@@ -1788,7 +1799,7 @@
 		vector = _MetalNorm,0.475,0.475,0.475
 		vector = _SmoothnessNorm,0.475,0.475,0.475
 
-		texture = _MainTex,TURD/TU_BD_Recolour/Turrets/Sidam/SIDAM2
+		texture = _MainTex,TURD/TU_BD_Recolour/Turrets/Sidam/SIDAM_PaintBase
 		texture = _BumpMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Bump
 		texture = _Emissive,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Emis
 		texture = _AOMap,TURD/TU_Standardised_Switching/000_PlaceholderTextures/Occ
@@ -1921,6 +1932,7 @@
 	}
 }
 
+
 @PART[bahaGoalKeeper]:FOR[003_Standardised_Switching]:NEEDS[TexturesUnlimited&BDArmory]
 {
 	@MODULE[KSPTextureSwitch],0

diff --git a/...D/TU_BD_Recolour/Turrets/Sidam/SIDAM2.png → ...ecolour/Turrets/Sidam/SIDAM_PaintBase.png b/...D/TU_BD_Recolour/Turrets/Sidam/SIDAM2.png → ...ecolour/Turrets/Sidam/SIDAM_PaintBase.png