diff --git a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg index ae4509c..5b78d83 100644 --- a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg +++ b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg @@ -1,16 +1,7 @@ -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand]] +@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand|KerbalSeat]] { MODULE { name = ModuleLogisticsConsumer } } - -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[KerbalSeat]] -{ - MODULE - { - name = ModuleLogisticsConsumer - } -} - diff --git a/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg b/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg index ec6401a..63010d2 100644 --- a/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg +++ b/FOR_RELEASE/GameData/000_USITools/Agency/USIAgency.cfg @@ -1,6 +1,7 @@ AGENT { name = Umbra Space Industries + title = Umbra Space Industries description = A world leader in corrugated paper products, Umbra Space Industries is now applying their formidable boxing and packaging skills into a a series of products for colonization, exploration, and resource exploitation! diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt index 40faf6f..4eb4163 100644 --- a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt @@ -1,3 +1,15 @@ +1.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +1.0.0 - 2018.11.20 +------------------ +KSP 1.5.0 Compatibility + +0.13.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility + 0.12.0 - 2018.03.13 ------------------ KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg index f50f99e..9dd880b 100644 --- a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg +++ b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg @@ -16,4 +16,12 @@ RESOURCE_DEFINITION //Hidden resource used to manage mass isTweakable = false isVisible = false volume = 1 -} \ No newline at end of file +} + +@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools] +{ + MODULE + { + name = USI_ModuleFieldRepair + } +} diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll index 12b4439..a3a4d6d 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.dll and b/FOR_RELEASE/GameData/000_USITools/USITools.dll differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb index 9aa9e79..71cc976 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb and b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb index 3bf118b..14ad592 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.pdb and b/FOR_RELEASE/GameData/000_USITools/USITools.pdb differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version index 1ec62e5..6e22adb 100644 --- a/FOR_RELEASE/GameData/000_USITools/USITools.version +++ b/FOR_RELEASE/GameData/000_USITools/USITools.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":12, + "MAJOR":1, + "MINOR":1, "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":4, - "PATCH":1 + "MINOR":6, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":9 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version index dc4c81e..97fe782 100644 --- a/FOR_RELEASE/GameData/Firespitter/Firespitter.version +++ b/FOR_RELEASE/GameData/Firespitter/Firespitter.version @@ -3,22 +3,22 @@ "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version", "VERSION": { "MAJOR": 7, - "MINOR": 9, + "MINOR": 12, "PATCH": 0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":4, - "PATCH":1 + "MINOR":6, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":9 } } diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll index 92c99aa..8b77348 100644 Binary files a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll and b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll differ diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb index a326b45..ee4c809 100644 Binary files a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb and b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb differ diff --git a/FOR_RELEASE/GameData/ModuleManager.3.0.4.dll b/FOR_RELEASE/GameData/ModuleManager.3.0.4.dll deleted file mode 100644 index 5ecfde0..0000000 Binary files a/FOR_RELEASE/GameData/ModuleManager.3.0.4.dll and /dev/null differ diff --git a/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll b/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll new file mode 100644 index 0000000..3ef00da Binary files /dev/null and b/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt index 73f6df3..ab9ccc2 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt @@ -1,3 +1,17 @@ +1.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +1.0.0 - 2018.11.20 +------------------ +KSP 1.5.0 Compatibility +Fix FSfuelSwitch mass discrepancy in MountableSupPack & MountableLqdTank + +0.8.0 - 2018.06.22 +------------------ +Updated LH2 capacity to match CryoTanks +KSP 1.4.4 Compatibility + 0.7.0 - 2018.03.13 ----------------- KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg index 82f50c3..15ed123 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 600;6000;192000;54,66;600;600;600;600;120;120 + resourceAmounts = 600;6000;192000;54,66;600;600;600;900;120;120 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 2400000;24000;2016;55.08;0.48;9600;0;22.05;96;144 + tankCost = 2400000;24000;2016;55.08;0.48;9600;0;33.075;96;144 basePartMass = 0.075 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg index 0d0ff0a..875fe30 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_02.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 4500;45000;1440000;405,495;4500;4500;4500;4500;900;900 + resourceAmounts = 4500;45000;1440000;405,495;4500;4500;4500;6750;900;900 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 18000000;180000;15120;413.1;3.6;72000;0;165.375;720;1080 + tankCost = 18000000;180000;15120;413.1;3.6;72000;0;248.0625;720;1080 basePartMass = 0.5625 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg index 51f918f..014778d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_03.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 15000;150000;4800000;1350,1650;15000;15000;15000;15000;3000;3000 + resourceAmounts = 15000;150000;4800000;1350,1650;15000;15000;15000;22500;3000;3000 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 60000000;600000;50400;1377;12;240000;0;551.25;2400;3600 + tankCost = 60000000;600000;50400;1377;12;240000;0;826.875;2400;3600 basePartMass = 1.8750 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false @@ -96,4 +96,4 @@ bulkheadProfiles = size0,srf { name = USI_ModuleResourceWarehouse } -} \ No newline at end of file +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg index d834ab3..f66f916 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 37500;375000;12000000;3375,4125;37500;37500;37500;37500;7500;7500 + resourceAmounts = 37500;375000;12000000;3375,4125;37500;37500;37500;56250;7500;7500 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 150000000;1500000;126000;3442.5;30;600000;0;1378.125;6000;9000 + tankCost = 150000000;1500000;126000;3442.5;30;600000;0;2067.1875;6000;9000 basePartMass = 4.6875 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg index afce11e..de3e6f7 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg @@ -55,9 +55,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 14000;140000;4480000;1260,1540;14000;14000;14000;14000;2800;2800 + resourceAmounts = 14000;140000;4480000;1260,1540;14000;14000;14000;21000;2800;2800 initialResourceAmounts = 0;140000;4480000;0,0;0;0;0;0;0;0 - tankCost = 56000000;560000;47040;1285.2;11.2;224000;0;514.5;2240;3360 + tankCost = 56000000;560000;47040;1285.2;11.2;224000;0;771.75;2240;3360 basePartMass = 1.75 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg index c729ee6..8004784 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg @@ -54,10 +54,10 @@ PART:NEEDS[KIS] { name = FSfuelSwitch resourceNames = LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 90,110;1000;1000;1000;1000;200;200 + resourceAmounts = 90,110;1000;1000;1000;1500;200;200 initialResourceAmounts = 0,0;0;0;0;0;0;0 - tankCost = 91.8;0.8;16000;0;36.75;160;240 - basePartMass = 0.1 + tankCost = 91.8;0.8;16000;0;55.125;160;240 + basePartMass = 0.125 tankMass = 0;0;0;0;0;0;0 hasGUI = false } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg index 228e883..e602125 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg @@ -57,7 +57,7 @@ PART:NEEDS[KIS] resourceAmounts = 1000;1000;1000;1000;1000;500,500;1000;1000;1000;960,40;200;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;850,170 initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0 tankCost = 1760;700;300;800;320;150000;2000;14240;8000;2400;4;15800;7000;32000;2000;500;10;300;10;20;250000;15000;500;0.01;7140 - basePartMass = 0.1 + basePartMass = 0.125 tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0 hasGUI = false } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg index e81e1d6..9ac9314 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg @@ -80,9 +80,9 @@ PART { name = FSfuelSwitch resourceNames =LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 112.5,137.5;1250;1250;1250;1250;250;250 + resourceAmounts = 112.5,137.5;1250;1250;1250;1875;250;250 initialResourceAmounts = 0,0;0;0;0;0;0;0 - tankCost = 114.75;1;20000;0;45.9375;200;300 + tankCost = 114.75;1;20000;0;68.90625;200;300 basePartMass = 0.15625 tankMass = 0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg index c190c24..90ba558 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 450;4500;144000;40.5,49.5;450;450;450;450;90;90 + resourceAmounts = 450;4500;144000;40.5,49.5;450;450;450;675;90;90 initialResourceAmounts = 0;4500;144000;0,0;0;0;0;0;0;0 - tankCost = 1800000;18000;1512;41.31;0.36;7200;0;16.5375;72;108 + tankCost = 1800000;18000;1512;41.31;0.36;7200;0;24.80625;72;108 basePartMass = 0.05625 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg index a352246..b50ca99 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size0,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 3500;35000;1120000;315,385;3500;3500;3500;3500;700;700 + resourceAmounts = 3500;35000;1120000;315,385;3500;3500;3500;5250;700;700 initialResourceAmounts = 0;35000;1120000;0,0;0;0;0;0;0;0 - tankCost = 14000000;140000;11760;321.3;2.8;56000;0;128.625;560;840 + tankCost = 14000000;140000;11760;321.3;2.8;56000;0;192.9375;560;840 basePartMass = 0.4375 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg index c6d77cf..d5366a3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size1,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 30000;300000;9600000;2700,3300;30000;30000;30000;30000;6000;6000 + resourceAmounts = 30000;300000;9600000;2700,3300;30000;30000;30000;45000;6000;6000 initialResourceAmounts = 0;300000;9600000;0,0;0;0;0;0;0;0 - tankCost = 120000000;1200000;100800;2754;24;480000;0;1102.5;4800;7200 + tankCost = 120000000;1200000;100800;2754;24;480000;0;1653.75;4800;7200 basePartMass = 3.75 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg index 2d54a1e..a043793 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size1p5,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 100000;1000000;32000000;9000,11000;100000;100000;100000;100000;20000;20000 + resourceAmounts = 100000;1000000;32000000;9000,11000;100000;100000;100000;150000;20000;20000 initialResourceAmounts = 0;1000000;32000000;0,0;0;0;0;0;0;0 - tankCost = 400000000;4000000;336000;9180;80;1600000;0;3675;16000;24000 + tankCost = 400000000;4000000;336000;9180;80;1600000;0;5512.5;16000;24000 basePartMass = 12.5 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg index ec18f92..712b318 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size2,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 230000;2300000;73600000;20700,25300;230000;230000;230000;230000;46000;46000 + resourceAmounts = 230000;2300000;73600000;20700,25300;230000;230000;230000;345000;46000;46000 initialResourceAmounts = 0;2300000;73600000;0,0;0;0;0;0;0;0 - tankCost = 920000000;9200000;772800;21114;184;3680000;0;8452.5;36800;55200 + tankCost = 920000000;9200000;772800;21114;184;3680000;0;12678.75;36800;55200 basePartMass = 28.75 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg index 691344e..1518d97 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size3,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 750000;7500000;240000000;67500,82500;750000;750000;750000;750000;150000;150000 + resourceAmounts = 750000;7500000;240000000;67500,82500;750000;750000;750000;1125000;150000;150000 initialResourceAmounts = 0;7500000;240000000;0,0;0;0;0;0;0;0 - tankCost = 3000000000;30000000;2520000;68850;600;12000000;0;27562.5;120000;180000 + tankCost = 3000000000;30000000;2520000;68850;600;12000000;0;41343.75;120000;180000 basePartMass = 93.75 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg index cc83f82..59a81bc 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg @@ -56,9 +56,9 @@ bulkheadProfiles = size4,srf { name = FSfuelSwitch resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 1800000;18000000;576000000;162000,198000;1800000;1800000;1800000;1800000;360000;360000 + resourceAmounts = 1800000;18000000;576000000;162000,198000;1800000;1800000;1800000;2700000;360000;360000 initialResourceAmounts = 0;18000000;576000000;0,0;0;0;0;0;0;0 - tankCost = 7200000000;72000000;6048000;165240;1440;28800000;0;66150;288000;432000 + tankCost = 7200000000;72000000;6048000;165240;1440;28800000;0;99225;288000;432000 basePartMass = 225 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/StowPakSup.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/StowPakSup.cfg new file mode 100644 index 0000000..120023f --- /dev/null +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/StowPakSup.cfg @@ -0,0 +1,104 @@ +PART +{ + name = StowPakSup + module = Part + author = RoverDude + + rescaleFactor = 1 + MODEL + { + model = UmbraSpaceIndustries/Kontainers/Assets/MiniPak + scale = 1.5,1.5,1.5 + } + + // definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z + node_attach = 0,0,.225,0,0,-1 + + breakingForce = 2072 + breakingTorque = 2072 + + TechRequired = advConstruction + entryCost = 7600 + cost = 3800 + category = none + subcategory = 0 + title = Supply Stow-Pak + manufacturer = USI - Logistics Division + description = When you just need a miniscule amount of supplies. + + attachRules = 1,1,1,1,0 + + mass = 0.1 + dragModelType = default + maximum_drag = 0.20 + minimum_drag = 0.15 + angularDrag = 2 + crashTolerance = 8 + maxTemp = 2000 + bulkheadProfiles = size1,srf + + MODULE:NEEDS[KIS] + { + name = ModuleKISItem + shortcutKeyAction = drop + useName = use + usableFromEva = true + usableFromContainer = true + usableFromPod = true + usableFromEditor = true + stackable = false + volumeOverride = 1000 + editorItemsCategory = false + moveSndPath = KIS/Sounds/itemMove + equipable = false + equipMode = part + equipSlot = Back Pocket + equipSkill = + equipRemoveHelmet = false + equipMeshName = helmet + equipBoneName = helmet01 + equipPos = (0, 0, 0) + equipDir = (0, 0, 0) + carriable = true + allowAttachOnStatic = false + } + + MODULE + { + name = FStextureSwitch2 + textureNames = UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak;UmbraSpaceIndustries/Kontainers/Assets/KISPak + objectNames = + textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaintenanceSupplies + useFuelSwitchModule = true + fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24 + repaintableEVA = true + nextButtonText = Next Cargo + prevButtonText = Previous Cargo + moduleID = 2 + } + + MODULE + { + name = FSfuelSwitch + resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaterialKits,SpecializedParts + resourceAmounts = 250;250;250;250;250;125,125;250;250;250;240,10;50;250;250;250;250;250;250;250;250;250;250;250;250;250;212,42 + initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0 + tankCost = 440;175;75;200;80;37500;500;3560;2000;600;1;3950;1750;8000;500;125;10;300;2.5;5;62500;3750;125;0.01;1785 + basePartMass = 0.1 + tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0 + hasGUI = false + } + + MODULE + { + name = USI_ModuleResourceWarehouse + } + MODULE + { + name = USI_ModuleRecycleBin + } + MODULE + { + name = ModuleWeightDistributableCargo + } +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg index aab1849..91f9a1e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg @@ -54,9 +54,9 @@ bulkheadProfiles = size1,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 2500;25000;800000;225,275;2500;2500;2500;2500;500;500 + resourceAmounts = 2500;25000;800000;225,275;2500;2500;2500;3750;500;500 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 10000000;100000;8400;229.5;2;40000;0;91.875;400;600 + tankCost = 10000000;100000;8400;229.5;2;40000;0;137.8125;400;600 basePartMass = 0.3125 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg index 729d568..21c6098 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg @@ -55,9 +55,9 @@ bulkheadProfiles = size2,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 20000;200000;6400000;1800,2200;20000;20000;20000;20000;4000;4000 + resourceAmounts = 20000;200000;6400000;1800,2200;20000;20000;20000;30000;4000;4000 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 80000000;800000;67200;1836;16;320000;0;735;3200;4800 + tankCost = 80000000;800000;67200;1836;16;320000;0;1102.5;3200;4800 basePartMass = 2.5 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_03.cfg index a1d9d05..7c058f4 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_03.cfg @@ -55,9 +55,9 @@ bulkheadProfiles = size3,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 65000;650000;20800000;5850,7150;65000;65000;65000;65000;13000;13000 + resourceAmounts = 65000;650000;20800000;5850,7150;65000;65000;65000;97500;13000;13000 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 260000000;2600000;218400;5967;52;1040000;0;2388.75;10400;15600 + tankCost = 260000000;2600000;218400;5967;52;1040000;0;3583.125;10400;15600 basePartMass = 8.125 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_04.cfg index d11464a..8937ed5 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_04.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_04.cfg @@ -55,9 +55,9 @@ bulkheadProfiles = size3,srf { name = FSfuelSwitch resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 160000;1600000;51200000;14400,17600;160000;160000;160000;160000;32000;32000 + resourceAmounts = 160000;1600000;51200000;14400,17600;160000;160000;160000;240000;32000;32000 initialResourceAmounts = 0;0;0;0,0;0;0;0;0;0;0 - tankCost = 640000000;6400000;537600;14688;128;2560000;0;5880;25600;38400 + tankCost = 640000000;6400000;537600;14688;128;2560000;0;8820;25600;38400 basePartMass = 20 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt index f99ced6..8159f88 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/CHANGELOG.txt @@ -1,3 +1,15 @@ +1.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +1.0.0 - 2018.11.20 +------------------ +KSP 1.5.0 Compatibility + +0.8.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility + 0.7.0 - 2018.03.13 ----------------- KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version index baa2fce..72b2165 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Orion/Orion.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":7, + "MAJOR":1, + "MINOR":1, "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":4, - "PATCH":1 + "MINOR":6, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":9 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg index 93c280b..8e54648 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg @@ -111,12 +111,6 @@ PART amount = 0 maxAmount = 22 } - - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleCoreHeat diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg index cb3059b..d2b5899 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg @@ -118,11 +118,6 @@ PART amount = 500 maxAmount = 500 } - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleCoreHeat diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg index 8e9f724..8a5cebe 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg @@ -113,12 +113,6 @@ PART amount = 0 maxAmount = 154 } - - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleCoreHeat diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg index 8239bd3..c174fdf 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg @@ -63,7 +63,7 @@ PART OUTPUT_RESOURCE { ResourceName = DepletedFuel - Ratio = 0.000018 + Ratio = 0.000012 DumpExcess = true } OUTPUT_RESOURCE @@ -111,12 +111,6 @@ PART amount = 0 maxAmount = 450 } - - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleCoreHeat diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg index 485a51e..1f4e87b 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg @@ -115,11 +115,6 @@ PART amount = 0 maxAmount = 2 } - - MODULE - { - name = USI_ModuleFieldRepair - } MODULE { name = ModuleCoreHeat diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version index aa927a8..100a3e1 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":7, + "MAJOR":1, + "MINOR":1, "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":4, - "PATCH":1 + "MINOR":6, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":4, + "MINOR":6, "PATCH":9 } }