# Conflicts:
#	Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg
This commit is contained in:
Chris Adderley 2020-08-17 21:16:51 -07:00
commit b9b2d2a639
5 changed files with 185 additions and 185 deletions

View File

@ -118,32 +118,38 @@
} }
VARIANT VARIANT
{ {
name = Metal name = Gold
displayName = #LOC_Restock_variant-surface_metal displayName = #autoLOC_8007118
themeName = Metal themeName = Gold
primaryColor = #6f6e6d description = #autoLOC_8003046
secondaryColor = #6f6e6d primaryColor = #fccb0a
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-gold
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25
_Color= 0,0,0,0 BaseMaterialName=FairingBase
_SpecColor= 0.75,0.75,0.75,1 shaderName=KSP/Bumped Specular (Mapped)
_Shininess= 0.07
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase1875White = false FairingBase1875White = false
FairingBase1875BlackWhite = false FairingBase1875BlackWhite = false
FairingBase1875Orange = false FairingBase1875Orange = false
FairingBase1875Metal = true FairingBase1875Metal = false
FairingBase1875Gold = false FairingBase1875Gold = true
FairingBase1875Silver = false FairingBase1875Silver = false
FairingBase1875Inner = true FairingBase1875Inner = true
} }
@ -188,38 +194,32 @@
} }
VARIANT VARIANT
{ {
name = Gold name = Metal
displayName = #autoLOC_8007118 displayName = #LOC_Restock_variant-surface_metal
themeName = Gold themeName = Metal
description = #autoLOC_8003046 primaryColor = #6f6e6d
primaryColor = #fccb0a secondaryColor = #6f6e6d
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-gold mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
BaseMaterialName=FairingBase _Color= 0,0,0,0
shaderName=KSP/Bumped Specular (Mapped) _SpecColor= 0.75,0.75,0.75,1
_Shininess= 0.07
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase1875White = false FairingBase1875White = false
FairingBase1875BlackWhite = false FairingBase1875BlackWhite = false
FairingBase1875Orange = false FairingBase1875Orange = false
FairingBase1875Metal = false FairingBase1875Metal = true
FairingBase1875Gold = true FairingBase1875Gold = false
FairingBase1875Silver = false FairingBase1875Silver = false
FairingBase1875Inner = true FairingBase1875Inner = true
} }
@ -267,7 +267,7 @@
VARIANT VARIANT
{ {
name = White name = White
displayName = displayName = #autoLOC_8007119
themeName = White themeName = White
primaryColor = #ffffff primaryColor = #ffffff
secondaryColor = #ffffff secondaryColor = #ffffff
@ -298,7 +298,7 @@
VARIANT VARIANT
{ {
name = BlackAndWhite name = BlackAndWhite
displayName = displayName = #autoLOC_8007120
themeName = BlackAndWhite themeName = BlackAndWhite
primaryColor = #000000 primaryColor = #000000
secondaryColor = #ffffff secondaryColor = #ffffff
@ -329,7 +329,7 @@
VARIANT VARIANT
{ {
name = Orange name = Orange
displayName = displayName = #autoLOC_8007121
themeName = Orange themeName = Orange
primaryColor = #f49841 primaryColor = #f49841
secondaryColor = #4c4f47 secondaryColor = #4c4f47
@ -359,33 +359,38 @@
} }
VARIANT VARIANT
{ {
name = Metal name = Gold
displayName = #LOC_Restock_variant-surface_metal displayName = #autoLOC_8007118
themeName = Metal themeName = Gold
primaryColor = #6f6e6d description = #autoLOC_8003046
secondaryColor = #6f6e6d primaryColor = #fccb0a
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-gold
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold
FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
BaseMaterialName=FairingBase BaseMaterialName=FairingBase
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite shaderName=KSP/Bumped Specular (Mapped)
_Color= 0,0,0,0
_SpecColor= 0.75,0.75,0.75,1 _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.07 _Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase5White = false FairingBase5White = false
FairingBase5BlackWhite = false FairingBase5BlackWhite = false
FairingBase5Orange = false FairingBase5Orange = false
FairingBase5Metal = true FairingBase5Metal = false
FairingBase5Gold = false FairingBase5Gold = true
FairingBase5Silver = false FairingBase5Silver = false
FairingBase5Inner = true FairingBase5Inner = true
} }
@ -430,38 +435,33 @@
} }
VARIANT VARIANT
{ {
name = Gold name = Metal
displayName = #autoLOC_8007118 displayName = #LOC_Restock_variant-surface_metal
themeName = Gold themeName = Metal
description = #autoLOC_8003046 primaryColor = #6f6e6d
primaryColor = #fccb0a secondaryColor = #6f6e6d
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-gold mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
BaseMaterialName=FairingBase BaseMaterialName=FairingBase
shaderName=KSP/Bumped Specular (Mapped) CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
_Color= 0,0,0,0
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular _SpecColor= 0.75,0.75,0.75,1
_Shininess= 0.41 _Shininess= 0.07
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase5White = false FairingBase5White = false
FairingBase5BlackWhite = false FairingBase5BlackWhite = false
FairingBase5Orange = false FairingBase5Orange = false
FairingBase5Metal = false FairingBase5Metal = true
FairingBase5Gold = true FairingBase5Gold = false
FairingBase5Silver = false FairingBase5Silver = false
FairingBase5Inner = true FairingBase5Inner = true
} }

View File

@ -45,7 +45,7 @@ Localization
#LOC_RestockPlus_restock-engine-boar_description = The single Boar is slightly more efficient than its dual counterpart, and provides, logically, half the thrust. Due to a less integrated set of mounting points, there is a slight decrease in raw thrust-to-weight ratio. #LOC_RestockPlus_restock-engine-boar_description = The single Boar is slightly more efficient than its dual counterpart, and provides, logically, half the thrust. Due to a less integrated set of mounting points, there is a slight decrease in raw thrust-to-weight ratio.
#LOC_RestockPlus_restock-engine-boar_tags = ascent main propuls lower sls dynetics f1b restock kr1 boar #LOC_RestockPlus_restock-engine-boar_tags = ascent main propuls lower sls dynetics f1b restock kr1 boar
#LOC_RestockPlus_restock-engine-cherenkov_title = LV-N410 'Cherenkov' Atomic Rocker Motor #LOC_RestockPlus_restock-engine-cherenkov_title = LV-N410 'Cherenkov' Atomic Rocket Motor
#LOC_RestockPlus_restock-engine-cherenkov_description = By popular demand, Rockomax has brought a powerful large nuclear engine to market. Like its smaller cousin the Nerv, it runs on only Liquid Fuel. As a result of a large development budget, gimballing mechanisms have been installed on the turbopump exhaust ducts, allowing limited vectored thrust abilities. #LOC_RestockPlus_restock-engine-cherenkov_description = By popular demand, Rockomax has brought a powerful large nuclear engine to market. Like its smaller cousin the Nerv, it runs on only Liquid Fuel. As a result of a large development budget, gimballing mechanisms have been installed on the turbopump exhaust ducts, allowing limited vectored thrust abilities.
#LOC_RestockPlus_restock-engine-cherenkov_tags = active atom efficient engine inter liquid (cherenkov nuclear nuke orbit propuls radio reactor vacuum restock #LOC_RestockPlus_restock-engine-cherenkov_tags = active atom efficient engine inter liquid (cherenkov nuclear nuke orbit propuls radio reactor vacuum restock

View File

@ -384,32 +384,38 @@ PART
} }
VARIANT VARIANT
{ {
name = Metal name = Gold
displayName = #LOC_Restock_variant-surface_metal displayName = #autoLOC_8007118
themeName = Metal themeName = Gold
primaryColor = #6f6e6d description = #autoLOC_8003046
secondaryColor = #6f6e6d primaryColor = #fccb0a
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-gold
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25
_Color= 0,0,0,0 BaseMaterialName=FairingBase
_SpecColor= 0.75,0.75,0.75,1 shaderName=KSP/Bumped Specular (Mapped)
_Shininess= 0.07
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase1875White = false FairingBase1875White = false
FairingBase1875BlackWhite = false FairingBase1875BlackWhite = false
FairingBase1875Orange = false FairingBase1875Orange = false
FairingBase1875Metal = true FairingBase1875Metal = false
FairingBase1875Gold = false FairingBase1875Gold = true
FairingBase1875Silver = false FairingBase1875Silver = false
FairingBase1875Inner = true FairingBase1875Inner = true
} }
@ -454,38 +460,32 @@ PART
} }
VARIANT VARIANT
{ {
name = Gold name = Metal
displayName = #autoLOC_8007118 displayName = #LOC_Restock_variant-surface_metal
themeName = Gold themeName = Metal
description = #autoLOC_8003046 primaryColor = #6f6e6d
primaryColor = #fccb0a secondaryColor = #6f6e6d
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-gold mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
BaseMaterialName=FairingBase _Color= 0,0,0,0
shaderName=KSP/Bumped Specular (Mapped) _SpecColor= 0.75,0.75,0.75,1
_Shininess= 0.07
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase1875White = false FairingBase1875White = false
FairingBase1875BlackWhite = false FairingBase1875BlackWhite = false
FairingBase1875Orange = false FairingBase1875Orange = false
FairingBase1875Metal = false FairingBase1875Metal = true
FairingBase1875Gold = true FairingBase1875Gold = false
FairingBase1875Silver = false FairingBase1875Silver = false
FairingBase1875Inner = true FairingBase1875Inner = true
} }

