- Migrate Mastodon/Galleon and Skiff/Caravel from 1.875m to 2.5m label as per Making History default size.

- Reorganized Mainsail, Skipper variant ordering to follow ReStock convention of: default size truss, boattail, decreasing size trusses, compact
- Reorganized Mastodon/Galleon and Skiff/Caravel variant ordering to follow ReStock convention (as above) whilst following MH's ordering a little more closely.
- Corrected localization bug where Skiff/Caravel tankbutt variant tag specified a size1p5 diameter rather than size2 and remedied the relevant dictionaries.
This commit is contained in:
Poodmund
2020-04-24 14:07:29 +01:00
parent d50c8ad21c
commit cf4ae24c2e
8 changed files with 1435 additions and 1448 deletions

View File

@ -43,8 +43,8 @@ Localization
#LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
#LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
#LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
#LOC_Restock_variant-engine_tankbutt_size1p5_white = Tankbutt (2.5m, White)
#LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (2.5m, Orange/Grey)
#LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
#LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
#LOC_Restock_variant-engine_boattail_size2_white = Boattail (2.5m, White)
#LOC_Restock_variant-engine_boattail_size2_grey-orange = Boattail (2.5m, Orange/Grey)

View File

@ -43,8 +43,8 @@ Localization
#LOC_Restock_variant-engine_boattail_size1p5_white = Cola (1.875m, Blanca)
#LOC_Restock_variant-engine_boattail_size1_grey-orange = Cola (1.25m, Naranja/Gris)
#LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Cola (1.875m, Naranja/Gris)
#LOC_Restock_variant-engine_tankbutt_size1p5_white = Protector (2.5m, Blanca)
#LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Protector (2.5m, Naranja/Gris)
#LOC_Restock_variant-engine_tankbutt_size2_white = Protector (2.5m, Blanca)
#LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Protector (2.5m, Naranja/Gris)
#LOC_Restock_variant-engine_boattail_size2_white = Cola (2.5m, Blanca)
#LOC_Restock_variant-engine_boattail_size2_grey-orange = Cola (2.5m, Naranja/Gris)

View File

@ -40,8 +40,8 @@ Localization
#LOC_Restock_variant-engine_boattail_size1p5_white = 艇尾型(1.875m,白色)
#LOC_Restock_variant-engine_boattail_size1_grey-orange = 艇尾型(1.25m,灰色和橙色)
#LOC_Restock_variant-engine_boattail_size1p5_grey-orange = 艇尾型(1.875m,灰色和橙色)
#LOC_Restock_variant-engine_tankbutt_size1p5_white = 箱尾型(2.5m,白色)
#LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = 箱尾型(2.5m,灰色和橙色)
#LOC_Restock_variant-engine_tankbutt_size2_white = 箱尾型(2.5m,白色)
#LOC_Restock_variant-engine_tankbutt_size2_grey-orange = 箱尾型(2.5m,灰色和橙色)
#LOC_Restock_variant-engine_shroud_white = 白色外壳
#LOC_Restock_variant-engine_shroud_grey-orange = 金属外壳

View File

