Merge branch 'master' into develop

This commit is contained in:
Chris Adderley
2020-08-02 08:04:56 -07:00
committed by GitHub
106 changed files with 622 additions and 278 deletions

View File

@ -5,7 +5,7 @@
// - TD-50 Decoupler (Decoupler_4)
// TD-18 Decoupler
@PART[Decoupler_1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Decoupler_1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -84,7 +84,7 @@
}
// Size 1.5 Decoupler
@PART[Size1p5_Strut_Decoupler]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Size1p5_Strut_Decoupler]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -130,7 +130,7 @@
}
// TD-50 Decoupler
@PART[Decoupler_4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Decoupler_4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -6,7 +6,7 @@
// - EP-50 Engine Plate (EnginePlate4)
// EP-18 Engine Plate
@PART[EnginePlate1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[EnginePlate1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
!MODEL,* {}
@ -16,6 +16,13 @@
texture = blank, ReStock/Assets/Structural/restock-structural-tubes-1
texture = blank-n, ReStock/Assets/Structural/restock-structural-tubes-1-n
}
// this is the same as the stock value in KSP 1.9.x, but since KSP 1.8.x
// has different mass values, the variant masses below result in negative mass.
// This prevents that from happening, at the expense of slightly affecting part balance
// when ReStock is used with 1.8.x
@mass = 0.14
!MODULE[ModulePartVariants] {}
MODULE
{
@ -440,7 +447,7 @@
}
// EP-25 Engine Plate
@PART[EnginePlate2]:HAS[~RestockIgnore[*]]:FOR[ReStock] {
@PART[EnginePlate2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
@author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
!MODEL,* {}
MODEL
@ -449,6 +456,13 @@
texture = blank, ReStock/Assets/Structural/restock-structural-tubes-1
texture = blank-n, ReStock/Assets/Structural/restock-structural-tubes-1-n
}
// this is the same as the stock value in KSP 1.9.x, but since KSP 1.8.x
// has different mass values, the variant masses below result in negative mass.
// This prevents that from happening, at the expense of slightly affecting part balance
// when ReStock is used with 1.8.x
@mass = 0.25
!MODULE[ModulePartVariants] {}
MODULE
{
@ -969,7 +983,7 @@
}
// EP-37 Engine Plate
@PART[EnginePlate3]:HAS[~RestockIgnore[*]]:FOR[ReStock] {
@PART[EnginePlate3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
@author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
!MODEL,* {}
MODEL
@ -978,6 +992,13 @@
texture = blank, ReStock/Assets/Structural/restock-structural-tubes-1
texture = blank-n, ReStock/Assets/Structural/restock-structural-tubes-1-n
}
// this is the same as the stock value in KSP 1.9.x, but since KSP 1.8.x
// has different mass values, the variant masses below result in negative mass.
// This prevents that from happening, at the expense of slightly affecting part balance
// when ReStock is used with 1.8.x
@mass = 0.58
!MODULE[ModulePartVariants] {}
MODULE
{
@ -1402,7 +1423,7 @@
}
// EP-50 Engine Plate
@PART[EnginePlate4]:HAS[~RestockIgnore[*]]:FOR[ReStock] {
@PART[EnginePlate4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] {
@author = Andrew Cassidy (Cinebox) and Chris Adderley (Nertea)
!MODEL,* {}
MODEL
@ -1411,6 +1432,13 @@
texture = blank, ReStock/Assets/Structural/restock-structural-tubes-1
texture = blank-n, ReStock/Assets/Structural/restock-structural-tubes-1-n
}
// this is the same as the stock value in KSP 1.9.x, but since KSP 1.8.x
// has different mass values, the variant masses below result in negative mass.
// This prevents that from happening, at the expense of slightly affecting part balance
// when ReStock is used with 1.8.x
@mass = 1.0
!MODULE[ModulePartVariants] {}
MODULE
{

View File

@ -4,7 +4,7 @@
// - TS-50 Separator (Separator_4)
// TS-18 Separator
@PART[Separator_1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Separator_1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -83,7 +83,7 @@
}
// TS-50 Decoupler
@PART[Separator_4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Separator_4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE