Merge pull request #483 from Poodmund/master

Localization/Variant fixes, MH part hide patch fix, MH RCS Mini config fix
This commit is contained in:
Chris Adderley
2019-03-02 11:09:47 -08:00
committed by GitHub
7 changed files with 94 additions and 82 deletions

View File

@ -432,21 +432,6 @@
} }
} }
VARIANT VARIANT
{
name = Gold
displayName = #LOC_Restock_variant-probe-gold
themeName = Gold
primaryColor = #fccb0a
GAMEOBJECTS
{
Rover_White = false
Rover_Grey = false
Rover_GoldFoil = true
Rover_SilverFoil = false
Rover_Common = true
}
}
VARIANT
{ {
name = Silver name = Silver
displayName = #LOC_Restock_variant-probe-silver displayName = #LOC_Restock_variant-probe-silver
@ -462,6 +447,21 @@
} }
} }
VARIANT VARIANT
{
name = Gold
displayName = #LOC_Restock_variant-probe-gold
themeName = Gold
primaryColor = #fccb0a
GAMEOBJECTS
{
Rover_White = false
Rover_Grey = false
Rover_GoldFoil = true
Rover_SilverFoil = false
Rover_Common = true
}
}
VARIANT
{ {
name = Bare name = Bare
displayName = #LOC_Restock_variant-probe-bare displayName = #LOC_Restock_variant-probe-bare

View File

@ -397,13 +397,11 @@
@animationName = restock-srb-hammer-heat-1 @animationName = restock-srb-hammer-heat-1
@responseSpeed = 0.1 @responseSpeed = 0.1
} }
@MODULE[ModulePartVariants] !MODULE[ModulePartVariants] {}
MODULE
{ {
name = ModulePartVariants
baseVariant = White baseVariant = White
!primaryColor = DELETE
!secondaryColor = DELETE
!baseDisplayName = DELETE
!baseThemeName = DELETE
useMultipleDragCubes = false useMultipleDragCubes = false
VARIANT VARIANT
{ {
@ -418,23 +416,31 @@
OrangeStripe = false OrangeStripe = false
} }
} }
@VARIANT[YellowAndWhite] VARIANT
{ {
!TEXTURE {} name = Orange
GAMEOBJECTS primaryColor = #f49841
{ secondaryColor = #f49841
YellowStripe = true displayName = #autoLOC_8007100
OrangeStripe = false themeName = Orange
}
}
@VARIANT[Orange]
{
!TEXTURE {}
GAMEOBJECTS GAMEOBJECTS
{ {
YellowStripe = false YellowStripe = false
OrangeStripe = true OrangeStripe = true
} }
}
VARIANT
{
name = YellowAndWhite
primaryColor = #E8DB27
secondaryColor = #ffffff
displayName = #autoLOC_8003114
themeName = YellowAndWhite
GAMEOBJECTS
{
YellowStripe = true
OrangeStripe = false
}
} }
} }
@MODULE[ModuleJettison] @MODULE[ModuleJettison]
@ -552,13 +558,11 @@
dependOnEngineState = True dependOnEngineState = True
dependOnThrottle = True dependOnThrottle = True
} }
@MODULE[ModulePartVariants] !MODULE[ModulePartVariants] {}
MODULE
{ {
name = ModulePartVariants
baseVariant = White baseVariant = White
!primaryColor = DELETE
!secondaryColor = DELETE
!baseDisplayName = DELETE
!baseThemeName = DELETE
useMultipleDragCubes = false useMultipleDragCubes = false
VARIANT VARIANT
{ {
@ -573,23 +577,31 @@
OrangeStripe = false OrangeStripe = false
} }
} }
@VARIANT[YellowAndWhite] VARIANT
{ {
!TEXTURE {} name = Orange
GAMEOBJECTS primaryColor = #f49841
{ secondaryColor = #f49841
YellowStripe = true displayName = #autoLOC_8007100
OrangeStripe = false themeName = Orange
}
}
@VARIANT[Orange]
{
!TEXTURE {}
GAMEOBJECTS GAMEOBJECTS
{ {
YellowStripe = false YellowStripe = false
OrangeStripe = true OrangeStripe = true
} }
}
VARIANT
{
name = YellowAndWhite
primaryColor = #E8DB27
secondaryColor = #ffffff
displayName = #autoLOC_8003114
themeName = YellowAndWhite
GAMEOBJECTS
{
YellowStripe = true
OrangeStripe = false
}
} }
} }
@MODULE[ModuleJettison] @MODULE[ModuleJettison]

View File

@ -3,7 +3,7 @@
// - (MonoPropMini) // - (MonoPropMini)
// Spherical Radial Tiny Tank // Spherical Radial Tiny Tank
@PART[MonoPropMini] @PART[monopropMiniSphere]
{ {
@author = Chris Adderley (Nertea) @author = Chris Adderley (Nertea)
!mesh = DELETE !mesh = DELETE

View File

@ -35,12 +35,12 @@
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
} }
GAMEOBJECTS GAMEOBJECTS
@ -57,13 +57,13 @@
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
} }
GAMEOBJECTS GAMEOBJECTS
{ {
@ -79,12 +79,12 @@
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-orange mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
} }
GAMEOBJECTS GAMEOBJECTS

View File

@ -50,7 +50,7 @@ PART
VARIANT VARIANT
{ {
name = White name = White
displayName = #autoLOC_8007122 displayName = #autoLOC_8007119
themeName = White themeName = White
primaryColor = #ffffff primaryColor = #ffffff
secondaryColor = #ffffff secondaryColor = #ffffff
@ -65,7 +65,7 @@ PART
{ {
name = BlackAndWhite name = BlackAndWhite
displayName = #autoLOC_8007122 displayName = #autoLOC_8007122
themeName = White themeName = BlackAndWhite
primaryColor = #ffffff primaryColor = #ffffff
secondaryColor = #000000 secondaryColor = #000000
GAMEOBJECTS GAMEOBJECTS

View File

@ -85,9 +85,9 @@ PART
nSides = 32 nSides = 32
nArcs = 2 nArcs = 2
nCollidersPerXSection = 8 nCollidersPerXSection = 8
TextureURL = ReStock/Assets/Payload/restock-fairing-125-1 TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
TextureNormalURL = ReStock/Assets/Payload/restock-fairing-125-1-n TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n
panelGrouping = 3 panelGrouping = 3
pivot = 0,0.151,0 pivot = 0,0.151,0
@ -332,12 +332,12 @@ PART
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
} }
GAMEOBJECTS GAMEOBJECTS
@ -357,13 +357,13 @@ PART
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
} }
GAMEOBJECTS GAMEOBJECTS
{ {
@ -382,12 +382,12 @@ PART
TEXTURE TEXTURE
{ {
materialName=FairingIconShell materialName=FairingIconShell
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-orange mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange
} }
EXTRA_INFO EXTRA_INFO
{ {
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
} }
GAMEOBJECTS GAMEOBJECTS

View File

@ -1,7 +1,7 @@
// Hides all the MH replacing parts if MH is installed // Hides all the MH replacing parts if MH is installed
@PART[*]:HAS[MHReplacement[True]]:FOR[zReStockPlus]:NEEDS[SquadExpansion/MakingHistory] @PART[*]:HAS[#MHReplacement[True]]:FOR[zzReStockPlus]:NEEDS[SquadExpansion/MakingHistory]
{ {
TechHidden = True @TechHidden = True
category = none @category = none
subcategory = 0 @subcategory = 0
} }