Merge branch 'master' of github.com:PorktoberRevolution/ReStocked

pull/781/head
Andrew Cassidy 4 years ago
commit f141955c26
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1

@ -13,7 +13,7 @@ package:
- RestockRigidLegs
dependencies: # Configure dependencies
ModuleManager:
version: 4.1.0
version: 4.1.3
location: s3
deploy:
SpaceDock:

@ -40,8 +40,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 (1.875m, White)
#LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (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_shroud_white = White Shroud
#LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud

@ -6,7 +6,7 @@
{
"MAJOR":1,
"MINOR":0,
"PATCH":0,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":

@ -1,3 +1,15 @@
v1.0.3
-----
- Updated ModuleManager distribution to 4.1.3
- Fixed Flea, Hammer, Kickback and Thumper colliders (#779)
v1.0.2
-----
- Fixed plugin instantiation issue
- Fixed 'tankbutt' localizations for Skiff showing 1.875m when they should be 2.5m (#766)
- Fixed inflatable heatshield fairing (#765)
v1.0.1
-----
- Fixed lack of bundled ModuleManager
@ -7,7 +19,8 @@ v1.0.1
- Fixed compatability with RealChute and NO FAR (#756)
- Fixed Skippper orange boattail texture assignments (#754)
- Fixed large truss piece collider scaling (#753)
- Un-blacklisted legacy squad spark model (we don't have an appropriate replacement anymore)
- Un-blacklisted legacy Squad spark model (we don't have an appropriate replacement anymore)
- Updated Chinese translation (Duck1998)
v1.0.0
------

@ -1,5 +1,5 @@
=============
RESTOCK 1.0.0
RESTOCK 1.0.3
=============
Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the cancelled Part Overhaul project by Porkjet.
@ -13,7 +13,7 @@ DEPENDENCIES
============
Required:
- ModuleManager (4.1.0)
- ModuleManager (4.1.3)
=======
CREDITS

@ -1,5 +1,5 @@
========================
RESTOCK RIGID LEGS 1.0.0
RESTOCK RIGID LEGS 1.0.3
========================
Restock Rigid Legs adds alternate versions of the stock legs without the suspension module. These legs are functionally just animated parts the are by default tied to the landing gear action group. The legs are added as their own parts and do not replace the existing legs, making them compatible with saves just like any other mod. They also take advantage of the physics material switcher module added in 1.7.3, allowing for an adjustable level of friction to prevent your landers from sliding down slopes.
@ -9,8 +9,8 @@ DEPENDENCIES
============
Required:
- Restock (1.0.0)
- ModuleManager (4.0.2)
- Restock (1.0.3)
- ModuleManager (4.1.3)
============
INSTALLATION

@ -10,7 +10,7 @@ package:
- license.txt
dependencies: # Configure dependencies
ModuleManager:
version: 4.1.0
version: 4.1.3
location: s3
deploy:
SpaceDock:

@ -12,7 +12,7 @@ PART
rescaleFactor = 1.0
node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 1
TechRequired = advancedConstruction
TechRequired = advConstruction
entryCost = 1800
cost = 475
category = Coupling

@ -12,7 +12,7 @@ PART
rescaleFactor = 1.0
node_stack_top = 0.0, 0.075, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.075, 0.0, 0.0, -1.0, 0.0, 1
TechRequired = advancedConstruction
TechRequired = advConstruction
entryCost = 1800
cost = 475
category = Coupling

@ -2,7 +2,7 @@
// 1.875m SRB for post-1.8 (mirrors Pollux)
PART
{
name = restock-srb-anvil-1
name = restock-srb-castor-1
module = Part
author = Chris Adderley (Nertea)
rescaleFactor = 1

@ -6,7 +6,7 @@
{
"MAJOR":1,
"MINOR":0,
"PATCH":0,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":

@ -1,9 +1,20 @@
v1.0.3
-----
- Updated ModuleManager distribution to 4.1.3
- Fixed Pollux and Anvil colliders (#779)
v1.0.2
-----
- Fixed tech tree locations for 1.875m decoupler and separator
- Fixed Castor SRB having the same part name as old Anvil
v1.0.1
------
- Fixed lack of bundled ModuleManager
- Updated Simplified Chinese localization (Duck1998)
- Fixed Cherenkov shroud texture assignments (#754)
- Fixed x-large truss piece collider scaling (#753)
- Updated Chinese translation (Duck1998)
v1.0.0
------

@ -1,5 +1,5 @@
==============
RESTOCK+ 1.0.0
RESTOCK+ 1.0.3
==============
Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@ -21,8 +21,8 @@ DEPENDENCIES
============
Required:
- Restock (1.0.0)
- ModuleManager (4.1.0)
- Restock (1.0.3)
- ModuleManager (4.1.3)
=============
CREDITS

@ -13,11 +13,11 @@ namespace Restock
[KSPField] public string shaderProperty = "_EmissiveColor";
// animation curve for the red channel
[KSPField] public FloatCurve redCurve= new FloatCurve();
[KSPField] public FloatCurve redCurve = new FloatCurve();
// animation curve for the green channel
[KSPField] public FloatCurve greenCurve = new FloatCurve();
// animation curve for the blue channel
[KSPField] public FloatCurve blueCurve = new FloatCurve();
@ -26,41 +26,44 @@ namespace Restock
// draper point, the temperature in Kelvin where materials start glowing
[KSPField] public double draperPoint = 798.0;
// temperature where the animation is at its maximum
[KSPField] public double lerpMax = double.NaN;
// temperature where the animation is at its minimum, added with draperPoint
[KSPField] public double lerpMin = 0.0;
// use the part's core temperature? (overrides useSkinTemp)
[KSPField] public bool useCoreTemp = false;
// use the part's skin temperature?
[KSPField] public bool useSkinTemp = false;
// should the module disable the stock blackbody glow effect on the included renderers?
[KSPField] public bool disableBlackbody = false;
[KSPField] public List<Renderer> renderers = new List<Renderer>();
public List<Renderer> renderers = new List<Renderer>();
private readonly string _shaderBlackbody = "_TemperatureColor";
private ModuleCoreHeat _coreHeatModule = null;
private int _shaderPropertyID;
private int _shaderBlackbodyID;
private double _lerpRange;
private Color _emissiveColor = new Color();
private MaterialPropertyBlock _propertyBlock = new MaterialPropertyBlock();
private Color _emissiveColor;
private MaterialPropertyBlock _propertyBlock;
public void Start()
{
if (base.vessel == null) return;
_emissiveColor = new Color();
_propertyBlock = new MaterialPropertyBlock();
if (enableHeatEmissive)
{
if (useCoreTemp)
@ -72,7 +75,7 @@ namespace Restock
useCoreTemp = false;
}
}
if (double.IsNaN(lerpMax))
{
if (useCoreTemp)
@ -95,17 +98,17 @@ namespace Restock
_shaderBlackbodyID = Shader.PropertyToID(_shaderBlackbody);
}
}
public override void OnLoad(ConfigNode node)
{
if (HighLogic.LoadedSceneIsEditor || HighLogic.LoadedSceneIsFlight) return;
renderers = base.part.FindModelComponents<Renderer>();
if (node.HasValue("excludedRenderer"))
{
var excludedRenderers = new List<string>();
excludedRenderers.AddRange(node.GetValues("excludedRenderer"));
for (int i = renderers.Count - 1; i >= 0; i--)
@ -121,7 +124,7 @@ namespace Restock
public void LateUpdate()
{
if (!HighLogic.LoadedSceneIsFlight) return;
if (renderers == null) return;
if (renderers == null) return;
//when switching to the flight scene LateUpdate gets called AFTER OnLoad for some reason
// so renderers should hopefully only be null for one frame
@ -136,10 +139,10 @@ namespace Restock
{
temp = useSkinTemp ? base.part.skinTemperature : base.part.temperature;
}
var temp2 = (float) ((temp - draperPoint) / _lerpRange);
temp2 = Mathf.Clamp01(temp2);
_emissiveColor.r = redCurve.Evaluate(temp2);
_emissiveColor.g = greenCurve.Evaluate(temp2);
_emissiveColor.b = blueCurve.Evaluate(temp2);

Loading…
Cancel
Save