Merge branch 'MH-IVAs' into MH-Pods

MH-Pods
Andrew Cassidy 4 years ago
commit 80c639f32b
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1

5
.gitignore vendored

@ -7,3 +7,8 @@ build-deploy/
bin/
obj/
*.swp
Distribution/Restock/GameData/ReStock/Spaces/**/*.png
Distribution/Restock/GameData/ReStock/Props/**/*.png
Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png

@ -1 +1 @@
Subproject commit da0b16981a511db4488015c1280852c4693fb538
Subproject commit 380647e8b60bfa6d027eb2a1d164a523792676f7

@ -0,0 +1,73 @@
// adds Near Future Props to Restock IVAs to fill them out more
// Inflatable Airlock IVA
@INTERNAL[restock-airlock-1-IVA]:NEEDS[NearFutureProps]:AFTER[ReStock]
{
PROP
{
name = NF_PAPR_Clipboard_Log
position = -0.3309464,-0.001345975,-1.962911
rotation = -0.4704114,-0.4704107,-0.5279329,0.5279335
scale = 1,1,1
}
PROP
{
name = NF_RAIL_Small_Silver
position = 0,-0.281,-1.89
rotation = 4.619359E-07,0,0,1
scale = 1,1,1
}
PROP
{
name = NF_RAIL_Small_Silver
position = 0,0.281,-1.89
rotation = -1,0,0,4.619359E-07
scale = 1,1,1
}
PROP
{
name = NF_TANK_Wall_O2
position = 0.337,0,-0.112
rotation = 0,1,0,0
scale = 0.8,0.8,0.8
}
PROP
{
name = NF_TANK_Wall_O2
position = -0.337,0,-0.112
rotation = 0,1,0,0
scale = 0.8,0.8,0.8
}
PROP
{
name = NF_TANK_Wall_N2
position = 0.2382951,-0.2382949,-0.112
rotation = 0.3826832,0.9238797,0,0
scale = 0.8000004,0.8000001,0.8000005
}
PROP
{
name = NF_TANK_Wall_N2
position = -0.2382951,0.2382949,-0.112
rotation = 0.3826832,0.9238797,0,0
scale = 0.8000004,0.8000001,0.8000005
}
PROP
{
name = NF_TANK_Wall_N2
position = 0.238295,0.238295,-0.112
rotation = -0.3826834,0.9238796,0,0
scale = 0.8000003,0.8000001,0.8000005
}
PROP
{
name = NF_TANK_Wall_N2
position = -0.238295,-0.238295,-0.112
rotation = -0.3826834,0.9238796,0,0
scale = 0.8000003,0.8000001,0.8000005
}
}

