diff --git a/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version b/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version index ab3031901..cb8d79419 100644 --- a/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version +++ b/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version @@ -7,19 +7,19 @@ { "MAJOR":1, "MINOR":6, - "PATCH":0, + "PATCH":2, "BUILD":0 }, "KSP_VERSION_MIN": { "MAJOR":1, "MINOR":4, - "PATCH":3 + "PATCH":5 }, "KSP_VERSION_MAX": { "MAJOR":1, "MINOR":4, - "PATCH":3 + "PATCH":5 } } diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll index 7f6448cca..c02d57769 100644 Binary files a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll and b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/000_AT_Utils.dll differ diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll index d3ad20511..a8a535381 100644 Binary files a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll and b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/002_MultiAnimators.dll differ diff --git a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob index bee6dac96..e3d4958fa 100644 --- a/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob +++ b/FOR_RELEASE/GameData/000_AT_Utils/Plugins/PluginData/000_AT_Utils/000_AT_Utils.glob @@ -1,5 +1,5 @@ MeshesToSkip = flagtransform canopy -BadParts = RadialDrill +BadParts = RadialDrill MKS.Drill.02 MKS.Drill.03 StylesConfig { @@ -12,4 +12,4 @@ StylesConfig CloseButtonColor = red DangerButtonColor = red } - +//:mode=c#: \ No newline at end of file diff --git a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg index ae4509cdd..5b78d8315 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 ec6401af7..63010d269 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 40faf6fc5..4eb4163a2 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 f50f99eb3..9dd880b2c 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 12b4439e1..a3a4d6d6f 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 9aa9e79f3..71cc97618 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 3bf118b50..14ad5924b 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 1ec62e55f..6e22adbaf 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/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll index 01b038057..e6fce0430 100644 Binary files a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll and b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version index 0e8dbb37c..ffe3dc909 100644 --- a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version @@ -7,25 +7,25 @@ }, "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 }, "NAME": "Community Category Kit", "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", "VERSION": { - "BUILD": 0, - "MAJOR": 3, - "MINOR": 0, - "PATCH": 0 - } + "MAJOR": 4, + "MINOR": 1, + "PATCH": 0, + "BUILD": 0 + } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt index 86b0fd2fa..64c7e8512 100644 --- a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt @@ -1,3 +1,15 @@ +4.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +4.0.0 - 2018.11.20 +------------------ +KSP 1.5.0 Compatibility + +3.2.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility + 3.1.0 - 2018.03.13 ----------------- KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt index c88094507..b9ed47f4f 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt @@ -1,3 +1,20 @@ +1.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +1.0.1 - 2018.11.20 +------------------ +Fixed antimatter config name + +1.0.0 - 2018.10.20 +------------------ +KSP 1.5.0 Compatibility +Normalized atmospheric resource harvesting values. + +0.11.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility + 0.10.0 - 2018.03.13 ----------------- KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version index a585c7725..1f9a67adf 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":10, + "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 } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg index 12e8875ce..5e6eceedd 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg @@ -855,9 +855,9 @@ RESOURCE_DEFINITION { name = CompressedAir abbreviation = #LOC_CRP_CompressedAir_Abbreviation - displayName = #LOC_CompressedAir_DisplayName + displayName = #LOC_CRP_CompressedAir_DisplayName density = 0.000001283 - unitCost = 0.00015 + unitCost = 0.00004 hsp = 2175 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/fr-fr.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/fr-fr.cfg new file mode 100644 index 000000000..2ae3bc6f5 --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/fr-fr.cfg @@ -0,0 +1,501 @@ +Localization + +{ + + fr-fr + + { + + //USI + + #LOC_CRP_Hydrates_DisplayName = Hydrates + + #LOC_CRP_Gypsum_DisplayName = Gypse + + #LOC_CRP_IntakeLqd_DisplayName = Aduction Liquide + + #LOC_CRP_ColonySupplies_DisplayName = Provisions Coloniales + + #LOC_CRP_Lead_DisplayName = Plomb + + #LOC_CRP_CarbonDioxide_DisplayName = Dioxyde de Carbone + + #LOC_CRP_Chemicals_DisplayName = Produits Chimiques + + #LOC_CRP_Dirt_DisplayName = Boue + + #LOC_CRP_ExoticMinerals_DisplayName = Minerais Exotiques + + #LOC_CRP_Food_DisplayName = Nourriture + + #LOC_CRP_Supplies_DisplayName = Provisions + + #LOC_CRP_Fertilizer_DisplayName = Fertilisant + + #LOC_CRP_Mulch_DisplayName = Compost + + #LOC_CRP_Machinery_DisplayName = Machinerie + + #LOC_CRP_SpecializedParts_DisplayName = Pièces spécialisées + + #LOC_CRP_Recyclables_DisplayName = Recyclables + + #LOC_CRP_Hydrogen_DisplayName = Hydrogène + + #LOC_CRP_Karbonite_DisplayName = Karbonite + + #LOC_CRP_Karborundum_DisplayName = Karborundum + + #LOC_CRP_LqdCO2_DisplayName = CO2 liquide + + #LOC_CRP_LqdCO_DisplayName = CO Liquide + + #LOC_CRP_MaterialKits_DisplayName = Kits de Matériel + + #LOC_CRP_Metals_DisplayName = Métaux + + #LOC_CRP_Minerals_DisplayName = Minéraux + + #LOC_CRP_MetallicOre_DisplayName = Minerai métallique + + #LOC_CRP_Organics_DisplayName = Matières organiques + + #LOC_CRP_Oxygen_DisplayName = Oxygène + + #LOC_CRP_Polymers_DisplayName = Polymères + + #LOC_CRP_RareMetals_DisplayName = Métaux rares + + #LOC_CRP_RefinedExotics_DisplayName = Produits Exotiques Rafinés + + #LOC_CRP_Rock_DisplayName = Roche + + #LOC_CRP_RocketParts_DisplayName = Pièces de Fusées + + #LOC_CRP_SpareParts_DisplayName = Pièces détachées + + #LOC_CRP_Substrate_DisplayName = Substrat + + #LOC_CRP_Uraninite_DisplayName = Uraninite + + #LOC_CRP_Waste_DisplayName = Déchets + + #LOC_CRP_WasteWater_DisplayName = Eaux Usées + + #LOC_CRP_Water_DisplayName = Eau + + //NFT + + #LOC_CRP_ArgonGas_DisplayName = Argon Gazeux + + #LOC_CRP_ArgonGas_Abbreviation = Ar + + #LOC_CRP_Boron_DisplayName = Bore + + #LOC_CRP_Boron_Abbreviation = Bo + + #LOC_CRP_ResourceLode_DisplayName = Gisement exploitable + + #LOC_CRP_EnrichedUranium_DisplayName = Uranium Enrichi + + #LOC_CRP_EnrichedUranium_Abbreviation = UEnr + + #LOC_CRP_DepletedUranium_DisplayName = Uranium Appauvri + + #LOC_CRP_DepletedUranium_Abbreviation = UApp + + #LOC_CRP_LqdHydrogen_DisplayName = Hydrogène Liquide + + #LOC_CRP_LqdHydrogen_Abbreviation = H2Liq + + #LOC_CRP_StoredCharge_DisplayName = Charge Stockée + + #LOC_CRP_StoredCharge_Abbreviation = CS + + //KSPI-E + + #LOC_CRP_Actinides_DisplayName = Actinides + + #LOC_CRP_Actinides_Abbreviation = Act + + #LOC_CRP_Aluminium_DisplayName = Aluminium + + #LOC_CRP_Aluminium_Abbreviation = Al + + #LOC_CRP_Alumina_DisplayName = Alumine + + #LOC_CRP_Alumina_Abbreviation = Alm + + #LOC_CRP_Ammonia_DisplayName = Ammoniaque + + #LOC_CRP_Ammonia_Abbreviation = NH3 + + #LOC_CRP_Antimatter_DisplayName = Antimatière + + #LOC_CRP_Antimatter_Abbreviation = AM + + #LOC_CRP_AntiHydrogen_DisplayName = Antihydrogène + + #LOC_CRP_AntiHydrogen_Abbreviation = AH + + #LOC_CRP_LqdArgon_DisplayName = Argon Liquide + + #LOC_CRP_LqdArgon_Abbreviation = ArLiq + + #LOC_CRP_Borate_DisplayName = Borate + + #LOC_CRP_Borate_Abbreviation = Br + + #LOC_CRP_Caesium_DisplayName = Césium + + #LOC_CRP_Caesium_Abbreviation = Cs + + #LOC_CRP_Calcium_Abbreviation = Ca + + #LOC_CRP_Calcium_DisplayName = Calcium + + #LOC_CRP_CarbonMonoxide_DisplayName = Monoxyde de Carbone + + #LOC_CRP_CarbonMonoxide_Abbreviation = CO + + #LOC_CRP_Carbon_DisplayName = Carbone + + #LOC_CRP_Carbon_Abbreviation = C + + #LOC_CRP_ChargedParticles_DisplayName = Particules Chargées + + #LOC_CRP_ChargedParticles_Abbreviation = PC + + #LOC_CRP_Chlorine_DisplayName = Chlore + + #LOC_CRP_Chlorine_Abbreviation = Cl + + #LOC_CRP_CompressedAir_DisplayName = Air Comprimé + + #LOC_CRP_CompressedAir_Abbreviation = Air + + #LOC_CRP_Decaborane_DisplayName = Décaborane + + #LOC_CRP_Decaborane_Abbreviation = DeBo + + #LOC_CRP_Deuterium_DisplayName = Deutérium + + #LOC_CRP_Deuterium_Abbreviation = D + + #LOC_CRP_LqdDeuterium_DisplayName = Deutérium Liquide + + #LOC_CRP_LqdDeuterium_Abbreviation = D + + #LOC_CRP_DepletedFuel_DisplayName = Combustible Appauvri + + #LOC_CRP_DepletedFuel_Abbreviation = ComApp + + #LOC_CRP_ExoticMatter_DisplayName = Matière Exotique + + #LOC_CRP_ExoticMatter_Abbreviation = MatExo + + #LOC_CRP_FusionPellets_DisplayName = Pastilles de fusion + + #LOC_CRP_FusionPellets_Abbreviation = PF + + #LOC_CRP_Fluorine_DisplayName = Fluor + + #LOC_CRP_Fluorine_Abbreviation = F + + #LOC_CRP_Fluorite_DisplayName = Fluorite + + #LOC_CRP_Fluorite_Abbreviation = CaF2 + + #LOC_CRP_HeavyWater_DisplayName = Eau Lourde + + #LOC_CRP_HeavyWater_Abbreviation = D2O + + #LOC_CRP_IntakeAtm_DisplayName = Entrée d'Air + + #LOC_CRP_IntakeAtm_Abbreviation = EntA + + #LOC_CRP_KryptonGas_DisplayName = Krypton + + #LOC_CRP_KryptonGas_Abbreviation = Kr + + #LOC_CRP_LqdKrypton_DisplayName = Krypton Liquide + + #LOC_CRP_LqdKrypton_Abbreviation = Kr + + #LOC_CRP_NeonGas_DisplayName = Néon + + #LOC_CRP_NeonGas_Abbreviation = Ne + + #LOC_CRP_LqdNeon_DisplayName = Néon Liquide + + #LOC_CRP_LqdNeon_Abbreviation = Ne + + #LOC_CRP_Lithium_DisplayName = Lithium + + #LOC_CRP_Lithium_Abbreviation = Li7 + + #LOC_CRP_Lithium6_DisplayName = Lithium6 + + #LOC_CRP_Lithium6_Abbreviation = Li6 + + #LOC_CRP_LithiumHydride_DisplayName = Hydrure de Lithium + + #LOC_CRP_LithiumHydride_Abbreviation = Li7H + + #LOC_CRP_LithiumDeuteride_DisplayName = Deutérure de Lithium + + #LOC_CRP_LithiumDeuteride_Abbreviation = Li6D + + #LOC_CRP_LqdAmmonia_DisplayName = Ammoniaque Liquide + + #LOC_CRP_LqdAmmonia_Abbreviation = NH3 + + #LOC_CRP_Helium3_DisplayName = Hélium3 + + #LOC_CRP_Helium3_Abbreviation = He3 + + #LOC_CRP_LqdHe3_DisplayName = Hélium3 Liquide + + #LOC_CRP_LqdHe3_Abbreviation = He3 + + #LOC_CRP_Helium4_DisplayName = Hélium4 + + #LOC_CRP_Helium4_Abbreviation = He4 + + #LOC_CRP_LqdHelium_DisplayName = Hélium Liquide + + #LOC_CRP_LqdHelium_Abbreviation = He4 + + #LOC_CRP_Nitratine_DisplayName = Nitratine + + #LOC_CRP_Nitratine_Abbreviation = Nit + + #LOC_CRP_Hexaborane_DisplayName = Héxaborane + + #LOC_CRP_Hexaborane_Abbreviation = HxBo + + #LOC_CRP_LqdNitrogen_DisplayName = Nitrogène Liquide + + #LOC_CRP_LqdNitrogen_Abbreviation = N14 + + #LOC_CRP_LqdNitrogen15_DisplayName = Nitrogène15 Liquide + + #LOC_CRP_LqdNitrogen15_Abbreviation = N15 + + #LOC_CRP_Megajoules_DisplayName = Mégajoules + + #LOC_CRP_Megajoules_Abbreviation = Meg3 + + #LOC_CRP_Monazite_DisplayName = Monazite + + #LOC_CRP_Monazite_Abbreviation = Monz + + #LOC_CRP_LqdOxygen18_DisplayName = Oxygène18 Liquide + + #LOC_CRP_LqdOxygen18_Abbreviation = O18 + + #LOC_CRP_Salt_DisplayName = Sel + + #LOC_CRP_Salt_Abbreviation = Sel + + #LOC_CRP_Sodium_DisplayName = Sodium + + #LOC_CRP_Sodium_Abbreviation = Na + + #LOC_CRP_Sulphur_DisplayName = Souffre + + #LOC_CRP_Sulphur_Abbreviation = S + + #LOC_CRP_SolidHydrogen_DisplayName = Hydrogène Solide + + #LOC_CRP_SolidHydrogen_Abbreviation = HS + + #LOC_CRP_PolyvinylChloride_DisplayName = Polychlorure de Vinyle + + #LOC_CRP_PolyvinylChloride_Abbreviation = PVC + + #LOC_CRP_Plutonium-238_DisplayName = Plutonium-238 + + #LOC_CRP_Plutonium-238_Abbreviation = Pu238 + + #LOC_CRP_Regolith_DisplayName = Régolithe + + #LOC_CRP_Regolith_Abbreviation = R + + #LOC_CRP_UF4_DisplayName = Fluorure d'Uranium4 + + #LOC_CRP_UF4_Abbreviation = UF4 + + #LOC_CRP_Silicates_DisplayName = Silicates + + #LOC_CRP_Silicates_Abbreviation = Silica + + #LOC_CRP_Silicon_DisplayName = Silicone + + #LOC_CRP_Silicon_Abbreviation = Si + + #LOC_CRP_Spodumene_DisplayName = Spodumène + + #LOC_CRP_Spodumene_Abbreviation = LiAl + + #LOC_CRP_SolarWind_DisplayName = Vents Solaire + + #LOC_CRP_SolarWind_Abbreviation = VS + + #LOC_CRP_ThermalPower_DisplayName = Energie Thermique + + #LOC_CRP_ThermalPower_Abbreviation = ET + + #LOC_CRP_Thorium_DisplayName = Thorium + + #LOC_CRP_Thorium_Abbreviation = Th + + #LOC_CRP_ThF4_DisplayName = Fluorure de thorium + + #LOC_CRP_ThF4_Abbreviation = ThF4 + + #LOC_CRP_Tritium_DisplayName = Tritium + + #LOC_CRP_Tritium_Abbreviation = T + + #LOC_CRP_LqdTritium_DisplayName = Tritium Liquide + + #LOC_CRP_LqdTritium_Abbreviation = T + + #LOC_CRP_UraniumNitride_DisplayName = Nitrure d'Uranium + + #LOC_CRP_UraniumNitride_Abbreviation = NU + + #LOC_CRP_VacuumPlasma_DisplayName = Projection Plasmique + + #LOC_CRP_VacuumPlasma_Abbreviation = PP + + #LOC_CRP_WasteHeat_DisplayName = Chaleur résiduelle + + #LOC_CRP_WasteHeat_Abbreviation = DT + + #LOC_CRP_LqdXenon_DisplayName = Xénon Liquide + + #LOC_CRP_LqdXenon_Abbreviation = Xe + + //RealFuels + + #LOC_CRP_Aerozine50_DisplayName = Aérozine50 + + #LOC_CRP_AK20_DisplayName = AK20 + + #LOC_CRP_AK27_DisplayName = AK27 + + #LOC_CRP_Aniline_DisplayName = Aniline + + #LOC_CRP_AvGas_DisplayName = AvGas + + #LOC_CRP_CaveaB_DisplayName = CaveaB + + #LOC_CRP_ClF3_DisplayName = ClF3 + + #LOC_CRP_ClF5_DisplayName = ClF5 + + #LOC_CRP_Diborane_DisplayName = Diborane + + #LOC_CRP_Ethane_DisplayName = Ethane + + #LOC_CRP_Ethanol_DisplayName = Ethanol + + #LOC_CRP_Ethanol75_DisplayName = Ethanol75 + + #LOC_CRP_Ethanol90_DisplayName = Ethanol90 + + #LOC_CRP_Ethylene_DisplayName = Ethylène + + #LOC_CRP_FLOX30_DisplayName = FLOX30 + + #LOC_CRP_FLOX70_DisplayName = FLOX70 + + #LOC_CRP_FLOX88_DisplayName = FLOX88 + + #LOC_CRP_Furfuryl_DisplayName = Alcool furfurylique + + #LOC_CRP_Helium_DisplayName = Hélium + + #LOC_CRP_HNIW_DisplayName = HNIW + + #LOC_CRP_HTP_DisplayName = HTP + + #LOC_CRP_HTPB_DisplayName = HTPB + + #LOC_CRP_Hydrazine_DisplayName = Hydrazine + + #LOC_CRP_Hydyne_DisplayName = Hydyne + + #LOC_CRP_IRFNA-III_DisplayName = IRFNA-III + + #LOC_CRP_IRFNA-IV_DisplayName = IRFNA-IV + + #LOC_CRP_IWFNA_DisplayName = IWFNA + + #LOC_CRP_Kerosene_DisplayName = Kérosene + + #LOC_CRP_LeadBallast_DisplayName = Lest + + #LOC_CRP_LqdFluorine_DisplayName = Fluor liquide + + #LOC_CRP_LqdMethane_DisplayName = Méthane Liquide + + #LOC_CRP_LqdOxygen_DisplayName = Oxygène Liquide + + #LOC_CRP_Methane_DisplayName = Méthane + + #LOC_CRP_Methanol_DisplayName = Méthanol + + #LOC_CRP_MMH_DisplayName = MMH + + #LOC_CRP_MON1_DisplayName = MON1 + + #LOC_CRP_MON3_DisplayName = MON3 + + #LOC_CRP_MON10_DisplayName = MON10 + + #LOC_CRP_MON15_DisplayName = MON15 + + #LOC_CRP_MON20_DisplayName = MON20 + + #LOC_CRP_MON25_DisplayName = MON25 + + #LOC_CRP_NGNC_DisplayName = NGNC + + #LOC_CRP_N2F4_DisplayName = N2F4 + + #LOC_CRP_Nitrogen_DisplayName = Nitrogène + + #LOC_CRP_NitrousOxide_DisplayName = Protoxyde d'Azote + + #LOC_CRP_NTO_DisplayName = NOS + + #LOC_CRP_OF2_DisplayName = OF2 + + #LOC_CRP_PBAN_DisplayName = PBAN + + #LOC_CRP_Pentaborane_DisplayName = Pentaborane + + #LOC_CRP_PSPC_DisplayName = PSPC + + #LOC_CRP_Syntin_DisplayName = Syntin + + #LOC_CRP_TEATEB_DisplayName = TEATEB + + #LOC_CRP_Tonka250_DisplayName = Tonka250 + + #LOC_CRP_Tonka500_DisplayName = Tonka500 + + #LOC_CRP_UDMH_DisplayName = UDMH + + #LOC_CRP_UH25_DisplayName = UH25 + + //DeepFreeze + + #LOC_CRP_Glykerol_DisplayName = Glycérol + + } + +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Alumina.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Alumina.cfg index 91033233d..1594ad6d3 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Alumina.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Alumina.cfg @@ -10,13 +10,40 @@ // //Express all numbers as percentages 0.0-100.0, not 0.0-1.0! // - +// ####################### Bodys with NO Alumina (Sun, Jool, Vall, Pol) +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Sun + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE // See Biome definitions +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 PlanetName = Jool - Distribution { PresenceChance = 0 @@ -26,97 +53,299 @@ PLANETARY_RESOURCE Dispersal = 0 } } - +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Vall + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Pol + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +// ####################### Global definition of Alumina GLOBAL_RESOURCE { ResourceName = Alumina ResourceType = 0 - Distribution { - PresenceChance = 70 + PresenceChance = 80 MinAbundance = .001 MaxAbundance = 10 Variance = 50 Dispersal = 3 } } +// ####################### Planetary definition of Alumina +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Moho + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Eve + Distribution + { + PresenceChance = 100 + MinAbundance = 0.5 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Gilly + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 PlanetName = Kerbin - Distribution { PresenceChance = 100 - MinAbundance = .001 + MinAbundance = 0.1 MaxAbundance = 10 Variance = 50 Dispersal = 3 } } - PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 PlanetName = Mun + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Minmus; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Duna + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 3 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Ike + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Dres + Distribution + { + PresenceChance = 100 + MinAbundance = 0.5 + MaxAbundance = 6 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Jool here (GasGiant); Alumina prevented, see top. +PLANETARY_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Laythe Distribution { PresenceChance = 100 - MinAbundance = .01 - MaxAbundance = 50 + MinAbundance = 0.01 + MaxAbundance = 1 Variance = 50 Dispersal = 3 } } - PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 - PlanetName = Moho + PlanetName = Tylo Distribution { PresenceChance = 100 - MinAbundance = .01 - MaxAbundance = 50 + MinAbundance = 5 + MaxAbundance = 15 Variance = 50 Dispersal = 3 } } - +// No Planetary definition for Vall; Alumina prevented, see top. PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 - PlanetName = Duna + PlanetName = Bop Distribution { PresenceChance = 100 - MinAbundance = .001 - MaxAbundance = 1 + MinAbundance = 1 + MaxAbundance = 5 Variance = 50 Dispersal = 3 } } - +// No Planetary definition for Pol; Alumina prevented, see top. PLANETARY_RESOURCE { ResourceName = Alumina ResourceType = 0 - PlanetName = Dres + PlanetName = Eeloo Distribution { PresenceChance = 100 - MinAbundance = .01 - MaxAbundance = 50 + MinAbundance = 0.1 + MaxAbundance = 3 Variance = 50 Dispersal = 3 } } +// ####################### Biome definition of Alumina +// ##### Minmus. All white areas. +BIOME_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + BiomeName = Poles + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + BiomeName = Highlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + BiomeName = Midlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + BiomeName = Lowlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Alumina + ResourceType = 0 + PlanetName = Minmus + BiomeName = Slopes + Distribution + { + PresenceChance = 100 + MinAbundance = 0.01 + MaxAbundance = 3 + Variance = 50 + Dispersal = 3 + } +} \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Antimatter.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Antimatter.cfg new file mode 100644 index 000000000..c269fc984 --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Antimatter.cfg @@ -0,0 +1,50 @@ +// +// Community Resource Pack +// Resource: Antimatter +// +//Resource types: +// 0 = Crustal (Stuff you dig up) +// 1 = Oceanic (Stuff in the oceans) +// 2 = Atmospheric (Stuff in the air, varies with pressure) +// 3 = Interplanetary (Stuff you find between planets) +// +//Express all numbers as percentages 0.0-100.0, not 0.0-1.0! +// + +// Kerbin Exo +PLANETARY_RESOURCE +{ + ResourceName = Antimatter + ResourceType = 3 + PlanetName = Kerbin + Distribution + { + PresenceChance = 100 + MinAbundance = 0.001 // - Relative atmospheric scaling applied + MaxAbundance = 0.002 // - Relative atmospheric scaling applied + MinAltitude = 1 + MaxAltitude = 2 + MinRange = 0.25 + MaxRange = 0.3 + Variance = 0 + } +} + +// Jool exo +PLANETARY_RESOURCE +{ + ResourceName = Antimatter + ResourceType = 3 + PlanetName = Jool + Distribution + { + PresenceChance = 100 + MinAbundance = 50 // - Relative atmospheric scaling applied + MaxAbundance = 100 // - Relative atmospheric scaling applied + MinAltitude = 1 + MaxAltitude = 3 + MinRange = 1 + MaxRange = 1 + Variance = 0 + } +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/ArgonGas.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/ArgonGas.cfg index 1d74bde2e..c30ef9254 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/ArgonGas.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/ArgonGas.cfg @@ -2,7 +2,7 @@ // Community Resource Pack // Resource: // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -14,12 +14,12 @@ GLOBAL_RESOURCE { ResourceName = ArgonGas ResourceType = 2 - + Distribution { - PresenceChance = 85 - MinAbundance = .001 - MaxAbundance = 0.5 + PresenceChance = 50 + MinAbundance = 1 // 0.001 - Relative atmospheric scaling applied + MaxAbundance = 100 // 0.5 - Relative atmospheric scaling applied Variance = 5 } } @@ -28,12 +28,12 @@ PLANETARY_RESOURCE ResourceName = ArgonGas ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = 0.01 - MaxAbundance = 0.1 + MinAbundance = 1 // 0.01 - Relative atmospheric scaling applied + MaxAbundance = 10 // 0.1 - Relative atmospheric scaling applied Variance = 5 } } @@ -42,12 +42,12 @@ PLANETARY_RESOURCE ResourceName = ArgonGas ResourceType = 2 PlanetName = Duna - + Distribution { PresenceChance = 100 - MinAbundance = 0.001 - MaxAbundance = 0.01 + MinAbundance = 0.1 // 0.001 - Relative atmospheric scaling applied + MaxAbundance = 1 // 0.01 - Relative atmospheric scaling applied Variance = 5 } } @@ -56,12 +56,12 @@ PLANETARY_RESOURCE ResourceName = ArgonGas ResourceType = 2 PlanetName = Jool - + Distribution { PresenceChance = 100 - MinAbundance = 0.07 - MaxAbundance = 1 + MinAbundance = 7 // 0.07 - Relative atmospheric scaling applied + MaxAbundance = 100 // 1 - Relative atmospheric scaling applied Variance = 5 } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg index efdceeebb..83d22d853 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg @@ -2,7 +2,7 @@ // Community Resource Pack // Resource: // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -15,12 +15,12 @@ PLANETARY_RESOURCE ResourceName = CarbonDioxide ResourceType = 2 PlanetName = Eve - + Distribution { PresenceChance = 100 - MinAbundance = 95 - MaxAbundance = 97 + MinAbundance = 97 // 95 - Relative atmospheric scaling applied + MaxAbundance = 100 // 97 - Relative atmospheric scaling applied Variance = 0 } } @@ -29,12 +29,12 @@ PLANETARY_RESOURCE ResourceName = CarbonDioxide ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = 1 - MaxAbundance = 2 + MinAbundance = 1 // 1 - Relative atmospheric scaling applied + MaxAbundance = 2 // 2 - Relative atmospheric scaling applied Variance = 0 } } @@ -43,12 +43,12 @@ PLANETARY_RESOURCE ResourceName = CarbonDioxide ResourceType = 2 PlanetName = Duna - + Distribution { PresenceChance = 100 - MinAbundance = 95 - MaxAbundance = 97 + MinAbundance = 97 // 95 - Relative atmospheric scaling applied + MaxAbundance = 100 // 97 - Relative atmospheric scaling applied Variance = 0 } } @@ -57,12 +57,12 @@ PLANETARY_RESOURCE ResourceName = CarbonDioxide ResourceType = 2 PlanetName = Laythe - + Distribution { PresenceChance = 100 - MinAbundance = 5 - MaxAbundance = 10 + MinAbundance = 5 // 5 - Relative atmospheric scaling applied + MaxAbundance = 11 // 10 - Relative atmospheric scaling applied Variance = 0 } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg index f8a9576ed..c12057bc8 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg @@ -2,7 +2,7 @@ // Community Resource Pack // Resource: // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -15,7 +15,7 @@ GLOBAL_RESOURCE { ResourceName = Karbonite ResourceType = 0 - + Distribution { PresenceChance = 70 @@ -30,12 +30,12 @@ GLOBAL_RESOURCE { ResourceName = Karbonite ResourceType = 1 - + Distribution { PresenceChance = 80 - MinAbundance = 1 - MaxAbundance = 10 + MinAbundance = 5 // 1 - Relative atmospheric scaling applied + MaxAbundance = 50 // 10 - Relative atmospheric scaling applied Variance = 20 Dispersal = 3 } @@ -45,30 +45,30 @@ GLOBAL_RESOURCE { ResourceName = Karbonite ResourceType = 2 - + Distribution { PresenceChance = 80 MinAbundance = .001 - MaxAbundance = 1 + MaxAbundance = 5 // 1 - Relative atmospheric scaling applied Variance = 50 //Karbonite plumes venting - Dispersal = 3 + Dispersal = 3 } } GLOBAL_RESOURCE { ResourceName = Karbonite ResourceType = 3 - + Distribution { PresenceChance = 20 MinAbundance = .001 - MaxAbundance = .5 + MaxAbundance = 50 // 0.5 - Relative atmospheric scaling applied MinAltitude = .2 MaxAltitude = 2 MinRange = .01 - MaxRange = .5 + MaxRange = .5 } } @@ -77,12 +77,12 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 2 PlanetName = Jool - + Distribution { PresenceChance = 100 - MinAbundance = 80 - MaxAbundance = 80 + MinAbundance = 100 // 80 - Relative atmospheric scaling applied + MaxAbundance = 100 // 80 - Relative atmospheric scaling applied Variance = 50 } } @@ -91,12 +91,12 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 1 PlanetName = Eve - + Distribution { PresenceChance = 100 - MinAbundance = 60 - MaxAbundance = 60 + MinAbundance = 75 // 60 - Relative atmospheric scaling applied + MaxAbundance = 75 //60 - Relative atmospheric scaling applied Variance = 10 } } @@ -105,7 +105,7 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 0 PlanetName = Kerbin - + Distribution { PresenceChance = 100 @@ -119,7 +119,7 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 1 PlanetName = Kerbin - + Distribution { PresenceChance = 100 @@ -134,7 +134,7 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 @@ -149,16 +149,16 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 3 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = .001 - MaxAbundance = .001 + MinAbundance = .001 // 0.001 - Relative atmospheric scaling applied + MaxAbundance = .001 // 0.001 - Relative atmospheric scaling applied MinAltitude = .245 MaxAltitude = .245 MinRange = .01 - MaxRange = .01 + MaxRange = .01 } } @@ -167,7 +167,7 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 0 PlanetName = Jool - + Distribution { PresenceChance = 0 @@ -183,15 +183,15 @@ PLANETARY_RESOURCE ResourceName = Karbonite ResourceType = 3 PlanetName = Jool - + Distribution { PresenceChance = 100 - MinAbundance = 1 - MaxAbundance = 1 + MinAbundance = 100 // 1 - Relative atmospheric scaling applied + MaxAbundance = 100 // 1 - Relative atmospheric scaling applied MinAltitude = .1 MaxAltitude = .1 MinRange = .1 - MaxRange = .1 + MaxRange = .1 } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdDeuterium.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdDeuterium.cfg new file mode 100644 index 000000000..628101eda --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdDeuterium.cfg @@ -0,0 +1,28 @@ +// +// Community Resource Pack +// Resource: +// +//Resource types: +// 0 = Crustal (Stuff you dig up) +// 1 = Oceanic (Stuff in the oceans) +// 2 = Atmospheric (Stuff in the air, varies with pressure) +// 3 = Interplanetary (Stuff you find between planets) +// +//Express all numbers as percentages 0.0-100.0, not 0.0-1.0! +// + +// Jool atmo +PLANETARY_RESOURCE +{ + ResourceName = LqdDeuterium + ResourceType = 2 + PlanetName = Jool + + Distribution + { + PresenceChance = 100 + MinAbundance = 20 // - Relative atmospheric scaling applied + MaxAbundance = 100 // - Relative atmospheric scaling applied + Variance = 20 + } +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHe3.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHe3.cfg index d35bec243..d79f13d0c 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHe3.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHe3.cfg @@ -1,8 +1,8 @@ // -// +// // Resource: LqdHe3 // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -16,7 +16,7 @@ GLOBAL_RESOURCE { ResourceName = LqdHe3 ResourceType = 0 - + Distribution { PresenceChance = 100 @@ -27,13 +27,13 @@ GLOBAL_RESOURCE } } -// Kerbin Crustal Helium3 abundance is 10 times Earth abundance +// Kerbin Crustal Helium3 abundance is 10 times Earth abundance PLANETARY_RESOURCE { ResourceName = LqdHe3 ResourceType = 0 PlanetName = Kerbin - + Distribution { PresenceChance = 100 @@ -50,7 +50,7 @@ PLANETARY_RESOURCE ResourceName = LqdHe3 ResourceType = 0 PlanetName = Earth - + Distribution { PresenceChance = 100 @@ -66,7 +66,7 @@ PLANETARY_RESOURCE ResourceName = LqdHe3 ResourceType = 0 PlanetName = Mun - + Distribution { PresenceChance = 100 @@ -83,7 +83,7 @@ PLANETARY_RESOURCE ResourceName = LqdHe3 ResourceType = 0 PlanetName = Moon - + Distribution { PresenceChance = 100 @@ -101,7 +101,7 @@ BIOME_RESOURCE ResourceType = 0 PlanetName = Kerbin BiomeName = Water - + Distribution { PresenceChance = 100 @@ -119,7 +119,7 @@ BIOME_RESOURCE ResourceType = 0 PlanetName = Earth BiomeName = Water - + Distribution { PresenceChance = 100 @@ -138,12 +138,12 @@ GLOBAL_RESOURCE { ResourceName = LqdHe3 ResourceType = 2 - + Distribution { - PresenceChance = 100 - MinAbundance = 0.0000000072 - MaxAbundance = 0.00014 + PresenceChance = 5 + MinAbundance = 0.001 // 0.0000000072 + MaxAbundance = 100 // 0.00014 Variance = 0 Dispersal = 1 } @@ -151,18 +151,18 @@ GLOBAL_RESOURCE -// Kerbin Atmospheric Helium3 abundance is 10 times Earth abundance +// Kerbin Atmospheric Helium3 abundance is 10 times Earth abundance PLANETARY_RESOURCE { ResourceName = LqdHe3 ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = 0.00000000072 - MaxAbundance = 0.00000000072 + MinAbundance = 0.001 // 0.00000000072 + MaxAbundance = 0.001 // 0.00000000072 Variance = 0 Dispersal = 1 } @@ -175,29 +175,29 @@ PLANETARY_RESOURCE ResourceName = LqdHe3 ResourceType = 2 PlanetName = Earth - + Distribution { PresenceChance = 100 - MinAbundance = 0.000000000072 - MaxAbundance = 0.000000000072 + MinAbundance = 0.001 // 0.000000000072 + MaxAbundance = 0.001 // 0.000000000072 Variance = 0 Dispersal = 1 } } -// Jool Helium3 abundance is 10 times Jupiter abundance +// Jool Helium3 abundance is 10 times Jupiter abundance PLANETARY_RESOURCE { ResourceName = LqdHe3 ResourceType = 2 PlanetName = Jool - + Distribution { PresenceChance = 100 - MinAbundance = 0.00014 - MaxAbundance = 0.00014 + MinAbundance = 10 // 0.00014 + MaxAbundance = 10 // 0.00014 Variance = 0 Dispersal = 1 } @@ -208,12 +208,12 @@ PLANETARY_RESOURCE ResourceName = LqdHe3 ResourceType = 2 PlanetName = Jupiter - + Distribution { PresenceChance = 100 - MinAbundance = 0.000014 - MaxAbundance = 0.000014 + MinAbundance = 1 // 0.000014 + MaxAbundance = 1 // 0.000014 Variance = 0 Dispersal = 1 } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHydrogen.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHydrogen.cfg index 55138da4a..e7a198164 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHydrogen.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/LqdHydrogen.cfg @@ -2,7 +2,7 @@ // Community Resource Pack // Resource: // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -11,35 +11,95 @@ //Express all numbers as percentages 0.0-100.0, not 0.0-1.0! // + +// GLOBAL EXO GLOBAL_RESOURCE { ResourceName = LqdHydrogen ResourceType = 3 - + Distribution { - PresenceChance = 85 - MinAbundance = .00000001 - MaxAbundance = .00000005 + PresenceChance = 50 + MinAbundance = 1 // .00000001 - Relative atmospheric scaling applied + MaxAbundance = 100 // .00000005 - Relative atmospheric scaling applied MinAltitude = 500 MaxAltitude = 200000000000 MinRange = .01 - MaxRange = .5 + MaxRange = .5 Variance = 20 } } +// SUN EXO +PLANETARY_RESOURCE +{ + ResourceName = LqdHydrogen + ResourceType = 3 + PlanetName = Sun + + Distribution + { + PresenceChance = 100 + MinAbundance = 10 // .00000001 - Relative atmospheric scaling applied + MaxAbundance = 20 // .00000005 - Relative atmospheric scaling applied + MinAltitude = 0.1 + MaxAltitude = 500 + MinRange = 500 + MaxRange = 500 + Variance = 0 + } +} +// JOOL EXO +PLANETARY_RESOURCE +{ + ResourceName = LqdHydrogen + ResourceType = 3 + PlanetName = Jool + Distribution + { + PresenceChance = 100 + MinAbundance = 20 + MaxAbundance = 60 + MinAltitude = 0.1 + MaxAltitude = 0.1 + MinRange = 75 + MaxRange = 100 + Variance = 0 + } +} +// KERBIN EXO +PLANETARY_RESOURCE +{ + ResourceName = LqdHydrogen + ResourceType = 3 + PlanetName = Kerbin + Distribution + { + PresenceChance = 100 + MinAbundance = 40 + MaxAbundance = 80 + MinAltitude = 0.1 + MaxAltitude = 25 + MinRange = 25 + MaxRange = 25 + Variance = 0 + } +} + + +// JOOL ATMO PLANETARY_RESOURCE { ResourceName = LqdHydrogen ResourceType = 2 PlanetName = Jool - + Distribution { PresenceChance = 100 - MinAbundance = 0.05 - MaxAbundance = 0.08 + MinAbundance = 62 // 50 - Relative atmospheric scaling applied + MaxAbundance = 100 // 80 - Relative atmospheric scaling applied Variance = 20 } -} \ No newline at end of file +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Oxygen.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Oxygen.cfg index 1b27cab67..99eaa31f3 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Oxygen.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Oxygen.cfg @@ -2,7 +2,7 @@ // Community Resource Pack // Resource: // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) @@ -15,12 +15,12 @@ PLANETARY_RESOURCE ResourceName = Oxygen ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = 20 - MaxAbundance = 30 + MinAbundance = 65 // 20 - Relative atmospheric scaling applied + MaxAbundance = 100 // 30 - Relative atmospheric scaling applied Variance = 0 } } @@ -29,13 +29,12 @@ PLANETARY_RESOURCE ResourceName = Oxygen ResourceType = 2 PlanetName = Laythe - + Distribution { PresenceChance = 100 - MinAbundance = 20 - MaxAbundance = 30 + MinAbundance = 65 // 20 - Relative atmospheric scaling applied + MaxAbundance = 100 // 30 - Relative atmospheric scaling applied Variance = 0 } } - diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Regolith.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Regolith.cfg new file mode 100644 index 000000000..8a0a78bab --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Regolith.cfg @@ -0,0 +1,371 @@ +// +// +// Resource: Regolith (Solar Wind Enriched Regolith) +// +//Resource types: +// 0 = Crustal (Stuff you dig up) +// 1 = Oceanic (Stuff in the oceans) +// 2 = Atmospheric (Stuff in the air, varies with pressure) +// 3 = Interplanetary (Stuff you find between planets) +// +//Express all numbers as percentages 0.0-100.0, not 0.0-1.0! +// +// ####################### Bodys with NO Regolith (Sun, Jool, Laythe) +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Sun + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Jool + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Laythe + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +// ####################### Global definition of Regolith +GLOBAL_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + Distribution + { + PresenceChance = 90 + MinAbundance = 1 + MaxAbundance = 20 + Variance = 50 + Dispersal = 3 + } +} +// ####################### Planetary definition of Regolith +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Moho + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Eve + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Gilly + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Kerbin + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 1 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Mun + Distribution + { + PresenceChance = 100 + MinAbundance = 10 + MaxAbundance = 50 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Minmus; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Duna + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Ike + Distribution + { + PresenceChance = 100 + MinAbundance = 10 + MaxAbundance = 50 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Dres + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Jool here (GasGiant); Regolith prevented, see top. +// No Planetary definition for Laythe here; Regolith prevented, see top. +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Tylo + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 25 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Vall; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Bop + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Pol + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Eeloo; See Biome definition. +// ####################### Biome definition of Regolith +// ##### Moho +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Moho + BiomeName = Northern Sinkhole Ridge + Distribution + { + PresenceChance = 100 + MinAbundance = 10 + MaxAbundance = 25 + Variance = 50 + Dispersal = 3 + } +} + +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Moho + BiomeName = Northern Sinkhole + + Distribution + { + PresenceChance = 100 + MinAbundance = 25 + MaxAbundance = 45 + Variance = 50 + Dispersal = 3 + } +} +// ##### Minmus +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Minmus + BiomeName = Poles + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Minmus + BiomeName = Highlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Minmus + BiomeName = Midlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Minmus + BiomeName = Lowlands + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Minmus + BiomeName = Slopes + Distribution + { + PresenceChance = 100 + MinAbundance = 0.01 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} +// ##### Vall +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Vall + BiomeName = Mountains + Distribution + { + PresenceChance = 100 + MinAbundance = 0.5 + MaxAbundance = 4 + Variance = 50 + Dispersal = 3 + } +} +// ##### Eeloo +BIOME_RESOURCE +{ + ResourceName = Regolith + ResourceType = 0 + PlanetName = Eeloo + BiomeName = Ice Canyons + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 9 + Variance = 50 + Dispersal = 3 + } +} \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg index c8f869f91..b337d3a05 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg @@ -10,38 +10,327 @@ // //Express all numbers as percentages 0.0-100.0, not 0.0-1.0! // - +// ####################### Bodys with NO Silicates (Sun, Jool, Vall) +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Sun + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE // See Biome definitions +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Minmus + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Jool + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Vall + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +// ####################### Global definition of Silicates GLOBAL_RESOURCE { ResourceName = Silicates ResourceType = 0 - Distribution { - PresenceChance = 60 + PresenceChance = 80 MinAbundance = .001 MaxAbundance = 10 - Variance = 10 + Variance = 50 Dispersal = 3 } } - -BIOME_RESOURCE +// ####################### Planetary definition of Silicates +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Moho + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Eve + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 20 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Gilly + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Kerbin + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE { ResourceName = Silicates ResourceType = 0 PlanetName = Mun - BiomeName = Northern Basin + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 25 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Minmus; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Duna + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 12 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Ike + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 25 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Dres + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Jool here (GasGiant); Silicates prevented, see top. +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = 10 + MaxAbundance = 30 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Tylo + + Distribution + { + PresenceChance = 100 + MinAbundance = 6 + MaxAbundance = 18 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Vall; Silicates prevented, see top. +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Bop Distribution { PresenceChance = 100 MinAbundance = 1 - MaxAbundance = 20 - Variance = 10 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Pol + + Distribution + { + PresenceChance = 100 + MinAbundance = 20 + MaxAbundance = 40 + Variance = 50 Dispersal = 3 } } - - - +PLANETARY_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Eeloo + + Distribution + { + PresenceChance = 100 + MinAbundance = 0.2 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +// ####################### Biome definition of Silicates +// ##### Minmus. All blue areas. +BIOME_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Minmus + BiomeName = Flats + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Minmus + BiomeName = Lesser Flats + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Minmus + BiomeName = Great Flats + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Silicates + ResourceType = 0 + PlanetName = Minmus + BiomeName = Greater Flats + Distribution + { + PresenceChance = 100 + MinAbundance = 2 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Spodumene.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Spodumene.cfg new file mode 100644 index 000000000..6b35e5a05 --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Spodumene.cfg @@ -0,0 +1,310 @@ +// +// Community Resource Pack +// Resource: Spodumene +// +//Resource types: +// 0 = Crustal (Stuff you dig up) +// 1 = Oceanic (Stuff in the oceans) +// 2 = Atmospheric (Stuff in the air, varies with pressure) +// 3 = Interplanetary (Stuff you find between planets) +// +//Express all numbers as percentages 0.0-100.0, not 0.0-1.0! +// +// ####################### Bodys with NO Spodumene (Sun, Jool) +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Sun + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE // See Biome definitions +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Minmus + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Jool + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} +// ####################### Global definition of Spodumene +GLOBAL_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + Distribution + { + PresenceChance = 80 + MinAbundance = .001 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +// ####################### Planetary definition of Spodumene +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Moho + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Eve + Distribution + { + PresenceChance = 100 + MinAbundance = 3 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Gilly + Distribution + { + PresenceChance = 100 + MinAbundance = 0.5 + MaxAbundance = 6 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Kerbin + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 20 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Mun + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 20 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Minmus; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Duna + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 10 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Ike + Distribution + { + PresenceChance = 100 + MinAbundance = 7 + MaxAbundance = 25 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Dres + Distribution + { + PresenceChance = 100 + MinAbundance = 0.5 + MaxAbundance = 7 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Jool here (GasGiant); Spodumene prevented, see top. +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 2 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Tylo + + Distribution + { + PresenceChance = 100 + MinAbundance = 3 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Vall; See Biome definition. +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Bop + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} +PLANETARY_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Pol + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 50 + Dispersal = 3 + } +} +// No Planetary definition for Eeloo; See Biome definition. +// ####################### Biome definition of Spodumene +// ##### Minmus +BIOME_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Minmus + BiomeName = Slopes + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 8 + Variance = 50 + Dispersal = 3 + } +} +BIOME_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Minmus + BiomeName = Poles + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 4 + Variance = 50 + Dispersal = 3 + } +} +// ##### Vall +BIOME_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Vall + BiomeName = Mountains + Distribution + { + PresenceChance = 100 + MinAbundance = 0.1 + MaxAbundance = 2 + Variance = 50 + Dispersal = 3 + } +} +// ##### Eeloo +BIOME_RESOURCE +{ + ResourceName = Spodumene + ResourceType = 0 + PlanetName = Eeloo + BiomeName = Ice Canyons + Distribution + { + PresenceChance = 100 + MinAbundance = 5 + MaxAbundance = 15 + Variance = 50 + Dispersal = 3 + } +} \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/XenonGas.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/XenonGas.cfg index 1aa0b11be..a90111e99 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/XenonGas.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/XenonGas.cfg @@ -1,52 +1,94 @@ // // Community Resource Pack -// Resource: +// Resource: XenonGas // -//Resource types: +//Resource types: // 0 = Crustal (Stuff you dig up) // 1 = Oceanic (Stuff in the oceans) // 2 = Atmospheric (Stuff in the air, varies with pressure) // 3 = Interplanetary (Stuff you find between planets) // -//Express all numbers as percentages 0.0-100.0, not 0.0-1.0! +//Express all numbers as percentages 0.001-100.0, not < 0.001 or > 100 +// +// scaled_value =IF(original_value >=1, original_value, ROUND(original_value^0.25, 3)) // GLOBAL_RESOURCE { ResourceName = XenonGas ResourceType = 2 - + Distribution { PresenceChance = 50 - MinAbundance = 0.00000005 - MaxAbundance = 0.0000005 + MinAbundance = 0.001 // 0.00000005 - Relative atmospheric scaling applied + MaxAbundance = 0.01 // 0.0000005 - Relative atmospheric scaling applied Variance = 5 } } -GLOBAL_RESOURCE + +// Xenon can be present in Basalt on sea floor +BIOME_RESOURCE { ResourceName = XenonGas - ResourceType = 1 - + ResourceType = 0 + PlanetName = Kerbin + BiomeName = Water + Distribution { - PresenceChance = 50 - MinAbundance = .0001 + PresenceChance = 100 + MinAbundance = 0.001 + MaxAbundance = 0.01 + Variance = 10 + Dispersal = 3 + } +} + +BIOME_RESOURCE +{ + ResourceName = XenonGas + ResourceType = 0 + PlanetName = Kerbin + BiomeName = Water + + Distribution + { + PresenceChance = 100 + MinAbundance = 0.001 MaxAbundance = 0.01 - Variance = 50 + Variance = 10 + Dispersal = 3 } } + +BIOME_RESOURCE +{ + ResourceName = XenonGas + ResourceType = 0 + PlanetName = Laythe + BiomeName = Crater Bay + + Distribution + { + PresenceChance = 100 + MinAbundance = 0.01 + MaxAbundance = 0.02 + Variance = 10 + Dispersal = 3 + } +} + PLANETARY_RESOURCE { ResourceName = XenonGas ResourceType = 2 PlanetName = Kerbin - + Distribution { PresenceChance = 100 - MinAbundance = 0.00000009 - MaxAbundance = 0.0000002 + MinAbundance = 0.001 // 0.00000009 - Relative atmospheric scaling applied + MaxAbundance = 0.002 // 0.0000002 - Relative atmospheric scaling applied Variance = 5 } -} \ No newline at end of file +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg index a79666132..c3a7de0d2 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg @@ -1,5 +1,13 @@ @PART[SurfaceScanner] { + MODULE + { + name = ModuleResourceScanner + ScannerType = 0 + ResourceName = Alumina + MaxAbundanceAltitude = 1000 + RequiresUnlock = false + } MODULE { name = ModuleResourceScanner @@ -65,6 +73,14 @@ RequiresUnlock = false } MODULE + { + name = ModuleResourceScanner + ScannerType = 0 + ResourceName = Regolith + MaxAbundanceAltitude = 1000 + RequiresUnlock = false + } + MODULE { name = ModuleResourceScanner ScannerType = 0 @@ -73,6 +89,14 @@ RequiresUnlock = false } MODULE + { + name = ModuleResourceScanner + ScannerType = 0 + ResourceName = Spodumene + MaxAbundanceAltitude = 1000 + RequiresUnlock = false + } + MODULE { name = ModuleResourceScanner ScannerType = 0 diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version index dc4c81ea9..97fe78247 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 92c99aaa2..8b7734831 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 a326b4596..ee4c8095e 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/GroundConstruction/GroundConstruction.version b/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version index 2344f5fd9..db866ed07 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version +++ b/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version @@ -6,20 +6,20 @@ "VERSION": { "MAJOR":2, - "MINOR":0, - "PATCH":1, + "MINOR":2, + "PATCH":0, "BUILD":0 }, "KSP_VERSION_MIN": { "MAJOR":1, "MINOR":4, - "PATCH":3 + "PATCH":5 }, "KSP_VERSION_MAX": { "MAJOR":1, "MINOR":4, - "PATCH":3 + "PATCH":5 } } diff --git a/FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg b/FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg index d6646875f..41861cb3e 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg +++ b/FOR_RELEASE/GameData/GroundConstruction/KitResources.cfg @@ -9,4 +9,5 @@ GC_KIT_RESOURCES keep = UF4 keep = ThF4 keep = Actinides + keep = Machinery } diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.cfg index f5d0d9952..6263e4c31 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.cfg +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.cfg @@ -17,7 +17,7 @@ PART TechRequired = advConstruction category = Payload subcategory = 0 - title = DIY Kit Container + title = Ground Kit Container manufacturer = AT Industries description = DIY Kit is a pack of all the needed tools, blueprints and hightech components needed to build a vessel offworld. Provided that you have enough raw materials, a workshop and a powersupply already in place. @@ -37,6 +37,7 @@ PART breakingTorque = 200 maxTemp = 2600 bulkheadProfiles = size2 + tags = ferromagnetic fuelCrossFeed = False vesselType = Lander @@ -48,8 +49,7 @@ PART { name = ModuleConstructionKit SpawnTransforms = launch-position - DetachableNode = top - KitType = Box + MinSize = 0.25, 0.25, 0.25 } MODULE @@ -65,8 +65,8 @@ PART nodeType = size0 size1 size2 size3 stagingEnabled = False undockEjectionForce = 1 - acquireForce = 0 - acquireTorque = 0 + acquireForce = 1 + acquireTorque = 1 captureRange = 0.1 } } diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.mu index 0cd355a45..27fb529df 100644 Binary files a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.mu and b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/DIYKit.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer-norm.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer-norm.png new file mode 100644 index 000000000..01fbcdc8b Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer-norm.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.cfg new file mode 100644 index 000000000..0c8f88734 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.cfg @@ -0,0 +1,87 @@ +PART +{ + name = OrbitalKitContainer2 + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/DIYKit/OrbitalKitContainer + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_top = 0.0, 1.5, 0.0, 0, 1, 0, 1 + node_stack_bottom = 0.0, -1.5, 0.0, 0, -1, 0, 1 + + TechRequired = specializedConstruction + category = Payload + subcategory = 0 + identicalParts = OrbitalKitContainer + title = Dockable Kit Container + manufacturer = AT Industries + description = DIY Kit is a pack of all the tools, blueprints and hightech components needed to build a vessel offworld. Provided that you have enough raw materials, a workshop and a powersupply already in place. This container is meant for orbital construction. It has a builtin docking port for external access. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 400 + cost = 200 + mass = 0.5 + + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 10 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2600 + bulkheadProfiles = size2 + tags = ferromagnetic + + fuelCrossFeed = False + vesselType = Lander + CrewCapacity = 0 + + stagingIcon = DECOUPLER_VERT + + MODULE + { + name = DockedKitContainer + ConstructionNode = bottom + SpawnManager + { + SpawnSpace = metric-mesh + SpawnTransform = launch-transform + SpawnOffset = 0, -1, 0 + } + MetricMesh = metric-mesh + MinSize = 0.25, 0.35, 0.25 + } + + MODULE + { + name = NamedDockingNode + PortName = Transport + nodeTransformName = transport-port + referenceAttachNode = top + nodeType = size0 size1 size2 size3 + stagingEnabled = False + undockEjectionForce = 1 + acquireForce = 1 + acquireTorque = 1 + captureRange = 0.1 + } + + MODULE + { + name = NamedDockingNode + PortName = Construction + nodeTransformName = construction-port + referenceAttachNode = bottom + nodeType = size1 size2 size3 size4 + stagingEnabled = False + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.mu new file mode 100644 index 000000000..d3419f81a Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.png new file mode 100644 index 000000000..135b13a78 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer_old.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer_old.cfg new file mode 100644 index 000000000..562e8cf81 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/DIYKit/OrbitalKitContainer_old.cfg @@ -0,0 +1,85 @@ +PART +{ + name = OrbitalKitContainer + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/DIYKit/OrbitalKitContainer + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_top = 0.0, 1.5, 0.0, 0, 1, 0, 1 + node_stack_bottom = 0.0, -1.5, 0.0, 0, -1, 0, 1 + + TechRequired = specializedConstruction + TechHidden = true + category = none + subcategory = 0 + title = Dockable Kit Container + manufacturer = AT Industries + description = DIY Kit is a pack of all the tools, blueprints and hightech components needed to build a vessel offworld. Provided that you have enough raw materials, a workshop and a powersupply already in place. This container is meant for orbital construction. It has a builtin docking port for external access. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 400 + cost = 200 + mass = 0.5 + + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 10 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2600 + bulkheadProfiles = size2 + tags = ferromagnetic + + fuelCrossFeed = False + vesselType = Lander + CrewCapacity = 0 + + stagingIcon = DECOUPLER_VERT + + MODULE + { + name = DockedKitContainer + ConstructionNode = bottom + SpawnManager + { + SpawnSpace = metric-mesh + SpawnTransform = launch-transform + SpawnOffset = 0, -1, 0 + } + MetricMesh = metric-mesh + MinSize = 0.25, 0.35, 0.25 + } + + MODULE + { + name = ModuleDockingNode + nodeTransformName = transport-port + referenceAttachNode = top + nodeType = size0 size1 size2 size3 + stagingEnabled = False + undockEjectionForce = 1 + acquireForce = 1 + acquireTorque = 1 + captureRange = 0.1 + } + + MODULE + { + name = ModuleDockingNode + nodeTransformName = construction-port + referenceAttachNode = bottom + nodeType = size1 size2 size3 size4 + stagingEnabled = False + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/GroundAssemblyLine.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/GroundAssemblyLine.mu index 3b0b04b4a..d803b4b9b 100644 Binary files a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/GroundAssemblyLine.mu and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/GroundAssemblyLine.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop-norm.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop-norm.png new file mode 100644 index 000000000..f7cc94f4e Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop-norm.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.mu new file mode 100644 index 000000000..26d6e6f40 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.png new file mode 100644 index 000000000..281f68a07 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/MobileWorkshop.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/MobileWorkshop.mu new file mode 100644 index 000000000..69553364c Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/MobileWorkshop.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-emission.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-emission.png new file mode 100644 index 000000000..e6eb23058 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-emission.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-norm.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-norm.png new file mode 100644 index 000000000..dd1b00661 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine-norm.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.mu new file mode 100644 index 000000000..17e78cdbb Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.png new file mode 100644 index 000000000..113811415 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace-norm.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace-norm.png new file mode 100644 index 000000000..d6e30d019 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace-norm.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.mu new file mode 100644 index 000000000..80a57a8bb Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.png new file mode 100644 index 000000000..a8f5aee1a Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop-norm.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop-norm.png new file mode 100644 index 000000000..b8a92523d Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop-norm.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.mu b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.mu new file mode 100644 index 000000000..6746b71d7 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.mu differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.png new file mode 100644 index 000000000..f390cff6a Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/airlock-circle.png b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/airlock-circle.png new file mode 100644 index 000000000..beeff5f37 Binary files /dev/null and b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/Assets/airlock-circle.png differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/GroundAssemblyLine.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/GroundAssemblyLine.cfg index 8817e153f..081abe2ce 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/GroundAssemblyLine.cfg +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/GroundAssemblyLine.cfg @@ -13,7 +13,7 @@ PART { node_stack_back = -0.269721, -4.07448, -0.830392, 0, -1, 0, 1 - TechRequired = specializedConstruction + TechRequired = advMetalworks category = Pods subcategory = 0 title = Ground Assembly Line @@ -50,7 +50,9 @@ PART { MODULE { - name = SinglePartAssemblyWorkshop + name = GroundAssemblyWorkshop + KitParts = DIYKit,OrbitalKitContainer2 + SelectedPart = Ground Kit Container } MODULE @@ -142,6 +144,109 @@ PART { rate = 2 } } + + MODULE + { + name = ModuleTankManager + Volume = 5 + TANK + { + TankType = Components + CurrentResource = SpecializedParts + Volume = 1 + } + TANK + { + TankType = Components + CurrentResource = MaterialKits + Volume = 1 + } + } + + MODULE:NEEDS[!KolonyTools] + { + name = ModuleResourceConverter + ConverterName = Part Printer + StartActionName = Start Part Printer + StopActionName = Stop Part Printer + ToggleActionName = Toggle Part Printer + Efficiency = 1 + AutoShutdown = true + GeneratesHeat = false + UseSpecialistBonus = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + Specialty = ConstructionSkill + EfficiencyBonus = 1 + + ConvertByMass = true + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.01 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 1.5 + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 95 + } + OUTPUT_RESOURCE + { + ResourceName = SpecializedParts + Ratio = 0.007 + DumpExcess = false + } + } + + MODULE:NEEDS[!KolonyTools] + { + name = ModuleResourceConverter + ConverterName = Replicator + StartActionName = Start Replicator + StopActionName = Stop Replicator + ToggleActionName = Toggle Replicator + Efficiency = 1 + AutoShutdown = true + GeneratesHeat = false + UseSpecialistBonus = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + Specialty = ConstructionSkill + EfficiencyBonus = 1 + + ConvertByMass = true + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.03 + } + INPUT_RESOURCE + { + ResourceName = SpecializedParts + Ratio = 0.01 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 1.7 + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 95 + } + OUTPUT_RESOURCE + { + ResourceName = Machinery + Ratio = 0.03 + DumpExcess = false + } + }     MODULE:NEEDS[USILifeSupport]     { @@ -166,5 +271,12 @@ PART { amount = 3000 maxAmount = 3000 } + + RESOURCE + { + name = Machinery + amount = 100 + maxAmount = 200 + } } //:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/InlineGroundWorkshop.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/InlineGroundWorkshop.cfg new file mode 100644 index 000000000..1f2d9b226 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/InlineGroundWorkshop.cfg @@ -0,0 +1,93 @@ +PART { + name = InlineGroundWorkshop + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/Workshops/Assets/InlineGroundWorkshop + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_top = 0.0, 1.27686, 0, 0, 1, 0, 2 + node_stack_bottom = 0.0, -0.793769, 0, 0, -1, 0, 2 + + TechRequired = advConstruction + category = Pods + subcategory = 0 + title = Inline Workshop + manufacturer = AT Industries + description = This tin can has just enough room and equimpent for building, even if painfully slow, a nearby DIY Kit. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 10000 + cost = 3500 + mass = 2.5 + + dragModelType = default + maximum_drag = 0.25 + minimum_drag = 0.25 + angularDrag = 2.5 + crashTolerance = 15 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2000 + fuelCrossFeed = True + + bulkheadProfiles = size2 size3 + + INTERNAL + { + name = Placeholder + } + + CrewCapacity = 2 + + vesselType = Lander + + MODULE + { + name = GroundWorkshop + workshopType = GROUND + Efficiency = 0.5 + } + + MODULE + { + name = ModuleGenerator + isAlwaysActive = true + OUTPUT_RESOURCE + { + name = ElectricCharge + rate = 1 + } + } + +    MODULE:NEEDS[USILifeSupport] +    { +        name = ModuleLifeSupportRecycler +        CrewCapacity = 2 +        RecyclePercent = 0.79 +        ConverterName = Life Support +        tag = Life Support +        StartActionName = Start Life Support +        StopActionName = Stop Life Support + +        INPUT_RESOURCE +        { +            ResourceName = ElectricCharge +            Ratio = 1.75 +        } +    } + + RESOURCE + { + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/MobileWorkshop.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/MobileWorkshop.cfg new file mode 100644 index 000000000..b3f9614e3 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/MobileWorkshop.cfg @@ -0,0 +1,182 @@ +PART { + name = MobileWorkshop + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/Workshops/Assets/MobileWorkshop + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_bottom = 0.0, -3.67935, 0.0, 0, -1, 0, 2 + node_stack_back = 0.0, 0, -2.02154, 0, 0, -1, 2 + + TechRequired = advancedMotors + category = Pods + subcategory = 0 + title = Mobile Workshop + manufacturer = AT Industries + description = This heavy-duty vehicle have enought space and equipped with everything that is needed to build anything, provided you have appropriate DIY Kit lying around. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 70000 + cost = 35000 + mass = 11.5 + + dragModelType = default + maximum_drag = 0.25 + minimum_drag = 0.25 + angularDrag = 2.5 + crashTolerance = 10 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2000 + fuelCrossFeed = True + + bulkheadProfiles = size4 + + INTERNAL + { + name = Placeholder + } + + CrewCapacity = 8 + + vesselType = Rover + + MODULE + { + name = GroundWorkshop + Efficiency = 1 + } + + MODULE + { + name = FlagDecal + textureQuadName = flagTransform + } + + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.03 + } + } + + MODULE + { + name = ModuleProbeControlPoint + minimumCrew = 1 + multiHop = False + } + + MODULE + { + name = ModuleKerbNetAccess + EnhancedSituationMask = 7 + EnhancedMinimumFoV = 175 + EnhancedMaximumFoV = 179.5 + MinimumFoV = 5 + MaximumFoV = 10 + AnomalyDetection = 1 + DISPLAY_MODES + { + Mode = Biome + Mode = Terrain + } + } + + MODULE + { + name = ModuleDataTransmitter + antennaType = RELAY + packetInterval = 0.35 + packetSize = 4 + packetResourceCost = 24.0 + requiredResource = ElectricCharge + antennaPower = 1000000 + antennaCombinable = True + } + + MODULE + { + name = MultiAnimator + AnimationNames = MobileWorkshop-ladders + AnimatorID = Ladder + EnergyConsumption = 0.01 + OpenEventGUIName = Unfold Ladders + CloseEventGUIName = Fold Ladders + ActionGUIName = Toggle Ladders + } + + MODULE + { + name = MultiLights + AnimationNames = MobileWorkshop-lights MobileWorkshop-windows + LightNames = lamp-r lamp-l + AnimatorID = Lights + ReverseSpeed = 0.3 + EnergyConsumption = 0.2 + } + + MODULE + { + name = ModuleGenerator + isAlwaysActive = true + OUTPUT_RESOURCE + { + name = ElectricCharge + rate = 4 + } + } + + MODULE + { + name = ModuleTankManager + Volume = 10 + TANK + { + TankType = Components + CurrentResource = MaterialKits + Volume = 2 + } + TANK + { + name = LFO + Volume = 8 + } + } + +    MODULE:NEEDS[USILifeSupport] +    { +        name = ModuleLifeSupportRecycler +        CrewCapacity = 8 +        RecyclePercent = 0.79 +        ConverterName = Life Support +        tag = Life Support +        StartActionName = Start Life Support +        StopActionName = Stop Life Support + +        INPUT_RESOURCE +        { +            ResourceName = ElectricCharge +            Ratio = 18.75 +        } +    } + + RESOURCE + { + name = ElectricCharge + amount = 8000 + maxAmount = 8000 + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblyLine.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblyLine.cfg new file mode 100644 index 000000000..754e72d4d --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblyLine.cfg @@ -0,0 +1,250 @@ +PART { + name = OrbitalAssemblyLine + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblyLine + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_top = 0, 4.82626, 0, 0, 1, 0, 2 + node_stack_bottom = 0, -4.82626, 0, 0, -1, 0, 2 + + TechRequired = metaMaterials + category = Pods + subcategory = 0 + title = Orbital Assembly Line + manufacturer = AT Industries + description = This state of the art factory is designed specificaly for zero-G conditions. It can rapidly produce everything required to assemble a new DIY Kit, but it requires an assembly space to hold the container. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 700000 + cost = 450000 + mass = 11.7 + + dragModelType = default + maximum_drag = 0.25 + minimum_drag = 0.25 + angularDrag = 2.5 + crashTolerance = 5 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2000 + fuelCrossFeed = True + + bulkheadProfiles = size2, size3 + + INTERNAL + { + name = Placeholder + } + + CrewCapacity = 4 + + vesselType = Station + + MODULE + { + name = SingleVesselAssemblyWorkshop + KitParts = DIYKit,OrbitalKitContainer2 + SelectedPart = Dockable Kit Container + workshopType = ORBITAL + } + + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.03 + } + } + + MODULE + { + name = ModuleProbeControlPoint + minimumCrew = 1 + multiHop = False + } + + MODULE + { + name = ModuleKerbNetAccess + EnhancedSituationMask = 7 + EnhancedMinimumFoV = 175 + EnhancedMaximumFoV = 179.5 + MinimumFoV = 5 + MaximumFoV = 10 + AnomalyDetection = 1 + DISPLAY_MODES + { + Mode = Biome + Mode = Terrain + } + } + + MODULE + { + name = ModuleDataTransmitter + antennaType = RELAY + packetInterval = 0.35 + packetSize = 4 + packetResourceCost = 24.0 + requiredResource = ElectricCharge + antennaPower = 1000000 + antennaCombinable = True + } + + MODULE + { + name = ModuleGenerator + isAlwaysActive = true + OUTPUT_RESOURCE + { + name = ElectricCharge + rate = 3 + } + } + + MODULE + { + name = ModuleTankManager + Volume = 23 + TANK + { + TankType = Components + CurrentResource = SpecializedParts + Volume = 1 + } + TANK + { + TankType = Components + CurrentResource = MaterialKits + Volume = 1 + } + } + + MODULE:NEEDS[!KolonyTools] + { + name = ModuleResourceConverter + ConverterName = Part Printer + StartActionName = Start Part Printer + StopActionName = Stop Part Printer + ToggleActionName = Toggle Part Printer + Efficiency = 1 + AutoShutdown = true + GeneratesHeat = false + UseSpecialistBonus = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + Specialty = ConstructionSkill + EfficiencyBonus = 1 + + ConvertByMass = true + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.025 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 2.5 + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 95 + } + OUTPUT_RESOURCE + { + ResourceName = SpecializedParts + Ratio = 0.0175 + DumpExcess = false + } + } + + MODULE:NEEDS[!KolonyTools] + { + name = ModuleResourceConverter + ConverterName = Replicator + StartActionName = Start Replicator + StopActionName = Stop Replicator + ToggleActionName = Toggle Replicator + Efficiency = 1 + AutoShutdown = true + GeneratesHeat = false + UseSpecialistBonus = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + Specialty = ConstructionSkill + EfficiencyBonus = 1 + + ConvertByMass = true + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.06 + } + INPUT_RESOURCE + { + ResourceName = SpecializedParts + Ratio = 0.02 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 2.7 + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 95 + } + OUTPUT_RESOURCE + { + ResourceName = Machinery + Ratio = 0.06 + DumpExcess = false + } + } + +    MODULE:NEEDS[USILifeSupport] +    { +        name = ModuleLifeSupportRecycler +        CrewCapacity = 4 +        RecyclePercent = 0.79 +        ConverterName = Life Support +        tag = Life Support +        StartActionName = Start Life Support +        StopActionName = Stop Life Support + +        INPUT_RESOURCE +        { +            ResourceName = ElectricCharge +            Ratio = 9 +        } +    } + + RESOURCE + { + name = ElectricCharge + amount = 5000 + maxAmount = 5000 + } + + RESOURCE + { + name = Machinery + amount = 100 + maxAmount = 200 + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblySpace.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblySpace.cfg new file mode 100644 index 000000000..261610355 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalAssemblySpace.cfg @@ -0,0 +1,75 @@ +PART { + name = OrbitalAssemblySpace + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/Workshops/Assets/OrbitalAssemblySpace + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_bottom = 0, -2.30744, 0, 0, -1, 0, 2 + + TechRequired = metaMaterials + category = Utility + subcategory = 0 + title = Orbital Assembly Space + manufacturer = AT Industries + description = This shielded compartment is ideal to store a container during DIY Kit assembly. It is also equipped with the Magnetic Damper that immobilize the container, preventing costly equipment from being broken and kerbals from being injured by stuff flying around. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 10000 + cost = 3000 + mass = 2.5 + + dragModelType = default + maximum_drag = 0.25 + minimum_drag = 0.25 + angularDrag = 2.5 + crashTolerance = 10 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 2000 + fuelCrossFeed = True + + bulkheadProfiles = size4, size2 + + CrewCapacity = 0 + + vesselType = Ship + + MODULE + { + name = AssemblySpace + AnimatorID = Gates + Title = Orbital Assembly Space + SpawnManager + { + SpawnSpace = internal-space + SpawnTransform = launch-transform + SpawnOffset = 0, -1, 0 + } + } + + MODULE + { + name = ATMagneticDamper + Sensor = internal-space + MagnetLocation = launch-transform + AffectedPartTags = ferromagnetic + Attenuation = 0.5 + } + + MODULE + { + name = MultiGeometryAnimator + AnimationNames = open-gates + AnimatorID = Gates + EnergyConsumption = 0.1 + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalWorkshop.cfg b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalWorkshop.cfg new file mode 100644 index 000000000..608a13993 --- /dev/null +++ b/FOR_RELEASE/GameData/GroundConstruction/Parts/Workshops/OrbitalWorkshop.cfg @@ -0,0 +1,93 @@ +PART { + name = OrbitalWorkshop + module = Part + author = Allis Tauri + + MODEL + { + model = GroundConstruction/Parts/Workshops/Assets/OrbitalWorkshop + } + rescaleFactor = 1.0 + scale = 1.0 + + node_stack_top = 0.0, 3.75915, 0, 0, 1, 0, 2 + node_stack_bottom = 0.0, -3.75915, 0, 0, -1, 0, 2 + + TechRequired = specializedConstruction + category = Utility + subcategory = 0 + title = Orbital Workshop + manufacturer = AT Industries + description = A full-fledged zero-g workshop with space for 6 engineers and the top-notch equipment for orbital construction. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,0 + + entryCost = 150000 + cost = 50000 + mass = 7.2 + + dragModelType = default + maximum_drag = 0.25 + minimum_drag = 0.25 + angularDrag = 2.5 + crashTolerance = 7 + breakingForce = 200 + breakingTorque = 200 + maxTemp = 1200 + fuelCrossFeed = True + + bulkheadProfiles = size2 size3 + + INTERNAL + { + name = Placeholder + } + + CrewCapacity = 6 + + vesselType = Station + + MODULE + { + name = SingleVesselConstructionWorkshop + workshopType = ORBITAL + } + + MODULE + { + name = ModuleTankManager + Volume = 7.3 + TANK + { + TankType = Components + CurrentResource = MaterialKits + Volume = 1 + } + } + +    MODULE:NEEDS[USILifeSupport] +    { +        name = ModuleLifeSupportRecycler +        CrewCapacity = 6 +        RecyclePercent = 0.79 +        ConverterName = Life Support +        tag = Life Support +        StartActionName = Start Life Support +        StopActionName = Stop Life Support + +        INPUT_RESOURCE +        { +            ResourceName = ElectricCharge +            Ratio = 1.75 +        } +    } + + RESOURCE + { + name = ElectricCharge + amount = 3000 + maxAmount = 3000 + } +} +//:mode=c#: diff --git a/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll b/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll index a9a472c9d..9755adec8 100644 Binary files a/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll and b/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll differ diff --git a/FOR_RELEASE/GameData/GroundConstruction/Plugins/PluginData/GroundConstruction/GroundConstruction.glob b/FOR_RELEASE/GameData/GroundConstruction/Plugins/PluginData/GroundConstruction/GroundConstruction.glob index ca90f7797..ceac960c2 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/Plugins/PluginData/GroundConstruction/GroundConstruction.glob +++ b/FOR_RELEASE/GameData/GroundConstruction/Plugins/PluginData/GroundConstruction/GroundConstruction.glob @@ -2,26 +2,25 @@ UseStockAppLauncher = true AssemblyResource { - name = SpecializedParts - WorkPerMass = 15 - EnergyPerMass = 1000 - ComplexityWork = 17 + name = SpecializedParts + WorkPerMass = 15 + EnergyPerMass = 1000 + ComplexityWork = 17 } ConstructionResource { - name = MaterialKits - WorkPerMass = 10 - EnergyPerMass = 10000 - ComplexityWork = 13 + name = MaterialKits + WorkPerMass = 10 + EnergyPerMass = 10000 + ComplexityWork = 13 } WorkshopShutdownThreshold = 0.99 MaxDistanceToWorkshop = 300 MinDistanceToWorkshop = 50 MaxDistanceEfficiency = 0.2 -//MaxMetalworkPerHour = 0.01 VolumePerKerbal = 8 PartVolumeFactor = 0.3 @@ -31,9 +30,11 @@ MaxGenericEfficiency = 0.5 ComplexityFactor = 1E-04 VesselKitDensity = 0.5 -VesselKitMinSize = 0.5 +MinKitVolume = 0.02 DeployMaxSpeed = 0.1 DeployMaxAV = 1E-03 -DeploymentSpeed = 0.5 +MaxDeploymentMomentum = 0.5 MinDeploymentTime = 5 + +//:mode=c#: \ No newline at end of file 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 5ecfde07e..000000000 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 000000000..3ef00da8f Binary files /dev/null and b/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg index 5caee3c5b..17cc798ac 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg @@ -44,61 +44,54 @@ PART MODULE { - name = ModuleResourceConverter_USI - ConverterName = Fuel Cell - StartActionName = Start Fuel Cell - StopActionName = Stop Fuel Cell - FillAmount = 0.95 + name = ModuleLight + lightName = Lamp1,Lamp2 + useAnimationDim = true + lightBrightenSpeed = 2.5 + lightDimSpeed = 2.5 + resourceAmount = 0.04 + animationName = AkitaLights + useResources = true + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = USI_Converter + ConverterName = Fuel Cell + StartActionName = Start Fuel Cell + StopActionName = Stop Fuel Cell + + FillAmount = 0.95 AutoShutdown = false GeneratesHeat = false UseSpecialistBonus = false - - - INPUT_RESOURCE - { + + INPUT_RESOURCE + { ResourceName = MonoPropellant Ratio = 0.003 FlowMode = STAGE_PRIORITY_FLOW - } - OUTPUT_RESOURCE - { + } + OUTPUT_RESOURCE + { ResourceName = ElectricCharge Ratio = 1.2 DumpExcess = false - } + } } - - - RESOURCE { name = ElectricCharge amount = 50 maxAmount = 50 } - RESOURCE { name = MonoPropellant - amount =40 - maxAmount =40 + amount = 40 + maxAmount = 40 } - - MODULE - { - name = ModuleLight - lightName = Lamp1,Lamp2 - useAnimationDim = true - lightBrightenSpeed = 2.5 - lightDimSpeed = 2.5 - resourceAmount = 0.04 - animationName = AkitaLights - useResources = true - } - - MODULE - { - name = USI_InertialDampener - } - } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt index 73f6df3dd..ab9ccc277 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/Karibou/Parts/KER_CrewCab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg index 562e21d5b..2f83925f0 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg @@ -48,13 +48,6 @@ PART name = crewCabinInternals } - RESOURCE - { - name = ElectricCharge - amount = 150 - maxAmount = 150 - } - MODULE { name = ModuleScienceExperiment @@ -96,7 +89,38 @@ PART animationName = CrewCabLights useResources = true } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_HabitationSwapOption + ConverterName = Habitat + StartActionName = Start Habitat + StopActionName = Stop Habitat + BaseKerbalMonths = 21 + CrewCapacity = 4 + BaseHabMultiplier = 0 + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 0.525 + } + } RESOURCE { name = Supplies @@ -104,28 +128,17 @@ PART maxAmount = 500 isTweakable = True } - RESOURCE { name = Mulch amount = 0 maxAmount = 500 isTweakable = True - } - - MODULE + } + RESOURCE { - name = ModuleHabitation - BaseKerbalMonths = 21 - CrewCapacity = 4 - BaseHabMultiplier = 0 - ConverterName = Habitat - StartActionName = Start Habitat - StopActionName = Stop Habitat - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 0.525 - } + name = ElectricCharge + amount = 150 + maxAmount = 150 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Hub.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Hub.cfg index 469881fad..b3724200c 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Hub.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Hub.cfg @@ -57,19 +57,20 @@ PART name = USIAnimation animationName = Deploy } - - RESOURCE + MODULE { - name=ElectricCharge - amount=400 - maxAmount = 400 + name = USI_ModuleResourceWarehouse } - MODULE { - name = USI_ModuleResourceWarehouse + name = USI_ModuleRecycleBin + } + RESOURCE + { + name = ElectricCharge + amount = 400 + maxAmount = 400 } - RESOURCE { name = Machinery @@ -91,10 +92,4 @@ PART maxAmount = 500 isTweakable = True } - - MODULE - { - name = USI_ModuleRecycleBin - } - } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_PassengerCab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_PassengerCab.cfg index 3415064f3..5033d42b9 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_PassengerCab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_PassengerCab.cfg @@ -47,19 +47,12 @@ PART { name = USIGenericInternal } - RESOURCE - { - name = ElectricCharge - amount = 150 - maxAmount = 150 - } MODULE { name = USIAnimation animationName = Deploy } - MODULE { name = ModuleLight @@ -71,7 +64,12 @@ PART animationName = CrewCabLights useResources = true } - + RESOURCE + { + name = ElectricCharge + amount = 150 + maxAmount = 150 + } RESOURCE { name = Supplies @@ -86,8 +84,6 @@ PART maxAmount = 500 isTweakable = True } - - } // Cost is used to balance without life support - with life support this costs the same as a Crew Cab. diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RCSBlock.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RCSBlock.cfg index 880bce209..a91068bd8 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RCSBlock.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RCSBlock.cfg @@ -49,21 +49,6 @@ PART rate = 0.6 } } - - RESOURCE - { - name = MonoPropellant - amount = 500 - maxAmount = 500 - } - - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } - MODULE { name = ModuleRCS @@ -78,6 +63,16 @@ PART key = 4 0.001 } } - - + RESOURCE + { + name = MonoPropellant + amount = 500 + maxAmount = 500 + } + RESOURCE + { + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RadialProbe.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RadialProbe.cfg index c28a0f211..948534a89 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RadialProbe.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RadialProbe.cfg @@ -42,12 +42,6 @@ PART rate = 0.020 } } - RESOURCE - { - name = ElectricCharge - amount = 10 - maxAmount = 10 - } MODULE { name = ModuleReactionWheel @@ -77,4 +71,10 @@ PART packetFloor = .1 packetCeiling = 5 } + RESOURCE + { + name = ElectricCharge + amount = 10 + maxAmount = 10 + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RoverCab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RoverCab.cfg index 0a3019d0e..5205a72fa 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RoverCab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_RoverCab.cfg @@ -47,17 +47,12 @@ PART { name = KaribouCabInternal } + MODULE { name = ModuleCommand minimumCrew = 1 } - RESOURCE - { - name = ElectricCharge - amount = 500 - maxAmount = 500 - } MODULE { name = ModuleReactionWheel @@ -85,7 +80,6 @@ PART usageReqMaskInternal = 5 usageReqMaskExternal = -1 } - MODULE { name = ModuleScienceContainer @@ -119,28 +113,6 @@ PART { name = FlagDecal textureQuadName = FLAG_02 - } - - RESOURCE - { - name = Supplies - amount = 500 - maxAmount = 500 - isTweakable = True - } - RESOURCE - { - name = Mulch - amount = 0 - maxAmount = 500 - isTweakable = True - } - MODULE - { - name = ModuleHabitation - BaseKerbalMonths = 1 - StartActionName = Start Habitat - StopActionName = Stop Habitat } MODULE { @@ -159,4 +131,48 @@ PART packetFloor = .1 packetCeiling = 5 } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_HabitationSwapOption + ConverterName = Habitat + StartActionName = Start Habitat + StopActionName = Stop Habitat + + BaseKerbalMonths = 1 + } + RESOURCE + { + name = ElectricCharge + amount = 500 + maxAmount = 500 + } + RESOURCE + { + name = Supplies + amount = 500 + maxAmount = 500 + isTweakable = True + } + RESOURCE + { + name = Mulch + amount = 0 + maxAmount = 500 + isTweakable = True + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Shelter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Shelter.cfg index f1707b3a1..d231fdb8b 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Shelter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_Shelter.cfg @@ -53,27 +53,35 @@ PART animationName = ShelterLights useResources = true } - - MODULE { - name = ModuleLifeSupport + name = USIAnimation + animationName = Deploy + inflatable = true + CrewCapacity = 2 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 1.2 - HabMultiplier = 0 + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_HabitationSwapOption + ConverterName = Habitat StartActionName = Start Habitat StopActionName = Stop Habitat - } - MODULE - { - name = USIAnimation - animationName = Deploy - inflatable = true - CrewCapacity = 2 - } + BaseKerbalMonths = 1.2 + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt index c54cc8b31..6a55c62d8 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/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.6.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility + 0.5.0 - 2018.03.13 ----------------- KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll index 00d00be0e..87d0e853f 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb index cddf9dab9..3bf6e240b 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll.mdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb index 930c4ded7..13358a68a 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.pdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version index 571d97ef1..f78cbf6cc 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":5, + "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/Konstruction/Konstruction_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction_CTT.cfg index 26879f4a3..d5d59f3a9 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction_CTT.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction_CTT.cfg @@ -57,7 +57,7 @@ @PART[PAL_Magnet]:NEEDS[CommunityTechTree] { - @TechRequired = experimentalElectrics + @TechRequired = offworldManufacturing } @PART[PAL_MiniWheel]:NEEDS[CommunityTechTree] diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg index 82f50c31a..15ed1234a 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 0d0ff0a6b..875fe30d2 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 51f918f37..014778dce 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 d834ab38d..f66f91630 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 afce11ee1..de3e6f73e 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 c729ee6d1..800478488 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 228e883c1..e6021253d 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 e81e1d68d..9ac9314e6 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 c190c2409..90ba55836 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 a352246ca..b50ca992f 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 c6d77cf66..d5366a3a5 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 2d54a1ef8..a04379388 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 ec18f9271..712b31807 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 691344e3b..1518d97b2 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 cc83f8235..59a81bc03 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 000000000..120023f22 --- /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 aab1849ad..91f9a1e28 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 729d56849..21c609828 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 a1d9d058d..7c058f4bf 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 d11464a8c..8937ed554 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/MKS/Assets/Harvester.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/Harvester.png new file mode 100644 index 000000000..f90016d49 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/Harvester.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/Harvester_N.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/Harvester_N.png new file mode 100644 index 000000000..1a3f4cfd9 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/Harvester_N.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt index 2bbae5a1e..d9e09f91f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt @@ -1,3 +1,27 @@ +1.1.0 - 2019.02.05 +------------------ +KSP 1.6.x Compatibility + +1.0.0 - 2018.11.20 +------------------ +KSP 1.5.0 Compatibility +Microwave Tranceiver now works on unmanned bases (Thanks jd284!) +Updated GC/ATI_Utils +Fixes to Tundra LFO ratios (Thanks Wyzard256!) +Fix Silicon Converter (Thanks boiler1!) +Multiple fixes to Orbital Logistics! + +0.56.0 - 2018.06.22 +------------------ +KSP 1.4.4 Compatibility +Updated LH2 tank capacity for cryotanks compatibility (Thanks Wyzard256!) +Included latest version of Ground Construction! +Set 'DumpExcess' to false for all logistics centers (Thanks LouisCyfer!) +Fixed bug with depleted fuel amount (Thanks Darinth!) +Fixed missing nodes on the Tundra ASM (Thanks Darinth!) +EPL Compatibility updates (Thanks Voicey99!) +Fixed drills not loading properly (Thanks MaximeBrean!) + 0.55.0 - 2018.03.13 ------------------ KSP 1.4.1 Compatibility diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll index f0959f8e3..725764a11 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb index c0c17a454..9839412f4 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb index 60712018b..eea581cbe 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version index e500251ea..baa8644c3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version @@ -8,24 +8,24 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":0, - "MINOR":55, + "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/MKS/Parts/Duna_Agriculture.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg index 5c52f8b92..ba1228b69 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -49,11 +48,24 @@ PART maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base + INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -64,7 +76,6 @@ PART storageRange = 2 allowRepeatedSubjects = True } - MODULE { name = ModuleAnimateGeneric @@ -73,98 +84,56 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 2 - vesselType = Base - MODULE { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } - - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } - RESOURCE - { - name = Machinery - amount = 100 - maxAmount = 100 - isTweakable = true - } - RESOURCE - { - name = Recyclables - amount = 0 - maxAmount = 100 - isTweakable = true + name = USIAnimation + animationName = Deploy } - RESOURCE + MODULE { - name = Organics - amount = 0 - maxAmount = 100 - isTweakable = true + name = ModulePowerCoupler } - MODULE { - name = USIAnimation - animationName = Deploy + name = ModuleWeightDistributor } - MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { - BonusEffect = ScienceBoost name = MKSModule - eTag = Greenhouse - eMultiplier = 1.163 + BonusEffect = ScienceBoost + EfficiencyMultiplier = 1.163 } - MODULE { - name = ModulePowerCoupler + name = USI_SwapController + ResourceCosts = SpecializedParts,6,MaterialKits,30,ElectricCharge,30 } - - //********************* MODULE { - name = ModuleSwapControllerNew - typeName = Config - ResourceCosts = SpecializedParts,6,MaterialKits,30,ElectricCharge,30 - } - + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = ModuleSwappableConverterNew - bayName = C1 - moduleIndex = 0 - isConverter = true - } - + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleSwapOption + name = USI_ConverterSwapOption ConverterName = Agroponics StartActionName = Start Agroponics StopActionName = Stop Agroponics + UseSpecialistBonus = true ExperienceEffect = BotanySkill + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -204,15 +173,16 @@ PART Ratio = 100 } } - MODULE { - name = ModuleSwapOption + name = USI_ConverterSwapOption ConverterName = Cultivate(S) StartActionName = Start Cultivate(S) StopActionName = Stop Cultivate(S) + UseSpecialistBonus = true ExperienceEffect = BotanySkill + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -257,15 +227,16 @@ PART Ratio = 100 } } - MODULE { - name = ModuleSwapOption + name = USI_ConverterSwapOption ConverterName = Cultivate(D) StartActionName = Start Cultivate(D) StopActionName = Stop Cultivate(D) + UseSpecialistBonus = true ExperienceEffect = BotanySkill + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -310,15 +281,16 @@ PART Ratio = 100 } } - MODULE { - name = ModuleSwapOption + name = USI_ConverterSwapOption ConverterName = Agriculture(S) StartActionName = Start Agriculture(S) StopActionName = Stop Agriculture(S) + UseSpecialistBonus = true ExperienceEffect = AgronomySkill + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -368,15 +340,16 @@ PART Ratio = 100 } } - MODULE { - name = ModuleSwapOption + name = USI_ConverterSwapOption ConverterName = Agriculture(D) StartActionName = Start Agriculture(D) StopActionName = Stop Agriculture(D) + UseSpecialistBonus = true ExperienceEffect = AgronomySkill + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -427,85 +400,32 @@ PART Ratio = 100 } } - - - MODULE + RESOURCE { - name = ModuleResourceConverter_USI - ConverterName = Agriculture(D) - StartActionName = Start Agriculture(D) - StopActionName = Stop Agriculture(D) - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = AgronomySkill - Efficiency = 1 - - INPUT_RESOURCE - { - ResourceName = Dirt - Ratio = 0.0025 - } - INPUT_RESOURCE - { - ResourceName = Water - Ratio = 0.0025000 - } - - INPUT_RESOURCE - { - ResourceName = Fertilizer - Ratio = 0.00000500 - } - OUTPUT_RESOURCE - { - ResourceName = Organics - Ratio = 0.00005000 - DumpExcess = False - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 5.46 - } - INPUT_RESOURCE - { - ResourceName = Machinery - Ratio = 0.000002 - } - OUTPUT_RESOURCE - { - ResourceName = Recyclables - Ratio = 0.000002 - DumpExcess = true - } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 100 - } - REQUIRED_RESOURCE - { - ResourceName = Organics - Ratio = 100 - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } - - - MODULE + RESOURCE { - name = USI_ModuleFieldRepair + name = Machinery + amount = 100 + maxAmount = 100 + isTweakable = true } - - MODULE + RESOURCE { - name = ModuleWeightDistributor + name = Recyclables + amount = 0 + maxAmount = 100 + isTweakable = true } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = Organics + amount = 0 + maxAmount = 100 + isTweakable = true } - } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg index 5552865c0..1538a48a6 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg @@ -48,12 +48,24 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -64,7 +76,6 @@ PART storageRange = 2 allowRepeatedSubjects = True } - MODULE { name = ModuleAnimateGeneric @@ -73,84 +84,70 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 2 - vesselType = Base - MODULE { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + name = USIAnimation + animationName = Deploy } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true + name = ModulePowerCoupler } - MODULE { - name = USIAnimation - animationName = Deploy + name = ModuleWeightDistributor } - MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { name = MKSModule ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler + name = USI_SwapController + ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.77 + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Recycler StartActionName = Start Recycler StopActionName = Stop Recycler + CrewCapacity = 4 + RecyclePercent = 0.77 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 21 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.885 + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Purifier StartActionName = Start Purifier StopActionName = Stop Purifier + CrewCapacity = 4 + RecyclePercent = 0.885 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -162,36 +159,28 @@ PART Ratio = 0.00885 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 0 - CrewCapacity = 4 - BaseHabMultiplier = 1.4 + name = USILS_HabitationSwapOption ConverterName = Habitat StartActionName = Start Habitat StopActionName = Stop Habitat + + BaseKerbalMonths = 0 + CrewCapacity = 4 + BaseHabMultiplier = 1.4 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 0.14 } } - - - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = ModuleWeightDistributor - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kolonist.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kolonist.cfg index 9406e7901..4fa080e71 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kolonist.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kolonist.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -48,12 +47,24 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 1 + vesselType = Base INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -64,7 +75,6 @@ PART storageRange = 2 allowRepeatedSubjects = True } - MODULE { name = ModuleAnimateGeneric @@ -73,64 +83,48 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 1 - vesselType = Base - MODULE { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + name = USIAnimation + animationName = Deploy } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true + name = ModuleWeightDistributor } - MODULE { - name = USIAnimation - animationName = Deploy + name = USI_InertialDampener } - MODULE { - name = ModuleLifeSupport + name = ModulePowerCoupler } - MODULE { name = MKSModule ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler + name = USI_SwapController } - - //********************* - - MODULE + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportExtender + name = USILS_LifeSupportExtenderSwapOption ConverterName = Living Module StartActionName = Start Living Module StopActionName = Stop Living Module - Efficiency = 1 - - PartOnly = false - restrictedClass = - TimeMultiplier = 1 INPUT_RESOURCE { @@ -143,19 +137,11 @@ PART Ratio = 0.000139 } } - - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = ModuleWeightDistributor - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg index 698fd24b8..822f35d26 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -48,35 +47,14 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base INTERNAL { name = landerCabinInternals } - MODULE - { - name = ModuleScienceContainer - reviewActionName = Review Data - storeActionName = Store Experiments - collectActionName = Take Data - evaOnlyStorage = True - storageRange = 2 - allowRepeatedSubjects = True - } - - MODULE - { - name = ModuleAnimateGeneric - animationName = Light - actionGUIName = Toggle Lights - startEventGUIName = Lights On - endEventGUIName = Lights Off - } - - CrewCapacity = 2 - vesselType = Base - MODULE { name = ModuleCommand @@ -93,38 +71,33 @@ PART minimumCrew = 1 multiHop = False } - - - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } - MODULE { - name = USIAnimation - animationName = Deploy + name = ModuleScienceContainer + reviewActionName = Review Data + storeActionName = Store Experiments + collectActionName = Take Data + evaOnlyStorage = True + storageRange = 2 + allowRepeatedSubjects = True } - MODULE { - name = ModuleLifeSupport + name = ModuleAnimateGeneric + animationName = Light + actionGUIName = Toggle Lights + startEventGUIName = Lights On + endEventGUIName = Lights Off } - MODULE { - name = MKSModule + name = USIAnimation + animationName = Deploy } - MODULE { name = ModulePowerCoupler } - - //********************* MODULE { name = ModuleResourceDistributor @@ -133,33 +106,32 @@ PART { name = ModulePlanetaryLogistics } - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleWeightDistributor } - MODULE { name = USI_InertialDampener } - MODULE { name = ModuleOrbitalLogistics } MODULE { - name = ModuleResourceConverter_USI + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_Converter ConverterName = Transport Credits StartActionName = Start T-Credits StopActionName = Stop T-Credits UseSpecialistBonus = false + IsStandaloneConverter = true Efficiency = 1 INPUT_RESOURCE @@ -190,6 +162,13 @@ PART } } RESOURCE + { + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } + RESOURCE { name = TransportCredits amount = 0 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_MedBay.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_MedBay.cfg index c7dcc42f9..17691acca 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_MedBay.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_MedBay.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -47,12 +46,24 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -63,7 +74,6 @@ PART storageRange = 2 allowRepeatedSubjects = True } - MODULE { name = ModuleAnimateGeneric @@ -72,69 +82,58 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 2 - vesselType = Base - MODULE { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + name = USIAnimation + animationName = Deploy } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true + name = ModuleWeightDistributor } - MODULE { - name = USIAnimation - animationName = Deploy + name = USI_InertialDampener } - MODULE { - name = ModuleLifeSupport + name = ModulePowerCoupler } - MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler + name = USI_SwapController } - - //********************* - - MODULE + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportExtender + name = USILS_LifeSupportExtenderSwapOption ConverterName = MedBay StartActionName = Start MedBay StopActionName = Stop MedBay - Efficiency = 1 - PartOnly = true - restrictedClass = Tourist + AffectsPartOnly = true + RestrictedToClass = Tourist TimeMultiplier = 2 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = MedicalSkill INPUT_RESOURCE @@ -148,18 +147,11 @@ PART Ratio = 0.000556 } } - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = ModuleWeightDistributor - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_PDU.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_PDU.cfg index 8a5d11fbb..a9a7b5ea3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_PDU.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_PDU.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -48,12 +47,45 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } + MODULE + { + name = ModuleOverheatDisplay + } + MODULE + { + name = ModuleCoreHeat + CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.05 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.01 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } MODULE { name = ModuleScienceContainer @@ -64,7 +96,6 @@ PART storageRange = 2 allowRepeatedSubjects = True } - MODULE { name = ModuleAnimateGeneric @@ -73,67 +104,41 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 2 - vesselType = Base - - MODULE - { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } - - RESOURCE - { - name = ElectricCharge - amount = 15000 - maxAmount = 15000 - isTweakable = true - } - MODULE { name = USIAnimation animationName = Deploy } - MODULE { - name = ModuleLifeSupport + name = ModuleWeightDistributor } - MODULE { - name = MKSModule + name = USI_InertialDampener } - MODULE { name = ModulePowerCoupler } - MODULE { name = ModulePowerDistributor } - - //********************* MODULE { - name = ModuleOverheatDisplay + name = MKSModule + ApplyBonuses = false } - MODULE { - name = ModuleResourceConverter_USI + name = USI_Converter ConverterName = Reactor StartActionName = Start Reactor StopActionName = Stop Reactor + + IsStandaloneConverter = true + INPUT_RESOURCE { ResourceName = EnrichedUranium @@ -179,49 +184,23 @@ PART key = 3000 0 0 0 } } - RESOURCE { - name = EnrichedUranium - amount = 10 - maxAmount = 10 + name = ElectricCharge + amount = 15000 + maxAmount = 15000 + isTweakable = true } RESOURCE { - name = DepletedFuel - amount = 0 - maxAmount = 10 - } - - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.05 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.01 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small - } - MODULE - { - name = USI_ModuleFieldRepair + name = EnrichedUranium + amount = 10 + maxAmount = 10 } - - MODULE - { - name = ModuleWeightDistributor - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = DepletedFuel + amount = 0 + maxAmount = 10 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Pioneer.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Pioneer.cfg index 355149efc..12601524e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Pioneer.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Pioneer.cfg @@ -23,7 +23,6 @@ PART node_stack_pod07 = 0, -.14, 1.29, 0,0,1,1 node_stack_pod08 = 0, -.14,-1.29, 0,0,-1,1 - node_stack_top = 0.0, -0.7, 0.0, 0.0, -1.0, 0.0,3 node_stack_bottom = 0.0, 1.925, 0.0, 0.0, 1.0, 0.0,2 TechRequired = advConstruction @@ -48,12 +47,30 @@ PART breakingTorque = 280 maxTemp = 1700 bulkheadProfiles = size2 + CrewCapacity = 2 + vesselType = Base INTERNAL { name = landerCabinInternals } + MODULE + { + name = ModuleCommand + minimumCrew = 1 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } + MODULE + { + name = ModuleProbeControlPoint + minimumCrew = 1 + multiHop = False + } MODULE { name = ModuleScienceContainer @@ -64,7 +81,22 @@ PART storageRange = 2 allowRepeatedSubjects = True } - + MODULE + { + name = ModuleKerbNetAccess + MinimumFoV = 17 + MaximumFoV = 63 + AnomalyDetection = 0 + DISPLAY_MODES + { + Mode = Terrain + Mode = Biome + } + REQUIRED_EFFECTS + { + Effect = ScienceSkill + } + } MODULE { name = ModuleAnimateGeneric @@ -73,67 +105,70 @@ PART startEventGUIName = Lights On endEventGUIName = Lights Off } - - CrewCapacity = 2 - vesselType = Base - MODULE { - name = ModuleCommand - minimumCrew = 1 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + name = USIAnimation + animationName = Deploy } - MODULE { - name = ModuleProbeControlPoint - minimumCrew = 1 - multiHop = False + name = ModuleExperienceManagement + costPerKerbal = 0 } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true + name = ModuleResourceDistributor } - MODULE { - name = USIAnimation - animationName = Deploy + name = ModuleColonyRewards } - MODULE { - name = ModuleLifeSupport + name = ModuleResourceSurveyor } - MODULE { - name = MKSModule - ApplyBonuses = false + name = ModuleWeightDistributor + } + MODULE + { + name = USI_InertialDampener } - MODULE { name = ModulePowerCoupler - } - + } MODULE { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.70 + name = MKSModule + ApplyBonuses = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Recycler StartActionName = Start Recycler StopActionName = Stop Recycler + CrewCapacity = 4 + RecyclePercent = 0.70 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -156,30 +191,6 @@ PART Ratio = 400 } } - - MODULE - { - name = ModuleKerbNetAccess - MinimumFoV = 17 - MaximumFoV = 63 - AnomalyDetection = 0 - DISPLAY_MODES - { - Mode = Terrain - Mode = Biome - } - REQUIRED_EFFECTS - { - Effect = ScienceSkill - } - } - - MODULE - { - name = ModuleExperienceManagement - costPerKerbal = 0 - } - RESOURCE { name = Machinery @@ -194,30 +205,11 @@ PART maxAmount = 400 isTweakable = True } - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE - { - name = ModuleResourceDistributor - } - MODULE - { - name = ModuleColonyRewards - } - MODULE - { - name = ModuleResourceSurveyor - } - - MODULE - { - name = ModuleWeightDistributor - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg index 0bcbe4dc2..0d5d99418 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg @@ -43,246 +43,264 @@ PART bulkheadProfiles = srf fuelCrossFeed = True mesh = MiniDrill.mu + + MODULE + { + name = ModuleAnimationGroup + deployAnimationName = Deploy + activeAnimationName = Drill + moduleType = Drill + } MODULE { name = ModuleOverheatDisplay } - MODULE { - name = ModuleSwapControllerNew + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 50 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } + MODULE + { + name = MKSModule + } + MODULE + { + name = USI_SwapController typeName = Separator ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 } - MODULE { - name = ModuleSwappableConverterNew - bayName = S1 + name = USI_SwappableBay + bayName = Bay 1 moduleIndex = 0 - isConverter = false } - MODULE { - name = ModuleSwapOption - Efficiency = 6.1 - ResourceName = Dirt + name = USI_Harvester + + HarvesterType = 0 + ImpactTransform = ImpactTransform + ImpactRange = 7 + AutoShutdown = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + EfficiencyBonus = 1 + GeneratesHeat = true + + TemperatureModifier + { + key = 0 10000 + key = 250 5000 + key = 500 2500 + key = 750 250 + key = 1000 0 + } + ThermalEfficiency + { + key = 0 0.1 + key = 250 .1 + key = 500 1 + key = 750 .1 + key = 1000 0 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 12.2 + } + } + MODULE + { + name = USI_HarvesterSwapOption ConverterName = Dirt StartActionName = Start Dirt Drill StopActionName = Stop Dirt Drill - } + Efficiency = 6.1 + ResourceName = Dirt + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Gypsum + name = USI_HarvesterSwapOption ConverterName = Gypsum StartActionName = Start Gypsum Drill StopActionName = Stop Gypsum Drill - } + Efficiency = 1.22 + ResourceName = Gypsum + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Minerals + name = USI_HarvesterSwapOption ConverterName = Minerals StartActionName = Start Minerals Drill StopActionName = Stop Minerals Drill - } + Efficiency = 1.22 + ResourceName = Minerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Substrate + name = USI_HarvesterSwapOption ConverterName = Substrate StartActionName = Start Substrate Drill StopActionName = Stop Substrate Drill - } + Efficiency = 1.22 + ResourceName = Substrate + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = MetallicOre + name = USI_HarvesterSwapOption ConverterName = MetallicOre StartActionName = Start MetallicOre Drill StopActionName = Stop MetallicOre Drill - } + Efficiency = 1.22 + ResourceName = MetallicOre + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Water + name = USI_HarvesterSwapOption ConverterName = Water StartActionName = Start Water Drill StopActionName = Stop Water Drill - } - + Efficiency = 1.22 + ResourceName = Water + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Hydrates + name = USI_HarvesterSwapOption ConverterName = Hydrates StartActionName = Start Hydrates Drill StopActionName = Stop Hydrates Drill - } + Efficiency = 1.22 + ResourceName = Hydrates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Uraninite + name = USI_HarvesterSwapOption ConverterName = Uraninite StartActionName = Start Uraninite Drill StopActionName = Stop Uraninite Drill - } + Efficiency = 1.22 + ResourceName = Uraninite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = RareMetals + name = USI_HarvesterSwapOption ConverterName = RareMetals StartActionName = Start RareMetals Drill StopActionName = Stop RareMetals Drill - } + Efficiency = 1.22 + ResourceName = RareMetals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = ExoticMinerals + name = USI_HarvesterSwapOption ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill StopActionName = Stop ExoticMinerals Drill - } + Efficiency = 1.22 + ResourceName = ExoticMinerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Silicates + name = USI_HarvesterSwapOption ConverterName = Silicates StartActionName = Start Silicates Drill StopActionName = Stop Silicates Drill - } + Efficiency = 1.22 + ResourceName = Silicates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Rock + name = USI_HarvesterSwapOption ConverterName = Rock StartActionName = Start Rock Drill StopActionName = Stop Rock Drill - } + Efficiency = 1.22 + ResourceName = Rock + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Ore + name = USI_HarvesterSwapOption ConverterName = Ore StartActionName = Start Ore Drill StopActionName = Stop Ore Drill - } + Efficiency = 1.22 + ResourceName = Ore + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Karbonite + name = USI_HarvesterSwapOption ConverterName = Karbonite StartActionName = Start Karbonite Drill StopActionName = Stop Karbonite Drill + + Efficiency = 1.22 + ResourceName = Karbonite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } MODULE { - name = ModuleSwapOption - Efficiency = 1.22 - ResourceName = Karborundum + name = USI_HarvesterSwapOption ConverterName = Karborundum StartActionName = Start Karborundum Drill StopActionName = Stop Karborundum Drill - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 1 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 12.2 - } - ImpactTransform = ImpactTransform - ImpactRange = 7 - AutoShutdown = true + + Efficiency = 1.22 + ResourceName = Karborundum UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = DrillSkill - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 10000 - key = 250 5000 - key = 500 2500 - key = 750 250 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } } - - MODULE - { - name = ModuleAnimationGroup - deployAnimationName = Deploy - activeAnimationName = Drill - moduleType = Drill - } - - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 50 //Maximum amount of radiator capacity we can consume - 50 = 1 small - } - - MODULE - { - name = MKSModule - } - } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg index 5ffadf160..86d73d030 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg @@ -43,243 +43,234 @@ PART bulkheadProfiles = srf fuelCrossFeed = True mesh = MiniDrill.mu + + MODULE + { + name = ModuleAnimationGroup + deployAnimationName = Deploy + activeAnimationName = Drill + moduleType = Drill + } MODULE { name = ModuleOverheatDisplay } MODULE { - name = ModuleSwapControllerNew + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 50 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } + MODULE + { + name = MKSModule + } + MODULE + { + name = USI_SwapController typeName = Separator ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 } - MODULE { - name = ModuleSwappableConverterNew - bayName = S1 + name = USI_SwappableBay + bayName = Bay 1 moduleIndex = 0 - isConverter = false - } - + } MODULE { - name = ModuleSwapOption - Efficiency = 4 + name = USI_Harvester + + HarvesterType = 0 ResourceName = Dirt + ImpactTransform = ImpactTransform + ImpactRange = 7 + AutoShutdown = true + UseSpecialistBonus = false + EfficiencyBonus = 1 + GeneratesHeat = true + + TemperatureModifier + { + key = 0 10000 + key = 250 5000 + key = 500 2500 + key = 750 250 + key = 1000 0 + } + ThermalEfficiency + { + key = 0 0.1 + key = 250 .1 + key = 500 1 + key = 750 .1 + key = 1000 0 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 8 + } + } + MODULE + { + name = USI_HarvesterSwapOption ConverterName = Dirt StartActionName = Start Dirt Drill StopActionName = Stop Dirt Drill - } + Efficiency = 4 + ResourceName = Dirt + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Gypsum + name = USI_HarvesterSwapOption ConverterName = Gypsum StartActionName = Start Gypsum Drill StopActionName = Stop Gypsum Drill - } + Efficiency = 0.8 + ResourceName = Gypsum + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Minerals + name = USI_HarvesterSwapOption ConverterName = Minerals StartActionName = Start Minerals Drill StopActionName = Stop Minerals Drill - } + Efficiency = 0.8 + ResourceName = Minerals + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Substrate + name = USI_HarvesterSwapOption ConverterName = Substrate StartActionName = Start Substrate Drill StopActionName = Stop Substrate Drill - } + Efficiency = 0.8 + ResourceName = Substrate + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = MetallicOre + name = USI_HarvesterSwapOption ConverterName = MetallicOre StartActionName = Start MetallicOre Drill StopActionName = Stop MetallicOre Drill - } + Efficiency = 0.8 + ResourceName = MetallicOre + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Water + name = USI_HarvesterSwapOption ConverterName = Water StartActionName = Start Water Drill StopActionName = Stop Water Drill - } - + Efficiency = 0.8 + ResourceName = Water + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Hydrates + name = USI_HarvesterSwapOption ConverterName = Hydrates StartActionName = Start Hydrates Drill StopActionName = Stop Hydrates Drill - } + Efficiency = 0.8 + ResourceName = Hydrates + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Uraninite + name = USI_HarvesterSwapOption ConverterName = Uraninite StartActionName = Start Uraninite Drill StopActionName = Stop Uraninite Drill - } + Efficiency = 0.8 + ResourceName = Uraninite + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = RareMetals + name = USI_HarvesterSwapOption ConverterName = RareMetals StartActionName = Start RareMetals Drill StopActionName = Stop RareMetals Drill - } + Efficiency = 0.8 + ResourceName = RareMetals + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = ExoticMinerals + name = USI_HarvesterSwapOption ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill StopActionName = Stop ExoticMinerals Drill - } + Efficiency = 0.8 + ResourceName = ExoticMinerals + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Silicates + name = USI_HarvesterSwapOption ConverterName = Silicates StartActionName = Start Silicates Drill StopActionName = Stop Silicates Drill - } + Efficiency = 0.8 + ResourceName = Silicates + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Rock + name = USI_HarvesterSwapOption ConverterName = Rock StartActionName = Start Rock Drill StopActionName = Stop Rock Drill - } + Efficiency = 0.8 + ResourceName = Rock + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Ore + name = USI_HarvesterSwapOption ConverterName = Ore StartActionName = Start Ore Drill StopActionName = Stop Ore Drill - } + Efficiency = 0.8 + ResourceName = Ore + } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Karbonite + name = USI_HarvesterSwapOption ConverterName = Karbonite StartActionName = Start Karbonite Drill StopActionName = Stop Karbonite Drill + + Efficiency = 0.8 + ResourceName = Karbonite } MODULE { - name = ModuleSwapOption - Efficiency = 0.8 - ResourceName = Karborundum + name = USI_HarvesterSwapOption ConverterName = Karborundum StartActionName = Start Karborundum Drill StopActionName = Stop Karborundum Drill - } - - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 4 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 8 - } - ImpactTransform = ImpactTransform - ImpactRange = 7 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 10000 - key = 250 5000 - key = 500 2500 - key = 750 250 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - } - - MODULE - { - name = ModuleAnimationGroup - deployAnimationName = Deploy - activeAnimationName = Drill - moduleType = Drill - } - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 50 //Maximum amount of radiator capacity we can consume - 50 = 1 small + Efficiency = 0.8 + ResourceName = Karborundum } - - MODULE - { - name = MKSModule - } - -} \ No newline at end of file +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg index 47f3b417a..123b49059 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg @@ -44,214 +44,141 @@ PART maxTemp = 5000 bulkheadProfiles = srf fuelCrossFeed = True - MODULE - { - name = ModuleOverheatDisplay - } - - MODULE - { - name = ModuleSwapControllerNew - typeName = Separator - ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 - } MODULE { - name = ModuleSwappableConverterNew - bayName = S1 - moduleIndex = 0 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S2 - moduleIndex = 1 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S3 - moduleIndex = 2 - isConverter = false - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 10 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Gypsum - ConverterName = Gypsum - StartActionName = Start Gypsum Drill - StopActionName = Stop Gypsum Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Minerals - ConverterName = Minerals - StartActionName = Start Minerals Drill - StopActionName = Stop Minerals Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Substrate - ConverterName = Substrate - StartActionName = Start Substrate Drill - StopActionName = Stop Substrate Drill + name = ModuleAnimationGroup + deployAnimationName = Drill_Deploy + activeAnimationName = Drill_Running + moduleType = Drill } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = MetallicOre - ConverterName = MetallicOre - StartActionName = Start MetallicOre Drill - StopActionName = Stop MetallicOre Drill + name = ModuleOverheatDisplay } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Water - ConverterName = Water - StartActionName = Start Water Drill - StopActionName = Stop Water Drill + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 100 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Hydrates - ConverterName = Hydrates - StartActionName = Start Hydrates Drill - StopActionName = Stop Hydrates Drill + name = ModulePartVariants + baseVariant = MKS_GreyRed + VARIANT + { + name = MKS_GreyRed + displayName = Grey/Red + primaryColor = #6F6D6F + secondaryColor = #850707 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_RD + } + } + VARIANT + { + name = MKS_GreyGreen + displayName = Grey/Green + primaryColor = #393939 + secondaryColor = #048A00 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_GN + } + } + VARIANT + { + name = MKS_GreyYellow + displayName = Grey/Yellow + primaryColor = #393939 + secondaryColor = #FFC600 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_YL + } + } + VARIANT + { + name = MKS_GreyWhite + displayName = Grey/White + primaryColor = #393939 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_WT + } + } + VARIANT + { + name = Stock + displayName = Stock + primaryColor = #DE9536 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = Squad/Parts/Resources/RadialDrill/TriBitDrill + } + } } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Uraninite - ConverterName = Uraninite - StartActionName = Start Uraninite Drill - StopActionName = Stop Uraninite Drill + name = MKSModule } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = RareMetals - ConverterName = RareMetals - StartActionName = Start RareMetals Drill - StopActionName = Stop RareMetals Drill + name = USI_SwapController + typeName = Separator + ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = ExoticMinerals - ConverterName = ExoticMinerals - StartActionName = Start ExoticMinerals Drill - StopActionName = Stop ExoticMinerals Drill + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Silicates - ConverterName = Silicates - StartActionName = Start Silicates Drill - StopActionName = Stop Silicates Drill + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Rock - ConverterName = Rock - StartActionName = Start Rock Drill - StopActionName = Stop Rock Drill + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } - MODULE { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Ore - ConverterName = Ore - StartActionName = Start Ore Drill - StopActionName = Stop Ore Drill - } + name = USI_Harvester - MODULE - { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Karbonite - ConverterName = Karbonite - StartActionName = Start Karbonite Drill - StopActionName = Stop Karbonite Drill - } - MODULE - { - name = ModuleSwapOption - Efficiency = 2 - ResourceName = Karborundum - ConverterName = Karborundum - StartActionName = Start Karborundum Drill - StopActionName = Stop Karborundum Drill - } - - - MODULE - { - name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 10 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 20 - } ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 20000 @@ -268,31 +195,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 10 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 20 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 20000 @@ -309,31 +230,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 10 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 20 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 20000 @@ -350,54 +265,190 @@ PART key = 750 .1 key = 1000 0 } - } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 20 + } + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Dirt + StartActionName = Start Dirt Drill + StopActionName = Stop Dirt Drill + Efficiency = 10 + ResourceName = Dirt + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 100 //Maximum amount of radiator capacity we can consume - 50 = 1 small + name = USI_HarvesterSwapOption + ConverterName = Gypsum + StartActionName = Start Gypsum Drill + StopActionName = Stop Gypsum Drill + + Efficiency = 2 + ResourceName = Gypsum + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Minerals + StartActionName = Start Minerals Drill + StopActionName = Stop Minerals Drill + Efficiency = 2 + ResourceName = Minerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleAnimationGroup - deployAnimationName = Drill_Deploy - activeAnimationName = Drill_Running - moduleType = Drill + name = USI_HarvesterSwapOption + ConverterName = Substrate + StartActionName = Start Substrate Drill + StopActionName = Stop Substrate Drill + + Efficiency = 2 + ResourceName = Substrate + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = MetallicOre + StartActionName = Start MetallicOre Drill + StopActionName = Stop MetallicOre Drill + Efficiency = 2 + ResourceName = MetallicOre + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = MKSModule + name = USI_HarvesterSwapOption + ConverterName = Water + StartActionName = Start Water Drill + StopActionName = Stop Water Drill + + Efficiency = 2 + ResourceName = Water + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Hydrates + StartActionName = Start Hydrates Drill + StopActionName = Stop Hydrates Drill + Efficiency = 2 + ResourceName = Hydrates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModulePartVariants - baseVariant = Invariant - VARIANT - { - name = Invariant - displayName = Invariant - primaryColor = #000000 - secondaryColor = #000000 - TEXTURE - { - materialName = Drill_Fixed - mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_RD - } - } + name = USI_HarvesterSwapOption + ConverterName = Uraninite + StartActionName = Start Uraninite Drill + StopActionName = Stop Uraninite Drill + + Efficiency = 2 + ResourceName = Uraninite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = RareMetals + StartActionName = Start RareMetals Drill + StopActionName = Stop RareMetals Drill + + Efficiency = 2 + ResourceName = RareMetals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = ExoticMinerals + StartActionName = Start ExoticMinerals Drill + StopActionName = Stop ExoticMinerals Drill + + Efficiency = 2 + ResourceName = ExoticMinerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Silicates + StartActionName = Start Silicates Drill + StopActionName = Stop Silicates Drill + + Efficiency = 2 + ResourceName = Silicates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Rock + StartActionName = Start Rock Drill + StopActionName = Stop Rock Drill + + Efficiency = 2 + ResourceName = Rock + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Ore + StartActionName = Start Ore Drill + StopActionName = Stop Ore Drill + + Efficiency = 2 + ResourceName = Ore + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karbonite + StartActionName = Start Karbonite Drill + StopActionName = Stop Karbonite Drill + + Efficiency = 2 + ResourceName = Karbonite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karborundum + StartActionName = Start Karborundum Drill + StopActionName = Stop Karborundum Drill + + Efficiency = 2 + ResourceName = Karborundum + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg index 12a2a083b..7a9e4211f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg @@ -44,205 +44,133 @@ PART maxTemp = 5000 bulkheadProfiles = srf fuelCrossFeed = True - MODULE - { - name = ModuleOverheatDisplay - } - - MODULE - { - name = ModuleSwapControllerNew - typeName = Separator - ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 - } - - MODULE - { - name = ModuleSwappableConverterNew - bayName = S1 - moduleIndex = 0 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S2 - moduleIndex = 1 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S3 - moduleIndex = 2 - isConverter = false - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 6.55 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Gypsum - ConverterName = Gypsum - StartActionName = Start Gypsum Drill - StopActionName = Stop Gypsum Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Minerals - ConverterName = Minerals - StartActionName = Start Minerals Drill - StopActionName = Stop Minerals Drill - } MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Substrate - ConverterName = Substrate - StartActionName = Start Substrate Drill - StopActionName = Stop Substrate Drill + name = ModuleAnimationGroup + deployAnimationName = Drill_Deploy + activeAnimationName = Drill_Running + moduleType = Drill } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = MetallicOre - ConverterName = MetallicOre - StartActionName = Start MetallicOre Drill - StopActionName = Stop MetallicOre Drill + name = ModuleOverheatDisplay } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Water - ConverterName = Water - StartActionName = Start Water Drill - StopActionName = Stop Water Drill + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 100 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Hydrates - ConverterName = Hydrates - StartActionName = Start Hydrates Drill - StopActionName = Stop Hydrates Drill + name = ModulePartVariants + baseVariant = MKS_GreyGreen + VARIANT + { + name = MKS_GreyRed + displayName = Grey/Red + primaryColor = #6F6D6F + secondaryColor = #850707 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_RD + } + } + VARIANT + { + name = MKS_GreyGreen + displayName = Grey/Green + primaryColor = #393939 + secondaryColor = #048A00 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_GN + } + } + VARIANT + { + name = MKS_GreyYellow + displayName = Grey/Yellow + primaryColor = #393939 + secondaryColor = #FFC600 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_YL + } + } + VARIANT + { + name = MKS_GreyWhite + displayName = Grey/White + primaryColor = #393939 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_WT + } + } + VARIANT + { + name = Stock + displayName = Stock + primaryColor = #DE9536 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = Squad/Parts/Resources/RadialDrill/TriBitDrill + } + } } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Uraninite - ConverterName = Uraninite - StartActionName = Start Uraninite Drill - StopActionName = Stop Uraninite Drill - } - + name = MKSModule + } MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = RareMetals - ConverterName = RareMetals - StartActionName = Start RareMetals Drill - StopActionName = Stop RareMetals Drill + name = USI_SwapController + typeName = Separator + ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = ExoticMinerals - ConverterName = ExoticMinerals - StartActionName = Start ExoticMinerals Drill - StopActionName = Stop ExoticMinerals Drill - } - + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Silicates - ConverterName = Silicates - StartActionName = Start Silicates Drill - StopActionName = Stop Silicates Drill + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Rock - ConverterName = Rock - StartActionName = Start Rock Drill - StopActionName = Stop Rock Drill + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } - MODULE { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Ore - ConverterName = Ore - StartActionName = Start Ore Drill - StopActionName = Stop Ore Drill - } + name = USI_Harvester - MODULE - { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Karbonite - ConverterName = Karbonite - StartActionName = Start Karbonite Drill - StopActionName = Stop Karbonite Drill - } - MODULE - { - name = ModuleSwapOption - Efficiency = 1.31 - ResourceName = Karborundum - ConverterName = Karborundum - StartActionName = Start Karborundum Drill - StopActionName = Stop Karborundum Drill - } - - - MODULE - { - name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6.55 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 13.1 - } ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true @@ -265,22 +193,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 6.55 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 13.1 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true @@ -303,22 +226,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 6.55 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 13.1 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 5 AutoShutdown = true @@ -341,54 +259,160 @@ PART key = 750 .1 key = 1000 0 } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 13.1 + } } - MODULE { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 100 //Maximum amount of radiator capacity we can consume - 50 = 1 small + name = USI_HarvesterSwapOption + ConverterName = Dirt + StartActionName = Start Dirt Drill + StopActionName = Stop Dirt Drill + + Efficiency = 6.55 + ResourceName = Dirt } - MODULE { - name = ModuleAnimationGroup - deployAnimationName = Drill_Deploy - activeAnimationName = Drill_Running - moduleType = Drill + name = USI_HarvesterSwapOption + ConverterName = Gypsum + StartActionName = Start Gypsum Drill + StopActionName = Stop Gypsum Drill + + Efficiency = 1.31 + ResourceName = Gypsum } - MODULE { - name = MKSModule - } + name = USI_HarvesterSwapOption + ConverterName = Minerals + StartActionName = Start Minerals Drill + StopActionName = Stop Minerals Drill + Efficiency = 1.31 + ResourceName = Minerals + } MODULE { - name = ModulePartVariants - baseVariant = Invariant - VARIANT - { - name = Invariant - displayName = Invariant - primaryColor = #000000 - secondaryColor = #000000 - TEXTURE - { - materialName = Drill_Fixed - mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_GN - } - } + name = USI_HarvesterSwapOption + ConverterName = Substrate + StartActionName = Start Substrate Drill + StopActionName = Stop Substrate Drill + + Efficiency = 1.31 + ResourceName = Substrate + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = MetallicOre + StartActionName = Start MetallicOre Drill + StopActionName = Stop MetallicOre Drill + + Efficiency = 1.31 + ResourceName = MetallicOre + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Water + StartActionName = Start Water Drill + StopActionName = Stop Water Drill + + Efficiency = 1.31 + ResourceName = Water + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Hydrates + StartActionName = Start Hydrates Drill + StopActionName = Stop Hydrates Drill + + Efficiency = 1.31 + ResourceName = Hydrates + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Uraninite + StartActionName = Start Uraninite Drill + StopActionName = Stop Uraninite Drill + + Efficiency = 1.31 + ResourceName = Uraninite + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = RareMetals + StartActionName = Start RareMetals Drill + StopActionName = Stop RareMetals Drill + + Efficiency = 1.31 + ResourceName = RareMetals + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = ExoticMinerals + StartActionName = Start ExoticMinerals Drill + StopActionName = Stop ExoticMinerals Drill + + Efficiency = 1.31 + ResourceName = ExoticMinerals + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Silicates + StartActionName = Start Silicates Drill + StopActionName = Stop Silicates Drill + + Efficiency = 1.31 + ResourceName = Silicates + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Rock + StartActionName = Start Rock Drill + StopActionName = Stop Rock Drill + + Efficiency = 1.31 + ResourceName = Rock + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Ore + StartActionName = Start Ore Drill + StopActionName = Stop Ore Drill + + Efficiency = 1.31 + ResourceName = Ore + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karbonite + StartActionName = Start Karbonite Drill + StopActionName = Stop Karbonite Drill + + Efficiency = 1.31 + ResourceName = Karbonite + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karborundum + StartActionName = Start Karborundum Drill + StopActionName = Stop Karborundum Drill + + Efficiency = 1.31 + ResourceName = Karborundum } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg index 93496bf67..38c7b6578 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg @@ -44,229 +44,153 @@ PART maxTemp = 5000 bulkheadProfiles = srf fuelCrossFeed = True - MODULE - { - name = ModuleOverheatDisplay - } MODULE { - name = ModuleSwapControllerNew - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 - } - - MODULE - { - name = ModuleSwappableConverterNew - bayName = S1 - moduleIndex = 0 - isConverter = false - } - - MODULE - { - name = ModuleSwappableConverterNew - bayName = S2 - moduleIndex = 1 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S3 - moduleIndex = 2 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S4 - moduleIndex = 3 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S5 - moduleIndex = 4 - isConverter = false - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Gypsum - ConverterName = Gypsum - StartActionName = Start Gypsum Drill - StopActionName = Stop Gypsum Drill + name = ModuleAnimationGroup + deployAnimationName = Drill_Deploy + activeAnimationName = Drill_Running + moduleType = Drill } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Minerals - ConverterName = Minerals - StartActionName = Start Minerals Drill - StopActionName = Stop Minerals Drill + name = ModuleOverheatDisplay } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Substrate - ConverterName = Substrate - StartActionName = Start Substrate Drill - StopActionName = Stop Substrate Drill + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 200 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = MetallicOre - ConverterName = MetallicOre - StartActionName = Start MetallicOre Drill - StopActionName = Stop MetallicOre Drill + name = ModulePartVariants + baseVariant = MKS_GreyWhite + VARIANT + { + name = MKS_GreyRed + displayName = Grey/Red + primaryColor = #6F6D6F + secondaryColor = #850707 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_RD + } + } + VARIANT + { + name = MKS_GreyGreen + displayName = Grey/Green + primaryColor = #393939 + secondaryColor = #048A00 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_GN + } + } + VARIANT + { + name = MKS_GreyYellow + displayName = Grey/Yellow + primaryColor = #393939 + secondaryColor = #FFC600 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_YL + } + } + VARIANT + { + name = MKS_GreyWhite + displayName = Grey/White + primaryColor = #393939 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_WT + } + } + VARIANT + { + name = Stock + displayName = Stock + primaryColor = #DE9536 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = Squad/Parts/Resources/RadialDrill/TriBitDrill + } + } } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Water - ConverterName = Water - StartActionName = Start Water Drill - StopActionName = Stop Water Drill + name = MKSModule } - - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Hydrates - ConverterName = Hydrates - StartActionName = Start Hydrates Drill - StopActionName = Stop Hydrates Drill + name = USI_SwapController + typeName = Separator + ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Uraninite - ConverterName = Uraninite - StartActionName = Start Uraninite Drill - StopActionName = Stop Uraninite Drill + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = RareMetals - ConverterName = RareMetals - StartActionName = Start RareMetals Drill - StopActionName = Stop RareMetals Drill + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = ExoticMinerals - ConverterName = ExoticMinerals - StartActionName = Start ExoticMinerals Drill - StopActionName = Stop ExoticMinerals Drill + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Silicates - ConverterName = Silicates - StartActionName = Start Silicates Drill - StopActionName = Stop Silicates Drill + name = USI_SwappableBay + bayName = Bay 4 + moduleIndex = 3 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Rock - ConverterName = Rock - StartActionName = Start Rock Drill - StopActionName = Stop Rock Drill + name = USI_SwappableBay + bayName = Bay 5 + moduleIndex = 4 } - MODULE { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Ore - ConverterName = Ore - StartActionName = Start Ore Drill - StopActionName = Stop Ore Drill - } + name = USI_Harvester - MODULE - { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Karbonite - ConverterName = Karbonite - StartActionName = Start Karbonite Drill - StopActionName = Stop Karbonite Drill - } - MODULE - { - name = ModuleSwapOption - Efficiency = 6 - ResourceName = Karborundum - ConverterName = Karborundum - StartActionName = Start Karborundum Drill - StopActionName = Stop Karborundum Drill - } - - - MODULE - { - name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 60 - } ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 40000 @@ -283,31 +207,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 60 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 40000 @@ -324,31 +242,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 60 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 40000 @@ -365,31 +277,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 60 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 40000 @@ -406,31 +312,25 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 30 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 60 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true - UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill EfficiencyBonus = 1 GeneratesHeat = true + TemperatureModifier { key = 0 40000 @@ -447,56 +347,190 @@ PART key = 750 .1 key = 1000 0 } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 60 + } } - + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Dirt + StartActionName = Start Dirt Drill + StopActionName = Stop Dirt Drill - + Efficiency = 30 + ResourceName = Dirt + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 200 //Maximum amount of radiator capacity we can consume - 50 = 1 small + name = USI_HarvesterSwapOption + ConverterName = Gypsum + StartActionName = Start Gypsum Drill + StopActionName = Stop Gypsum Drill + + Efficiency = 6 + ResourceName = Gypsum + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Minerals + StartActionName = Start Minerals Drill + StopActionName = Stop Minerals Drill + Efficiency = 6 + ResourceName = Minerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModuleAnimationGroup - deployAnimationName = Drill_Deploy - activeAnimationName = Drill_Running - moduleType = Drill + name = USI_HarvesterSwapOption + ConverterName = Substrate + StartActionName = Start Substrate Drill + StopActionName = Stop Substrate Drill + + Efficiency = 6 + ResourceName = Substrate + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = MetallicOre + StartActionName = Start MetallicOre Drill + StopActionName = Stop MetallicOre Drill + Efficiency = 6 + ResourceName = MetallicOre + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = MKSModule + name = USI_HarvesterSwapOption + ConverterName = Water + StartActionName = Start Water Drill + StopActionName = Stop Water Drill + + Efficiency = 6 + ResourceName = Water + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Hydrates + StartActionName = Start Hydrates Drill + StopActionName = Stop Hydrates Drill + Efficiency = 6 + ResourceName = Hydrates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } MODULE { - name = ModulePartVariants - baseVariant = Invariant - VARIANT - { - name = Invariant - displayName = Invariant - primaryColor = #000000 - secondaryColor = #000000 - TEXTURE - { - materialName = Drill_Fixed - mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_WT - } - } + name = USI_HarvesterSwapOption + ConverterName = Uraninite + StartActionName = Start Uraninite Drill + StopActionName = Stop Uraninite Drill + + Efficiency = 6 + ResourceName = Uraninite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = RareMetals + StartActionName = Start RareMetals Drill + StopActionName = Stop RareMetals Drill + + Efficiency = 6 + ResourceName = RareMetals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = ExoticMinerals + StartActionName = Start ExoticMinerals Drill + StopActionName = Stop ExoticMinerals Drill + + Efficiency = 6 + ResourceName = ExoticMinerals + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Silicates + StartActionName = Start Silicates Drill + StopActionName = Stop Silicates Drill + + Efficiency = 6 + ResourceName = Silicates + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Rock + StartActionName = Start Rock Drill + StopActionName = Stop Rock Drill + + Efficiency = 6 + ResourceName = Rock + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Ore + StartActionName = Start Ore Drill + StopActionName = Stop Ore Drill + + Efficiency = 6 + ResourceName = Ore + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karbonite + StartActionName = Start Karbonite Drill + StopActionName = Stop Karbonite Drill + + Efficiency = 6 + ResourceName = Karbonite + UseSpecialistBonus = true + ExperienceEffect = DrillSkill + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karborundum + StartActionName = Start Karborundum Drill + StopActionName = Stop Karborundum Drill + + Efficiency = 6 + ResourceName = Karborundum + UseSpecialistBonus = true + ExperienceEffect = DrillSkill } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg index c320ce9c8..89f46f090 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg @@ -44,219 +44,145 @@ PART maxTemp = 5000 bulkheadProfiles = srf fuelCrossFeed = True - MODULE - { - name = ModuleOverheatDisplay - } - - MODULE - { - name = ModuleSwapControllerNew - typeName = Separator - ResourceCosts = SpecializedParts,7,MaterialKits,35,ElectricCharge,35 - } - - MODULE - { - name = ModuleSwappableConverterNew - bayName = S1 - moduleIndex = 0 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S2 - moduleIndex = 1 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S3 - moduleIndex = 2 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S4 - moduleIndex = 3 - isConverter = false - } - MODULE - { - name = ModuleSwappableConverterNew - bayName = S5 - moduleIndex = 4 - isConverter = false - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - } MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Gypsum - ConverterName = Gypsum - StartActionName = Start Gypsum Drill - StopActionName = Stop Gypsum Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Minerals - ConverterName = Minerals - StartActionName = Start Minerals Drill - StopActionName = Stop Minerals Drill - } - - MODULE - { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Substrate - ConverterName = Substrate - StartActionName = Start Substrate Drill - StopActionName = Stop Substrate Drill - } - + name = ModuleAnimationGroup + deployAnimationName = Drill_Deploy + activeAnimationName = Drill_Running + moduleType = Drill + } MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = MetallicOre - ConverterName = MetallicOre - StartActionName = Start MetallicOre Drill - StopActionName = Stop MetallicOre Drill + name = ModuleOverheatDisplay } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Water - ConverterName = Water - StartActionName = Start Water Drill - StopActionName = Stop Water Drill + name = ModuleCoreHeat + CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 200 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Hydrates - ConverterName = Hydrates - StartActionName = Start Hydrates Drill - StopActionName = Stop Hydrates Drill + name = ModulePartVariants + baseVariant = MKS_GreyYellow + VARIANT + { + name = MKS_GreyRed + displayName = Grey/Red + primaryColor = #6F6D6F + secondaryColor = #850707 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_RD + } + } + VARIANT + { + name = MKS_GreyGreen + displayName = Grey/Green + primaryColor = #393939 + secondaryColor = #048A00 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_GN + } + } + VARIANT + { + name = MKS_GreyYellow + displayName = Grey/Yellow + primaryColor = #393939 + secondaryColor = #FFC600 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_YL + } + } + VARIANT + { + name = MKS_GreyWhite + displayName = Grey/White + primaryColor = #393939 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_WT + } + } + VARIANT + { + name = Stock + displayName = Stock + primaryColor = #DE9536 + secondaryColor = #A0A0A0 + TEXTURE + { + materialName = Drill_Fixed + mainTextureURL = Squad/Parts/Resources/RadialDrill/TriBitDrill + } + } } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Uraninite - ConverterName = Uraninite - StartActionName = Start Uraninite Drill - StopActionName = Stop Uraninite Drill + name = MKSModule } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = RareMetals - ConverterName = RareMetals - StartActionName = Start RareMetals Drill - StopActionName = Stop RareMetals Drill + name = USI_SwapController + typeName = Separator + ResourceCosts = SpecializedParts,7,MaterialKits,35,ElectricCharge,35 } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = ExoticMinerals - ConverterName = ExoticMinerals - StartActionName = Start ExoticMinerals Drill - StopActionName = Stop ExoticMinerals Drill - } - + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Silicates - ConverterName = Silicates - StartActionName = Start Silicates Drill - StopActionName = Stop Silicates Drill + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Rock - ConverterName = Rock - StartActionName = Start Rock Drill - StopActionName = Stop Rock Drill + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Ore - ConverterName = Ore - StartActionName = Start Ore Drill - StopActionName = Stop Ore Drill + name = USI_SwappableBay + bayName = Bay 4 + moduleIndex = 3 } - MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Karbonite - ConverterName = Karbonite - StartActionName = Start Karbonite Drill - StopActionName = Stop Karbonite Drill + name = USI_SwappableBay + bayName = Bay 5 + moduleIndex = 4 } MODULE { - name = ModuleSwapOption - Efficiency = 5.24 - ResourceName = Karborundum - ConverterName = Karborundum - StartActionName = Start Karborundum Drill - StopActionName = Stop Karborundum Drill - } + name = USI_Harvester - - MODULE - { - name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 52.4 - } ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true @@ -279,22 +205,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 52.4 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true @@ -317,22 +238,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 52.4 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true @@ -355,22 +271,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 52.4 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true @@ -393,22 +304,17 @@ PART key = 750 .1 key = 1000 0 } - } - - MODULE - { - name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 26.2 - ResourceName = Dirt - ConverterName = Dirt - StartActionName = Start Dirt Drill - StopActionName = Stop Dirt Drill INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 52.4 } + } + MODULE + { + name = USI_Harvester + + HarvesterType = 0 ImpactTransform = ImpactTransform ImpactRange = 15 AutoShutdown = true @@ -431,55 +337,160 @@ PART key = 750 .1 key = 1000 0 } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 52.4 + } } - - MODULE { - name = ModuleCoreHeat - CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 200 //Maximum amount of radiator capacity we can consume - 50 = 1 small + name = USI_HarvesterSwapOption + ConverterName = Dirt + StartActionName = Start Dirt Drill + StopActionName = Stop Dirt Drill + + Efficiency = 26.2 + ResourceName = Dirt } - MODULE { - name = ModuleAnimationGroup - deployAnimationName = Drill_Deploy - activeAnimationName = Drill_Running - moduleType = Drill - } - + name = USI_HarvesterSwapOption + ConverterName = Gypsum + StartActionName = Start Gypsum Drill + StopActionName = Stop Gypsum Drill + + Efficiency = 5.24 + ResourceName = Gypsum + } MODULE { - name = MKSModule + name = USI_HarvesterSwapOption + ConverterName = Minerals + StartActionName = Start Minerals Drill + StopActionName = Stop Minerals Drill + + Efficiency = 5.24 + ResourceName = Minerals } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Substrate + StartActionName = Start Substrate Drill + StopActionName = Stop Substrate Drill + Efficiency = 5.24 + ResourceName = Substrate + } MODULE { - name = ModulePartVariants - baseVariant = Invariant - VARIANT - { - name = Invariant - displayName = Invariant - primaryColor = #000000 - secondaryColor = #000000 - TEXTURE - { - materialName = Drill_Fixed - mainTextureURL = UmbraSpaceIndustries/MKS/Assets/TriBitDrill_YL - } - } + name = USI_HarvesterSwapOption + ConverterName = MetallicOre + StartActionName = Start MetallicOre Drill + StopActionName = Stop MetallicOre Drill + + Efficiency = 5.24 + ResourceName = MetallicOre + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Water + StartActionName = Start Water Drill + StopActionName = Stop Water Drill + + Efficiency = 5.24 + ResourceName = Water + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Hydrates + StartActionName = Start Hydrates Drill + StopActionName = Stop Hydrates Drill + + Efficiency = 5.24 + ResourceName = Hydrates + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Uraninite + StartActionName = Start Uraninite Drill + StopActionName = Stop Uraninite Drill + + Efficiency = 5.24 + ResourceName = Uraninite + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = RareMetals + StartActionName = Start RareMetals Drill + StopActionName = Stop RareMetals Drill + + Efficiency = 5.24 + ResourceName = RareMetals + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = ExoticMinerals + StartActionName = Start ExoticMinerals Drill + StopActionName = Stop ExoticMinerals Drill + + Efficiency = 5.24 + ResourceName = ExoticMinerals + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Silicates + StartActionName = Start Silicates Drill + StopActionName = Stop Silicates Drill + + Efficiency = 5.24 + ResourceName = Silicates + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Rock + StartActionName = Start Rock Drill + StopActionName = Stop Rock Drill + + Efficiency = 5.24 + ResourceName = Rock + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Ore + StartActionName = Start Ore Drill + StopActionName = Stop Ore Drill + + Efficiency = 5.24 + ResourceName = Ore + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karbonite + StartActionName = Start Karbonite Drill + StopActionName = Stop Karbonite Drill + + Efficiency = 5.24 + ResourceName = Karbonite + } + MODULE + { + name = USI_HarvesterSwapOption + ConverterName = Karborundum + StartActionName = Start Karborundum Drill + StopActionName = Stop Karborundum Drill + + Efficiency = 5.24 + ResourceName = Karborundum } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_PowerAntenna.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_PowerAntenna.cfg index 025067698..6fa569c12 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_PowerAntenna.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_PowerAntenna.cfg @@ -30,7 +30,7 @@ category = Electrical subcategory = 0 title = Microwave Power Tranceiver manufacturer = Umbra Space Industries -description = Allows for the transfer of power via microwave transmission +description = Allows for the transfer of power via microwave transmission. This advanced technology is reliable enough to transmit power even in remote bases without constant monitoring by technicians. tags = USI MKS power transfer tranceiver microwave transmission logistics consume distribut Distribute PDU @@ -53,6 +53,7 @@ bulkheadProfiles = srf { name = ModulePowerDistributor PowerDistributionRange = 2000 + RequiredSkill = } MODULE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor125.cfg index 7df49f5a6..c16a4f15d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor125.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor125.cfg @@ -48,14 +48,54 @@ PART } MODULE { - name = ModuleResourceConverter_USI - ConverterName = LFO - StartActionName = Start LFO - StopActionName = Stop LFO - Efficiency = 1 + name = ModuleCoreHeat + CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 2000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 250 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = ModulePlanetaryLogistics + PushOnly = true + } + MODULE + { + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + AutoShutdown = true GeneratesHeat = true UseSpecialistBonus = false + TemperatureModifier { key = 0 10000 @@ -74,6 +114,13 @@ PART key = 1500 0.1 key = 2000 0 } + } + MODULE + { + name = USI_ConverterSwapOption + ConverterName = LFO + StartActionName = Start LFO + StopActionName = Stop LFO INPUT_RESOURCE { ResourceName = Ore @@ -119,35 +166,12 @@ PART Ratio = 90 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = LiquidFuel StartActionName = Start LiquidFuel StopActionName = Stop LiquidFuel - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -186,36 +210,13 @@ PART ResourceName = Machinery Ratio = 90 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MonoPropellant StartActionName = Start MonoPropellant StopActionName = Stop MonoPropellant - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -256,36 +257,13 @@ PART ResourceName = Machinery Ratio = 90 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Chemicals StartActionName = Start Chemicals StopActionName = Stop Chemicals - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -324,36 +302,13 @@ PART ResourceName = Machinery Ratio = 90 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Metals StartActionName = Start Metals StopActionName = Stop Metals - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = MetallicOre @@ -393,35 +348,12 @@ PART Ratio = 90 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Polymers StartActionName = Start Polymers StopActionName = Stop Polymers - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Substrate @@ -460,36 +392,13 @@ PART ResourceName = Machinery Ratio = 90 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(G) StartActionName = Start Fertilizer(G) StopActionName = Stop Fertilizer(G) - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Gypsum @@ -529,35 +438,12 @@ PART Ratio = 90 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(M) StartActionName = Start Fertilizer(M) StopActionName = Stop Fertilizer(M) - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -596,27 +482,34 @@ PART ResourceName = Machinery Ratio = 90 } - } - + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Crusher] - eTag = Crusher - StartActionName = Start [Crusher] - StopActionName = Stop [Crusher] - UseBonus = false - Efficiency = 1 - eMultiplier = 0.481 + name = USI_ConverterSwapOption + ConverterName = Silicon + StartActionName = Start Silicon + StopActionName = Stop Silicon + INPUT_RESOURCE + { + ResourceName = Silicates + Ratio = 0.0013 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 2.405 + Ratio = 1.56 } - REQUIRED_RESOURCE + OUTPUT_RESOURCE { - ResourceName = Machinery - Ratio = 90 + ResourceName = Silicon + Ratio = 0.00026 + DumpExcess = False + } + OUTPUT_RESOURCE:NEEDS[ART] + { + ResourceName = Rock + Ratio = 0.00026 + DumpExcess = true } INPUT_RESOURCE { @@ -629,20 +522,20 @@ PART Ratio = 0.00000045 DumpExcess = true } - } - - - + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 90 + } + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Smelter] - eTag = Smelter - StartActionName = Start [Smelter] - StopActionName = Stop [Smelter] - UseBonus = false - Efficiency = 1 - eMultiplier = 0.481 + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Crusher] + StartActionName = Start [Crusher] + StopActionName = Stop [Crusher] + EfficiencyTag = Crusher + EfficiencyMultiplier = 0.481 INPUT_RESOURCE { ResourceName = ElectricCharge @@ -664,57 +557,24 @@ PART Ratio = 0.00000045 DumpExcess = true } - } - - MODULE + } + MODULE { - name = ModuleResourceConverter_USI - ConverterName = Silicon - StartActionName = Start Silicon - StopActionName = Stop Silicon - Efficiency = 1 - AutoShutdown = true - GeneratesHeat = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 10000 - key = 500 5000 - key = 1000 2500 - key = 1250 2500 - key = 1500 500 - key = 2000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.25 - key = 1000 1.0 - key = 1250 0.5 - key = 1500 0.1 - key = 2000 0 - } - INPUT_RESOURCE - { - ResourceName = Silicates - Ratio = 0.0013 - } + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Smelter] + StartActionName = Start [Smelter] + StopActionName = Stop [Smelter] + EfficiencyTag = Smelter + EfficiencyMultiplier = 0.481 INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 1.56 - } - OUTPUT_RESOURCE - { - ResourceName = Silicon - Ratio = 0.00026 - DumpExcess = False + Ratio = 2.405 } - OUTPUT_RESOURCE:NEEDS[ART] + REQUIRED_RESOURCE { - ResourceName = Rock - Ratio = 0.00026 - DumpExcess = true + ResourceName = Machinery + Ratio = 90 } INPUT_RESOURCE { @@ -727,18 +587,7 @@ PART Ratio = 0.00000045 DumpExcess = true } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 90 - } - } - - MODULE - { - name = USI_ModuleFieldRepair } - RESOURCE { name = Machinery @@ -753,44 +602,4 @@ PART maxAmount = 90 isTweakable = True } - MODULE - { - name = MKSModule - } - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 2000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 250 //Maximum amount of radiator capacity we can consume - 50 = 1 small - } - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 - } - - - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = ModulePlanetaryLogistics - PushOnly = true - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor250.cfg index 98eeced16..0a85e4c71 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor250.cfg @@ -47,12 +47,56 @@ PART } MODULE { - name = ModuleResourceConverter_USI - ConverterName = LFO - StartActionName = Start LFO - StopActionName = Stop LFO - Efficiency = 1 - EfficiencyBonus = 1 + name = ModuleCoreHeat + CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 3000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 1000 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = ModulePlanetaryLogistics + PushOnly = true + } + MODULE + { + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,9,MaterialKits,45,ElectricCharge,45 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } + MODULE + { + name = USI_Converter + GeneratesHeat = true AutoShutdown = true UseSpecialistBonus = false @@ -74,6 +118,39 @@ PART key = 2000 0.1 key = 3000 0 } + } + MODULE + { + name = USI_Converter + + GeneratesHeat = true + AutoShutdown = true + UseSpecialistBonus = false + TemperatureModifier + { + key = 0 50000 + key = 500 20000 + key = 1000 5000 + key = 1500 2500 + key = 2000 500 + key = 3000 0 + } + ThermalEfficiency + { + key = 0 0 + key = 500 0.15 + key = 1000 1.0 + key = 1500 0.25 + key = 2000 0.1 + key = 3000 0 + } + } + MODULE + { + name = USI_ConverterSwapOption + ConverterName = LFO + StartActionName = Start LFO + StopActionName = Stop LFO INPUT_RESOURCE { ResourceName = Ore @@ -119,35 +196,12 @@ PART Ratio = 650 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = LiquidFuel StartActionName = Start LiquidFuel StopActionName = Stop LiquidFuel - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -187,35 +241,12 @@ PART Ratio = 650 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MonoPropellant StartActionName = Start MonoPropellant StopActionName = Stop MonoPropellant - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -254,36 +285,13 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Chemicals StartActionName = Start Chemicals StopActionName = Stop Chemicals - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -322,36 +330,13 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Metals StartActionName = Start Metals StopActionName = Stop Metals - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = MetallicOre @@ -390,36 +375,13 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Polymers StartActionName = Start Polymers StopActionName = Stop Polymers - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Substrate @@ -458,36 +420,13 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(G) StartActionName = Start Fertilizer(G) StopActionName = Stop Fertilizer(G) - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Gypsum @@ -526,36 +465,13 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(M) StartActionName = Start Fertilizer(M) StopActionName = Stop Fertilizer(M) - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -594,27 +510,34 @@ PART ResourceName = Machinery Ratio = 650 } - } - + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Crusher] - eTag = Crusher - StartActionName = Start [Crusher] - StopActionName = Stop [Crusher] - UseBonus = false - Efficiency = 1 - eMultiplier = 1.728 + name = USI_ConverterSwapOption + ConverterName = Silicon + StartActionName = Start Silicon + StopActionName = Stop Silicon + INPUT_RESOURCE + { + ResourceName = Silicates + Ratio = 0.0047 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 17.282 + Ratio = 5.64 } - REQUIRED_RESOURCE + OUTPUT_RESOURCE { - ResourceName = Machinery - Ratio = 650 + ResourceName = Silicon + Ratio = 0.00094 + DumpExcess = False + } + OUTPUT_RESOURCE:NEEDS[ART] + { + ResourceName = Rock + Ratio = 0.00094 + DumpExcess = true } INPUT_RESOURCE { @@ -627,18 +550,20 @@ PART Ratio = 0.00000325 DumpExcess = true } - } - + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 650 + } + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Smelter] - eTag = Smelter - StartActionName = Start [Smelter] - StopActionName = Stop [Smelter] - UseBonus = false - Efficiency = 1 - eMultiplier = 1.728 + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Crusher] + StartActionName = Start [Crusher] + StopActionName = Stop [Crusher] + EfficiencyTag = Crusher + EfficiencyMultiplier = 1.728 INPUT_RESOURCE { ResourceName = ElectricCharge @@ -660,57 +585,24 @@ PART Ratio = 0.00000325 DumpExcess = true } - } - + } MODULE { - name = ModuleResourceConverter_USI - ConverterName = Silicon - StartActionName = Start Silicon - StopActionName = Stop Silicon - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 50000 - key = 500 20000 - key = 1000 5000 - key = 1500 2500 - key = 2000 500 - key = 3000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.15 - key = 1000 1.0 - key = 1500 0.25 - key = 2000 0.1 - key = 3000 0 - } - INPUT_RESOURCE - { - ResourceName = Silicates - Ratio = 0.0047 - } + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Smelter] + StartActionName = Start [Smelter] + StopActionName = Stop [Smelter] + EfficiencyTag = Smelter + EfficiencyMultiplier = 1.728 INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 5.64 - } - OUTPUT_RESOURCE - { - ResourceName = Silicon - Ratio = 0.00094 - DumpExcess = False + Ratio = 17.282 } - OUTPUT_RESOURCE:NEEDS[ART] + REQUIRED_RESOURCE { - ResourceName = Rock - Ratio = 0.00094 - DumpExcess = true + ResourceName = Machinery + Ratio = 650 } INPUT_RESOURCE { @@ -723,18 +615,7 @@ PART Ratio = 0.00000325 DumpExcess = true } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 650 - } - } - - MODULE - { - name = USI_ModuleFieldRepair } - RESOURCE { name = Machinery @@ -748,50 +629,5 @@ PART amount = 0 maxAmount = 650 isTweakable = True - } - MODULE - { - name = MKSModule } - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 3000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 1000 //Maximum amount of radiator capacity we can consume - 50 = 1 small - } - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,9,MaterialKits,45,ElectricCharge,45 - } - MODULE - { - name = ModuleSwappableConverter - bayName = C2 - typeName = Config - ResourceCosts = SpecializedParts,9,MaterialKits,45,ElectricCharge,45 - } - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = ModulePlanetaryLogistics - PushOnly = true - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor375.cfg index f07a4081f..86903670d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Processor375.cfg @@ -47,14 +47,118 @@ PART } MODULE { - name = ModuleResourceConverter_USI - ConverterName = LFO - StartActionName = Start LFO - StopActionName = Stop LFO - Efficiency = 1 + name = ModuleCoreHeat + CoreTempGoal = 1500 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = ModulePlanetaryLogistics + PushOnly = true + } + MODULE + { + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,18,MaterialKits,90,ElectricCharge,90 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 + } + MODULE + { + name = USI_Converter + + GeneratesHeat = true + AutoShutdown = true + TemperatureModifier + { + key = 0 100000 + key = 500 50000 + key = 1000 10000 + key = 1500 10000 + key = 2000 2500 + key = 3000 500 + key = 4000 0 + } + ThermalEfficiency + { + key = 0 0 + key = 500 0.1 + key = 1000 0.25 + key = 1500 1.0 + key = 2000 0.5 + key = 3000 0.1 + key = 4000 0 + } + } + MODULE + { + name = USI_Converter + + GeneratesHeat = true + AutoShutdown = true + TemperatureModifier + { + key = 0 100000 + key = 500 50000 + key = 1000 10000 + key = 1500 10000 + key = 2000 2500 + key = 3000 500 + key = 4000 0 + } + ThermalEfficiency + { + key = 0 0 + key = 500 0.1 + key = 1000 0.25 + key = 1500 1.0 + key = 2000 0.5 + key = 3000 0.1 + key = 4000 0 + } + } + MODULE + { + name = USI_Converter + GeneratesHeat = true AutoShutdown = true - UseSpecialistBonus = false TemperatureModifier { key = 0 100000 @@ -75,6 +179,13 @@ PART key = 3000 0.1 key = 4000 0 } + } + MODULE + { + name = USI_ConverterSwapOption + ConverterName = LFO + StartActionName = Start LFO + StopActionName = Stop LFO INPUT_RESOURCE { ResourceName = Ore @@ -120,38 +231,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = LiquidFuel StartActionName = Start LiquidFuel StopActionName = Stop LiquidFuel - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -191,37 +276,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MonoPropellant StartActionName = Start MonoPropellant StopActionName = Stop MonoPropellant - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Ore @@ -261,37 +321,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Chemicals StartActionName = Start Chemicals StopActionName = Stop Chemicals - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -331,37 +366,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Metals StartActionName = Start Metals StopActionName = Stop Metals - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = MetallicOre @@ -401,37 +411,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Polymers StartActionName = Start Polymers StopActionName = Stop Polymers - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Substrate @@ -471,37 +456,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(G) StartActionName = Start Fertilizer(G) StopActionName = Stop Fertilizer(G) - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Gypsum @@ -541,37 +501,12 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(M) StartActionName = Start Fertilizer(M) StopActionName = Stop Fertilizer(M) - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } INPUT_RESOURCE { ResourceName = Minerals @@ -610,28 +545,34 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Crusher] - eTag = Crusher - StartActionName = Start [Crusher] - StopActionName = Stop [Crusher] - UseBonus = false - Efficiency = 1 - eMultiplier = 3.767 + name = USI_ConverterSwapOption + ConverterName = Silicon + StartActionName = Start Silicon + StopActionName = Stop Silicon + INPUT_RESOURCE + { + ResourceName = Silicates + Ratio = 0.01 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 56.501 + Ratio = 12 } - REQUIRED_RESOURCE + OUTPUT_RESOURCE { - ResourceName = Machinery - Ratio = 2000 + ResourceName = Silicon + Ratio = 0.002 + DumpExcess = False + } + OUTPUT_RESOURCE:NEEDS[ART] + { + ResourceName = Rock + Ratio = 0.002 + DumpExcess = true } INPUT_RESOURCE { @@ -644,20 +585,20 @@ PART Ratio = 0.00001 DumpExcess = true } - } - - - + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 2000 + } + } MODULE { - name = ModuleEfficiencyPart - ConverterName = [Smelter] - eTag = Smelter - StartActionName = Start [Smelter] - StopActionName = Stop [Smelter] - UseBonus = false - Efficiency = 1 - eMultiplier = 3.767 + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Crusher] + StartActionName = Start [Crusher] + StopActionName = Stop [Crusher] + EfficiencyTag = Crusher + EfficiencyMultiplier = 3.767 INPUT_RESOURCE { ResourceName = ElectricCharge @@ -679,59 +620,24 @@ PART Ratio = 0.00001 DumpExcess = true } - } - + } MODULE { - name = ModuleResourceConverter_USI - ConverterName = Silicon - StartActionName = Start Silicon - StopActionName = Stop Silicon - Efficiency = 1 - GeneratesHeat = true - AutoShutdown = true - UseSpecialistBonus = false - TemperatureModifier - { - key = 0 100000 - key = 500 50000 - key = 1000 10000 - key = 1500 10000 - key = 2000 2500 - key = 3000 500 - key = 4000 0 - } - ThermalEfficiency - { - key = 0 0 - key = 500 0.1 - key = 1000 0.25 - key = 1500 1.0 - key = 2000 0.5 - key = 3000 0.1 - key = 4000 0 - } - INPUT_RESOURCE - { - ResourceName = Silicates - Ratio = 0.01 - } + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Smelter] + StartActionName = Start [Smelter] + StopActionName = Stop [Smelter] + EfficiencyTag = Smelter + EfficiencyMultiplier = 3.767 INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 12 - } - OUTPUT_RESOURCE - { - ResourceName = Silicon - Ratio = 0.002 - DumpExcess = False + Ratio = 56.501 } - OUTPUT_RESOURCE:NEEDS[ART] + REQUIRED_RESOURCE { - ResourceName = Rock - Ratio = 0.002 - DumpExcess = true + ResourceName = Machinery + Ratio = 2000 } INPUT_RESOURCE { @@ -744,18 +650,7 @@ PART Ratio = 0.00001 DumpExcess = true } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 2000 - } - } - - MODULE - { - name = USI_ModuleFieldRepair } - RESOURCE { name = Machinery @@ -769,58 +664,5 @@ PART amount = 0 maxAmount = 2000 isTweakable = True - } - MODULE - { - name = MKSModule - } - MODULE - { - name = ModuleCoreHeat - CoreTempGoal = 1500 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,18,MaterialKits,90,ElectricCharge,90 - } - MODULE - { - name = ModuleSwappableConverter - bayName = C2 - typeName = Config - ResourceCosts = SpecializedParts,18,MaterialKits,90,ElectricCharge,90 - } - MODULE - { - name = ModuleSwappableConverter - bayName = C3 - typeName = Config - ResourceCosts = SpecializedParts,18,MaterialKits,90,ElectricCharge,90 - } - - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = ModulePlanetaryLogistics - PushOnly = true - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg index 9826ddb9a..5eafa078e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg @@ -38,19 +38,97 @@ PART breakingForce = 250 breakingTorque = 250 CrewCapacity = 0 - + vesselType = Base + + INTERNAL + { + name = landerCabinInternals + } + MODULE { - name = ModuleResourceConverter_USI + name = ModuleLight + lightName = + useAnimationDim = true + lightBrightenSpeed = 1 + lightDimSpeed = 1 + resourceAmount = 0.01 + animationName = LightsAgModule + useResources = true + } + MODULE + { + name = USIAnimation + animationName = Deploy + inflatable = true + CrewCapacity = 2 + ResourceCosts = MaterialKits,1000,ElectricCharge,100 + } + MODULE + { + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + 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 = MKSModule + BonusEffect = ScienceBoost + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_ConverterSwapOption ConverterName = Agroponics StartActionName = Start Agroponics StopActionName = Stop Agroponics UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 INPUT_RESOURCE { @@ -89,20 +167,16 @@ PART ResourceName = Machinery Ratio = 500 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(S) StartActionName = Start Cultivate(S) StopActionName = Stop Cultivate(S) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 INPUT_RESOURCE { @@ -146,51 +220,15 @@ PART ResourceName = Machinery Ratio = 500 } - } - - MODULE - { - name = ModuleEfficiencyPart - ConverterName = [Greenhouse] - eTag = Greenhouse - StartActionName = Start [Greenhouse] - StopActionName = Stop [Greenhouse] - UseBonus = false - Efficiency = 1 - eMultiplier = 3.47 - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 17.35 - } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 500 - } - INPUT_RESOURCE - { - ResourceName = Machinery - Ratio = 0.00001 - } - OUTPUT_RESOURCE - { - ResourceName = Recyclables - Ratio = 0.00001 - DumpExcess = true - } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(D) StartActionName = Start Cultivate(D) StopActionName = Stop Cultivate(D) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill Efficiency = 1 @@ -237,61 +275,52 @@ PART Ratio = 500 } } - MODULE { - 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 - } + name = USI_EfficiencyBoosterSwapOption + ConverterName = [Greenhouse] + StartActionName = Start [Greenhouse] + StopActionName = Stop [Greenhouse] - MODULE - { - name = USIAnimation - animationName = Deploy - inflatable = true - CrewCapacity = 2 - ResourceCosts = MaterialKits,1000,ElectricCharge,100 + EfficiencyTag = Greenhouse + EfficiencyMultiplier = 3.47 + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 17.35 + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 500 + } + INPUT_RESOURCE + { + ResourceName = Machinery + Ratio = 0.00001 + } + OUTPUT_RESOURCE + { + ResourceName = Recyclables + Ratio = 0.00001 + DumpExcess = true + } } RESOURCE { - name = Construction + name = Supplies amount = 0 - maxAmount = 1000 - } - RESOURCE - { - name = Machinery - amount = 5 - maxAmount = 500 + maxAmount = 250 isTweakable = True } RESOURCE { - name = Recyclables + name = Fertilizer amount = 0 - maxAmount = 500 + maxAmount = 100 isTweakable = True - } + } RESOURCE { name = Mulch @@ -301,66 +330,22 @@ PART } RESOURCE { - name = Supplies - amount = 0 - maxAmount = 250 + name = Machinery + amount = 5 + maxAmount = 500 isTweakable = True } RESOURCE { - name = Fertilizer + name = Recyclables amount = 0 - maxAmount = 100 + maxAmount = 500 isTweakable = True } - - MODULE - { - name = USI_ModuleFieldRepair - } - MODULE - { - name = ModuleLight - lightName = - useAnimationDim = true - lightBrightenSpeed = 1 - lightDimSpeed = 1 - resourceAmount = 0.01 - animationName = LightsAgModule - useResources = true - } - - MODULE - { - name = MKSModule - BonusEffect = ScienceBoost - } - - vesselType = Base - INTERNAL - { - name = landerCabinInternals - } - MODULE + RESOURCE { - name = ModuleLifeSupport + name = Construction + amount = 0 + maxAmount = 1000 } - - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg index 65ddad9a5..6ab4e2433 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg @@ -42,17 +42,39 @@ PART MODULE { - name = ModuleResourceConverter_USI + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + } + MODULE + { + name = USI_ConverterSwapOption ConverterName = Fertilizer(G) StartActionName = Start Fertilizer(G) StopActionName = Stop Fertilizer(G) - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - Efficiency = 1 - INPUT_RESOURCE { ResourceName = Gypsum @@ -92,20 +114,13 @@ PART Ratio = 30 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(M) StartActionName = Start Fertilizer(M) StopActionName = Stop Fertilizer(M) - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - Efficiency = 1 - INPUT_RESOURCE { ResourceName = Minerals @@ -145,17 +160,16 @@ PART Ratio = 30 } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Crusher] - eTag = Crusher StartActionName = Start [Crusher] StopActionName = Stop [Crusher] - UseBonus = false - Efficiency = 1 - eMultiplier = 0.83 + + EfficiencyTag = Crusher + EfficiencyMultiplier = 0.83 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -178,12 +192,6 @@ PART DumpExcess = true } } - - MODULE - { - name = USI_ModuleFieldRepair - } - RESOURCE { name = Machinery @@ -191,7 +199,6 @@ PART maxAmount = 30 isTweakable = True } - RESOURCE { name = Recyclables @@ -199,28 +206,4 @@ PART maxAmount = 30 isTweakable = True } - - MODULE - { - name = MKSModule - } - - - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 - } - - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg index e53853755..85ee2ecee 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg @@ -41,17 +41,90 @@ PART breakingForce = 250 breakingTorque = 250 + CrewCapacity = 0 + INTERNAL + { + name = crewCabinInternals + } + + MODULE + { + 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 = USIAnimation + animationName = Deploy + inflatable = true + CrewCapacity = 4 + ResourceCosts = MaterialKits,8000,ElectricCharge,500 + inflatedMass = 9.9 + } + MODULE + { + name = ModuleLight + lightName = + useAnimationDim = true + lightBrightenSpeed = 1 + lightDimSpeed = 1 + resourceAmount = 0.01 + animationName = LightsHabModule + useResources = true + } + MODULE + { + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } MODULE { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay + name = MKSModule + BonusEffect = RepBoost + ApplyBonuses = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController ResourceCosts = SpecializedParts,61,MaterialKits,305,ElectricCharge,305 - } - - MODULE + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation + name = USILS_HabitationSwapOption ConverterName = Hab-Common StartActionName = Start Hab-Common StopActionName = Stop Hab-Common @@ -63,7 +136,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = .94 + Ratio = 0.94 } INPUT_RESOURCE { @@ -81,11 +154,10 @@ PART ResourceName = Machinery Ratio = 200 } - } - - MODULE + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation + name = USILS_HabitationSwapOption ConverterName = Hab-Quarters StartActionName = Start Hab-Quarters StopActionName = Stop Hab-Quarters @@ -116,65 +188,6 @@ PART Ratio = 200 } } - - RESOURCE - { - name = Machinery - amount = 200 - maxAmount = 200 - } - - RESOURCE - { - name = Recyclables - amount = 0 - maxAmount = 200 - } - - - MODULE - { - 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 = USIAnimation - animationName = Deploy - inflatable = true - CrewCapacity = 4 - ResourceCosts = MaterialKits,8000,ElectricCharge,500 - inflatedMass = 9.9 - } - - RESOURCE - { - name = Construction - amount = 0 - maxAmount = 8000 - } - RESOURCE { name = Supplies @@ -189,48 +202,22 @@ PART maxAmount = 200 isTweakable = True } - - MODULE - { - name = USI_ModuleFieldRepair - } - - CrewCapacity = 0 - INTERNAL + RESOURCE { - name = crewCabinInternals + name = Machinery + amount = 200 + maxAmount = 200 } - - MODULE - { - name = ModuleLight - lightName = - useAnimationDim = true - lightBrightenSpeed = 1 - lightDimSpeed = 1 - resourceAmount = 0.01 - animationName = LightsHabModule - useResources = true - } - - MODULE + RESOURCE { - name = ModuleLifeSupport + name = Recyclables + amount = 0 + maxAmount = 200 } - - MODULE - { - name = MKSModule - BonusEffect = RepBoost - ApplyBonuses = false - } - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = Construction + amount = 0 + maxAmount = 8000 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_MiniHab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_MiniHab.cfg index 58c3adf83..4e7144a2d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_MiniHab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_MiniHab.cfg @@ -46,7 +46,6 @@ PART inflatable = true CrewCapacity = 2 } - MODULE { name = ModuleLight @@ -58,31 +57,6 @@ PART animationName = ShelterLights useResources = true } - - - MODULE - { - name = ModuleLifeSupport - } - - MODULE - { - name = ModuleHabitation - ConverterName = Habitat - StartActionName = Start Habitat - StopActionName = Stop Habitat - - BaseKerbalMonths = 10 - CrewCapacity = 0 - BaseHabMultiplier = 0 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 0.25 - } - } - MODULE { name = ModuleKISItem @@ -112,7 +86,6 @@ PART { name = ModuleWeightDistributableCargo } - MODULE { name = USI_InertialDampener @@ -122,5 +95,37 @@ PART name = MKSModule BonusEffect = RepBoost ApplyBonuses = false - } + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE :NEEDS[USILifeSupport] + { + name = USILS_HabitationSwapOption + ConverterName = Habitat + StartActionName = Start Habitat + StopActionName = Stop Habitat + + BaseKerbalMonths = 10 + CrewCapacity = 0 + BaseHabMultiplier = 0 + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 0.25 + } + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_PowerPack.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_PowerPack.cfg index f4f37f473..88d4f914d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_PowerPack.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_PowerPack.cfg @@ -42,11 +42,35 @@ PART MODULE { - name = ModuleResourceConverter_USI + name = ModulePowerDistributor + PowerDistributionRange = 500 + } + MODULE + { + name = ModulePowerCoupler + PowerCouplingRange = 500 + } + MODULE + { + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = MKSModule + } + MODULE + { + name = USI_Converter ConverterName = Generator StartActionName = Start Generator StopActionName = Stop Generator - FillAmount = 0.95 + + FillAmount = 0.95 + IsStandaloneConverter = true INPUT_RESOURCE { @@ -64,8 +88,7 @@ PART ResourceName = Plutonium-238 Ratio = 20 } - } - + } RESOURCE { name = Plutonium-238 @@ -73,7 +96,6 @@ PART maxAmount = 20 isTweakable = True } - RESOURCE { name = ElectricCharge @@ -81,29 +103,4 @@ PART maxAmount = 1000 isTweakable = True } - - MODULE - { - name = ModulePowerDistributor - PowerDistributionRange = 500 - } - MODULE - { - name = ModulePowerCoupler - PowerCouplingRange = 500 - } - - MODULE - { - name = MKSModule - } - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Sifter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Sifter.cfg index cb7b4260e..6c6d4dc6e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Sifter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Sifter.cfg @@ -47,46 +47,49 @@ PART deployAnimationName = activeAnimationName = Active moduleType = Shovel - } - - RESOURCE - { - name = Machinery - amount = 50 - maxAmount = 50 - isTweakable = True } - RESOURCE + MODULE { - name = Recyclables - amount = 0 - maxAmount = 50 - isTweakable = True + name = ModuleWeightDistributableCargo } - MODULE { - name = MKSModule + name = USI_InertialDampener } - MODULE { - name = USI_ModuleFieldRepair - } - + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleBulkConverter + name = MKS_BulkConverterSwapOption ConverterName = Sifter StartActionName = Start Sifter StopActionName = Stop Sifter + MinAbundance = 0.01 Yield = 0.000625 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = GeologySkill - Efficiency = 1 INPUT_RESOURCE { @@ -123,18 +126,15 @@ PART } MODULE { - name = ModuleBulkConverter + name = MKS_BulkConverterSwapOption ConverterName = Lode Harvester StartActionName = Start Lode Harvester StopActionName = Stop Lode Harvester + MinAbundance = 0.0 Yield = 0.25 - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = GeologySkill - Efficiency = 1 INPUT_RESOURCE { @@ -169,14 +169,18 @@ PART Ratio = 50 } } - - MODULE + RESOURCE { - name = ModuleWeightDistributableCargo - } - - MODULE + name = Machinery + amount = 50 + maxAmount = 50 + isTweakable = True + } + RESOURCE { - name = USI_InertialDampener + name = Recyclables + amount = 0 + maxAmount = 50 + isTweakable = True } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg index 529d4205f..1ce1eef18 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg @@ -43,15 +43,38 @@ PART MODULE { - name = ModuleResourceConverter_USI + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = MKSModule + ApplyBonuses = false + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + } + MODULE + { + name = USI_ConverterSwapOption ConverterName = Chemicals StartActionName = Start Chemicals StopActionName = Stop Chemicals - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -91,19 +114,13 @@ PART ResourceName = Machinery Ratio = 30 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Metals StartActionName = Start Metals - StopActionName = Stop Metals - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = ConverterSkill - Efficiency = 1 + StopActionName = Stop Metals INPUT_RESOURCE { @@ -143,19 +160,13 @@ PART ResourceName = Machinery Ratio = 30 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Polymers StartActionName = Start Polymers StopActionName = Stop Polymers - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -195,18 +206,17 @@ PART ResourceName = Machinery Ratio = 30 } - } - + } MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Smelter] - eTag = Smelter StartActionName = Start [Smelter] StopActionName = Stop [Smelter] - UseBonus = false - Efficiency = 1 - eMultiplier = 0.83 + + EfficiencyTag = Smelter + EfficiencyMultiplier = 0.83 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -229,12 +239,6 @@ PART DumpExcess = true } } - - MODULE - { - name = USI_ModuleFieldRepair - } - RESOURCE { name = Machinery @@ -248,27 +252,5 @@ PART amount = 0 maxAmount = 30 isTweakable = True - } - MODULE - { - name = MKSModule - } - - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 - } - - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE - { - name = USI_InertialDampener - } + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg index 296f6c78b..2180d9e39 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg @@ -41,38 +41,37 @@ PART breakingForce = 250 breakingTorque = 250 - MODULE - { - 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 - } - CrewCapacity = 0 INTERNAL { name = crewCabinInternals } + MODULE + { + 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 = USIAnimation @@ -80,39 +79,71 @@ PART inflatable = true CrewCapacity = 2 ResourceCosts = MaterialKits,2000,ElectricCharge,200 + } + MODULE + { + name = USI_ModuleRecycleBin } - RESOURCE + MODULE { - name = Construction - amount = 0 - maxAmount = 2000 + name = ModuleLight + lightName = + useAnimationDim = true + lightBrightenSpeed = 1 + lightDimSpeed = 1 + resourceAmount = 0.01 + animationName = LightsWorkshop + useResources = true + } + MODULE + { + name = ModuleAutoRepairer + } + MODULE + { + name = ModuleWeightDistributableCargo + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = GroundWorkshop + Efficiency = 3 } MODULE { name = MKSModule + ApplyBonuses = false } - MODULE { - name = USI_ModuleRecycleBin + name = USI_SwapController + ResourceCosts = SpecializedParts,75,MaterialKits,375,ElectricCharge,375 } - MODULE { - name = USI_ModuleFieldRepair + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MaterialKits StartActionName = Start MaterialKits StopActionName = Stop MaterialKits + UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -151,25 +182,21 @@ PART Ratio = 0.028 DumpExcess = False } - REQUIRED_RESOURCE { ResourceName = Machinery Ratio = 2500 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Machinery StartActionName = Start Machinery StopActionName = Stop Machinery + UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -186,7 +213,6 @@ PART ResourceName = ElectricCharge Ratio = 56 } - OUTPUT_RESOURCE { ResourceName = Machinery @@ -210,17 +236,16 @@ PART Ratio = 2500 } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Workshop] - eTag = Workshop StartActionName = Start [Workshop] StopActionName = Stop [Workshop] - UseBonus = false - Efficiency = 1 - eMultiplier = 15 + + EfficiencyTag = Workshop + EfficiencyMultiplier = 15 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -243,7 +268,6 @@ PART Ratio = 2500 } } - RESOURCE { name = MaterialKits @@ -251,7 +275,13 @@ PART maxAmount = 200 isTweakable = True } - + RESOURCE + { + name = SpecializedParts + amount = 0 + maxAmount = 200 + isTweakable = True + } RESOURCE { name = Machinery @@ -266,58 +296,10 @@ PART maxAmount = 2500 isTweakable = True } - RESOURCE { - name = SpecializedParts + name = Construction amount = 0 - maxAmount = 200 - isTweakable = True - } - - MODULE - { - name = ModuleLight - lightName = - useAnimationDim = true - lightBrightenSpeed = 1 - lightDimSpeed = 1 - resourceAmount = 0.01 - animationName = LightsWorkshop - useResources = true - } - - MODULE - { - name = ModuleAutoRepairer - } - - MODULE - { - name = ModuleLifeSupport - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,75,MaterialKits,375,ElectricCharge,375 - } - - MODULE - { - name = ModuleWeightDistributableCargo - } - - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = GroundWorkshop - Efficiency = 3 + maxAmount = 2000 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Salamander.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Salamander.cfg index 667124287..29b9a7f3a 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Salamander.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Salamander.cfg @@ -42,28 +42,11 @@ PART name = SalamanderInternal } - MODULE - { - name = ModuleJettison - jettisonName = Fairing - bottomNodeName = fairing - isFairing = True - jettisonedObjectMass = 0.5 - jettisonForce = 15 - jettisonDirection = 0 0 1 - } - MODULE { name = ModuleCommand minimumCrew = 1 } - RESOURCE - { - name = ElectricCharge - amount = 150 - maxAmount = 150 - } MODULE { name = ModuleDataTransmitter @@ -95,6 +78,16 @@ PART } } MODULE + { + name = ModuleJettison + jettisonName = Fairing + bottomNodeName = fairing + isFairing = True + jettisonedObjectMass = 0.5 + jettisonForce = 15 + jettisonDirection = 0 0 1 + } + MODULE { name = ModuleScienceExperiment experimentID = crewReport @@ -117,35 +110,54 @@ PART evaOnlyStorage = True storageRange = 2.0 } - - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = USI_InertialDampener + } MODULE { name = MKSModule ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 2 - RecyclePercent = .25 + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Life Support StartActionName = Start Life Support StopActionName = Stop Life Support + + CrewCapacity = 2 + RecyclePercent = .25 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 1 } } - MODULE - { - name = ModulePowerCoupler - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 150 + maxAmount = 150 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg index 82648b518..bff011b32 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg @@ -36,6 +36,11 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size1 + INTERNAL + { + name = USIGenericInternal + } + MODULE { name = ModuleCommand @@ -46,39 +51,44 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 100 - maxAmount = 100 - } - - RESOURCE + name = USIAnimation + deployAnimationName = Expand + inflatable = true + shedOnInflate = true + CrewCapacity = 6 + ResourceCosts = MaterialKits,1000,ElectricCharge,100 + } + MODULE { - name = Machinery - amount = 5 - maxAmount = 500 + name = USI_InertialDampener } - - RESOURCE + MODULE { - name = Recyclables - amount = 0 - maxAmount = 500 - } - - + name = MKSModule + BonusEffect = RepBoost + ApplyBonuses = false + } MODULE { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay + name = USI_SwapController ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 } - - MODULE + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation + name = USILS_HabitationSwapOption ConverterName = Habitat StartActionName = Start Habitat StopActionName = Stop Habitat @@ -109,17 +119,16 @@ PART DumpExcess = true } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Greenhouse] - eTag = Greenhouse StartActionName = Start [Greenhouse] StopActionName = Stop [Greenhouse] - UseBonus = false - Efficiency = 1 - eMultiplier = 2.875 + + EfficiencyTag = Greenhouse + EfficiencyMultiplier = 2.875 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -142,45 +151,28 @@ PART DumpExcess = true } } - - MODULE + RESOURCE { - name = USIAnimation - deployAnimationName = Expand - inflatable = true - shedOnInflate = true - CrewCapacity = 6 - ResourceCosts = MaterialKits,1000,ElectricCharge,100 - } + name = ElectricCharge + amount = 100 + maxAmount = 100 + } + RESOURCE + { + name = Machinery + amount = 5 + maxAmount = 500 + } + RESOURCE + { + name = Recyclables + amount = 0 + maxAmount = 500 + } RESOURCE { name = Construction amount = 0 maxAmount = 1000 } - INTERNAL - { - name = USIGenericInternal - } - MODULE - { - name = ModuleLifeSupport - } - - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = MKSModule - BonusEffect = RepBoost - ApplyBonuses = false - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg index 14ca8596a..af54e4719 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg @@ -37,6 +37,11 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size1 + INTERNAL + { + name = USIGenericInternal + } + MODULE { name = ModuleCommand @@ -47,37 +52,44 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 100 - maxAmount = 100 - } - RESOURCE + name = USIAnimation + deployAnimationName = Expand + inflatable = true + shedOnInflate = true + CrewCapacity = 6 + ResourceCosts = MaterialKits,8000,ElectricCharge,500 + } + MODULE { - name = Machinery - amount = 5 - maxAmount = 500 - } - - RESOURCE + name = USI_InertialDampener + } + MODULE { - name = Recyclables - amount = 0 - maxAmount = 500 - } - + name = MKSModule + BonusEffect = RepBoost + ApplyBonuses = false + } MODULE { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay + name = USI_SwapController ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 } - - MODULE + MODULE { - name = ModuleHabitation + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_HabitationSwapOption ConverterName = Habitat StartActionName = Start Habitat StopActionName = Stop Habitat @@ -108,17 +120,16 @@ PART DumpExcess = true } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Greenhouse] - eTag = Greenhouse StartActionName = Start [Greenhouse] StopActionName = Stop [Greenhouse] - UseBonus = false - Efficiency = 1 - eMultiplier = 10.225 + + EfficiencyTag = Greenhouse + EfficiencyMultiplier = 10.225 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -141,45 +152,28 @@ PART DumpExcess = true } } - - MODULE - { - name = USIAnimation - deployAnimationName = Expand - inflatable = true - shedOnInflate = true - CrewCapacity = 6 - ResourceCosts = MaterialKits,8000,ElectricCharge,500 - } RESOURCE { - name = Construction - amount = 0 - maxAmount = 8000 + name = ElectricCharge + amount = 100 + maxAmount = 100 } - INTERNAL + RESOURCE { - name = USIGenericInternal + name = Machinery + amount = 5 + maxAmount = 500 } - MODULE - { - name = ModuleLifeSupport - } - - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE + RESOURCE { - name = MKSModule - BonusEffect = RepBoost - ApplyBonuses = false + name = Recyclables + amount = 0 + maxAmount = 500 } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = Construction + amount = 0 + maxAmount = 8000 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg index f5490f424..4f1ec1e27 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg @@ -45,40 +45,48 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals } + MODULE { name = ModuleStructuralNode rootObject = F250Bot attachNodeNames = top reverseVisibility = true - } - + } MODULE { name = ModuleStructuralNode rootObject = F250Top attachNodeNames = bottom reverseVisibility = true - } - + } MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom - } - + } + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -89,55 +97,73 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = USI_InertialDampener + } MODULE { name = MKSModule - eTag = Crusher - eMultiplier = 4.48 + EfficiencyMultiplier = 4.48 } - MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + { + name = USI_SwapController + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = ModulePowerCoupler + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } - MODULE { - name = ModuleLifeSupport + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 } - - //******************************** MODULE { - name = ModuleResourceConverter_USI + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_ConverterSwapOption ConverterName = Fertilizer(G) StartActionName = Start Fertilizer(G) StopActionName = Stop Fertilizer(G) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Crusher INPUT_RESOURCE { @@ -177,20 +203,17 @@ PART ResourceName = Machinery Ratio = 2000 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Fertilizer(M) StartActionName = Start Fertilizer(M) StopActionName = Stop Fertilizer(M) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Crusher INPUT_RESOURCE { @@ -230,21 +253,17 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = H2O (Hyd) StartActionName = Start H2O (Hyd) StopActionName = Stop H2O (Hyd) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Crusher INPUT_RESOURCE { @@ -284,19 +303,17 @@ PART ResourceName = Machinery Ratio = 2000 } - } + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = H2O (Ore) StartActionName = Start H2O (Ore) StopActionName = Stop H2O (Ore) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Crusher INPUT_RESOURCE { @@ -336,19 +353,17 @@ PART ResourceName = Machinery Ratio = 2000 } - } + } MODULE:NEEDS[Karbonite] { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = H2O (Kar) StartActionName = Start H2O (Kar) StopActionName = Stop H2O (Kar) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Crusher INPUT_RESOURCE { @@ -388,48 +403,24 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } - MODULE - { - name = ModuleSwappableConverter - bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 - } - MODULE + RESOURCE { - name = ModuleSwappableConverter - bayName = B3 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 - } - RESOURCE + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } + RESOURCE { name = Machinery amount = 100 maxAmount = 2000 } - RESOURCE + RESOURCE { name = Recyclables amount = 0 maxAmount = 2000 } - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg index 45c815480..227653c11 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg @@ -44,26 +44,26 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals - } + } + MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = top reverseVisibility = true - } - + } MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = bottom reverseVisibility = true - } - + } MODULE { name = ModuleCommand @@ -74,62 +74,47 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 + name = ModulePowerCoupler } MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { - name = ModulePowerCoupler - } - - RESOURCE - { - name = Machinery - amount = 100 - maxAmount = 100 - isTweakable = true + name = MKSModule + BonusEffect = ScienceBoost + EfficiencyMultiplier = 1.505 } - RESOURCE + MODULE { - name = Recyclables - amount = 0 - maxAmount = 100 - isTweakable = true + name = USI_SwapController + ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } - RESOURCE + MODULE { - name = Organics - amount = 0 - maxAmount = 100 - isTweakable = true - } + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = MKSModule - eTag = Greenhouse - eMultiplier = 1.505 - BonusEffect = ScienceBoost - } + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agroponics StartActionName = Start Agroponics StopActionName = Stop Agroponics UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -168,20 +153,17 @@ PART ResourceName = Machinery Ratio = 100 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(S) StartActionName = Start Cultivate(S) StopActionName = Stop Cultivate(S) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -225,20 +207,17 @@ PART ResourceName = Machinery Ratio = 100 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(D) StartActionName = Start Cultivate(D) StopActionName = Stop Cultivate(D) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -282,20 +261,17 @@ PART ResourceName = Machinery Ratio = 100 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agriculture(S) StartActionName = Start Agriculture(S) StopActionName = Stop Agriculture(S) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = AgronomySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -345,20 +321,17 @@ PART ResourceName = Organics Ratio = 100 } - } - + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agriculture(D) StartActionName = Start Agriculture(D) StopActionName = Stop Agriculture(D) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = AgronomySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -407,22 +380,32 @@ PART ResourceName = Organics Ratio = 100 } - } - - MODULE + } + RESOURCE { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 - } - MODULE + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } + RESOURCE { - name = USI_ModuleFieldRepair + name = Machinery + amount = 100 + maxAmount = 100 + isTweakable = true } - - MODULE + RESOURCE { - name = USI_InertialDampener - } + name = Recyclables + amount = 0 + maxAmount = 100 + isTweakable = true + } + RESOURCE + { + name = Organics + amount = 0 + maxAmount = 100 + isTweakable = true + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg index e33a542d4..a1d727cd3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,18 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - MODULE { name = ModuleCommand @@ -89,62 +87,59 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 + name = ModulePowerCoupler } MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { - name = ModulePowerCoupler - } - - RESOURCE - { - name = Machinery - amount = 5 - maxAmount = 400 - isTweakable = true + name = MKSModule + EfficiencyMultiplier = 2.847 + BonusEffect = ScienceBoost } - RESOURCE + MODULE { - name = Recyclables - amount = 0 - maxAmount = 400 - isTweakable = true + name = USI_SwapController + ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 } - RESOURCE + MODULE { - name = Organics - amount = 0 - maxAmount = 400 - isTweakable = true + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } MODULE { - name = MKSModule - eTag = Greenhouse - eMultiplier = 2.847 - BonusEffect = ScienceBoost - } + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agroponics StartActionName = Start Agroponics StopActionName = Stop Agroponics UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -184,19 +179,16 @@ PART Ratio = 400 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(S) StartActionName = Start Cultivate(S) StopActionName = Stop Cultivate(S) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -241,19 +233,16 @@ PART Ratio = 400 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Cultivate(D) StartActionName = Start Cultivate(D) StopActionName = Stop Cultivate(D) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = BotanySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -298,19 +287,16 @@ PART Ratio = 400 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agriculture(S) StartActionName = Start Agriculture(S) StopActionName = Stop Agriculture(S) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = AgronomySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -360,19 +346,16 @@ PART Ratio = 400 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Agriculture(D) StartActionName = Start Agriculture(D) StopActionName = Stop Agriculture(D) UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = AgronomySkill - Efficiency = 1 + EfficiencyTag = Greenhouse INPUT_RESOURCE { @@ -421,29 +404,32 @@ PART ResourceName = Organics Ratio = 100 } - } - - MODULE + } + RESOURCE { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } + RESOURCE + { + name = Organics + amount = 0 + maxAmount = 400 + isTweakable = true } - MODULE + RESOURCE { - name = ModuleSwappableConverter - bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 + name = Machinery + amount = 5 + maxAmount = 400 + isTweakable = true } - MODULE + RESOURCE { - name = USI_ModuleFieldRepair + name = Recyclables + amount = 0 + maxAmount = 400 + isTweakable = true } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Akademy.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Akademy.cfg index 592585a74..e99f6f77e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Akademy.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Akademy.cfg @@ -126,11 +126,6 @@ PART { name = ModuleExperienceManagement costPerKerbal = 0 - } - - MODULE - { - name = ModuleLifeSupport } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg index 05bc5b891..028210f30 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,28 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -89,55 +97,82 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = ModuleAutoRepairer + } + MODULE + { + name = USI_InertialDampener + } + MODULE + { + name = GroundWorkshop + Efficiency = 3 + } MODULE { name = MKSModule - eTag = Workshop - eMultiplier = 4.49 + EfficiencyMultiplier = 4.49 } - MODULE { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } - - RESOURCE + name = USI_SwapController + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 + } + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } MODULE { - name = ModulePowerCoupler + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 } + MODULE + { + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 + } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleLifeSupport + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 } + MODULE + { + name = USI_Converter - //******************************** + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MaterialKits StartActionName = Start MaterialKits StopActionName = Stop MaterialKits UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Workshop INPUT_RESOURCE { @@ -181,40 +216,37 @@ PART ResourceName = Machinery Ratio = 2000 } - } - + } MODULE { - name = ModuleResourceConverter_USI - ConverterName = Machinery - StartActionName = Start Machinery - StopActionName = Stop Machinery + name = USI_ConverterSwapOption + ConverterName = SpecializedParts + StartActionName = Start SpecializedParts + StopActionName = Stop SpecializedParts UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Workshop INPUT_RESOURCE { - ResourceName = MaterialKits - Ratio = 0.00660000 + ResourceName = Silicon + Ratio = 0.01420000 } INPUT_RESOURCE { - ResourceName = SpecializedParts - Ratio = 0.00165000 + ResourceName = RefinedExotics + Ratio = 0.00142000 } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 16.5 + Ratio = 22.72 } OUTPUT_RESOURCE { - ResourceName = Machinery - Ratio = 0.00825000 + ResourceName = SpecializedParts + Ratio = 0.00710000 DumpExcess = False } INPUT_RESOURCE @@ -233,25 +265,22 @@ PART ResourceName = Machinery Ratio = 2000 } - } - + } MODULE { - name = ModuleResourceConverter_USI - ConverterName = ColonySupplies - StartActionName = Start ColonySupplies - StopActionName = Stop ColonySupplies + name = USI_ConverterSwapOption + ConverterName = Machinery + StartActionName = Start Machinery + StopActionName = Stop Machinery UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Workshop INPUT_RESOURCE { ResourceName = MaterialKits - Ratio = 0.00165000 + Ratio = 0.00660000 } INPUT_RESOURCE { @@ -259,18 +288,13 @@ PART Ratio = 0.00165000 } INPUT_RESOURCE - { - ResourceName = Organics - Ratio = 0.00495000 - } - INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 16.5 } OUTPUT_RESOURCE { - ResourceName = ColonySupplies + ResourceName = Machinery Ratio = 0.00825000 DumpExcess = False } @@ -291,40 +315,41 @@ PART Ratio = 2000 } } - - MODULE { - name = ModuleResourceConverter_USI - ConverterName = SpecializedParts - StartActionName = Start SpecializedParts - StopActionName = Stop SpecializedParts + name = USI_ConverterSwapOption + ConverterName = ColonySupplies + StartActionName = Start ColonySupplies + StopActionName = Stop ColonySupplies UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Workshop INPUT_RESOURCE { - ResourceName = Silicon - Ratio = 0.01420000 + ResourceName = MaterialKits + Ratio = 0.00165000 } INPUT_RESOURCE { - ResourceName = RefinedExotics - Ratio = 0.00142000 + ResourceName = SpecializedParts + Ratio = 0.00165000 + } + INPUT_RESOURCE + { + ResourceName = Organics + Ratio = 0.00495000 } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 22.72 + Ratio = 16.5 } OUTPUT_RESOURCE { - ResourceName = SpecializedParts - Ratio = 0.00710000 + ResourceName = ColonySupplies + Ratio = 0.00825000 DumpExcess = False } INPUT_RESOURCE @@ -343,29 +368,14 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } - MODULE - { - name = ModuleSwappableConverter - bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 - } - MODULE + RESOURCE { - name = ModuleSwappableConverter - bayName = B3 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } RESOURCE { name = Machinery @@ -378,24 +388,4 @@ PART amount = 0 maxAmount = 2000 } - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = ModuleAutoRepairer - } - - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = GroundWorkshop - Efficiency = 3 - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg index e892bb93f..f234ae8d1 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg @@ -36,6 +36,11 @@ PART bulkheadProfiles = size2 CrewCapacity = 0 + INTERNAL + { + name = USIGenericInternal + } + MODULE { name = USIAnimation @@ -46,40 +51,35 @@ PART inflatable = true ResourceCosts = MaterialKits,46000,ElectricCharge,4000 } - RESOURCE + MODULE { - name = Construction - amount = 0 - maxAmount = 46000 - } - INTERNAL + name = USI_InertialDampener + } + MODULE { - name = USIGenericInternal - } - RESOURCE + name = MKSModule + BonusEffect = RepBoost + ApplyBonuses = false + } + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } - - RESOURCE + name = USI_SwapController + ResourceCosts = SpecializedParts,316,MaterialKits,1580,ElectricCharge,1580 + } + MODULE { - name = Machinery - amount = 500 - maxAmount = 2500 - } - - RESOURCE + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE { - name = Recyclables - amount = 0 - maxAmount = 2500 - } - - MODULE + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation + name = USILS_HabitationSwapOption ConverterName = Habitat StartActionName = Start Habitat StopActionName = Stop Habitat @@ -110,17 +110,16 @@ PART DumpExcess = true } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Greenhouse] - eTag = Greenhouse StartActionName = Start [Greenhouse] StopActionName = Stop [Greenhouse] - UseBonus = false - Efficiency = 1 - eMultiplier = 63.188 + + EfficiencyTag = Greenhouse + EfficiencyMultiplier = 63.188 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -142,34 +141,29 @@ PART Ratio = 0.00005 DumpExcess = true } - } - - MODULE + } + RESOURCE { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,316,MaterialKits,1580,ElectricCharge,1580 - } - - MODULE + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } + RESOURCE { - name = ModuleLifeSupport - } - MODULE + name = Machinery + amount = 500 + maxAmount = 2500 + } + RESOURCE { - name = USI_ModuleFieldRepair + name = Recyclables + amount = 0 + maxAmount = 2500 } - - MODULE - { - name = MKSModule - BonusEffect = RepBoost - ApplyBonuses = false - } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = Construction + amount = 0 + maxAmount = 46000 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ISM.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ISM.cfg index c13b80c22..3721cf684 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ISM.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ISM.cfg @@ -69,7 +69,7 @@ PART { name = FSfuelSwitch resourceNames = Silicates,Silicon;Substrate,Polymers;ExoticMinerals,RareMetals,Chemicals,RefinedExotics;Hydrates,Water;Karbonite,Water;Ore,Water;Minerals,Chemicals;Gypsum,Fertilizer;Minerals,Fertilizer;MetallicOre,Metals;Ore,LiquidFuel,Oxidizer;Ore,LiquidFuel;Ore,MonoPropellant;RefinedExotics,Silicon,SpecializedParts;Metals,Polymers,Chemicals,MaterialKits;Substrate,Water,Organics,Fertilizer;Dirt,Water,Organics,Fertilizer;Organics,SpecializedParts,MaterialKits,ColonySupplies;SpecializedParts,MaterialKits,Machinery;Recyclables,Metals,Polymers,Chemicals;Mulch,Fertilizer,Supplies;Substrate,Water,Fertilizer,Supplies;Dirt,Water,Fertilizer,Supplies - resourceAmounts = 55,11;55,11;11.5,11.5,34.5,11.5;46,23;55,11;55,11;55,11;46,23;55,11;55,11;55,6.05,4.95;55,11;55,11;4.38,43.75,21.88;14,14,7,35;30.6,30.6,8.6,1;32,32,5.8,1;21,7,7,35;7,28,35;35,7,7,7;31.5,3.5,35;78,78,1,7.8;34.2,34.2,1,1.4 + resourceAmounts = 55,11;55,11;11.5,11.5,34.5,11.5;46,23;55,11;55,11;55,11;46,23;55,11;55,11;55,4.95,6.05;55,11;55,11;4.38,43.75,21.88;14,14,7,35;30.6,30.6,8.6,1;32,32,5.8,1;21,7,7,35;7,28,35;35,7,7,7;31.5,3.5,35;78,78,1,7.8;34.2,34.2,1,1.4 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,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,0,0;0,0,0,0;0,0,0,0 tankCost = 3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg index 3dbf8aec7..1a14f5e47 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg @@ -44,10 +44,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -55,7 +57,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -63,7 +64,6 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleCommand @@ -74,54 +74,62 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 + name = ModulePowerCoupler } MODULE { - name = ModuleLifeSupport - } - + name = USI_InertialDampener + } MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler - } - - MODULE + name = USI_SwapController + ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.81 + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Recycler StartActionName = Start Recycler StopActionName = Stop Recycler + CrewCapacity = 4 + RecyclePercent = 0.81 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 37 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.905 + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Purifier StartActionName = Start Purifier StopActionName = Stop Purifier + CrewCapacity = 4 + RecyclePercent = 0.905 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -133,54 +141,44 @@ PART Ratio = 0.00905 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 0 - CrewCapacity = 4 - BaseHabMultiplier = 2.35 + name = USILS_HabitationSwapOption ConverterName = Hab-Common StartActionName = Start Hab-Common StopActionName = Stop Hab-Common + + BaseKerbalMonths = 0 + CrewCapacity = 4 + BaseHabMultiplier = 2.35 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 0.235 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 18.5 - CrewCapacity = 4 - BaseHabMultiplier = 0 + name = USILS_HabitationSwapOption ConverterName = Hab-Quarters StartActionName = Start Hab-Quarters StopActionName = Stop Hab-Quarters + + BaseKerbalMonths = 18.5 + CrewCapacity = 4 + BaseHabMultiplier = 0 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 0.4625 } - } - - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 - } - - MODULE - { - name = USI_ModuleFieldRepair } - - MODULE + RESOURCE { - name = USI_InertialDampener - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg index b53e4c03e..ac2063207 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,18 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - MODULE { name = ModuleCommand @@ -89,54 +87,62 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 + name = USI_InertialDampener } MODULE { - name = ModuleLifeSupport + name = ModulePowerCoupler } - MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler - } - - MODULE + name = USI_SwapController + ResourceCosts = SpecializedParts,47,MaterialKits,235,ElectricCharge,235 + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.865 + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Recycler StartActionName = Start Recycler StopActionName = Stop Recycler + CrewCapacity = 4 + RecyclePercent = 0.865 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 138 } - } - - MODULE + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.9325 + name = USILS_LifeSupportRecyclerSwapOption ConverterName = Purifier StartActionName = Start Purifier StopActionName = Stop Purifier + CrewCapacity = 4 + RecyclePercent = 0.9325 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -148,54 +154,44 @@ PART Ratio = 0.009325 } } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 0 - CrewCapacity = 6 - BaseHabMultiplier = 5.42 + name = USILS_HabitationSwapOption ConverterName = Hab-Common StartActionName = Start Hab-Common StopActionName = Stop Hab-Common + + BaseKerbalMonths = 0 + CrewCapacity = 6 + BaseHabMultiplier = 5.42 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 0.813 } - } - - MODULE + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleHabitation - BaseKerbalMonths = 65 - CrewCapacity = 6 - BaseHabMultiplier = 0 + name = USILS_HabitationSwapOption ConverterName = Hab-Quarters StartActionName = Start Hab-Quarters StopActionName = Stop Hab-Quarters + + BaseKerbalMonths = 65 + CrewCapacity = 6 + BaseHabMultiplier = 0 + INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 1.625 } } - - MODULE - { - name = ModuleSwappableConverter - bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,47,MaterialKits,235,ElectricCharge,235 - } - - MODULE + RESOURCE { - name = USI_ModuleFieldRepair + name = ElectricCharge + amount = 1000 + maxAmount = 1000 } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist250.cfg index 9c2442bac..02df91bd3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist250.cfg @@ -44,10 +44,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals } + MODULE { name = ModuleStructuralNode @@ -55,7 +57,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -63,7 +64,6 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleCommand @@ -74,42 +74,41 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } + name = ModulePowerCoupler + } MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler - } - - - //********************* - - MODULE + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportExtender + name = USI_Converter + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportExtenderSwapOption ConverterName = Living Module StartActionName = Start Living Module StopActionName = Stop Living Module - Efficiency = 1 - PartOnly = false - restrictedClass = TimeMultiplier = 2 INPUT_RESOURCE @@ -122,14 +121,15 @@ PART ResourceName = ColonySupplies Ratio = 0.000278 } - } - MODULE + } + MODULE:NEEDS[USILifeSupport] { - name = USI_ModuleFieldRepair + name = USILS_KolonyGrowthModule } - - MODULE + RESOURCE { - name = USI_InertialDampener - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist375.cfg index 471c0f477..90aa59308 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kolonist375.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 6 + INTERNAL { name = USIGenericInternal - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,28 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -89,53 +97,41 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = USI_InertialDampener + } MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } - - RESOURCE + MODULE:NEEDS[USILifeSupport] { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } - MODULE + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupport + name = USI_Converter } - - //********************* - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModuleLifeSupportExtender + name = USILS_LifeSupportExtenderSwapOption ConverterName = Living Module StartActionName = Start Living Module StopActionName = Stop Living Module - Efficiency = 1 - PartOnly = false - restrictedClass = TimeMultiplier = 6 INPUT_RESOURCE @@ -148,14 +144,16 @@ PART ResourceName = ColonySupplies Ratio = 0.000833 } - } - MODULE - { - name = USI_ModuleFieldRepair } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = USI_InertialDampener + name = USILS_KolonyGrowthModule } + RESOURCE + { + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay250.cfg index 200e97f79..b5980e579 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay250.cfg @@ -44,10 +44,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -55,7 +57,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -63,7 +64,6 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleCommand @@ -74,46 +74,49 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } + name = ModulePowerCoupler + } MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener } - MODULE { name = MKSModule BonusEffect = RepBoost ApplyBonuses = false } - - MODULE + MODULE:NEEDS[USILifeSupport] { - name = ModulePowerCoupler - } - - //********************* - + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleLifeSupportExtender + name = USILS_LifeSupportExtenderSwapOption ConverterName = MedBay StartActionName = Start MedBay StopActionName = Stop MedBay - Efficiency = 1 - PartOnly = true - restrictedClass = Tourist + AffectsPartOnly = true + RestrictedToClass = Tourist TimeMultiplier = 4 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = MedicalSkill INPUT_RESOURCE @@ -127,13 +130,10 @@ PART Ratio = 0.001111 } } - MODULE + RESOURCE { - name = USI_ModuleFieldRepair + name = ElectricCharge + amount = 1000 + maxAmount = 1000 } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay375.cfg index 67ac1804b..93942b1dc 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_MedBay375.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,18 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - MODULE { name = ModuleScienceContainer @@ -89,14 +87,6 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - - MODULE - { - name = MKSModule - BonusEffect = RepBoost - ApplyBonuses = false - } - MODULE { name = ModuleCommand @@ -107,40 +97,49 @@ PART rate = 0.02777778 } } - - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } MODULE { name = ModulePowerCoupler } MODULE { - name = ModuleLifeSupport + name = USI_InertialDampener + } + MODULE + { + name = MKSModule + BonusEffect = RepBoost + ApplyBonuses = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 } - - //********************* - MODULE { - name = ModuleLifeSupportExtender + name = USILS_LifeSupportExtenderSwapOption ConverterName = MedBay StartActionName = Start MedBay StopActionName = Stop MedBay - Efficiency = 1 - PartOnly = true - restrictedClass = Tourist + AffectsPartOnly = true + RestrictedToClass = Tourist TimeMultiplier = 12 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = MedicalSkill INPUT_RESOURCE @@ -154,13 +153,11 @@ PART Ratio = 0.003333 } } - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE + RESOURCE { - name = USI_InertialDampener - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg index 75f4231a7..24f329e25 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg @@ -46,10 +46,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -57,7 +59,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -65,21 +66,28 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -90,63 +98,69 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - MODULE { - name = MKSModule + name = ModulePowerCoupler } MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + { + name = USI_ModuleRecycleBin } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } + name = USI_ModuleFieldRepair + PullResourceList = Machinery,DepletedFuel + PushResourceList = Recyclables + } MODULE { - name = ModulePowerCoupler + name = USI_InertialDampener } - MODULE { - name = ModuleLifeSupport + name = MKSModule } - MODULE { - name = USI_ModuleRecycleBin + name = USI_SwapController + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } MODULE { - name = USI_ModuleFieldRepair - PullResourceList = Machinery,DepletedFuel - PushResourceList = Recyclables - } - - //******************************** + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } + MODULE + { + name = USI_ConverterSwapOption ConverterName = Centrifuge StartActionName = Start Centrifuge StopActionName = Stop Centrifuge UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -188,19 +202,15 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Breeder StartActionName = Start Breeder StopActionName = Stop Breeder UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -236,23 +246,7 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } - MODULE - { - name = ModuleSwappableConverter - bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 - } - RESOURCE { name = Machinery @@ -265,9 +259,11 @@ PART amount = 0 maxAmount = 2000 } - - MODULE + RESOURCE { - name = USI_InertialDampener - } + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PDU.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PDU.cfg index 822e862f9..11450d3bd 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PDU.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PDU.cfg @@ -44,10 +44,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals } + MODULE { name = ModuleStructuralNode @@ -55,7 +57,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -63,7 +64,6 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleCommand @@ -74,44 +74,52 @@ PART rate = 0.01 } } - RESOURCE - { - name = ElectricCharge - amount = 24000 - maxAmount = 24000 - } - - MODULE - { - name = ModuleLifeSupport - } - MODULE { - name = MKSModule + name = ModuleCoreHeat + CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point + CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp + CoreTempGoalAdjustment = 0 //Dynamic goal adjustment + CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part + HeatRadiantMultiplier = 0.05 //If the core is hotter, how much heat radiates? + CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? + HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? + CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? + radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 + radiatorHeatingFactor = 0.01 //How much energy we push to the active radiator + MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change + CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? + MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small } - MODULE { name = ModulePowerCoupler } - MODULE { name = ModuleOverheatDisplay } - MODULE { name = ModulePowerDistributor } - MODULE { - name = ModuleResourceConverter_USI + name = USI_InertialDampener + } + MODULE + { + name = MKSModule + } + MODULE + { + name = USI_Converter ConverterName = Reactor StartActionName = Start Reactor StopActionName = Stop Reactor + + IsStandaloneConverter = true + INPUT_RESOURCE { ResourceName = EnrichedUranium @@ -157,44 +165,22 @@ PART key = 3000 0 0 0 } } - RESOURCE { - name = EnrichedUranium - amount = 20 - maxAmount = 20 + name = EnrichedUranium + amount = 20 + maxAmount = 20 } RESOURCE { - name = DepletedFuel - amount = 0 - maxAmount = 20 + name = DepletedFuel + amount = 0 + maxAmount = 20 } - - MODULE + RESOURCE { - name = ModuleCoreHeat - CoreTempGoal = 1000 //Internal temp goal - we don't transfer till we hit this point - CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp - CoreTempGoalAdjustment = 0 //Dynamic goal adjustment - CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part - HeatRadiantMultiplier = 0.05 //If the core is hotter, how much heat radiates? - CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates? - HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in? - CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer? - radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1 - radiatorHeatingFactor = 0.01 //How much energy we push to the active radiator - MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change - CoreShutdownTemp = 4000 //At what core temperature do we shut down all generators on this part? - MaxCoolant = 2000 //Maximum amount of radiator capacity we can consume - 50 = 1 small + name = ElectricCharge + amount = 24000 + maxAmount = 24000 } - MODULE - { - name = USI_ModuleFieldRepair - } - - MODULE - { - name = USI_InertialDampener - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg index d05af7d25..3bc652bf1 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg @@ -44,10 +44,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -78,56 +80,10 @@ PART minimumCrew = 1 multiHop = True } - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } - MODULE - { - name = ModuleLifeSupport - } - MODULE - { - name = MKSModule - ApplyBonuses = false - } MODULE { name = ModulePowerCoupler - } - MODULE - { - name = ModuleLifeSupportRecycler - CrewCapacity = 4 - RecyclePercent = 0.70 - ConverterName = Recycler - StartActionName = Start Recycler - StopActionName = Stop Recycler - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 3.0 - } - INPUT_RESOURCE - { - ResourceName = Machinery - Ratio = 0.000008 - } - OUTPUT_RESOURCE - { - ResourceName = Recyclables - Ratio = 0.000008 - DumpExcess = true - } - REQUIRED_RESOURCE - { - ResourceName = Machinery - Ratio = 400 - } - } + } MODULE { name = ModuleKerbNetAccess @@ -148,30 +104,12 @@ PART { name = ModuleExperienceManagement costPerKerbal = 0 - } - RESOURCE - { - name = Machinery - amount = 400 - maxAmount = 400 - isTweakable = True } - RESOURCE - { - name = Recyclables - amount = 0 - maxAmount = 400 - isTweakable = True - } MODULE { name = ModulePlanetaryLogistics } MODULE - { - name = USI_ModuleFieldRepair - } - MODULE { name = ModuleResourceDistributor } @@ -183,7 +121,6 @@ PART { name = ModuleResourceSurveyor } - MODULE { name = USI_InertialDampener @@ -194,12 +131,66 @@ PART } MODULE { - name = ModuleResourceConverter_USI + name = MKSModule + ApplyBonuses = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwapController + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE:NEEDS[USILifeSupport] + { + name = USI_Converter + UseSpecialistBonus = false + } + MODULE:NEEDS[USILifeSupport] + { + name = USILS_LifeSupportRecyclerSwapOption + ConverterName = Recycler + StartActionName = Start Recycler + StopActionName = Stop Recycler + + CrewCapacity = 4 + RecyclePercent = 0.70 + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 3.0 + } + INPUT_RESOURCE + { + ResourceName = Machinery + Ratio = 0.000008 + } + OUTPUT_RESOURCE + { + ResourceName = Recyclables + Ratio = 0.000008 + DumpExcess = true + } + REQUIRED_RESOURCE + { + ResourceName = Machinery + Ratio = 400 + } + } + // This is a standalone converter for TransportCredits + MODULE + { + name = USI_Converter ConverterName = Transport Credits StartActionName = Start T-Credits StopActionName = Stop T-Credits UseSpecialistBonus = false + IsStandaloneConverter = true Efficiency = 1 INPUT_RESOURCE @@ -230,6 +221,26 @@ PART } } RESOURCE + { + name = Machinery + amount = 400 + maxAmount = 400 + isTweakable = True + } + RESOURCE + { + name = Recyclables + amount = 0 + maxAmount = 400 + isTweakable = True + } + RESOURCE + { + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + } + RESOURCE { name = TransportCredits amount = 0 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RecyclingPlant.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RecyclingPlant.cfg index f35d2636d..24a8bfbf9 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RecyclingPlant.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RecyclingPlant.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,32 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } + MODULE + { + name = ModulePowerCoupler + } MODULE { name = ModuleScienceContainer @@ -89,48 +101,22 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - - MODULE - { - name = MKSModule - } - - MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } MODULE { - name = ModulePowerCoupler - } - - + name = USI_InertialDampener + } MODULE { - name = ModuleLifeSupport + name = MKSModule } - - RESOURCE - { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } - //******************************** MODULE { - name = ModuleResourceConverter_USI + name = USI_Converter ConverterName = Recycling StartActionName = Start Recycling StopActionName = Stop Recycling + IsStandaloneConverter = true UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 @@ -195,14 +181,12 @@ PART amount = 0 maxAmount = 2000 isTweakable = True - } - MODULE - { - name = USI_ModuleFieldRepair } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg index 7d058ce9d..f5200d01f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,28 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -89,48 +97,73 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = USI_InertialDampener + } MODULE { name = MKSModule - eTag = Smelter - eMultiplier = 4.48 + EfficiencyMultiplier = 4.48 } - - - MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } MODULE { - name = ModulePowerCoupler + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 2 + moduleIndex = 1 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 3 + moduleIndex = 2 } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleLifeSupport + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 } + MODULE + { + name = USI_Converter - //******************************** + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Metals StartActionName = Start Metals StopActionName = Stop Metals - + UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Smelter INPUT_RESOURCE { @@ -173,16 +206,14 @@ PART } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Polymers StartActionName = Start Polymers StopActionName = Stop Polymers - + UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Smelter INPUT_RESOURCE { @@ -225,16 +256,14 @@ PART } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Chemicals StartActionName = Start Chemicals StopActionName = Stop Chemicals UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Smelter INPUT_RESOURCE { @@ -277,16 +306,14 @@ PART } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Silicon StartActionName = Start Silicon StopActionName = Stop Silicon UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Smelter INPUT_RESOURCE { @@ -329,16 +356,14 @@ PART } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Refined Exotics StartActionName = Start Refined Exotics StopActionName = Stop Refined Exotics UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 + EfficiencyTag = Smelter INPUT_RESOURCE { @@ -388,31 +413,7 @@ PART ResourceName = Machinery Ratio = 2000 } - } - - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } - MODULE - { - name = ModuleSwappableConverter - bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B3 - typeName = Separator - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 - } RESOURCE { name = Machinery @@ -424,10 +425,6 @@ PART name = Recyclables amount = 0 maxAmount = 2000 - } - MODULE - { - name = USI_ModuleFieldRepair } RESOURCE { @@ -435,10 +432,5 @@ PART amount = 1000 maxAmount = 1000 isTweakable = true - } - - MODULE - { - name = USI_InertialDampener - } + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RegSifter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RegSifter.cfg index 3c60213a8..95d1a8afa 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RegSifter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_RegSifter.cfg @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size3 CrewCapacity = 4 + INTERNAL { name = crewCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,21 +65,28 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleStructuralNode rootObject = F125Bot attachNodeNames = 125top } - MODULE { name = ModuleStructuralNode rootObject = F125Top attachNodeNames = 125bottom } - + MODULE + { + name = ModuleCommand + minimumCrew = 0 + RESOURCE + { + name=ElectricCharge + rate = 0.02777778 + } + } MODULE { name = ModuleScienceContainer @@ -89,55 +97,47 @@ PART storageRange = 3.5 allowRepeatedSubjects = True } - + MODULE + { + name = ModulePowerCoupler + } + MODULE + { + name = USI_InertialDampener + } MODULE { name = MKSModule } - - MODULE - { - name = ModuleCommand - minimumCrew = 0 - RESOURCE - { - name=ElectricCharge - rate = 0.02777778 - } - } MODULE { - name = ModulePowerCoupler + name = USI_SwapController + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } - MODULE { - name = ModuleLifeSupport + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } - - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - isTweakable = true - } - - //******************************** + name = USI_Converter + + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleBulkConverter + name = MKS_BulkConverterSwapOption ConverterName = Sifter StartActionName = Start Sifter StopActionName = Stop Sifter - MinAbundance = 0.0 - Yield = 0.02375 + MinAbundance = 0 + Yield = 0.02375 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = GeologySkill - Efficiency = 1 INPUT_RESOURCE { @@ -172,21 +172,17 @@ PART Ratio = 2000 } } - MODULE { - name = ModuleBulkConverter + name = MKS_BulkConverterSwapOption ConverterName = Lode Harvester StartActionName = Start Lode Harvester StopActionName = Stop Lode Harvester - MinAbundance = 0.0 - Yield = 9.5 + MinAbundance = 0 + Yield = 9.5 UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = GeologySkill - Efficiency = 1 INPUT_RESOURCE { @@ -220,8 +216,7 @@ PART ResourceName = Machinery Ratio = 2000 } - } - + } RESOURCE { name = Machinery @@ -235,14 +230,12 @@ PART amount = 0 maxAmount = 2000 isTweakable = True - } - MODULE - { - name = USI_ModuleFieldRepair } - - MODULE + RESOURCE { - name = USI_InertialDampener + name = ElectricCharge + amount = 1000 + maxAmount = 1000 + isTweakable = true } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg index e7cec3f5b..199ece4f2 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg @@ -23,7 +23,7 @@ PART TechRequired = advConstruction entryCost = 8100 - cost = 8000 + cost = 26200 category = none subcategory = 0 title = MKS 'Tundra' Mobile Workshop (2.5m) @@ -45,10 +45,12 @@ PART maxTemp = 1200 // = 2900 bulkheadProfiles = size2 CrewCapacity = 2 + INTERNAL { name = landerCabinInternals - } + } + MODULE { name = ModuleStructuralNode @@ -56,7 +58,6 @@ PART attachNodeNames = top reverseVisibility = true } - MODULE { name = ModuleStructuralNode @@ -64,7 +65,6 @@ PART attachNodeNames = bottom reverseVisibility = true } - MODULE { name = ModuleCommand @@ -75,49 +75,69 @@ PART rate = 0.01 } } - RESOURCE + MODULE { - name = ElectricCharge - amount = 1000 - maxAmount = 1000 - } + name = ModulePowerCoupler + } MODULE { - name = ModuleLifeSupport + name = ModuleLight + lightName = + useAnimationDim = true + lightBrightenSpeed = 1 + lightDimSpeed = 1 + resourceAmount = 0.01 + animationName = LightsWorkshop + useResources = true + } + MODULE + { + name = ModuleAutoRepairer } - MODULE { - name = ModulePowerCoupler + name = USI_InertialDampener } - MODULE { - name = MKSModule + name = GroundWorkshop + Efficiency = 1 } - MODULE { name = USI_ModuleRecycleBin } - MODULE { - name = USI_ModuleFieldRepair + name = MKSModule + } + MODULE + { + name = USI_SwapController + ResourceCosts = SpecializedParts,20,MaterialKits,100,ElectricCharge,100 + } + MODULE + { + name = USI_SwappableBay + bayName = Bay 1 + moduleIndex = 0 } + MODULE + { + name = USI_Converter + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + } MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = MaterialKits StartActionName = Start MaterialKits StopActionName = Stop MaterialKits UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -163,19 +183,15 @@ PART Ratio = 500 } } - MODULE { - name = ModuleResourceConverter_USI + name = USI_ConverterSwapOption ConverterName = Machinery StartActionName = Start Machinery StopActionName = Stop Machinery UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 ExperienceEffect = ConverterSkill - Efficiency = 1 INPUT_RESOURCE { @@ -216,17 +232,16 @@ PART Ratio = 500 } } - MODULE { - name = ModuleEfficiencyPart + name = USI_EfficiencyBoosterSwapOption ConverterName = [Workshop] - eTag = Workshop StartActionName = Start [Workshop] StopActionName = Stop [Workshop] - UseBonus = false - Efficiency = 1 - eMultiplier = 3.855 + + EfficiencyTag = Workshop + EfficiencyMultiplier = 3.855 + INPUT_RESOURCE { ResourceName = ElectricCharge @@ -248,16 +263,14 @@ PART ResourceName = Machinery Ratio = 500 } - } - + } RESOURCE { name = MaterialKits amount = 0 maxAmount = 200 isTweakable = True - } - + } RESOURCE { name = Machinery @@ -272,58 +285,17 @@ PART maxAmount = 500 isTweakable = True } - RESOURCE { name = SpecializedParts amount = 0 maxAmount = 200 isTweakable = True - } - - MODULE - { - name = ModuleLight - lightName = - useAnimationDim = true - lightBrightenSpeed = 1 - lightDimSpeed = 1 - resourceAmount = 0.01 - animationName = LightsWorkshop - useResources = true - } - - MODULE - { - name = ModuleAutoRepairer - } - - MODULE - { - name = ModuleLifeSupport - } - - MODULE - { - name = ModuleSwappableConverter - bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,20,MaterialKits,100,ElectricCharge,100 } - - MODULE + RESOURCE { - name = ModuleWeightDistributableCargo + name = ElectricCharge + amount = 1000 + maxAmount = 1000 } - - MODULE - { - name = USI_InertialDampener - } - - MODULE - { - name = GroundWorkshop - Efficiency = 1 - } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/AddConsumers.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/AddConsumers.cfg index e42b6df8e..2d0c27d18 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/AddConsumers.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/AddConsumers.cfg @@ -1,4 +1,4 @@ -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[MKSModule]] +@PART[*]:HAS[@MODULE[USI_Converter],!MODULE[ModuleLogisticsConsumer]] { MODULE { @@ -6,7 +6,7 @@ } } -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleResourceConverter_USI]] +@PART[*]:HAS[@MODULE[USI_Harvester],!MODULE[ModuleLogisticsConsumer]] { MODULE { @@ -14,19 +14,10 @@ } } -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleResourceHarvester_USI]] +@PART[*]:HAS[@MODULE[MKSModule],!MODULE[ModuleLogisticsConsumer]] { MODULE { name = ModuleLogisticsConsumer } } - -@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleBulkHarvester]] -{ - MODULE - { - name = ModuleLogisticsConsumer - } -} - diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg index 04f18dc71..52e24d697 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg @@ -425,7 +425,7 @@ { name = OseModuleWorkshop ConversionRate = 1.0 // How much of a parts mass needs to be processed until it is done - ProductivityFactor = 0.05 // How much units of the resource a processed per second + ProductivityFactor = 0.1 // How much units of the resource a processed per second UpkeepResource = ElectricCharge // This resource will be consumed 1 per second during processing MinimumCrew = 1 // Amount of Kerbals needed for the Workshop to work MaxPartVolume = 1000.0 @@ -565,7 +565,7 @@ MODULE { - name = ModuleResourceConverter_USI + name = USI_Converter ConverterName = MaterialKits StartActionName = Start MaterialKits StopActionName = Stop MaterialKits diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg index 2e3af6f81..abde5f7c8 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg @@ -28,7 +28,7 @@ { MODULE { - name = ModuleResourceConverter_USI + name = ModuleResourceConverter ConverterName = H2OSplitter StartActionName = Start ISRU [Water -> LH2+Ox] StopActionName = Stop ISRU [Water -> LH2+Ox] diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/TAC-LS.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/TAC-LS.cfg index 0fa7960fc..3e5ff0f33 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/TAC-LS.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/TAC-LS.cfg @@ -1,6 +1,6 @@ -@PART[*_AgModule]:NEEDS[TACLifeSupport] +@PART[*]:HAS[MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Agroponics]]]:NEEDS[TACLifeSupport] { - @MODULE[ModuleResourceConverter_USI,Agroponics] + @MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Agroponics]] { // Get original input of mulch and output of supplies and compute the equivalent number of Kerbals @@ -57,37 +57,15 @@ } } -@PART[*_Agriculture|*_Agriculture250|*_Agriculture375]:NEEDS[TACLifeSupport] +@PART[*]:HAS[MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Cultivate?S?]]]:NEEDS[TACLifeSupport] { - @MODULE[ModuleResourceConverter_USI]:HAS[#ConverterName[Agroponics]] + @MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Cultivate?S?]] { // Get original input of mulch and output of supplies and compute the equivalent number of Kerbals - %MulchIn = #$INPUT_RESOURCE:HAS[#ResourceName[Mulch]]/Ratio$ - @MulchIn /= #$@LIFE_SUPPORT_SETTINGS/WasteAmount$ %SuppliesOut = #$OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]]/Ratio$ @SuppliesOut /= #$@LIFE_SUPPORT_SETTINGS/SupplyAmount$ - // Now change to the same equivalent number of Kerbals for TAC-LS resources - @INPUT_RESOURCE:HAS[#ResourceName[Mulch]] - { - @ResourceName = Waste - @Ratio = #$../MulchIn$ - @Ratio *= 0.000001539351852 - } - INPUT_RESOURCE - { - ResourceName = WasteWater - Ratio = #$../MulchIn$ - @Ratio *= 0.000014247685185 - } - INPUT_RESOURCE - { - ResourceName = CarbonDioxide - Ratio = #$../MulchIn$ - @Ratio *= 0.00148012889876 - } - @OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]] { @ResourceName = Food @@ -114,42 +92,11 @@ %DumpExcess = True } } - - @MODULE[ModuleResourceConverter_USI]:HAS[#ConverterName[Cultivate?S?]] - { - // Get original input of mulch and output of supplies and compute the equivalent number of Kerbals - - %SuppliesOut = #$OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]]/Ratio$ - @SuppliesOut /= #$@LIFE_SUPPORT_SETTINGS/SupplyAmount$ - - @OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]] - { - @ResourceName = Food - @Ratio = #$../SuppliesOut$ - @Ratio *= 0.000016927083333 - - %DumpExcess = True - } - - OUTPUT_RESOURCE - { - ResourceName = Water - Ratio = #$../SuppliesOut$ - @Ratio *= 0.000011188078704 - - %DumpExcess = True - } - OUTPUT_RESOURCE - { - ResourceName = Oxygen - Ratio = #$../SuppliesOut$ - @Ratio *= 0.001713537562385 +} - %DumpExcess = True - } - } - - @MODULE[ModuleResourceConverter_USI]:HAS[#ConverterName[Cultivate?D?]] +@PART[*]:HAS[MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Cultivate?D?]]]:NEEDS[TACLifeSupport] +{ + @MODULE[USI_ConverterSwapOption]:HAS[#ConverterName[Cultivate?D?]] { // Get original input of mulch and output of supplies and compute the equivalent number of Kerbals @@ -185,38 +132,26 @@ } } -@PART[*_Aeroponics]:NEEDS[TACLifeSupport] -{ - @MODULE[ModuleResourceConverter_USI,Cultivator] - { - %SuppliesOut = #$OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]]/Ratio$ - @SuppliesOut /= #$@LIFE_SUPPORT_SETTINGS/SupplyAmount$ - - @OUTPUT_RESOURCE:HAS[#ResourceName[Supplies]] - { - @ResourceName = Food - @Ratio = #$../SuppliesOut$ - @Ratio *= 0.000016927083333 - - %DumpExcess = True - } - // Maybe better to reduce water consumption by this amount? But it doesn't really matter... - OUTPUT_RESOURCE - { - ResourceName = Water - Ratio = #$../SuppliesOut$ - @Ratio *= 0.000011188078704 - %DumpExcess = True - } - OUTPUT_RESOURCE - { - ResourceName = Oxygen - Ratio = #$../SuppliesOut$ - @Ratio *= 0.001713537562385 - %DumpExcess = True - } - } -} +// Need new patches for TAC-LS recycler recipes that ADD converter swap options +// for TAC-LS instead of modifying the USI-LS swap options. The old patch (below) +// isn't going to work anymore since ModuleLifeSupportRecycler is deprecated. +// New patches will need to be something like: +// +// @PART[Duna_Kerbitat]:NEEDS[TACLifeSupport] +// { +// MODULE +// { +// name = USI_ConverterSwapOption +// ConverterName = TAC-LS Recycler +// ... +// INPUT_RESOURCE +// { +// ResourceName = Waste +// Ratio = 0.000006157407408 +// } +// ... +// } +// } @PART[*]:HAS[@MODULE[ModuleLifeSupportRecycler]]:NEEDS[TACLifeSupport] { @MODULE[ModuleLifeSupportRecycler] diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg index 93c280b2e..8e5464892 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 cb3059bea..d2b5899db 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 8e9f7241a..8a5cebe54 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 11d7aab89..c174fdf8c 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg @@ -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 485a51e4a..1f4e87b1d 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 aa927a899..100a3e103 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 } } diff --git a/Source/KolonyTools/.vs/KolonyTools/DesignTimeBuild/.dtbcache b/Source/KolonyTools/.vs/KolonyTools/DesignTimeBuild/.dtbcache new file mode 100644 index 000000000..6b7594a92 Binary files /dev/null and b/Source/KolonyTools/.vs/KolonyTools/DesignTimeBuild/.dtbcache differ diff --git a/Source/KolonyTools/.vs/KolonyTools/v15/.suo b/Source/KolonyTools/.vs/KolonyTools/v15/.suo index 89aa78b5a..0af88cd01 100644 Binary files a/Source/KolonyTools/.vs/KolonyTools/v15/.suo and b/Source/KolonyTools/.vs/KolonyTools/v15/.suo differ diff --git a/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/db.lock b/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/db.lock new file mode 100644 index 000000000..e69de29bb diff --git a/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide b/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide new file mode 100644 index 000000000..b4f0479fa Binary files /dev/null and b/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide differ diff --git a/Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs b/Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs index 6e92b3b6d..5ef916c55 100644 --- a/Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs +++ b/Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs @@ -10,7 +10,7 @@ namespace KolonyTools.AC { class CustomAstronautComplexUI : MonoBehaviour { - private Rect _areaRect = new Rect(-500f, -500f, 200f, 200f); + private Rect _areaRect; private float KBulk = 1; private int KBulki = 1; private int crewWeCanHire = 10; @@ -18,25 +18,26 @@ class CustomAstronautComplexUI : MonoBehaviour private static float KCourage = 50; private static bool KFearless = false; private static int KCareer = 0; - private List _kolonists; private static int KLevel = 0; + private List _kolonists; + private static int KLevel = 0; private string[] _recruitableKolonists; private string[] KLevelStringsZero = new string[1] { "Level 0" }; private string[] KLevelStringsOne = new string[2] { "Level 0", "Level 1" }; private string[] KLevelStringsTwo = new string[3] { "Level 0", "Level 1", "Level 2" }; //private string[] KLevelStringsAll = new string[6] { "Level 0", "Level 1", "Level 2", "Level 3", "Level 4", "Level 5" }; private static int KGender = 0; - private GUIContent KMale = new GUIContent("Male", AssetBase.GetTexture("kerbalicon_recruit")); - private GUIContent KFemale = new GUIContent("Female", AssetBase.GetTexture("kerbalicon_recruit_female")); - private GUIContent KGRandom = new GUIContent("Random", "When this option is selected the kerbal might be male or female"); + private GUIContent KMale; + private GUIContent KFemale; + private GUIContent KGRandom; private GUIContent[] KGendArray; - Color basecolor = GUI.color; + Color basecolor; private float ACLevel = 0; private double KDead; private double DCost = 1; - KerbalRoster roster = HighLogic.CurrentGame.CrewRoster; + KerbalRoster roster; private bool hTest = true; private bool hasKredits = true; - private bool kerExp = HighLogic.CurrentGame.Parameters.CustomParams().KerbalExperienceEnabled(HighLogic.CurrentGame.Mode); + private bool kerExp; private static string RecruitLevel = "RecruitementLevel"; [KSPAddon(KSPAddon.Startup.Instantly, true)] @@ -55,20 +56,30 @@ public StaticLoader() private void Awake() { - _kolonists = new List(); - _kolonists.Add(new Kolonist { Name = "Pilot", isBase = true, Effects = "Autopilot, VesselControl, RepBoost, Logistics, Explorer" }); - _kolonists.Add(new Kolonist { Name = "Scientist", isBase = true, Effects = "Science, Experiment, Botany, Agronomy, Medical, ScienceBoost" }); - _kolonists.Add(new Kolonist { Name = "Engineer", isBase = true, Effects = "Repair, Converter, Drill, Geology, FundsBoost" }); - _kolonists.Add(new Kolonist { Name = "Kolonist", isBase = false, Effects = "RepBoost, FundsBoost, ScienceBoost" }); - _kolonists.Add(new Kolonist { Name = "Miner", isBase = false, Effects = "Drill, FundsBoost" }); - _kolonists.Add(new Kolonist { Name = "Technician", isBase = false, Effects = "Converter, FundsBoost" }); - _kolonists.Add(new Kolonist { Name = "Mechanic", isBase = false, Effects = "Repair, FundsBoost" }); - _kolonists.Add(new Kolonist { Name = "Biologist", isBase = false, Effects = "Biology, ScienceBoost" }); - _kolonists.Add(new Kolonist { Name = "Geologist", isBase = false, Effects = "Geology, FundsBoost" }); - _kolonists.Add(new Kolonist { Name = "Farmer", isBase = false, Effects = "Agronomy, ScienceBoost, RepBoost" }); - _kolonists.Add(new Kolonist { Name = "Medic", isBase = false, Effects = "Medical, ScienceBoost, RepBoost" }); - _kolonists.Add(new Kolonist { Name = "Quartermaster", isBase = false, Effects = "Logistics, RepBoost" }); - _kolonists.Add(new Kolonist { Name = "Scout", isBase = false, Effects = "Explorer" }); + _areaRect = new Rect(-500f, -500f, 200f, 200f); + KMale = new GUIContent("Male", AssetBase.GetTexture("kerbalicon_recruit")); + KFemale = new GUIContent("Female", AssetBase.GetTexture("kerbalicon_recruit_female")); + KGRandom = new GUIContent("Random", "When this option is selected the kerbal might be male or female"); + basecolor = GUI.color; + roster = HighLogic.CurrentGame.CrewRoster; + kerExp = HighLogic.CurrentGame.Parameters.CustomParams().KerbalExperienceEnabled(HighLogic.CurrentGame.Mode); + + _kolonists = new List + { + new Kolonist { Name = "Pilot", isBase = true, Effects = "Autopilot, VesselControl, RepBoost, Logistics, Explorer" }, + new Kolonist { Name = "Scientist", isBase = true, Effects = "Science, Experiment, Botany, Agronomy, Medical, ScienceBoost" }, + new Kolonist { Name = "Engineer", isBase = true, Effects = "Repair, Converter, Drill, Geology, FundsBoost" }, + new Kolonist { Name = "Kolonist", isBase = false, Effects = "RepBoost, FundsBoost, ScienceBoost" }, + new Kolonist { Name = "Miner", isBase = false, Effects = "Drill, FundsBoost" }, + new Kolonist { Name = "Technician", isBase = false, Effects = "Converter, FundsBoost" }, + new Kolonist { Name = "Mechanic", isBase = false, Effects = "Repair, FundsBoost" }, + new Kolonist { Name = "Biologist", isBase = false, Effects = "Biology, ScienceBoost" }, + new Kolonist { Name = "Geologist", isBase = false, Effects = "Geology, FundsBoost" }, + new Kolonist { Name = "Farmer", isBase = false, Effects = "Agronomy, ScienceBoost, RepBoost" }, + new Kolonist { Name = "Medic", isBase = false, Effects = "Medical, ScienceBoost, RepBoost" }, + new Kolonist { Name = "Quartermaster", isBase = false, Effects = "Logistics, RepBoost" }, + new Kolonist { Name = "Scout", isBase = false, Effects = "Explorer" } + }; KGendArray = new GUIContent[3] { KGRandom, KMale, KFemale }; } diff --git a/Source/KolonyTools/KolonyTools/Converters/MKSModule.cs b/Source/KolonyTools/KolonyTools/Converters/MKSModule.cs new file mode 100644 index 000000000..bc7481f4a --- /dev/null +++ b/Source/KolonyTools/KolonyTools/Converters/MKSModule.cs @@ -0,0 +1,316 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; +using USITools; + +namespace KolonyTools +{ + /// + /// Applies MKS efficiency boosts from kolonization and efficiency parts. + /// + public class MKSModule : PartModule + { + [KSPField] + public string BonusEffect = "FundsBoost"; + + [KSPField] + public float EfficiencyMultiplier = 1f; + + [KSPField] + public bool ApplyBonuses = true; + + [KSPField(guiName = "Governor", isPersistant = true, guiActive = true, guiActiveEditor = false), UI_FloatRange(stepIncrement = 0.1f, maxValue = 1f, minValue = 0f)] + public float Governor = 1.0f; + + [KSPField(isPersistant = true)] + private double lastCheck = -1; + + private const int EFFICIENCY_RANGE = 500; + private List _bonusConsumers; + private List _bonusTags; + private bool _catchupDone; + private double checkTime = 5f; + private float _colonyEfficiencyConsumption; + private float _colonyEfficiencyBoost; + private float _efficiencyRate; + private double _maxDelta; + + public override string GetInfo() + { + var output = new StringBuilder(); + + output.AppendLine("Contributes to bonuses research"); + + if (ApplyBonuses) + { + output.AppendLine("Benefits from bonuses:"); + output.AppendLine(" Geology Research"); + if (BonusEffect == "RepBoost") + output.AppendLine(" Kolonization Research"); + else if (BonusEffect == "ScienceBoost") + output.AppendLine(" Botany Research"); + } + + if (_bonusTags != null && _bonusTags.Any()) + { + output.AppendLine("Benefits from Efficiency Parts:"); + for (int i = 0; i < _bonusTags.Count; i++) + { + output.AppendLine(string.Format(" {0} (consumption {1})", _bonusTags[i], EfficiencyMultiplier)); + } + } + + return output.ToString(); + } + + public override void OnAwake() + { + if (!HighLogic.LoadedSceneIsFlight) + return; + + _maxDelta = ResourceUtilities.GetMaxDeltaTime(); + } + + public void Update() + { + if (!HighLogic.LoadedSceneIsFlight) + return; + + if (lastCheck < 0) + lastCheck = vessel.lastUT; + + var currentTime = Planetarium.GetUniversalTime(); + + if (!InCatchupMode()) + { + if (Math.Abs(currentTime - lastCheck) < checkTime) + return; + } + lastCheck = Math.Min(lastCheck + _maxDelta, currentTime); + + UpdateKolonizationStats(); + UpdateEfficiencyBonus(); + } + + private bool InCatchupMode() + { + if (_catchupDone) + return false; + + if (_bonusConsumers == null) + return true; + + var count = _bonusConsumers.Count; + for (int i = 0; i < count; ++i) + { + var consumer = _bonusConsumers[i]; + if (consumer.InCatchupMode()) + return true; + } + + _catchupDone = true; + return false; + } + + private void UpdateKolonizationStats() + { + //No kolonization on Kerbin! + if (vessel.mainBody == FlightGlobals.GetHomeBody()) + return; + + var stats = KolonizationManager.Instance.FetchLogEntry(vessel.id.ToString(), vessel.mainBody.flightGlobalsIndex); + + if (Planetarium.GetUniversalTime() - stats.LastUpdate < checkTime) + { + return; + } + + stats.RepBoosters = GetVesselCrewByEffect("RepBoost"); + stats.FundsBoosters = GetVesselCrewByEffect("FundsBoost"); + stats.ScienceBoosters = GetVesselCrewByEffect("ScienceBoost"); + + var elapsedTime = Planetarium.GetUniversalTime() - stats.LastUpdate; + var orbitMod = 1d; + if (!vessel.LandedOrSplashed) + orbitMod = KolonizationSetup.Instance.Config.OrbitMultiplier; + + var scienceBase = stats.ScienceBoosters * elapsedTime * orbitMod; + var repBase = stats.RepBoosters * elapsedTime * orbitMod; + var fundsBase = stats.FundsBoosters * elapsedTime * orbitMod; + + stats.LastUpdate = Planetarium.GetUniversalTime(); + stats.BotanyResearch += scienceBase; + stats.KolonizationResearch += repBase; + stats.GeologyResearch += fundsBase; + + var mult = vessel.mainBody.scienceValues.RecoveryValue; + var science = scienceBase * KolonizationSetup.Instance.Config.ScienceMultiplier * mult; + var rep = repBase * KolonizationSetup.Instance.Config.RepMultiplier * mult; + var funds = fundsBase * KolonizationSetup.Instance.Config.FundsMultiplier * mult; + + stats.Science += science; + stats.Funds += funds; + stats.Rep += rep; + KolonizationManager.Instance.TrackLogEntry(stats); + + //Update the hab bonus + var thisBodyInfo = KolonizationManager.Instance.KolonizationInfo.Where(b => b.BodyIndex == vessel.mainBody.flightGlobalsIndex); + var habBonus = thisBodyInfo.Sum(b => b.KolonizationResearch); + habBonus = Math.Sqrt(habBonus); + habBonus /= KolonizationSetup.Instance.Config.EfficiencyMultiplier; + USI_GlobalBonuses.Instance.SaveHabBonus(vessel.mainBody.flightGlobalsIndex, habBonus); + } + + private int GetVesselCrewByEffect(string effect) + { + var count = vessel.GetCrewCount(); + var crew = vessel.GetVesselCrew(); + var numCrew = 0; + for (int i = 0; i < count; ++i) + { + var c = crew[i]; + if (c.HasEffect(effect)) + numCrew++; + } + return numCrew; + } + + private void UpdateEfficiencyBonus() + { + if (!ApplyBonuses) + return; + + _bonusConsumers = part.FindConverterAddonsImplementing(); + + if (_bonusConsumers.Any()) + { + _bonusTags = _bonusConsumers + .Select(c => c.Tag) + .Distinct() + .OrderBy(c => c) + .ToList(); + } + + var rates = GetEfficiencyBonuses(); + for (int i = 0; i < _bonusConsumers.Count; i++) + { + var consumer = _bonusConsumers[i]; + consumer.SetEfficiencyBonus("MKS", rates[consumer.Tag]); + consumer.SetEfficiencyBonus("GOV", Governor); + } + } + + public Dictionary GetEfficiencyBonuses() + { + var bodyId = vessel.mainBody.flightGlobalsIndex; + var geoBonus = KolonizationManager.GetGeologyResearchBonus(bodyId); + var planetaryBonus = GetPlanetaryBonus(); + + var bonuses = new Dictionary(); + if (_bonusTags != null && _bonusTags.Any()) + { + for (int i = 0; i < _bonusTags.Count; i++) + { + var tag = _bonusTags[i]; + var bonusValue = geoBonus * planetaryBonus * GetEfficiencyPartsBonus(tag); + + bonuses.Add(tag, bonusValue); + } + } + + return bonuses; + } + + private float GetPlanetaryBonus() + { + var bodyId = vessel.mainBody.flightGlobalsIndex; + switch (BonusEffect) + { + case "RepBoost": + return KolonizationManager.GetKolonizationResearchBonus(bodyId); + case "ScienceBoost": + return KolonizationManager.GetBotanyResearchBonus(bodyId); + default: + return KolonizationManager.GetGeologyResearchBonus(bodyId); + } + } + + private float GetEfficiencyPartsBonus(string tag) + { + var totalConsumption = GetCurrentConsumption(tag); + if (totalConsumption < ResourceUtilities.FLOAT_TOLERANCE) + return 1f; + + var totalEfficiencyBoost = GetActiveBoosters(tag); + if (Math.Abs(totalConsumption - _colonyEfficiencyConsumption) > ResourceUtilities.FLOAT_TOLERANCE + || Math.Abs(totalEfficiencyBoost - _colonyEfficiencyBoost) > ResourceUtilities.FLOAT_TOLERANCE) + { + _colonyEfficiencyConsumption = totalConsumption; + _colonyEfficiencyBoost = totalEfficiencyBoost; + _efficiencyRate = GetEfficiency(); + } + + return 1f + _efficiencyRate; + } + + private float GetCurrentConsumption(string tag) + { + // We don't just count consumers - we count total efficiency consumption. + // This way high efficiency modules get a higher weight. + var totalEfficiencyConsumption = 0f; + + // Find any nearby vessels that have consumers for this efficiency bonus tag. + var mksVessels = LogisticsTools.GetNearbyVessels(EFFICIENCY_RANGE, true, vessel, true) + .Where(v => v + .FindConverterAddonsImplementing() + .Any(a => a.Tag == tag)); + + foreach (var mksVessel in mksVessels) + { + var mksModule = mksVessel.FindPartModuleImplementing(); + if (mksModule == null) + { + Debug.LogError(string.Format("[MKS] {0}: Part is misconfigured. Parts with an EfficiencyConsumerAddon must also have an MKSModule.", GetType().Name)); + continue; + } + + var consumers = mksVessel.FindConverterAddonsImplementing(); + foreach (var consumer in consumers) + { + if (consumer.IsActive && consumer.Tag == tag) + { + totalEfficiencyConsumption += mksModule.EfficiencyMultiplier; + } + } + } + + return totalEfficiencyConsumption; + } + + private float GetActiveBoosters(string tag) + { + var totalEfficiencyBoost = 0f; + var boosters = LogisticsTools.GetNearbyVessels(EFFICIENCY_RANGE, true, vessel, true) + .SelectMany(v => v + .FindConverterAddonsImplementing() + .Where(a => a.Tag == tag)); + + foreach (var booster in boosters) + { + if (booster.IsActive) + { + totalEfficiencyBoost += (float)(booster.EfficiencyMultiplier * booster.Multiplier); + } + } + + return totalEfficiencyBoost; + } + + private float GetEfficiency() + { + return _colonyEfficiencyBoost / _colonyEfficiencyConsumption; + } + } +} diff --git a/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs b/Source/KolonyTools/KolonyTools/Converters/MKS_BulkConverterSwapOption.cs similarity index 91% rename from Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs rename to Source/KolonyTools/KolonyTools/Converters/MKS_BulkConverterSwapOption.cs index 58dcb752d..2e7776c91 100644 --- a/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs +++ b/Source/KolonyTools/KolonyTools/Converters/MKS_BulkConverterSwapOption.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using KSP.UI.Screens.Editor; using USITools; -using UnityEngine; namespace KolonyTools { @@ -14,7 +12,7 @@ public class AutoConverterConfig : PartModule public float yield; } - public class ModuleBulkConverter : ModuleResourceConverter_USI + public class MKS_BulkConverterSwapOption : USI_ConverterSwapOption { [KSPField] public float Yield = 1f; @@ -22,12 +20,36 @@ public class ModuleBulkConverter : ModuleResourceConverter_USI [KSPField] public float MinAbundance = 0f; - private static List _blackList = new List{"Dirt","ResourceLode"}; - + private static List _blackList = new List { "Dirt", "ResourceLode" }; private int _lastLoadedPlanet = -1; - private List _resourceYields; + public override ConversionRecipe PrepareRecipe(ConversionRecipe recipe) + { + base.PrepareRecipe(recipe); + + CheckYieldsAreLoaded(recipe.Inputs); + var staticOutputs = GetResourceNames(recipe.Outputs); + + var count = _resourceYields.Count; + for (int i = 0; i < count; ++i) + { + var resourceOutput = _resourceYields[i]; + if (!staticOutputs.Contains(resourceOutput.ResourceName)) + recipe.Outputs.Add(new ResourceRatio(resourceOutput.ResourceName, resourceOutput.Ratio, true)); + } + + return recipe; + } + + private void CheckYieldsAreLoaded(List inputs) + { + if (vessel.mainBody.flightGlobalsIndex != _lastLoadedPlanet || _resourceYields == null) + { + LoadPlanetYields(inputs); + } + } + private void LoadPlanetYields(List inputs) { _lastLoadedPlanet = vessel.mainBody.flightGlobalsIndex; @@ -74,6 +96,17 @@ private void LoadPlanetYields(List inputs) } } + private List GetResourceNames(List inputs) + { + var resNames = new List(); + var count = inputs.Count; + for (int i = 0; i < count; ++i) + { + resNames.Add(inputs[i].ResourceName); + } + return resNames; + } + private static Dictionary GetResourceAbundance(int planetBodyIndex, List inputResourcesNames) { Dictionary planetResourceAbundance = new Dictionary(); @@ -94,44 +127,5 @@ private static Dictionary GetResourceAbundance(int planetBodyInd } return planetResourceAbundance; } - - private List GetResourceNames(List inputs) - { - var resNames = new List(); - var count = inputs.Count; - for (int i = 0; i < count; ++i) - { - resNames.Add(inputs[i].ResourceName); - } - return resNames; - } - - private void CheckYieldsAreLoaded(List inputs) - { - if (vessel.mainBody.flightGlobalsIndex != _lastLoadedPlanet || _resourceYields == null) - { - LoadPlanetYields(inputs); - } - } - - protected override ConversionRecipe PrepareRecipe(double deltatime) - { - if (!IsActivated) - return new ConversionRecipe(); - - var recipe = base.PrepareRecipe(deltatime); - - CheckYieldsAreLoaded(recipe.Inputs); - var staticOutputs = GetResourceNames(recipe.Outputs); - - var count = _resourceYields.Count; - for (int i = 0; i < count; ++i) - { - var resourceOutput = _resourceYields[i]; - if (!staticOutputs.Contains(resourceOutput.ResourceName)) - recipe.Outputs.Add(new ResourceRatio(resourceOutput.ResourceName, resourceOutput.Ratio, true)); - } - return recipe; - } } -} \ No newline at end of file +} diff --git a/Source/KolonyTools/KolonyTools/DeprecatedClasses.cs b/Source/KolonyTools/KolonyTools/DeprecatedClasses.cs new file mode 100644 index 000000000..290366a61 --- /dev/null +++ b/Source/KolonyTools/KolonyTools/DeprecatedClasses.cs @@ -0,0 +1,10 @@ +using System; + +namespace KolonyTools +{ + [Obsolete("Use USI_EfficiencyBoosterSwapOption and related classes instead.")] + public class ModuleEfficiencyPart { } + + [Obsolete("Use MKS_BulkConverterSwapOption and related classes instead.")] + public class ModuleBulkConverter { } +} diff --git a/Source/KolonyTools/KolonyTools/Kolonization/KolonizationConfig.cs b/Source/KolonyTools/KolonyTools/Kolonization/KolonizationConfig.cs index 3c791dca6..c5f5d02d0 100644 --- a/Source/KolonyTools/KolonyTools/Kolonization/KolonizationConfig.cs +++ b/Source/KolonyTools/KolonyTools/Kolonization/KolonizationConfig.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace KolonyTools.Kolonization +namespace KolonyTools.Kolonization { public class KolonizationConfig { diff --git a/Source/KolonyTools/KolonyTools/KolonyTools.csproj b/Source/KolonyTools/KolonyTools/KolonyTools.csproj index 2ebc182e0..dd4662cfd 100644 --- a/Source/KolonyTools/KolonyTools/KolonyTools.csproj +++ b/Source/KolonyTools/KolonyTools/KolonyTools.csproj @@ -32,7 +32,7 @@ - ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\Assembly-CSharp.dll False @@ -42,11 +42,11 @@ - ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.dll False - ..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.UI.dll False @@ -62,6 +62,7 @@ + @@ -82,13 +83,13 @@ - + - + @@ -99,7 +100,6 @@ - diff --git a/Source/KolonyTools/KolonyTools/MKSModule.cs b/Source/KolonyTools/KolonyTools/MKSModule.cs deleted file mode 100644 index 123d0bf5c..000000000 --- a/Source/KolonyTools/KolonyTools/MKSModule.cs +++ /dev/null @@ -1,299 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using USITools; - -namespace KolonyTools -{ - public class MKSModule : PartModule - { - [KSPField] - public string BonusEffect = "FundsBoost"; - - [KSPField] - public string eTag = ""; - - [KSPField] - public float eMultiplier = 1f; - - [KSPField] - public bool ApplyBonuses = true; - - [KSPField(guiName = "Governor", isPersistant = true, guiActive = true, guiActiveEditor = false), UI_FloatRange(stepIncrement = 0.1f, maxValue = 1f, minValue = 0f)] - public float Governor = 1.0f; - - [KSPField(isPersistant = true)] - private double lastCheck = -1; - - private double checkTime = 5f; - - private bool CatchupDone; - private float _colonyConverterEff; - private float _effPartTotal; - private float _efficiencyRate; - private const int EFF_RANGE = 500; - private List _bonusConsumerConverters; - - public override void OnStart(StartState state) - { - // Apply bonuses to all converters but efficiency boosters - _bonusConsumerConverters = part.FindModulesImplementing() - .Where(mod => !typeof(ModuleEfficiencyPart).IsInstanceOfType(mod)).ToList(); - } - - public virtual float GetEfficiencyRate() - { - return GetEfficiencyPartsBonus(); - } - - private float GetEfficiencyPartsBonus() - { - if (eTag == "") - return 1f; - - var curConverters = GetActiveConverters(); - if (curConverters < ResourceUtilities.FLOAT_TOLERANCE) - return 1f; - - var curEParts = GetActiveEParts(); - if (Math.Abs(curConverters - _colonyConverterEff) > ResourceUtilities.FLOAT_TOLERANCE - || Math.Abs(curEParts - _effPartTotal) > ResourceUtilities.FLOAT_TOLERANCE) - { - _colonyConverterEff = curConverters; - _effPartTotal = curEParts; - _efficiencyRate = GetEfficiency(); - } - return 1f + _efficiencyRate; - } - - private float GetActiveEParts() - { - var totEff = 0f; - var vList = - LogisticsTools.GetNearbyVessels(EFF_RANGE, true, vessel, true) - .Where(v => v.FindPartModulesImplementing().Any(m => m.eTag == eTag)); - - foreach (var vsl in vList) - { - var pList = vsl.FindPartModulesImplementing(); - foreach (var p in pList) - { - if (p.IsActivated && p.eTag == eTag) - totEff += (float)(p.EfficiencyMultiplier * p.eMultiplier); - } - } - return totEff; - } - - private float GetActiveConverters() - { - //We don't just count converters - we count total efficiency of those - //converters. This way high efficiency modules get a higher weight. - var totEff = 0f; - - //Find any vessels that have an MKS Module tied to this same eTag. - var vList = - LogisticsTools.GetNearbyVessels(EFF_RANGE, true, vessel, true) - .Where(v => v.FindPartModulesImplementing().Any(m => m.eTag == eTag)); - - foreach (var vsl in vList) - { - var pList = vsl.FindPartModulesImplementing(); - foreach (var p in pList) - { - var m = p.part.FindModuleImplementing(); - if (m != null && m.eTag == eTag) - { - if (p.IsActivated) // p has a GetEfficiencyMultiplier () - totEff += m.eMultiplier; - } - } - } - return totEff; - } - - public override void OnAwake() - { - if (!HighLogic.LoadedSceneIsFlight) - return; - - _conMods = part.FindModulesImplementing(); - _maxDelta = ResourceUtilities.GetMaxDeltaTime(); - } - - private double _maxDelta; - private List _conMods; - - private bool InCatchupMode() - { - if(CatchupDone) - return false; - - var count = _conMods.Count; - for (int i = 0; i < count; ++i) - { - var c = _conMods[i]; - var em = c.GetEfficiencyMultiplier(); - if (c.lastTimeFactor / 2 > em) - return true; - } - CatchupDone = true; - return false; - } - - - public void FixedUpdate() - { - if (!HighLogic.LoadedSceneIsFlight) - return; - - if (lastCheck < 0) - lastCheck = vessel.lastUT; - - if (!HighLogic.LoadedSceneIsFlight) - return; - - var planTime = Planetarium.GetUniversalTime(); - - if (!InCatchupMode()) - { - if (Math.Abs(planTime - lastCheck) < checkTime) - return; - } - lastCheck = Math.Min(lastCheck + _maxDelta, planTime); - - UpdateKolonizationStats(); - UpdateEfficiencyBonus(); - } - - private void UpdateKolonizationStats() - { - //No kolonization on Kerbin! - if (vessel.mainBody == FlightGlobals.GetHomeBody()) - return; - - var k = KolonizationManager.Instance.FetchLogEntry(vessel.id.ToString(), vessel.mainBody.flightGlobalsIndex); - - if (Planetarium.GetUniversalTime() - k.LastUpdate < checkTime) - { - return; - } - - k.RepBoosters = GetVesselCrewByEffect("RepBoost"); - k.FundsBoosters = GetVesselCrewByEffect("FundsBoost"); - k.ScienceBoosters = GetVesselCrewByEffect("ScienceBoost"); - - var elapsedTime = Planetarium.GetUniversalTime() - k.LastUpdate; - var orbitMod = 1d; - if (!vessel.LandedOrSplashed) - orbitMod = KolonizationSetup.Instance.Config.OrbitMultiplier; - - var scienceBase = k.ScienceBoosters * elapsedTime * orbitMod; - var repBase = k.RepBoosters * elapsedTime * orbitMod; - var fundsBase = k.FundsBoosters * elapsedTime * orbitMod; - - k.LastUpdate = Planetarium.GetUniversalTime(); - k.BotanyResearch += scienceBase; - k.KolonizationResearch += repBase; - k.GeologyResearch += fundsBase; - - - var mult = vessel.mainBody.scienceValues.RecoveryValue; - var science = scienceBase * KolonizationSetup.Instance.Config.ScienceMultiplier * mult; - var rep = repBase * KolonizationSetup.Instance.Config.RepMultiplier * mult; - var funds = fundsBase * KolonizationSetup.Instance.Config.FundsMultiplier * mult; - - k.Science += science; - k.Funds += funds; - k.Rep += rep; - KolonizationManager.Instance.TrackLogEntry(k); - - //Update the hab bonus - var thisBodyInfo = KolonizationManager.Instance.KolonizationInfo.Where(b => b.BodyIndex == vessel.mainBody.flightGlobalsIndex); - var habBonus = thisBodyInfo.Sum(b => b.KolonizationResearch); - habBonus = Math.Sqrt(habBonus); - habBonus /= KolonizationSetup.Instance.Config.EfficiencyMultiplier; - USI_GlobalBonuses.Instance.SaveHabBonus(vessel.mainBody.flightGlobalsIndex, habBonus); - - - } - - private int GetVesselCrewByEffect(string effect) - { - var count = vessel.GetCrewCount(); - var crew = vessel.GetVesselCrew(); - var numCrew = 0; - for (int i = 0; i < count; ++i) - { - var c = crew[i]; - if (c.HasEffect(effect)) - numCrew++; - } - return numCrew; - } - - private void UpdateEfficiencyBonus() - { - if (!ApplyBonuses) - return; - var rate = GetEfficiencyBonus(); - foreach (var con in _bonusConsumerConverters) - { - if (con.useEfficiencyBonus) - { - con.SetEfficiencyBonus("MKS", rate); - } - con.SetEfficiencyBonus("GOV", Governor); - } - } - - private float GetPlanetaryBonus() - { - var bodyId = vessel.mainBody.flightGlobalsIndex; - if (BonusEffect == "RepBoost") - return KolonizationManager.GetKolonizationResearchBonus(bodyId); - else if (BonusEffect == "ScienceBoost") - return KolonizationManager.GetBotanyResearchBonus(bodyId); - else - return KolonizationManager.GetGeologyResearchBonus(bodyId); - } - - private float GetEfficiency() - { - var alloc = _effPartTotal / _colonyConverterEff; - return alloc; - } - - public override string GetInfo() - { - var output = new StringBuilder(""); - - output.Append("Contributes to bonuses research\n"); - - if (ApplyBonuses) - { - output.Append("Benefits from bonuses:\n"); - output.Append(" Geology Research\n"); - if (BonusEffect == "RepBoost") - output.Append(" Kolonization Research\n"); - else if (BonusEffect == "ScienceBoost") - output.Append(" Botany Research\n"); - } - - if (!string.IsNullOrEmpty(eTag)) - { - output.Append("Benefits from Efficiency Parts:\n"); - output.Append(string.Format(" {0} (consumption {1})\n", eTag, eMultiplier)); - } - return output.ToString(); - } - - public float GetEfficiencyBonus() - { - var bodyId = vessel.mainBody.flightGlobalsIndex; - var geoBonus = KolonizationManager.GetGeologyResearchBonus(bodyId); - return geoBonus * GetEfficiencyPartsBonus() * GetPlanetaryBonus(); - } - } -} \ No newline at end of file diff --git a/Source/KolonyTools/KolonyTools/ModuleEfficiencyPart.cs b/Source/KolonyTools/KolonyTools/ModuleEfficiencyPart.cs deleted file mode 100644 index 78ef9ac82..000000000 --- a/Source/KolonyTools/KolonyTools/ModuleEfficiencyPart.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using USITools; - -namespace KolonyTools -{ - public class ModuleEfficiencyPart : ModuleResourceConverter_USI - { - [KSPField] - public double eMultiplier = 1d; - - [KSPField] - public string eTag = ""; - - public float Governor = 1.0f; - - public override string GetInfo() - { - if (string.IsNullOrEmpty(eTag)) - return base.GetInfo(); - var resourceConsumption = base.GetInfo(); - int index = resourceConsumption.IndexOf("\n"); // Strip the first line containing the etag - resourceConsumption = resourceConsumption.Substring(index + 1); - return "Boosts efficiency of converters benefiting from a " + eTag + "\n\n" + - "Boost power: " + eMultiplier.ToString() + resourceConsumption; - } - - private double _curMult; - - public double EfficiencyMultiplier - { - get - { - if (HighLogic.LoadedSceneIsEditor) - return eMultiplier * Governor; - if (!IsActivated) - _curMult = 0d; - return _curMult * Governor; - } - set - { - _curMult = value; - } - } - - protected override void PostProcess(ConverterResults result, double deltaTime) - { - base.PostProcess(result,deltaTime); - EfficiencyMultiplier = result.TimeFactor/deltaTime; - } - } -} - diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/ModuleOrbitalLogistics.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/ModuleOrbitalLogistics.cs index d9c88ba5e..b9c961d5a 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/ModuleOrbitalLogistics.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/ModuleOrbitalLogistics.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; - +using System.Linq; using UnityEngine; namespace KolonyTools @@ -11,8 +11,14 @@ namespace KolonyTools public class ModuleOrbitalLogistics : PartModule { #region KSPFields + [KSPField(isPersistant = true, guiActive = false, guiActiveEditor = false)] + public string ModuleId; + [KSPField(isPersistant = false, guiActive = false)] public float MaxTransferMass = 1000000f; + + [KSPField(isPersistant = false, guiActive = true, guiName = "Available T-Credits")] + public string TransportCredits; #endregion #region Static class variables @@ -25,6 +31,7 @@ public class ModuleOrbitalLogistics : PartModule protected OrbitalLogisticsGuiMain_Module _mainGui; protected ScenarioOrbitalLogistics _scenario; + private double _nextCheckTime; #endregion /// @@ -58,6 +65,21 @@ void Start() _scenario = HighLogic.FindObjectOfType(); } + /// + /// Implementation of .Update + /// + void Update() + { + // We're just displaying the current amount of TransportCredits on the vessel + // This only needs to be done in flight and doesn't need to be done hyperactively. + // Once per second is sufficient. + if (!HighLogic.LoadedSceneIsFlight || _nextCheckTime > Planetarium.GetUniversalTime()) + return; + + TransportCredits = vessel.GetTransportCapacity().ToString("N0"); + _nextCheckTime = Planetarium.GetUniversalTime() + 1; + } + /// /// Implementation of .OnGUI /// @@ -83,6 +105,15 @@ void OnGUI() } } + public override void OnLoad(ConfigNode node) + { + base.OnLoad(node); + + string moduleId = string.Empty; + if (!node.TryGetValue("ModuleId", ref moduleId) || string.IsNullOrEmpty(moduleId)) + ModuleId = Guid.NewGuid().ToString(); + } + /// /// Make a list of all valid tranfer vessels on this celestial body. /// @@ -96,11 +127,13 @@ public void MakeBodyVesselList() { if (vessel.mainBody.name == this.vessel.mainBody.name) { - if (!vessel.packed && vessel.loaded - && vessel.situation == (vessel.situation & VesselSituationsAllowedForTransfer) - && vessel.FindPartModuleImplementing() != null) + if (vessel.loaded) { - BodyVesselList.Add(vessel); + if (vessel.situation == (vessel.situation & VesselSituationsAllowedForTransfer) + && vessel.FindPartModuleImplementing() != null) + { + BodyVesselList.Add(vessel); + } } else if (vessel.protoVessel.situation == (vessel.protoVessel.situation & VesselSituationsAllowedForTransfer)) { @@ -127,5 +160,58 @@ public void MakeBodyVesselList() // Sort by vessel name BodyVesselList.Sort((a, b) => a.vesselName.CompareTo(b.vesselName)); } + + public static string GetOrbLogModuleIdForVessel(Vessel vessel) + { + if (vessel.loaded) + { + return vessel.FindPartModuleImplementing().ModuleId; + } + else + { + foreach (var part in vessel.protoVessel.protoPartSnapshots) + { + foreach (var module in part.modules) + { + if (module.moduleName == "ModuleOrbitalLogistics") + { + return module.moduleValues.GetValue("ModuleId") ?? "unassigned"; + } + } + } + } + + return "not found"; + } + + public static Vessel FindVesselByOrbLogModuleId(string moduleId) + { + foreach (Vessel vessel in FlightGlobals.Vessels) + { + if (vessel.loaded) + { + var modules = vessel.FindPartModulesImplementing(); + if (modules.Any(m => m.ModuleId == moduleId)) + { + return vessel; + } + } + else + { + foreach (var part in vessel.protoVessel.protoPartSnapshots) + { + foreach (var module in part.modules) + { + if (module.moduleName == "ModuleOrbitalLogistics" && module.moduleValues.GetValue("ModuleId") == moduleId) + { + return vessel; + } + } + } + } + } + + return null; + } } } diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/OrbitalLogisticsTransferRequest.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/OrbitalLogisticsTransferRequest.cs index 9ac9880e7..02225bdc8 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/OrbitalLogisticsTransferRequest.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/OrbitalLogisticsTransferRequest.cs @@ -42,6 +42,24 @@ public class OrbitalLogisticsTransferRequest : IConfigNode, IComparable /// The resources will be deducted from. /// + /// Use the property for UI display purposes. public Vessel Origin { get @@ -79,6 +98,12 @@ public Vessel Origin _origin = FlightGlobals.Vessels .Where(v => v.id.ToString() == _originId) .SingleOrDefault(); + + // If the origin disappeared, try to find it by its OrbLog module instead. + if (_origin == null) + { + _origin = ModuleOrbitalLogistics.FindVesselByOrbLogModuleId(_originModuleId); + } } return _origin; @@ -87,12 +112,15 @@ public Vessel Origin { _origin = value; _originId = value.id.ToString(); + _originName = value.vesselName; + _originModuleId = ModuleOrbitalLogistics.GetOrbLogModuleIdForVessel(value); } } /// /// The resources will be added to. /// + /// Use the property for UI display purposes. public Vessel Destination { get @@ -104,12 +132,42 @@ public Vessel Destination .SingleOrDefault(); } + // If the destination disappeared, try to find it by its OrbLog module instead. + if (_destination == null) + { + _destination = ModuleOrbitalLogistics.FindVesselByOrbLogModuleId(_destinationModuleId); + } + return _destination; } set { _destination = value; _destinationId = value.id.ToString(); + _destinationName = value.vesselName; + _destinationModuleId = ModuleOrbitalLogistics.GetOrbLogModuleIdForVessel(value); + } + } + + /// + /// The name of the resources will be added to. Use this for UI display purposes. + /// + public string DestinationVesselName + { + get + { + return Destination == null ? _destinationName : Destination.vesselName; + } + } + + /// + /// The name of the resources will be removed from. Use this for UI display purposes. + /// + public string OriginVesselName + { + get + { + return Origin == null ? _originName : Origin.vesselName; } } #endregion @@ -246,6 +304,14 @@ public IEnumerator Deliver() yield break; } + // If the destination no longer has the OrbLog module it had when the transfer was initiated, fail. + var whoHasTheDestinationOrbLogModule = ModuleOrbitalLogistics.FindVesselByOrbLogModuleId(_destinationModuleId); + if (Destination != whoHasTheDestinationOrbLogModule) + { + Status = DeliveryStatus.Failed; + yield break; + } + // Exchange resources between origin and destination vessels bool deliveredAll = true; double deliveredAmount; diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Module.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Module.cs index 6a0270a92..5401ab4a9 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Module.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Module.cs @@ -58,7 +58,10 @@ protected override void DrawWindowContents(int windowId) foreach (OrbitalLogisticsTransferRequest transfer in _scenario.PendingTransfers) { // Only show transfers in the module's SoI - if (transfer.Destination.mainBody != _module.vessel.mainBody && transfer.Origin.mainBody != _module.vessel.mainBody) + if (transfer.Destination == null + || transfer.Origin == null + || (transfer.Destination.mainBody != _module.vessel.mainBody + && transfer.Origin.mainBody != _module.vessel.mainBody)) continue; // Determine text color based on transfer status @@ -83,8 +86,8 @@ protected override void DrawWindowContents(int windowId) ReviewTransferGui.SetVisible(true); } - GUILayout.Label(" " + transfer.Origin.vesselName, labelStyle, GUILayout.Width(155)); - GUILayout.Label(transfer.Destination.vesselName, labelStyle, GUILayout.Width(155)); + GUILayout.Label(" " + transfer.OriginVesselName, labelStyle, GUILayout.Width(155)); + GUILayout.Label(transfer.DestinationVesselName, labelStyle, GUILayout.Width(155)); GUILayout.Label( Utilities.FormatTime(transfer.GetArrivalTime() - Planetarium.GetUniversalTime()), rAlignLabelStyle, GUILayout.Width(80) @@ -109,7 +112,10 @@ protected override void DrawWindowContents(int windowId) foreach (OrbitalLogisticsTransferRequest transfer in _scenario.ExpiredTransfers) { // Only show transfers in the module's SoI - if (transfer.Destination.mainBody != _module.vessel.mainBody && transfer.Origin.mainBody != _module.vessel.mainBody) + if (transfer.Destination == null + || transfer.Origin == null + || (transfer.Destination.mainBody != _module.vessel.mainBody + && transfer.Origin.mainBody != _module.vessel.mainBody)) continue; // Determine text color based on transfer status @@ -132,8 +138,8 @@ protected override void DrawWindowContents(int windowId) ReviewTransferGui.SetVisible(true); } - GUILayout.Label(" " + transfer.Origin.vesselName, labelStyle, GUILayout.Width(155)); - GUILayout.Label(transfer.Destination.vesselName, labelStyle, GUILayout.Width(155)); + GUILayout.Label(" " + transfer.OriginVesselName, labelStyle, GUILayout.Width(155)); + GUILayout.Label(transfer.DestinationVesselName, labelStyle, GUILayout.Width(155)); GUILayout.Label(transfer.Status.ToString(), labelStyle, GUILayout.Width(80)); GUILayout.EndHorizontal(); } diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Scenario.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Scenario.cs index dbdeb42e7..16f77b54b 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Scenario.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGuiMain_Scenario.cs @@ -98,8 +98,8 @@ public void DrawWindow() ReviewTransferGui.SetVisible(true); } - GUILayout.Label(" " + transfer.Origin.vesselName, labelStyle, GUILayout.Width(165)); - GUILayout.Label(transfer.Destination.vesselName, labelStyle, GUILayout.Width(165)); + GUILayout.Label(" " + transfer.OriginVesselName ?? "(Missing)", labelStyle, GUILayout.Width(165)); + GUILayout.Label(transfer.DestinationVesselName ?? "(Missing)", labelStyle, GUILayout.Width(165)); GUILayout.Label(transfer.CalculateFuelUnits().ToString("F2"), labelStyle, GUILayout.Width(80)); GUILayout.Label(transfer.TotalMass().ToString("F2"), labelStyle, GUILayout.Width(80)); GUILayout.Label( @@ -182,8 +182,8 @@ public void DrawWindow() ReviewTransferGui.SetVisible(true); } - GUILayout.Label(" " + transfer.Origin.vesselName, labelStyle, GUILayout.Width(165)); - GUILayout.Label(transfer.Destination.vesselName, labelStyle, GUILayout.Width(165)); + GUILayout.Label(" " + transfer.OriginVesselName ?? "(Missing)", labelStyle, GUILayout.Width(165)); + GUILayout.Label(transfer.DestinationVesselName ?? "(Missing)", labelStyle, GUILayout.Width(165)); GUILayout.Label(transfer.CalculateFuelUnits().ToString("F2"), labelStyle, GUILayout.Width(80)); GUILayout.Label(transfer.TotalMass().ToString("F2"), labelStyle, GUILayout.Width(80)); GUILayout.Label(transfer.Status.ToString(), labelStyle, GUILayout.Width(90)); diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_CreateTransfer.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_CreateTransfer.cs index f8eec3be8..004747757 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_CreateTransfer.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_CreateTransfer.cs @@ -33,6 +33,7 @@ public class OrbitalLogisticsGui_CreateTransfer : Window private PartResourceDefinition _selectedResource; private List _originVesselResources; private List _destinationVesselResources; + private List _filteredVessels; #endregion public OrbitalLogisticsGui_CreateTransfer(ModuleOrbitalLogistics module, ScenarioOrbitalLogistics scenario) @@ -50,11 +51,15 @@ public OrbitalLogisticsGui_CreateTransfer(ModuleOrbitalLogistics module, Scenari private void Start() { // Create list of vessels in current SoI - var vesselNames = _module.BodyVesselList + _filteredVessels = _module.BodyVesselList + .Where(v => v.id != _module.vessel.id) + .ToList(); + + var vesselNames = _filteredVessels .Select(v => new GUIContent(v.vesselName)) .ToArray(); - _orbLogVesselsInSoI = vesselNames.Length; + _orbLogVesselsInSoI = _module.BodyVesselList.Count; // Set the origin vessel UpdateOriginVessel(_module.BodyVesselList.IndexOf(_module.vessel)); @@ -124,8 +129,12 @@ protected override void DrawWindowContents(int windowId) // Create some visual separation between sections GUILayout.Label(string.Empty); - // Only allow transfers between different vessels - if (_originVesselIndex != _destinationVesselIndex) + // Display a message if there is only one vessel in the current SoI that is eligible for OrbLog + if (_orbLogVesselsInSoI <= 1) + { + GUILayout.Label(TOO_FEW_VESSELS_MESSAGE, UIHelper.yellowLabelStyle); + } + else { // Display transferable resources _availableResourceScrollViewPosition = GUILayout.BeginScrollView(_availableResourceScrollViewPosition, GUILayout.MinHeight(130)); @@ -329,15 +338,6 @@ protected override void DrawWindowContents(int windowId) GUILayout.Label(_errorMessageText, UIHelper.redLabelStyle); } } - // Origin and destination vessel are the same, so... - else - { - // Display a message if there is only one vessel in the current SoI that is eligible for OrbLog - if (_orbLogVesselsInSoI < 2) - { - GUILayout.Label(TOO_FEW_VESSELS_MESSAGE, UIHelper.yellowLabelStyle); - } - } // Display Start and Cancel buttons GUILayout.BeginHorizontal(); @@ -409,7 +409,7 @@ protected void UpdateDestinationVessel(int newVesselIndex) _selectedResource = null; _destinationVesselIndex = newVesselIndex; - _destinationVessel = _module.BodyVesselList[_destinationVesselIndex]; + _destinationVessel = _filteredVessels[_destinationVesselIndex]; _destinationVesselResources = _destinationVessel.GetResources(); if (_originVessel != null) @@ -436,7 +436,7 @@ protected void UpdateDestinationVessel(int newVesselIndex) protected int GetPreviousVesselIndex(int index) { if (index == 0) - return _module.BodyVesselList.Count() - 1; + return _filteredVessels.Count() - 1; else return index - 1; } @@ -448,7 +448,7 @@ protected int GetPreviousVesselIndex(int index) /// protected int GetNextVesselIndex(int index) { - if (index == _module.BodyVesselList.Count() - 1) + if (index == _filteredVessels.Count() - 1) return 0; else return index + 1; diff --git a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_ReviewTransfer.cs b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_ReviewTransfer.cs index 988984add..6aca5b270 100644 --- a/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_ReviewTransfer.cs +++ b/Source/KolonyTools/KolonyTools/OrbitalLogistics/UI/OrbitalLogisticsGui_ReviewTransfer.cs @@ -56,12 +56,12 @@ protected override void DrawWindowContents(int windowId) GUILayout.BeginHorizontal(); GUILayout.Label("From:", UIHelper.whiteLabelStyle, GUILayout.MinWidth(40), GUILayout.MaxWidth(240)); - GUILayout.Label(Transfer.Origin.vesselName, UIHelper.yellowRightAlignLabelStyle, GUILayout.Width(160)); + GUILayout.Label(Transfer.OriginVesselName ?? "(Missing)", UIHelper.yellowRightAlignLabelStyle, GUILayout.Width(160)); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); GUILayout.Label("To:", UIHelper.whiteLabelStyle, GUILayout.MinWidth(40), GUILayout.MaxWidth(240)); - GUILayout.Label(Transfer.Destination.vesselName, UIHelper.yellowRightAlignLabelStyle, GUILayout.Width(160)); + GUILayout.Label(Transfer.DestinationVesselName ?? "(Missing)", UIHelper.yellowRightAlignLabelStyle, GUILayout.Width(160)); GUILayout.EndHorizontal(); _arrivalTime = Transfer.GetArrivalTime() - Planetarium.GetUniversalTime();