diff --git a/.gitignore b/.gitignore index a545ba31..895aa70d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ build-deploy/ bin/ obj/ *.swp +Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png +Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png \ No newline at end of file diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index da0b1698..7bf5baf8 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit da0b16981a511db4488015c1280852c4693fb538 +Subproject commit 7bf5baf8aed57df8656ec89b50594d359e7422c2 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-inflatable-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-1.cfg similarity index 98% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-inflatable-625-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-1.cfg index 99326a3d..e331d4d9 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-inflatable-625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-airlock-1.cfg @@ -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 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg new file mode 100644 index 00000000..b29ffa0e --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg @@ -0,0 +1,12 @@ +// Restock Plus v1.2.0 +// Hatch - 0.625m bulkhead +PROP +{ + name = RS_HTCH_625 + MODEL + { + model = ReStockPlus/Props/Hatches/RS_HTCH_625 + } +} + +proxy = 0, 0, 0, 0.6, 0.1, 0.6, 1, 0, 0 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.mu new file mode 100644 index 00000000..8407974a Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1-n.dds new file mode 100644 index 00000000..06651767 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1-n.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1.dds new file mode 100644 index 00000000..fc5d6037 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg new file mode 100644 index 00000000..a93e0b60 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg @@ -0,0 +1,12 @@ +// Restock Plus v1.2.0 +// Light - Airlock pressurization indicator (green) +PROP +{ + name = RS_LGHT_Airlock_Green + MODEL + { + model = ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green + } +} + +proxy = 0, 0, 0, 0.10, 0.15, 0.07, 1, 0, 0 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.mu new file mode 100644 index 00000000..bf2b776d Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg new file mode 100644 index 00000000..c4e26c35 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg @@ -0,0 +1,12 @@ +// Restock Plus v1.2.0 +// Light - Airlock pressurization indicator (green) +PROP +{ + name = RS_LGHT_Airlock_Red + MODEL + { + model = ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red + } +} + +proxy = 0, 0, 0, 0.10, 0.15, 0.07, 1, 0, 0 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.mu new file mode 100644 index 00000000..fc616f24 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg new file mode 100644 index 00000000..2970c0ce --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg @@ -0,0 +1,29 @@ +// Restock Plus v1.2.0 +// Light - Airlock pressurization indicator (green) +PROP +{ + name = RS_LGHT_Box_1 + MODEL + { + model = ReStockPlus/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 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.mu new file mode 100644 index 00000000..6acb6519 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-e.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-e.dds new file mode 100644 index 00000000..c28ebf8c Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-e.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-n.dds new file mode 100644 index 00000000..48ef38a2 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-n.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1.dds new file mode 100644 index 00000000..5eff7179 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-e.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-e.dds new file mode 100644 index 00000000..0f7ae025 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-e.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds new file mode 100644 index 00000000..c910b95f Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask.mu new file mode 100644 index 00000000..98c865f2 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-n.dds new file mode 100644 index 00000000..6efb6d63 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-n.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg new file mode 100755 index 00000000..bdc24ea5 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg @@ -0,0 +1,130 @@ +INTERNAL +{ + name = restock-airlock-1-IVA + MODEL + { + model = ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA + } + MODEL + { + model = ReStockPlus/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 = 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_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_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 + } + 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 + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.dds new file mode 100644 index 00000000..d04780ff Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.mu new file mode 100644 index 00000000..f7bbbf84 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.mu differ