@ -23,6 +23,13 @@
rotation = 0, 0, 0
}
!INTERNAL,* {}
INTERNAL
{
name = restock-airlock-1-IVA
}
@MODULE[ModuleAnimateGeneric]
{
@animationName = Deploy

@ -0,0 +1,12 @@
// Restock Plus v1.2.0
// Hatch - 0.625m bulkhead
PROP
{
name = RS_HTCH_625
MODEL
{
model = ReStock/Props/Hatches/RS_HTCH_625
}
}
proxy = 0, 0, 0, 0.6, 0.1, 0.6, 1, 0, 0

@ -0,0 +1,12 @@
// Restock Plus v1.2.0
// Light - Airlock pressurization indicator (green)
PROP
{
name = RS_LGHT_Airlock_Green
MODEL
{
model = ReStock/Props/Lights/RS_LGHT_Airlock_Green
}
}
proxy = 0, 0, 0, 0.10, 0.15, 0.07, 1, 0, 0

@ -0,0 +1,12 @@
// Restock Plus v1.2.0
// Light - Airlock pressurization indicator (green)
PROP
{
name = RS_LGHT_Airlock_Red
MODEL
{
model = ReStock/Props/Lights/RS_LGHT_Airlock_Red
}
}
proxy = 0, 0, 0, 0.10, 0.15, 0.07, 1, 0, 0

@ -0,0 +1,29 @@
// Restock Plus v1.2.0
// Light - Airlock pressurization indicator (green)
PROP
{
name = RS_LGHT_Box_1
MODEL
{
model = ReStock/Props/Lights/RS_LGHT_Box_1
}
//MODULE
{
name = InternalButtonLight
buttonName = enable_BOXCOLLIDER
defaultValue = true
lightName = SpotLight
lightColor = 1,1,1
lightIntensityOn = 0.75
lightIntensityOff = 0
useButtonColor = true
buttonColorOn = 1,1,1
buttonColorOff = 0,0,0
}
}
proxy = 0, 0, 0, 0.06, 0.15, 0.07, 1, 0, 0

@ -0,0 +1,68 @@
INTERNAL
{
name = restock-airlock-1-IVA
MODEL
{
model = ReStock/Spaces/Airlock/restock-airlock-1-IVA
}
MODEL
{
model = ReStock/Spaces/Airlock/restock-airlock-1-IVA-mask
}
MODULE
{
name = InternalSeat
seatTransformName = seat1
allowCrewHelmet = false
portraitCameraName = seat1_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_top_clicker
cameraTransformName = window_top_camera
}
PROP
{
name = RS_LGHT_Box_1
position = -0.2032,0,-2.1108
rotation = 0.707107,0,0,0.7071066
scale = 1,1,1
}
PROP
{
name = RS_LGHT_Airlock_Green
position = 0,0.3212,-2.02
rotation = -0.707107,1.791241E-07,0.7071066,1.79124E-07
scale = 1,1,1
}
PROP
{
name = genericClusterSwitches05
position = -0.126,0.3299,-2.007
rotation = -0.9762959,-0.21644,5.317851E-07,-1.229346E-07
scale = 1,1,1
}
PROP
{
name = IndicatorPanel
position = 0.144,0.3119,-2.007
rotation = 2.38022E-07,-8.930404E-08,-0.9794683,-0.2015985
scale = 1,1,1
}
PROP
{
name = genericClusterSwitches05
position = -0.1641,0.3141,-2.007
rotation = 0,0,-0.9762959,0.2164401
scale = 1,1,1
}
PROP
{
name = RS_HTCH_625
position = 0,0,0
rotation = -0.7071068,0,0,0.7071068
scale = 1,1,1
}
}

@ -7,7 +7,7 @@ v1.2.0
- KV-3 'Pomegranate' Reentry Module (Andrew Cassidy): 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
- Inflatable Airlock (Andrew Cassidy): now has built in decoupler and optional ring to connect seamlessly with KV-series pods. Has a new IVA.
v1.1.1
------

@ -26,6 +26,11 @@ Localization
#LOC_RestockPlus_airlock_inflate = Inflate Airlock
#LOC_RestockPlus_airlock_deflate = Deflate Airlock
#LOC_RestockPlus_airlock_toggle = Toggle Airlock
// IVA SEATS
// =========
#LOC_RestockPlus-seat-pilot = Pilot's Seat
#LOC_RestockPlus-seat-copilot= Co-Pilot's Seat
// ENGINES

@ -8,7 +8,7 @@ PART
MODEL
{
model = ReStock/Assets/Command/restock-pod-sphere-1
position = 0.0, 0.0, 0.0
position = 0.0, 0.2, 0.0
rotation = 0.0, 0.0, 0.0
scale = 1.0, 1.0, 1.0
}
@ -16,8 +16,9 @@ PART
CrewCapacity = 1
// Attachment
attachRules = 1,0,1,1,0
node_stack_top = 0.0, 0.825, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.875, 0.0, 0.0, -1.0, 0.0, 1
node_stack_top = 0.0, 1.025, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.675, 0.0, 0.0, -1.0, 0.0, 1 //0.875 without model offset
node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
/// Flag to disable this part if MH is installed
MHReplacement = True
@ -37,8 +38,8 @@ PART
maximum_drag = 0.2
minimum_drag = 0.15
angularDrag = 2
CoMOffset = 0.0, 0.0, 0.0
CoPOffset = 0.0, 0.4, 0.0
CoMOffset = 0.0, -0.2, 0.0
CoPOffset = 0.0, 0.2, 0.0
crashTolerance = 12
maxTemp = 2000 // = 3400
explosionPotential = 0
@ -54,7 +55,7 @@ PART
INTERNAL
{
name = GenericSpace1
name = restock-pod-sphere-1-IVA
}
MODULE

@ -8,7 +8,7 @@ PART
MODEL
{
model = ReStock/Assets/Command/restock-pod-sphere-2
position = 0.0, 0.0, 0.0
position = 0.0, 0.2, 0.0
rotation = 0.0, 0.0, 0.0
scale = 1.0, 1.0, 1.0
}
@ -16,8 +16,9 @@ PART
CrewCapacity = 2
// Attachment
attachRules = 1,0,1,1,0
node_stack_top = 0.0, 0.825, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.875, 0.0, 0.0, -1.0, 0.0, 1
node_stack_top = 0.0, 1.025, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.675, 0.0, 0.0, -1.0, 0.0, 1 //0.875 without model offset
node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
/// Flag to disable this part if MH is installed
MHReplacement = True
@ -37,8 +38,8 @@ PART
maximum_drag = 0.2
minimum_drag = 0.15
angularDrag = 2
CoMOffset = 0.0, 0.0, 0.0
CoPOffset = 0.0, 0.4, 0.0
CoMOffset = 0.0, -0.2, 0.0
CoPOffset = 0.0, 0.2, 0.0
crashTolerance = 12
maxTemp = 2000 // = 3400
explosionPotential = 0
@ -54,7 +55,7 @@ PART
INTERNAL
{
name = GenericSpace3
name = restock-pod-sphere-2-IVA
}
MODULE

@ -8,7 +8,7 @@ PART
MODEL
{
model = ReStock/Assets/Command/restock-pod-sphere-3
position = 0.0, 0.0, 0.0
position = 0.0, 0.2, 0.0
rotation = 0.0, 0.0, 0.0
scale = 1.0, 1.0, 1.0
}
@ -16,8 +16,9 @@ PART
CrewCapacity = 3
// Attachment
attachRules = 1,0,1,1,0
node_stack_top = 0.0, 0.825, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.875, 0.0, 0.0, -1.0, 0.0, 1
node_stack_top = 0.0, 1.025, 0.0, 0.0, 1.0, 0.0, 1
node_stack_bottom = 0.0, -0.675, 0.0, 0.0, -1.0, 0.0, 1 //0.875 without model offset
node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
/// Flag to disable this part if MH is installed
MHReplacement = True
@ -37,8 +38,8 @@ PART
maximum_drag = 0.2
minimum_drag = 0.15
angularDrag = 2
CoMOffset = 0.0, 0.0, 0.0
CoPOffset = 0.0, 0.4, 0.0
CoMOffset = 0.0, -0.2, 0.0
CoPOffset = 0.0, 0.2, 0.0
crashTolerance = 12
maxTemp = 2000 // = 3400
explosionPotential = 0
@ -54,7 +55,7 @@ PART
INTERNAL
{
name = GenericSpace3
name = restock-pod-sphere-3-IVA
}
MODULE

@ -74,7 +74,7 @@ PART
INTERNAL
{
name = GenericSpace3
name = restock-mk2-pod-IVA
}
RESOURCE

@ -2,7 +2,7 @@
// Inflatable Airlock
PART
{
name = restock-airlock-inflatable-625-1
name = restock-airlock-1
module = Part
author = Andrew Cassidy
MODEL
@ -63,7 +63,7 @@ PART
INTERNAL
{
name = GenericSpace1
name = restock-airlock-1-IVA
}
MODULE

@ -0,0 +1,77 @@
INTERNAL
{
name = restock-mk2-pod-IVA
MODEL
{
model = ReStockPlus/Spaces/Mk2-Pod/restock-mk2-pod-IVA
}
MODEL
{
model = ReStockPlus/Spaces/Mk2-Pod/restock-mk2-pod-IVA-Mask
}
MODULE
{
name = InternalSeat
seatTransformName = seat1
allowCrewHelmet = false
portraitCameraName = seat1_camera
displayseatName = #LOC_RestockPlus-seat-pilot
displayseatIndex = 1
}
MODULE
{
name = InternalSeat
seatTransformName = seat2
allowCrewHelmet = false
portraitCameraName = seat2_camera
displayseatName = #LOC_RestockPlus-seat-copilot
displayseatIndex = 2
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_left_clicker
cameraTransformName = window_left_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_right_clicker
cameraTransformName = window_right_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_nose_clicker
cameraTransformName = window_nose_camera
}
PROP
{
name = RS_HTCH_625
position = 0,0,-1
rotation = -2.318076E-07,0.7071068,0.7071068,-2.318077E-07
scale = 1,1,1
}
PROP
{
name = RS_LGHT_Box_1
position = 0,0.3373,-0.573
rotation = 0.4999999,0.5000001,0.4999999,0.5000001
scale = 1,1,1
}
PROP
{
name = Seat_Pilot_Helmet
position = -0.176954,-0.1005774,0.1873479
rotation = 0.0871559,-0.9961947,0,0
scale = 1,1,1
}
PROP
{
name = Seat_Pilot_Helmet
position = 0.175072,-0.1005774,0.1873479
rotation = -0.08715595,-0.9961947,0,0
scale = 1,1,1
}
}

@ -0,0 +1,51 @@
INTERNAL
{
name = restock-pod-sphere-1-IVA
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-1-IVA
}
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-IVA-Mask
}
MODULE
{
name = InternalSeat
seatTransformName = seat1
allowCrewHelmet = true
portraitCameraName = seat1_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_1_clicker
cameraTransformName = window_1_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_2_clicker
cameraTransformName = window_2_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_3_clicker
cameraTransformName = window_3_camera
}
PROP
{
name = Seat_Pilot_Helmet
position = 0,-0.166,0
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
PROP
{
name = RS_LGHT_Box_1
position = 0,0,-0.975
rotation = 0.499999,-0.5000011,-0.4999976,0.5000024
scale = 1,1,1
}
}

@ -0,0 +1,65 @@
INTERNAL
{
name = restock-pod-sphere-2-IVA
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-2-IVA
}
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-IVA-Mask
}
MODULE
{
name = InternalSeat
seatTransformName = seat1
allowCrewHelmet = false
portraitCameraName = seat1_camera
}
MODULE
{
name = InternalSeat
seatTransformName = seat2
allowCrewHelmet = false
portraitCameraName = seat2_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_1_clicker
cameraTransformName = window_1_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_2_clicker
cameraTransformName = window_2_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_3_clicker
cameraTransformName = window_3_camera
}
PROP
{
name = RS_LGHT_Box_1
position = 0,0,-0.975
rotation = 0.499999,-0.5000011,-0.4999976,0.5000024
scale = 1,1,1
}
PROP
{
name = Seat_Pilot
position = -0.25,-0.287,0
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
PROP
{
name = Seat_Pilot
position = 0.25,-0.287,0
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
}

@ -0,0 +1,79 @@
INTERNAL
{
name = restock-pod-sphere-3-IVA
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-3-IVA
}
MODEL
{
model = ReStockPlus/Spaces/Vostok/restock-pod-sphere-IVA-Mask
}
MODULE
{
name = InternalSeat
seatTransformName = seat1
allowCrewHelmet = false
portraitCameraName = seat1_camera
}
MODULE
{
name = InternalSeat
seatTransformName = seat2
allowCrewHelmet = false
portraitCameraName = seat2_camera
}
MODULE
{
name = InternalSeat
seatTransformName = seat3
allowCrewHelmet = false
portraitCameraName = seat3_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_1_clicker
cameraTransformName = window_1_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_2_clicker
cameraTransformName = window_2_camera
}
MODULE
{
name = InternalCameraSwitch
colliderTransformName = window_3_clicker
cameraTransformName = window_3_camera
}
PROP
{
name = RS_LGHT_Box_1
position = 0,0,-0.975
rotation = 0.499999,-0.5000011,-0.4999976,0.5000024
scale = 1,1,1
}
PROP
{
name = Seat_Pilot
position = -0.3999998,-0.287,0
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
PROP
{
name = Seat_Pilot
position = 0,-0.287,0.214
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
PROP
{
name = Seat_Pilot
position = 0.4,-0.287,0
rotation = 0,-1,0,2.808803E-07
scale = 1,1,1
}
}

@ -6,7 +6,7 @@ v1.2.0
- SP-3 'Mandarin' Reentry Module (Andrew Cassidy): 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
- 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.
v1.1.1
------

Loading…
Cancel
Save