mirror of
https://github.com/PorktoberRevolution/ReStocked
synced 2024-09-01 17:34:42 +00:00
Merge branch 'master' into develop
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
// - Heat Shield (1.875m) (HeatShield1p5)
|
||||
|
||||
// Heat Shield (1.875m)
|
||||
@PART[HeatShield1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[HeatShield1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -4,7 +4,7 @@
|
||||
// - Protective Rocket Nosecone mk16 (rocketNoseConeSize4)
|
||||
|
||||
// Protective Rocket Nosecone Mk5A
|
||||
@PART[Size_1_5_Cone]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size_1_5_Cone]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -65,7 +65,7 @@
|
||||
}
|
||||
|
||||
// Protective Rocket Nosecone mk16
|
||||
@PART[rocketNoseConeSize4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[rocketNoseConeSize4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -4,7 +4,7 @@
|
||||
// - RE-J10 "Wolfhound" Liquid Fuel Engine AJ10 (LiquidEngineRE-J10)
|
||||
|
||||
// RK-7 "Kodiak" Liquid Fueled Engine
|
||||
@PART[LiquidEngineRK-7]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[LiquidEngineRK-7]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -531,7 +531,7 @@
|
||||
}
|
||||
|
||||
// RE-J10 "Wolfhound" Liquid Fuel Engine AJ10
|
||||
@PART[LiquidEngineRE-J10]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[LiquidEngineRE-J10]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -4,7 +4,7 @@
|
||||
// - KR-1 "Mastodon" Liquid Fuel Engine (LiquidEngineKE-1)
|
||||
|
||||
// RE-I2 "Skiff" Liquid Fuel Engine
|
||||
@PART[LiquidEngineRE-I2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[LiquidEngineRE-I2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -475,7 +475,7 @@
|
||||
}
|
||||
|
||||
// KR-1 "Mastodon" Liquid Fuel Engine
|
||||
@PART[LiquidEngineKE-1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[LiquidEngineKE-1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -3,7 +3,7 @@
|
||||
// - RV-1 "Cub" Vernier Engine (LiquidEngineRV-1)
|
||||
|
||||
// RV-1 "Cub" Vernier Engine
|
||||
@PART[LiquidEngineRV-1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[LiquidEngineRV-1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -3,7 +3,7 @@
|
||||
// - THK 'Pollux' SRB (Pollux)
|
||||
|
||||
// THK 'Pollux' SRB
|
||||
@PART[Pollux]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Pollux]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -11,7 +11,7 @@
|
||||
// - FL-A215 Fuel Tank Adapter (Size1p5_Size2_Adapter_01)
|
||||
|
||||
// FL-TX220 Fuel Tank
|
||||
@PART[Size1p5_Tank_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Tank_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -72,7 +72,7 @@
|
||||
}
|
||||
|
||||
// FL-TX440 Fuel Tank
|
||||
@PART[Size1p5_Tank_02]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Tank_02]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -133,7 +133,7 @@
|
||||
}
|
||||
|
||||
// FL-TX900 Fuel Tank
|
||||
@PART[Size1p5_Tank_03]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Tank_03]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -194,7 +194,7 @@
|
||||
}
|
||||
|
||||
// FL-TX1800 Fuel Tank
|
||||
@PART[Size1p5_Tank_04]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Tank_04]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -255,7 +255,7 @@
|
||||
}
|
||||
|
||||
// FL-C1000 Fuel Tank (Soyuz)
|
||||
@PART[Size1p5_Tank_05]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Tank_05]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -377,7 +377,7 @@
|
||||
}
|
||||
|
||||
// FL-A151L Fuel Tank Adapter - 1.875 to 1.25m Long
|
||||
@PART[Size1p5_Size1_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Size1_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -438,7 +438,7 @@
|
||||
}
|
||||
|
||||
// FL-A151S Fuel Tank Adapter - 1.875 to 1.25m Short
|
||||
@PART[Size1p5_Size1_Adapter_02]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Size1_Adapter_02]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -499,7 +499,7 @@
|
||||
}
|
||||
|
||||
// FL-A150 Fuel Tank Adapter - 1.875 to 0.625m
|
||||
@PART[Size1p5_Size0_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Size0_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -560,7 +560,7 @@
|
||||
}
|
||||
|
||||
// FL-A215 Fuel Tank Adapter - 2.5 to 1.875m
|
||||
@PART[Size1p5_Size2_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Size2_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -8,7 +8,7 @@
|
||||
// - Kerbodyne Engine Cluster Adapter Tank (Size4_EngineAdapter_01)
|
||||
|
||||
// Kerbodyne S4-64 Fuel Tank
|
||||
@PART[Size4_Tank_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size4_Tank_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -67,7 +67,7 @@
|
||||
}
|
||||
|
||||
// Kerbodyne S4-128 Fuel Tank
|
||||
@PART[Size4_Tank_02]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size4_Tank_02]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -126,7 +126,7 @@
|
||||
}
|
||||
|
||||
// Kerbodyne S4-256 Fuel Tank
|
||||
@PART[Size4_Tank_03]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size4_Tank_03]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -185,7 +185,7 @@
|
||||
}
|
||||
|
||||
// Kerbodyne S4-512 Fuel Tank
|
||||
@PART[Size4_Tank_04]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size4_Tank_04]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -244,7 +244,7 @@
|
||||
}
|
||||
|
||||
// Kerbodyne S3-S4 Adapter Tank
|
||||
@PART[Size3_Size4_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size3_Size4_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -303,7 +303,7 @@
|
||||
}
|
||||
|
||||
// Kerbodyne Engine Cluster Adapter Tank
|
||||
@PART[Size4_EngineAdapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size4_EngineAdapter_01]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -4,7 +4,7 @@
|
||||
// - FL-R5 RCS Fuel Tank (Size1p5_Monoprop)
|
||||
|
||||
// Stratus-V Minified Monopropellant Tank
|
||||
@PART[monopropMiniSphere]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[monopropMiniSphere]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -16,7 +16,7 @@
|
||||
}
|
||||
|
||||
// FL-R5 RCS Fuel Tank
|
||||
@PART[Size1p5_Monoprop]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Size1p5_Monoprop]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -3,7 +3,7 @@
|
||||
// - RoveMax M1-F Rover Wheel (roverWheelM1-F)
|
||||
|
||||
// RoveMax M1-F Rover Wheel
|
||||
@PART[roverWheelM1-F]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[roverWheelM1-F]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Andrew Cassidy
|
||||
!MODEL {}
|
||||
|
@ -4,7 +4,7 @@
|
||||
// - AE-FF4 Airstream Protective Shell (5m) (fairingSize4)
|
||||
|
||||
// AE-FF1.5 Airstream Protective Shell (1.875m)
|
||||
@PART[fairingSize1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[fairingSize1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -242,7 +242,7 @@
|
||||
}
|
||||
|
||||
// AE-FF4 Airstream Protective Shell (5m)
|
||||
@PART[fairingSize4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[fairingSize4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
@ -7,7 +7,7 @@
|
||||
// - T-50 Structural Tube (Tube4)
|
||||
|
||||
// T-12 Structural Tube
|
||||
@PART[Tube1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Tube1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -315,7 +315,7 @@
|
||||
}
|
||||
|
||||
// T-18 Structural Tube
|
||||
@PART[Tube1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Tube1p5]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -622,7 +622,7 @@
|
||||
}
|
||||
|
||||
// T-25 Structural Tube
|
||||
@PART[Tube2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Tube2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -929,7 +929,7 @@
|
||||
}
|
||||
|
||||
// T-37 Structural Tube
|
||||
@PART[Tube3]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Tube3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
@ -1236,7 +1236,7 @@
|
||||
}
|
||||
|
||||
// T-50 Structural Tube
|
||||
@PART[Tube4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
@PART[Tube4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
|
Reference in New Issue
Block a user