View File

@ -283,7 +283,7 @@ PART
VARIANT VARIANT
{ {
name = White name = White
displayName = displayName = #autoLOC_8007119
themeName = White themeName = White
primaryColor = #ffffff primaryColor = #ffffff
secondaryColor = #ffffff secondaryColor = #ffffff
@ -314,7 +314,7 @@ PART
VARIANT VARIANT
{ {
name = BlackAndWhite name = BlackAndWhite
displayName = displayName = #autoLOC_8007120
themeName = BlackAndWhite themeName = BlackAndWhite
primaryColor = #000000 primaryColor = #000000
secondaryColor = #ffffff secondaryColor = #ffffff
@ -345,7 +345,7 @@ PART
VARIANT VARIANT
{ {
name = Orange name = Orange
displayName = displayName = #autoLOC_8007121
themeName = Orange themeName = Orange
primaryColor = #f49841 primaryColor = #f49841
secondaryColor = #4c4f47 secondaryColor = #4c4f47
@ -375,33 +375,38 @@ PART
} }
VARIANT VARIANT
{ {
name = Metal name = Gold
displayName = #LOC_Restock_variant-surface_metal displayName = #autoLOC_8007118
themeName = Metal themeName = Gold
primaryColor = #6f6e6d description = #autoLOC_8003046
secondaryColor = #6f6e6d primaryColor = #fccb0a
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-gold
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold
FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
BaseMaterialName=FairingBase BaseMaterialName=FairingBase
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite shaderName=KSP/Bumped Specular (Mapped)
_Color= 0,0,0,0
_SpecColor= 0.75,0.75,0.75,1 _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
_Shininess= 0.07 _Shininess= 0.41
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase5White = false FairingBase5White = false
FairingBase5BlackWhite = false FairingBase5BlackWhite = false
FairingBase5Orange = false FairingBase5Orange = false
FairingBase5Metal = true FairingBase5Metal = false
FairingBase5Gold = false FairingBase5Gold = true
FairingBase5Silver = false FairingBase5Silver = false
FairingBase5Inner = true FairingBase5Inner = true
} }
@ -446,38 +451,33 @@ PART
} }
VARIANT VARIANT
{ {
name = Gold name = Metal
displayName = #autoLOC_8007118 displayName = #LOC_Restock_variant-surface_metal
themeName = Gold themeName = Metal
description = #autoLOC_8003046 primaryColor = #6f6e6d
primaryColor = #fccb0a secondaryColor = #6f6e6d
TEXTURE TEXTURE
{ {
materialName=FairingsMat materialName=FairingsMat
mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-gold mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n
FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
BaseMaterialName=FairingBase BaseMaterialName=FairingBase
shaderName=KSP/Bumped Specular (Mapped) CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
_Color= 0,0,0,0
_SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular _SpecColor= 0.75,0.75,0.75,1
_Shininess= 0.41 _Shininess= 0.07
_Opacity= 1.0
_RimFalloff= 2.0
_AmbientMultiplier= 0.3
} }
GAMEOBJECTS GAMEOBJECTS
{ {
FairingBase5White = false FairingBase5White = false
FairingBase5BlackWhite = false FairingBase5BlackWhite = false
FairingBase5Orange = false FairingBase5Orange = false
FairingBase5Metal = false FairingBase5Metal = true
FairingBase5Gold = true FairingBase5Gold = false
FairingBase5Silver = false FairingBase5Silver = false
FairingBase5Inner = true FairingBase5Inner = true
} }