mirror of
https://github.com/PorktoberRevolution/ReStocked
synced 2024-09-01 17:34:42 +00:00
Merge branch '1-10-updates' into Master
This commit is contained in:
commit
cd3987cea9
@ -1 +1 @@
|
||||
Subproject commit d96f5a5e9414906d09be01b24d71690feacd8d53
|
||||
Subproject commit 29ec4fc935c44ef5a95c3dd10f1d5bc804ed2e57
|
||||
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.
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.
@ -76,7 +76,6 @@ Localization
|
||||
#LOC_Restock_variant-mounting_compact = Compact
|
||||
#LOC_Restock_variant-mounting_mounted = Mounted
|
||||
|
||||
|
||||
#LOC_Restock_variant-gold-truss = Gold (Mounted)
|
||||
#LOC_Restock_variant-silver-truss = Silver (Mounted)
|
||||
|
||||
@ -108,12 +107,18 @@ Localization
|
||||
#LOC_Restock_variant-surface_truss = Truss
|
||||
#LOC_Restock_variant-surface_warningStripes = Warning Stripes
|
||||
#LOC_Restock_variant-surface_thermalblankets = Insulated
|
||||
|
||||
#LOC_Restock_variant-decoupler_metal = Metal
|
||||
#LOC_Restock_variant-decoupler_grey-orange = Orange/Grey
|
||||
|
||||
#LOC_Restock_variant-surface_yellow = Yellow
|
||||
#LOC_Restock_variant-surface_black = Black
|
||||
#LOC_Restock_variant-surface_white = White
|
||||
#LOC_Restock_variant-surface_blue = Blue
|
||||
|
||||
#LOC_Restock_variant-strut_classic_metal = Metal
|
||||
#LOC_Restock_variant-strut_classic_white = White
|
||||
#LOC_Restock_variant-strut_compact_metal = Metal (Compact)
|
||||
#LOC_Restock_variant-strut_compact_white = White (Compact)
|
||||
|
||||
#LOC_Restock_variant-decoupler_metal = Metal
|
||||
#LOC_Restock_variant-decoupler_grey-orange = Orange/Grey
|
||||
|
||||
#LOC_Restock_variant-service-bay-opaque = Solid Caps
|
||||
#LOC_Restock_variant-service-bay-transparent = Truss Caps
|
||||
|
||||
@ -26,14 +26,16 @@
|
||||
stretchAxis = x
|
||||
stretchTextures = _MainTex _BumpMap
|
||||
}
|
||||
|
||||
!MODULE[ModulePartVariants] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModulePartVariants
|
||||
useMultipleDragCubes = false
|
||||
baseVariant = Yellow
|
||||
baseVariant = YellowAndWhite
|
||||
VARIANT
|
||||
{
|
||||
name = Yellow
|
||||
name = YellowAndWhite
|
||||
displayName = #LOC_Restock_variant-surface_yellow
|
||||
themeName = YellowAndWhite
|
||||
primaryColor = #B08D43
|
||||
@ -44,6 +46,8 @@
|
||||
line_black = false
|
||||
line_metal = false
|
||||
line_sofi = false
|
||||
line_white = false
|
||||
line_blue = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
@ -59,6 +63,8 @@
|
||||
line_black = true
|
||||
line_metal = false
|
||||
line_sofi = false
|
||||
line_white = false
|
||||
line_blue = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
@ -74,6 +80,8 @@
|
||||
line_black = false
|
||||
line_metal = true
|
||||
line_sofi = false
|
||||
line_white = false
|
||||
line_blue = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
@ -81,7 +89,7 @@
|
||||
name = Orange
|
||||
displayName = #autoLOC_8007123
|
||||
themeName = Orange
|
||||
primaryColor = #B08D43
|
||||
primaryColor = #A55929
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
@ -89,6 +97,42 @@
|
||||
line_black = false
|
||||
line_metal = false
|
||||
line_sofi = true
|
||||
line_white = false
|
||||
line_blue = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = White
|
||||
displayName = #LOC_Restock_variant-surface_white
|
||||
themeName = White
|
||||
primaryColor = #ffffff
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
line_yellow = false
|
||||
line_black = false
|
||||
line_metal = false
|
||||
line_sofi = false
|
||||
line_white = true
|
||||
line_blue = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Blue
|
||||
displayName = #LOC_Restock_variant-surface_blue
|
||||
themeName = White
|
||||
primaryColor = #426573
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
line_yellow = false
|
||||
line_black = false
|
||||
line_metal = false
|
||||
line_sofi = false
|
||||
line_white = false
|
||||
line_blue = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,16 +26,18 @@
|
||||
stretchAxis = x
|
||||
stretchTextures = _MainTex _BumpMap
|
||||
}
|
||||
|
||||
!MODULE[ModulePartVariants] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModulePartVariants
|
||||
useMultipleDragCubes = false
|
||||
baseVariant = Classic
|
||||
baseVariant = Gray
|
||||
VARIANT
|
||||
{
|
||||
name = Classic
|
||||
displayName = #LOC_Restock_variant-mounting_classic
|
||||
themeName = White
|
||||
name = Gray
|
||||
displayName = #LOC_Restock_variant-strut_classic_metal
|
||||
themeName = Metal
|
||||
primaryColor = #6f6e6d
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
@ -44,13 +46,19 @@
|
||||
strut_target_body_classic = true
|
||||
strut_main_body_compact = false
|
||||
strut_target_body_compact = false
|
||||
strut_main_body_classic_white = false
|
||||
strut_target_body_classic_white = false
|
||||
strut_main_body_compact_white = false
|
||||
strut_target_body_compact_white = false
|
||||
strut_metal = true
|
||||
strut_white = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Compact
|
||||
displayName = #LOC_Restock_variant-mounting_compact
|
||||
themeName = White
|
||||
displayName = #LOC_Restock_variant-strut_compact_metal
|
||||
themeName = Metal
|
||||
primaryColor = #6f6e6d
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
@ -59,6 +67,54 @@
|
||||
strut_target_body_classic = false
|
||||
strut_main_body_compact = true
|
||||
strut_target_body_compact = true
|
||||
strut_main_body_classic_white = false
|
||||
strut_target_body_classic_white = false
|
||||
strut_main_body_compact_white = false
|
||||
strut_target_body_compact_white = false
|
||||
strut_metal = true
|
||||
strut_white = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = White
|
||||
displayName = #LOC_Restock_variant-strut_classic_white
|
||||
themeName = White
|
||||
primaryColor = #ffffff
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
strut_main_body_classic = false
|
||||
strut_target_body_classic = false
|
||||
strut_main_body_compact = false
|
||||
strut_target_body_compact = false
|
||||
strut_main_body_classic_white = true
|
||||
strut_target_body_classic_white = true
|
||||
strut_main_body_compact_white = false
|
||||
strut_target_body_compact_white = false
|
||||
strut_metal = false
|
||||
strut_white = true
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = White_Compact
|
||||
displayName = #LOC_Restock_variant-strut_compact_white
|
||||
themeName = White
|
||||
primaryColor = #ffffff
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
strut_main_body_classic = false
|
||||
strut_target_body_classic = false
|
||||
strut_main_body_compact = false
|
||||
strut_target_body_compact = false
|
||||
strut_main_body_classic_white = false
|
||||
strut_target_body_classic_white = false
|
||||
strut_main_body_compact_white = true
|
||||
strut_target_body_compact_white = true
|
||||
strut_metal = false
|
||||
strut_white = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,347 @@
|
||||
// Patches applying art changes to the asteroid claw
|
||||
// Contents:
|
||||
// - Advanced Grabbing Unit (GrapplingDevice)
|
||||
// - Advanced Grabbing Unit Jr. (smallClaw)
|
||||
|
||||
// Advanced Grabbing Unit
|
||||
@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
{
|
||||
@author = Andrew Cassidy
|
||||
!mesh = DELETE
|
||||
MODEL
|
||||
{
|
||||
model = ReStock/Assets/Coupling/restock-claw-125-1
|
||||
}
|
||||
%rescaleFactor = 1
|
||||
%node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1
|
||||
|
||||
@MODULE[ModuleGrappleNode]
|
||||
{
|
||||
nodeTransformName = Pivot
|
||||
}
|
||||
@MODULE[ModuleAnimateGeneric]
|
||||
{
|
||||
animationName = Deploy
|
||||
}
|
||||
@MODULE[FlagDecal]
|
||||
{
|
||||
textureQuadName = flags
|
||||
}
|
||||
|
||||
!MODULE[FXModuleLookAtConstraint] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockConstraints
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_0_lower
|
||||
targetName = Actuator_0_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_0_upper
|
||||
targetName = Actuator_0_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_1_lower
|
||||
targetName = Actuator_1_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_1_upper
|
||||
targetName = Actuator_1_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_2_lower
|
||||
targetName = Actuator_2_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_2_upper
|
||||
targetName = Actuator_2_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_3_lower
|
||||
targetName = Actuator_3_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_3_upper
|
||||
targetName = Actuator_3_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_4_lower
|
||||
targetName = Actuator_4_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_4_upper
|
||||
targetName = Actuator_4_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_5_lower
|
||||
targetName = Actuator_5_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_5_upper
|
||||
targetName = Actuator_5_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_6_lower
|
||||
targetName = Actuator_6_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_6_upper
|
||||
targetName = Actuator_6_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_7_lower
|
||||
targetName = Actuator_7_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_7_upper
|
||||
targetName = Actuator_7_lower
|
||||
}
|
||||
}
|
||||
|
||||
!MODULE[ModulePartVariants] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModulePartVariants
|
||||
baseVariant = White
|
||||
useMultipleDragCubes = false
|
||||
VARIANT
|
||||
{
|
||||
name = White
|
||||
displayName = #LOC_Restock_variant-surface_white
|
||||
themeName = White
|
||||
primaryColor = #ffffff
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Accents_white = true
|
||||
Accents_black = false
|
||||
Accents_yellow = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Dark
|
||||
displayName = #LOC_Restock_variant-surface_black
|
||||
themeName = Dark
|
||||
primaryColor = #4c4f47
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Accents_white = false
|
||||
Accents_black = true
|
||||
Accents_yellow = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Yellow
|
||||
displayName = #LOC_Restock_variant-surface_yellow
|
||||
themeName = YellowAndWhite
|
||||
primaryColor = #B08D43
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Accents_white = false
|
||||
Accents_black = false
|
||||
Accents_yellow = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockDepthMask
|
||||
maskTransform = DepthMask
|
||||
}
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleLight
|
||||
lightName = Lamp
|
||||
useAnimationDim = true
|
||||
lightBrightenSpeed = 2.5
|
||||
lightDimSpeed = 2.5
|
||||
resourceAmount = 0.02
|
||||
useResources = true
|
||||
animationName = RestockClawLamp_On
|
||||
}
|
||||
}
|
||||
|
||||
// Advanced Grabbing Unit Jr.
|
||||
@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
{
|
||||
@author = Andrew Cassidy
|
||||
!mesh = DELETE
|
||||
MODEL
|
||||
{
|
||||
model = ReStock/Assets/Coupling/restock-claw-625-2
|
||||
}
|
||||
%rescaleFactor = 1
|
||||
%node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1
|
||||
%node_attach = 0.0, -0.0738, 0.00, 0.0, -1.0, 0.0, 1
|
||||
|
||||
@MODULE[ModuleGrappleNode]
|
||||
{
|
||||
nodeTransformName = Pivot
|
||||
}
|
||||
|
||||
@MODULE[ModuleAnimateGeneric]
|
||||
{
|
||||
animationName = Deploy
|
||||
}
|
||||
|
||||
@MODULE[FlagDecal]
|
||||
{
|
||||
textureQuadName = FlagTransform
|
||||
}
|
||||
|
||||
!MODULE[FXModuleLookAtConstraint] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockConstraints
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_0_lower
|
||||
targetName = Actuator_0_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_0_upper
|
||||
targetName = Actuator_0_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_1_lower
|
||||
targetName = Actuator_1_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_1_upper
|
||||
targetName = Actuator_1_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_2_lower
|
||||
targetName = Actuator_2_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_2_upper
|
||||
targetName = Actuator_2_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_3_lower
|
||||
targetName = Actuator_3_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_3_upper
|
||||
targetName = Actuator_3_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_4_lower
|
||||
targetName = Actuator_4_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_4_upper
|
||||
targetName = Actuator_4_lower
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_5_lower
|
||||
targetName = Actuator_5_upper
|
||||
}
|
||||
LOOKATCONSTRAINT
|
||||
{
|
||||
rotatorsName = Actuator_5_upper
|
||||
targetName = Actuator_5_lower
|
||||
}
|
||||
}
|
||||
|
||||
!MODULE[ModulePartVariants] {}
|
||||
MODULE
|
||||
{
|
||||
name = ModulePartVariants
|
||||
baseVariant = White
|
||||
useMultipleDragCubes = false
|
||||
VARIANT
|
||||
{
|
||||
name = White
|
||||
displayName = #LOC_Restock_variant-surface_white
|
||||
themeName = White
|
||||
primaryColor = #ffffff
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Body_white = true
|
||||
Body_black = false
|
||||
Body_yellow = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Dark
|
||||
displayName = #LOC_Restock_variant-surface_black
|
||||
themeName = Dark
|
||||
primaryColor = #4c4f47
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Body_white = false
|
||||
Body_black = true
|
||||
Body_yellow = false
|
||||
}
|
||||
}
|
||||
VARIANT
|
||||
{
|
||||
name = Yellow
|
||||
displayName = #LOC_Restock_variant-surface_yellow
|
||||
themeName = YellowAndWhite
|
||||
primaryColor = #B08D43
|
||||
secondaryColor = #999999
|
||||
GAMEOBJECTS
|
||||
{
|
||||
Body_white = false
|
||||
Body_black = false
|
||||
Body_yellow = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockDepthMask
|
||||
maskTransform = DepthMask
|
||||
}
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleLight
|
||||
lightName = SpotLight
|
||||
useAnimationDim = true
|
||||
lightBrightenSpeed = 2.5
|
||||
lightDimSpeed = 2.5
|
||||
resourceAmount = 0.02
|
||||
useResources = true
|
||||
animationName = RestockMiniClawLamp_On
|
||||
}
|
||||
}
|
||||
@ -186,3 +186,26 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Magnetometer Boom
|
||||
@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[ReStock]
|
||||
{
|
||||
@author = Andrew Cassidy
|
||||
!mesh = DELETE
|
||||
MODEL
|
||||
{
|
||||
model = ReStock/Assets/Science/restock-magnetometer-1
|
||||
}
|
||||
|
||||
@MODULE[ModuleDeployablePart]
|
||||
{
|
||||
@animationName = Deploy
|
||||
@breakName = Pivot
|
||||
}
|
||||
|
||||
MODULE
|
||||
{
|
||||
name = ModuleRestockDepthMask
|
||||
maskTransform = DepthMask
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -22,8 +22,8 @@ Squad/Parts/Command/mk1pod_v2/
|
||||
Squad/Parts/Command/mk2LanderCan_v2/
|
||||
Squad/Parts/Command/probeCoreCube/
|
||||
Squad/Parts/Command/probeCoreHex_v2/
|
||||
Squad/Parts/Command/probeCoreOcto_v2/
|
||||
Squad/Parts/Command/probeCoreOcto2_v2/
|
||||
Squad/Parts/Command/probeCoreOcto_v2/
|
||||
Squad/Parts/Command/probeRoverBody_v2/
|
||||
Squad/Parts/Command/probeStackLarge/
|
||||
Squad/Parts/Command/probeStackSmall/
|
||||
@ -68,6 +68,7 @@ Squad/Parts/Engine/solidBoosterS2-17/
|
||||
Squad/Parts/Engine/solidBoosterS2-33/
|
||||
Squad/Parts/Engine/solidBoosterSep/
|
||||
Squad/Parts/Engine/SolidBoostersF/Assets/
|
||||
Squad/Parts/FuelTank/drainTankFTE-1/
|
||||
Squad/Parts/FuelTank/FoilTanks/
|
||||
Squad/Parts/FuelTank/fuelTankOscarB/
|
||||
Squad/Parts/FuelTank/RCSFuelTankR1/
|
||||
@ -81,7 +82,6 @@ Squad/Parts/FuelTank/Size3Tanks/
|
||||
Squad/Parts/FuelTank/xenonTank/
|
||||
Squad/Parts/FuelTank/xenonTankLarge/
|
||||
Squad/Parts/FuelTank/xenonTankRadial/
|
||||
Squad/Parts/FuelTank/drainTankFTE-1/
|
||||
Squad/Parts/Misc/AsteroidDay/
|
||||
Squad/Parts/Resources/FuelCell/
|
||||
Squad/Parts/Resources/ISRU/
|
||||
@ -94,7 +94,16 @@ Squad/Parts/Resources/RadialTank/
|
||||
Squad/Parts/Resources/SmallTank/
|
||||
Squad/Parts/Resources/SurfaceScanner/
|
||||
Squad/Parts/Resources/SurveyScanner/
|
||||
Squad/Parts/Science/
|
||||
Squad/Parts/Science/AtmosphereSensor/
|
||||
Squad/Parts/Science/GooExperiment/
|
||||
Squad/Parts/Science/LargeCrewedLab/
|
||||
Squad/Parts/Science/Magnetometer/
|
||||
Squad/Parts/Science/MaterialBay/
|
||||
Squad/Parts/Science/ScienceBox/
|
||||
Squad/Parts/Science/sensorAccelerometer/
|
||||
Squad/Parts/Science/sensorBarometer/
|
||||
Squad/Parts/Science/sensorGravimeter/
|
||||
Squad/Parts/Science/sensorThermometer/
|
||||
Squad/Parts/Structural/FLAdapters/
|
||||
Squad/Parts/Structural/Size3To2Adapter_v2/
|
||||
Squad/Parts/Structural/stackAdapters/
|
||||
@ -136,8 +145,8 @@ Squad/Parts/Utility/linearVernorRCS/
|
||||
Squad/Parts/Utility/parachuteMk1/
|
||||
Squad/Parts/Utility/parachuteMk12-R/
|
||||
Squad/Parts/Utility/parachuteMk16-XL/
|
||||
Squad/Parts/Utility/parachuteMk25/
|
||||
Squad/Parts/Utility/parachuteMk2-R/
|
||||
Squad/Parts/Utility/parachuteMk25/
|
||||
Squad/Parts/Utility/radialAttachmentPoint/
|
||||
Squad/Parts/Utility/rcsBlockRV-105/
|
||||
Squad/Parts/Utility/rcsBlockRV-105_v2/
|
||||
@ -145,6 +154,7 @@ Squad/Parts/Utility/RelayAntennas/
|
||||
Squad/Parts/Utility/rockomaxAdapters/
|
||||
Squad/Parts/Utility/ServiceBay/
|
||||
Squad/Parts/Utility/ServiceBay_v2/
|
||||
Squad/Parts/Utility/smallClaw/
|
||||
Squad/Parts/Utility/spotLightMk1/
|
||||
Squad/Parts/Utility/spotLightMk2/
|
||||
Squad/Parts/Utility/stackCouplers/
|
||||
|
||||
@ -2,13 +2,17 @@ v1.2.0
|
||||
------
|
||||
- KSP 1.10.1
|
||||
- New stock part replacements
|
||||
- Coupling
|
||||
- Advanced Grabbing Unit Jr. (Andrew Cassidy): now has black, yellow, and white variants
|
||||
- Resources
|
||||
-FTE-1 Drain Valve (Andrew Cassidy): now has metal and warning stripe variants
|
||||
- FTE-1 Drain Valve (Andrew Cassidy): now has metal and warning stripe variants
|
||||
- Science
|
||||
- Magnetometer Boom (Andrew Cassidy)
|
||||
- New Making History part replacements
|
||||
- Command
|
||||
- KV-1 'Onion' Reentry Module (Andrew Cassidy): now has bare and green padded variants and a node for attaching the inflatable airlock.
|
||||
- KV-2 'Pea' Reentry Module (Andrew Cassidy): now has bare and beige padded variants and a node for attaching the inflatable airlock.
|
||||
- KV-3 'Pomegranate' Reentry Module (Andrew Cassidy): now has bare and white padded variants and a node for attaching the inflatable airlock.
|
||||
- KV-1 'Onion' Reentry Module (Well): now has bare and green padded variants and a node for attaching the inflatable airlock.
|
||||
- KV-2 'Pea' Reentry Module (Well): now has bare and beige padded variants and a node for attaching the inflatable airlock.
|
||||
- KV-3 'Pomegranate' Reentry Module (Well): now has bare and white padded variants and a node for attaching the inflatable airlock.
|
||||
- Mk2 Command Pod (Andrew Cassidy): Now has dark and white variants.
|
||||
- Coupling
|
||||
- Inflatable Airlock (Andrew Cassidy): now has built in decoupler and optional ring to connect seamlessly with KV-series pods. Has a new IVA.
|
||||
@ -19,11 +23,15 @@ v1.2.0
|
||||
- Poodle now supports a new Single Bell variant, which replaces the new Squad variant, and a Single Bell Compact variant, which is new
|
||||
- Decouplers now support a Classic variant (replaces stock White/Yellow variant)
|
||||
- Separators now support a Classic variant (replaces stock White/Yellow variant)
|
||||
- EAS-4 Strut Connector now supports new White and White (compact) variants
|
||||
- FTX-2 External Fuel Duct now supports new White variant, plus an additional Delta Blue variant.
|
||||
- Advanced Grabbing Unit Jr. now supports new White, Black, and Yellow variants
|
||||
- Fixes:
|
||||
- Fixed duplicate drag cubes on reaction wheels.
|
||||
- Rebuilt colliders for the following parts: QBE, HECS, HECS2, OKTO, OKTO2 (#862, #865)
|
||||
- Fixed smoothing issues on Jumbo-64 tank (#867)
|
||||
- Tuned probe core foil textures somewhat
|
||||
- Fixed missing pivot collider on Advanced Grabbing Unit
|
||||
|
||||
v1.1.2
|
||||
------
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -315,7 +315,7 @@ Localization
|
||||
#LOC_RestockPlus_restock-decoupler-radial-tiny-1_tags = restock break decouple separat split stag
|
||||
|
||||
// 0.625m
|
||||
#LOC_RestockPlus_restock-claw-625-1_title = Advanced Grabbing Unit Junior
|
||||
#LOC_RestockPlus_restock-claw-625-1_title = Compact Grabbing Unit Jr.
|
||||
#LOC_RestockPlus_restock-claw-625-1_description = A smaller claw for grappling smaller things. Unfortunately, it does not pivot.
|
||||
#LOC_RestockPlus_restock-claw-625-1_tags = restock a.r.m arm asteroid capture clam claw connect dock fasten grab join klaw nasa 625
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ PART
|
||||
author = Andrew Cassidy
|
||||
MODEL
|
||||
{
|
||||
model = ReStockPlus/Assets/Coupling/restock-claw-625
|
||||
model = ReStock/Assets/Coupling/restock-claw-625-1
|
||||
scale = 1.0, 1.0, 1.0
|
||||
}
|
||||
rescaleFactor = 1.0
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
v1.2.0
|
||||
------
|
||||
- New Command parts
|
||||
- SP-1 'Clementine' Reentry Module (Andrew Cassidy): 1-kerbal spherical command module with bare and green padded variants. Disabled if Making History is installed.
|
||||
- SP-2 'Tangerine' Reentry Module (Andrew Cassidy): 1-kerbal spherical command module with bare and beige padded variants. Disabled if Making History is installed.
|
||||
- SP-3 'Mandarin' Reentry Module (Andrew Cassidy): 1-kerbal spherical command module with bare and white padded variants. Disabled if Making History is installed.
|
||||
- SP-1 'Clementine' Reentry Module (Well): 1-kerbal spherical command module with bare and green padded variants. Disabled if Making History is installed.
|
||||
- SP-2 'Tangerine' Reentry Module (Well): 1-kerbal spherical command module with bare and beige padded variants. Disabled if Making History is installed.
|
||||
- SP-3 'Mandarin' Reentry Module (Well): 1-kerbal spherical command module with bare and white padded variants. Disabled if Making History is installed.
|
||||
- Mk2 "Acorn" Command Pod (Andrew Cassidy): 2-kerbal conical command module with dark and white variants. Disabled if Making History is installed
|
||||
- New Coupling parts
|
||||
- AL-1 'Lychee' Inflatable Docking Airlock (Andrew Cassidy): Inflatable airlock with integrated 0.625m docking port. Disabled if Making History is installed. Has a new IVA.
|
||||
- New Structural Parts
|
||||
- BZ-26 Radial Attachment Point Jr. (Andrew Cassidy): 0.625m radial attachment node
|
||||
- BZ-78 Radial Attachment Point (Andrew Cassidy): 1.875m radial attachment node
|
||||
- Bugfixes and tweaks
|
||||
- Advanced Grabbing Unit Junior renamed to Compact Grabbing Unit Jr. and assets moved to Restock base to be shared with stock Advanced Grabbing Unit Jr.
|
||||
|
||||
v1.1.2
|
||||
------
|
||||
|
||||
@ -5,42 +5,40 @@ namespace Restock
|
||||
{
|
||||
/* Extends the stock CModuleLinkedMesh used on struts and pipes to make pipe textures repeat instead of stretch when
|
||||
a pipe is extended beyond its default length */
|
||||
|
||||
|
||||
public class ModuleRestockLinkedMesh : CModuleLinkedMesh
|
||||
{
|
||||
// the direction along the texture that the pipe points. set to "x" or "y"
|
||||
[KSPField]
|
||||
public string stretchAxis = "x";
|
||||
|
||||
[KSPField] public string stretchAxis = "x";
|
||||
|
||||
// space-seperated list of textures to be effected by the length, preferably all of the ones on the material
|
||||
// Unity has no good way to get all the texture names attached to a material so it has to be set manually, unfortunately
|
||||
[KSPField]
|
||||
public string stretchTextures = "_MainTex";
|
||||
|
||||
|
||||
[KSPField] public string stretchTextures = "_MainTex";
|
||||
|
||||
|
||||
// reference to the material we will be modifying
|
||||
private Material[] pipeMaterials;
|
||||
|
||||
|
||||
// array of property IDs corresponding to the textures
|
||||
private int[] pipeMaterialIDs;
|
||||
|
||||
|
||||
// index of the texture scale vector, 0 for x, 1 for y
|
||||
private int pipeStretchIndex;
|
||||
|
||||
|
||||
// initial scale of the pipe object, may not be 1
|
||||
private float baseStretch;
|
||||
|
||||
// scale vector for the material
|
||||
private Vector2 texScale = Vector2.one;
|
||||
|
||||
|
||||
// offset vector for the material
|
||||
private Vector2 texOffset = Vector2.zero;
|
||||
|
||||
|
||||
|
||||
public override void OnStart(StartState state)
|
||||
{
|
||||
base.OnStart(state);
|
||||
|
||||
|
||||
// get all materials on the line object, including disabled ones
|
||||
var renderers = line.GetComponentsInChildren<MeshRenderer>(true);
|
||||
pipeMaterials = new Material[renderers.Length];
|
||||
@ -48,7 +46,7 @@ namespace Restock
|
||||
{
|
||||
pipeMaterials[i] = renderers[i].material;
|
||||
}
|
||||
|
||||
|
||||
// split texture list and convert to property IDs for easy access
|
||||
var texNames = stretchTextures.Split(' ');
|
||||
pipeMaterialIDs = new int[texNames.Length];
|
||||
@ -56,11 +54,11 @@ namespace Restock
|
||||
{
|
||||
pipeMaterialIDs[i] = Shader.PropertyToID(texNames[i]);
|
||||
}
|
||||
|
||||
|
||||
// default to 'x' if an invalid value is used
|
||||
pipeStretchIndex = stretchAxis != "y" ? 0 : 1;
|
||||
baseStretch = part.scaleFactor;
|
||||
|
||||
|
||||
GameEvents.onEditorVariantApplied.Add(OnVariantApplied);
|
||||
}
|
||||
|
||||
@ -91,23 +89,24 @@ namespace Restock
|
||||
{
|
||||
if (appliedPart == part) UpdateStretch();
|
||||
}
|
||||
|
||||
|
||||
// updates the texture stretch to match the pipe object's local scale
|
||||
private void UpdateStretch()
|
||||
{
|
||||
var stretch = line.localScale.z / baseStretch;
|
||||
|
||||
|
||||
texScale[pipeStretchIndex] = stretch;
|
||||
texOffset[pipeStretchIndex] = (1 - stretch) / 2;
|
||||
|
||||
for (var i = 0; i < pipeMaterials.Length; i++)
|
||||
foreach (var material in pipeMaterials)
|
||||
{
|
||||
var material = pipeMaterials[i];
|
||||
for (var j = 0; j < pipeMaterialIDs.Length; j++)
|
||||
foreach (var id in pipeMaterialIDs)
|
||||
{
|
||||
var id = pipeMaterialIDs[j];
|
||||
material.SetTextureScale(id, texScale);
|
||||
material.SetTextureOffset(id, texOffset);
|
||||
if (material.HasProperty(id))
|
||||
{
|
||||
material.SetTextureScale(id, texScale);
|
||||
material.SetTextureOffset(id, texOffset);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user