@ -2,7 +2,8 @@
// Contents:
// - LFB KR-1x2 "Twin-Boar" Liquid Fuel Engine (Size2LFB)
// - RE-L10 "Poodle" Liquid Fuel Engine (liquidEngine2-2_v2)
// - RE-M3 "Mainsail" Liquid Fuel Engine (liquidEngineMainsail_v2)
// - RE-I5 "Skipper" Liquid Fuel Engine (engineLargeSkipper_v2)
// Poodle
@PART[liquidEngine2-2_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@ -915,7 +916,35 @@
MODULE
{
name = ModulePartVariants
baseVariant = Full
baseVariant = Mid
VARIANT
{
name = Mid
displayName = #LOC_Restock_variant-engine_size2_white
primaryColor = #999999
secondaryColor = #ffffff
sizeGroup = GroupB
GAMEOBJECTS
{
Mainsail_25m = true
Mainsail_Shroud25White = true
Mainsail_Shroud25Orange = false
Mainsail_Boattail = false
Mainsail_BoattailOrange = false
Mainsail_BoattailWhite = false
Mainsail_Compact = false
Mainsail_ShroudCompactWhite = false
Mainsail_ShroudCompactOrange = false
Mainsail_Small = false
Mainsail_ShroudSmallWhite = false
Mainsail_ShroudSmallOrange = false
fairing = true
fairingSmall = false
fairingNewSmall = false
}
}
VARIANT
{
name = Full
@ -944,34 +973,6 @@
fairingNewSmall = false
}
}
VARIANT
{
name = Mid
displayName = #LOC_Restock_variant-engine_size2_white
primaryColor = #999999
secondaryColor = #ffffff
sizeGroup = GroupB
GAMEOBJECTS
{
Mainsail_25m = true
Mainsail_Shroud25White = true
Mainsail_Shroud25Orange = false
Mainsail_Boattail = false
Mainsail_BoattailOrange = false
Mainsail_BoattailWhite = false
Mainsail_Compact = false
Mainsail_ShroudCompactWhite = false
Mainsail_ShroudCompactOrange = false
Mainsail_Small = false
Mainsail_ShroudSmallWhite = false
Mainsail_ShroudSmallOrange = false
fairing = true
fairingSmall = false
fairingNewSmall = false
}
}
VARIANT
{
@ -1034,9 +1035,32 @@
node_stack_bottom = 0.0, -1.945, 0.0, 0.0, -1.0, 0.0, 2
}
}
VARIANT
{
name = MidAlt
displayName = #LOC_Restock_variant-engine_size2_grey-orange
primaryColor = #999999
secondaryColor = #f69449
GAMEOBJECTS
{
Mainsail_25m = true
Mainsail_Shroud25White = false
Mainsail_Shroud25Orange = true
Mainsail_Boattail = false
Mainsail_BoattailOrange = false
Mainsail_BoattailWhite = false
Mainsail_Compact = false
Mainsail_ShroudCompactWhite = false
Mainsail_ShroudCompactOrange = false
Mainsail_Small = false
Mainsail_ShroudSmallWhite = false
Mainsail_ShroudSmallOrange = false
fairing = true
fairingSmall = false
fairingNewSmall = false
}
}
VARIANT
{
name = FullAlt
@ -1062,34 +1086,6 @@
fairingSmall = false
fairingNewSmall = false
}
}
VARIANT
{
name = MidAlt
displayName = #LOC_Restock_variant-engine_size2_grey-orange
primaryColor = #999999
secondaryColor = #f69449
GAMEOBJECTS
{
Mainsail_25m = true
Mainsail_Shroud25White = false
Mainsail_Shroud25Orange = true
Mainsail_Boattail = false
Mainsail_BoattailOrange = false
Mainsail_BoattailWhite = false
Mainsail_Compact = false
Mainsail_ShroudCompactWhite = false
Mainsail_ShroudCompactOrange = false
Mainsail_Small = false
Mainsail_ShroudSmallWhite = false
Mainsail_ShroudSmallOrange = false
fairing = true
fairingSmall = false
fairingNewSmall = false
}
}
VARIANT
{
@ -1116,7 +1112,6 @@
fairingSmall = false
fairingNewSmall = true
}
}
VARIANT
{
@ -1449,7 +1444,40 @@
MODULE
{
name = ModulePartVariants
baseVariant = Full
baseVariant = TrussMount
VARIANT
{
name = TrussMount
displayName = #LOC_Restock_variant-engine_size2_white
primaryColor = #999999
secondaryColor = #ffffff
GAMEOBJECTS
{
Skipper_25m = true
Skipper_ShroudWhite = true
Skipper_ShroudOrange = false
B_SK_ActuatorsLrgTop = true
B_SK_ActuatorsLrg = true
Skipper_Boattail = false
Skipper_BoattailOrange = false
Skipper_BoattailWhite = false
Skipper_Compact = false
Skipper_ShroudCompactWhite = false
Skipper_ShroudCompactOrange = false
B_SK_ActuatorsCpt = false
Skipper_Small = false
Skipper_ShroudSmallWhite = false
Skipper_ShroudSmallOrange = false
B_SK_ActuatorsSmall = false
fairing1 = true
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
name = Shroud
@ -1483,41 +1511,6 @@
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
name = TrussMount
displayName = #LOC_Restock_variant-engine_size2_white
primaryColor = #999999
secondaryColor = #ffffff
GAMEOBJECTS
{
Skipper_25m = true
Skipper_ShroudWhite = true
Skipper_ShroudOrange = false
B_SK_ActuatorsLrgTop = true
B_SK_ActuatorsLrg = true
Skipper_Boattail = false
Skipper_BoattailOrange = false
Skipper_BoattailWhite = false
Skipper_Compact = false
Skipper_ShroudCompactWhite = false
Skipper_ShroudCompactOrange = false
B_SK_ActuatorsCpt = false
Skipper_Small = false
Skipper_ShroudSmallWhite = false
Skipper_ShroudSmallOrange = false
B_SK_ActuatorsSmall = false
fairing1 = true
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
@ -1551,7 +1544,6 @@
fairing2 = false
Skipper_ShroudSmall = true
}
}
VARIANT
{
@ -1592,6 +1584,39 @@
node_stack_top = 0.0, 0.583, 0.0, 0.0, 1.0, 0.0, 2
node_stack_bottom = 0.0, -1.362, 0.0, 0.0, -1.0, 0.0, 2
}
}
VARIANT
{
name = TrussMountAlt
displayName = #LOC_Restock_variant-engine_size2_grey-orange
primaryColor = #999999
secondaryColor = #f69449
GAMEOBJECTS
{
Skipper_25m = true
Skipper_ShroudWhite = false
Skipper_ShroudOrange = true
B_SK_ActuatorsLrgTop = true
B_SK_ActuatorsLrg = true
Skipper_Boattail = false
Skipper_BoattailOrange = false
Skipper_BoattailWhite = false
Skipper_Compact = false
Skipper_ShroudCompactWhite = false
Skipper_ShroudCompactOrange = false
B_SK_ActuatorsCpt = false
Skipper_Small = false
Skipper_ShroudSmallWhite = false
Skipper_ShroudSmallOrange = false
B_SK_ActuatorsSmall = false
fairing1 = true
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
@ -1626,41 +1651,6 @@
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
name = TrussMountAlt
displayName = #LOC_Restock_variant-engine_size2_grey-orange
primaryColor = #999999
secondaryColor = #f69449
GAMEOBJECTS
{
Skipper_25m = true
Skipper_ShroudWhite = false
Skipper_ShroudOrange = true
B_SK_ActuatorsLrgTop = true
B_SK_ActuatorsLrg = true
Skipper_Boattail = false
Skipper_BoattailOrange = false
Skipper_BoattailWhite = false
Skipper_Compact = false
Skipper_ShroudCompactWhite = false
Skipper_ShroudCompactOrange = false
B_SK_ActuatorsCpt = false
Skipper_Small = false
Skipper_ShroudSmallWhite = false
Skipper_ShroudSmallOrange = false
B_SK_ActuatorsSmall = false
fairing1 = true
fairing2 = false
Skipper_ShroudSmall = false
}
}
VARIANT
{
@ -1694,7 +1684,6 @@
fairing2 = false
Skipper_ShroudSmall = true
}
}
VARIANT
{
@ -1736,7 +1725,6 @@
node_stack_bottom = 0.0, -1.362, 0.0, 0.0, -1.0, 0.0, 2
}
}
}
@MODULE[ModuleJettison]

File diff suppressed because it is too large Load Diff