mirror of
https://github.com/PorktoberRevolution/ReStocked
synced 2024-06-11 05:54:07 +00:00
Merge branch 'master' into solar-tests
This commit is contained in:
commit
d0ce6e43ea
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,17 @@
|
|||
// Patches applying art changes to Making History decouplers
|
||||
// Contents:
|
||||
- TD-18 Decoupler (Decoupler_1p5)
|
||||
|
||||
|
||||
// TD-18 Decoupler
|
||||
@PART[Decoupler_1p5] {
|
||||
@author = Chris Adderley (Nertea)
|
||||
|
||||
!mesh = DELETE
|
||||
!MODEL {}
|
||||
MODEL {
|
||||
model = ReStock/Assets/Coupling/restock-decoupler-1875-1
|
||||
}
|
||||
|
||||
%rescaleFactor = 1
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
// Patches applying art changes to Making History separators
|
||||
// Contents:
|
||||
- TS-18 Separator (Separator_1p5)
|
||||
|
||||
// TS-18 Separator
|
||||
@PART[Separator_1p5] {
|
||||
@author = Chris Adderley (Nertea)
|
||||
|
||||
!mesh = DELETE
|
||||
!MODEL {}
|
||||
MODEL {
|
||||
model = ReStock/Assets/Coupling/restock-separator-1875-1
|
||||
}
|
||||
|
||||
%rescaleFactor = 1
|
||||
}
|
|
@ -0,0 +1,14 @@
|
|||
// Patches applying art changes to Making History RCS tanks
|
||||
// Contents:
|
||||
// - (MonoPropMini)
|
||||
|
||||
// Spherical Radial Tiny Tank
|
||||
@PART[MonoPropMini]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
!mesh = DELETE
|
||||
!MODEL {}
|
||||
MODEL {
|
||||
model = ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1
|
||||
}
|
||||
}
|
|
@ -0,0 +1,118 @@
|
|||
// Patches applying art changes to Making History fairings
|
||||
// Contents:
|
||||
- AE-FF1.5 Airstream Protective Shell (1.875m) (fairingSize1p5)
|
||||
|
||||
@PART[fairingSize1p5]
|
||||
{
|
||||
@author = Chris Adderley (Nertea)
|
||||
|
||||
!mesh = DELETE
|
||||
!MODEL {}
|
||||
MODEL {
|
||||
model = ReStock/Assets/Payload/restock-fairing-base-1875-1
|
||||
}
|
||||
MODEL
|
||||
{
|
||||
model = Squad/Parts/Aero/fairings/AutoTruss
|
||||
scale = 1.5,1.5,1.5
|
||||
position = 0.0,0.22,0.0
|
||||
}
|
||||
|
||||
@MODULE[ModuleProceduralFairing]
|
||||
{
|
||||
@pivot = 0,0.151, 0
|
||||
@TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
|
||||
@CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
|
||||
@TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n
|
||||
}
|
||||
|
||||
@MODULE[ModulePartVariants]
|
||||
{
|
||||
@VARIANT[White]
|
||||
{
|
||||
!TEXTURE {}
|
||||
!EXTRA_INFO {}
|
||||
TEXTURE
|
||||
{
|
||||
materialName=FairingIconShell
|
||||
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1
|
||||
}
|
||||
EXTRA_INFO
|
||||
{
|
||||
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
|
||||
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
|
||||
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
|
||||
}
|
||||
GAMEOBJECTS
|
||||
{
|
||||
FairingBase1875White = true
|
||||
FairingBase1875Orange = false
|
||||
FairingBase1875BlackWhite = false
|
||||
}
|
||||
}
|
||||
@VARIANT[Grey]
|
||||
{
|
||||
!TEXTURE {}
|
||||
!EXTRA_INFO {}
|
||||
TEXTURE
|
||||
{
|
||||
materialName=FairingIconShell
|
||||
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1
|
||||
}
|
||||
EXTRA_INFO
|
||||
{
|
||||
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
|
||||
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
|
||||
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
|
||||
}
|
||||
GAMEOBJECTS
|
||||
{
|
||||
FairingBase1875White = false
|
||||
FairingBase1875Orange = false
|
||||
FairingBase1875BlackWhite = true
|
||||
}
|
||||
}
|
||||
@VARIANT[Dark?Grey]
|
||||
{
|
||||
!TEXTURE {}
|
||||
!EXTRA_INFO {}
|
||||
TEXTURE
|
||||
{
|
||||
materialName=FairingIconShell
|
||||
mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-orange
|
||||
}
|
||||
EXTRA_INFO
|
||||
{
|
||||
FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
|
||||
FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
|
||||
CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
|
||||
}
|
||||
GAMEOBJECTS
|
||||
{
|
||||
FairingBase1875White = false
|
||||
FairingBase1875Orange = true
|
||||
FairingBase1875BlackWhite = false
|
||||
}
|
||||
}
|
||||
}
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockModifyFairingMaterials
|
||||
COLOR_PROPERTY
|
||||
{
|
||||
name = _Color
|
||||
color = 1.0, 1.0, 1.0, 1.0
|
||||
}
|
||||
COLOR_PROPERTY
|
||||
{
|
||||
name = _SpecColor
|
||||
color = 0.753, 0.753, 0.753, 1.0
|
||||
}
|
||||
|
||||
FLOAT_PROPERTY
|
||||
{
|
||||
name = _Shininess
|
||||
value = 0.3
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
v0.1.0
|
||||
------
|
||||
- Initial release
|
||||
- Parts included:
|
||||
- Stock parts included:
|
||||
- Command
|
||||
- Mk1 Command Pod (Nertea)
|
||||
- Mk1-3 Command Pod (Nertea)
|
||||
|
@ -19,7 +19,9 @@
|
|||
- RC-L01 Remote Guidance Unit (Nertea)
|
||||
- RC-001S Remote Guidance Unit (Nertea)
|
||||
- Control
|
||||
- .625m reaction wheel (Andrew Cassidy)
|
||||
- Small Inline Reaction Wheel (Andrew Cassidy)
|
||||
- Advanced Inline Stabilizer (Nertea)
|
||||
- Advanced Reaction Wheel Module, Large (Nertea)
|
||||
- RV-105 RCS Thruster Block (Nertea)
|
||||
- Place-Anywhere 7 Linear RCS Port (Nertea)
|
||||
- Vernor Engine (Nertea)
|
||||
|
@ -128,7 +130,7 @@
|
|||
- Z-400 Rechargeable Battery (Nertea)
|
||||
- Z-100 Rechargeable Battery Pack (Nertea)
|
||||
- PB-NUK Radioisotope Thermoelectric Generator (Beale)
|
||||
- Science
|
||||
- Science
|
||||
- Science Mobile Processing Lab MPL-LG-2 (Nertea)
|
||||
- Thermometer (Andrew Cassidy)
|
||||
- Barometer (Andrew Cassidy)
|
||||
|
@ -137,12 +139,21 @@
|
|||
- Mystery Goo™ Containment Unit (Andrew Cassidy)
|
||||
- SC-9001 Science Jr. (Andrew Cassidy)
|
||||
- Atmospheric Fluid Spectro-Variometer (Andrew Cassidy)
|
||||
- Communications
|
||||
- Experiment Storage Unit (Andrew Cassidy)
|
||||
- Communications
|
||||
- Communotron 88-88 (Andrew Cassidy)
|
||||
- HG-5 High Gain Antenna (Andrew Cassidy)
|
||||
- RA-2 Relay Antenna (Andrew Cassidy)
|
||||
- RA-15 Relay Antenna (Andrew Cassidy)
|
||||
- RA-100 Relay Antenna (Andrew Cassidy)
|
||||
- Making History parts included
|
||||
- Coupling
|
||||
- TD-18 Decoupler (Nertea)
|
||||
- TS-18 Separator (Nertea)
|
||||
- Fuel Tanks
|
||||
- Stratus-V Minified Monopropellant Tank (Nertea)
|
||||
- Payload
|
||||
- AE-FF1.5 Airstream Protective Shell (Nertea)
|
||||
- Additions/new variants:
|
||||
- Probe cores now all have consistent 'Bare' and 'Gold Foil' variants, plus a generally new 'Silver' foil variant
|
||||
- 'Dark' variant for 1.25m tanks has been completely reworked (it is no longer white)
|
||||
|
|
|
@ -38,6 +38,9 @@ PART
|
|||
fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, decouple
|
||||
sound_decoupler_fire = decouple
|
||||
|
||||
/// Flag to disable this part if MH is installed
|
||||
MHReplacement = True
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleDecouple
|
||||
|
|
|
@ -38,6 +38,9 @@ PART
|
|||
fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, decouple
|
||||
sound_decoupler_fire = decouple
|
||||
|
||||
/// Flag to disable this part if MH is installed
|
||||
MHReplacement = True
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleDecouple
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
// ReStock+ 0.1.0
|
||||
// Super tiny radial RCS tank
|
||||
|
||||
PART
|
||||
{
|
||||
name = restock-fuel-tank-rcs-radial-tiny-1
|
||||
|
@ -45,6 +44,9 @@ PART
|
|||
breakingForce = 50
|
||||
breakingTorque = 50
|
||||
|
||||
/// Flag to disable this part if MH is installed
|
||||
MHReplacement = True
|
||||
|
||||
// Resources
|
||||
RESOURCE
|
||||
{
|
||||
|
|
|
@ -74,6 +74,10 @@ PART
|
|||
bulkheadProfiles = size1p5
|
||||
|
||||
tags = #LOC_RestockPlus_restock-fairing-base-1875-1_tags
|
||||
|
||||
/// Flag to disable this part if MH is installed
|
||||
MHReplacement = True
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleProceduralFairing
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
// Hides all the MH replacing parts if MH is installed
|
||||
@PART[*]:HAS[MHReplacement[True]]:FOR[zReStockPlus]:NEEDS[SquadExpansion/MakingHistory]
|
||||
{
|
||||
TechHidden = True
|
||||
category = none
|
||||
subcategory = 0
|
||||
}
|
Loading…
Reference in New Issue
Block a user