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 24fd8e7b0..0b8885b9f 100644 --- a/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version +++ b/FOR_RELEASE/GameData/000_AT_Utils/000_AT_Utils.version @@ -6,20 +6,20 @@ "VERSION": { "MAJOR":1, - "MINOR":4, - "PATCH":4, + "MINOR":5, + "PATCH":0, "BUILD":0 }, "KSP_VERSION_MIN": { "MAJOR":1, "MINOR":3, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MAX": { "MAJOR":1, "MINOR":3, - "PATCH":0 + "PATCH":1 } } 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 7f05e3a11..41f41ec04 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_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt index cd3254875..87c8d812f 100644 --- a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt @@ -1,3 +1,11 @@ +0.10.2 - 2017.03.06 +------------------ +Logistics Updates + +0.10.1 - 2017.10.09 +------------------ +Fixed issue preventing categories from showing + 0.10.0 - 2017.10.09 ------------------ KSP 1.3.1 diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll index 442c3f9f8..d14b3d185 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 12a00c2c3..8de778d94 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 c7f0735d2..bb829b353 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 69ba84cfd..4c7893a91 100644 --- a/FOR_RELEASE/GameData/000_USITools/USITools.version +++ b/FOR_RELEASE/GameData/000_USITools/USITools.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":10, - "PATCH":0, + "PATCH":2, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll index 73687e46e..8ec6b6972 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 7d96126dd..46b8c3488 100644 --- a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version @@ -26,6 +26,6 @@ "BUILD": 0, "MAJOR": 2, "MINOR": 0, - "PATCH": 1 + "PATCH": 2 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt index 631858bcc..124763b2b 100644 --- a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt @@ -1,3 +1,7 @@ +2.0.2 - KSP 1.3 +------------------ +- [Enhancement] Added a new standard category: Lights. + 2.0.1 - KSP 1.3 ------------------ - [Fix #20] CCK categories don't show up in the editor. diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg b/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg index b1880cdc1..9d5225912 100644 --- a/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg @@ -29,4 +29,13 @@ CCKCommonFilterConfig usedByMod = Malemute usedByMod = Feline Utility Rovers } + Item + { + name = Lights + tag = cck-lights + normalIcon = CommunityCategoryKit/icons/Lights_N + selectedIcon = CommunityCategoryKit/icons/Lights_S + usedByMod = Kerbal Electric + usedByMod = Surface Mounted Stock-Alike Lights for Self-Illumination + } } diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_N.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_N.png new file mode 100644 index 000000000..32e877101 Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_N.png differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_S.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_S.png new file mode 100644 index 000000000..68bace2bc Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Lights_S.png differ diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt index fcabfca08..bb1cdb6d1 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt @@ -1,3 +1,9 @@ +0.8.1 - 2017.03.06 +------------------ +Fixed an issue with Chinese localization that was causing the game to hang during load. Thanks to everyone that helped with this! +Added Russian translations (Thanks doktorjet) +Corrected density of Silicates/Silicon (Note that while cost/volume are the same, the resources are now ten times heavier) + 0.8.0 - 2017.10.09 ------------------ KSP 1.3.1 diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version index 32b3af8a6..76bd3f654 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":8, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg index ff8f5be04..12e8875ce 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg @@ -1426,7 +1426,7 @@ RESOURCE_DEFINITION name = Silicates abbreviation = #LOC_CRP_Silicates_Abbreviation displayName = #LOC_CRP_Silicates_DisplayName - density = 0.00025 + density = 0.0025 flowMode = ALL_VESSEL transfer = PUMP isTweakable = true @@ -1440,7 +1440,7 @@ RESOURCE_DEFINITION name = Silicon abbreviation = #LOC_CRP_Silicon_Abbreviation displayName = #LOC_CRP_Silicon_DisplayName - density = 0.0002329 + density = 0.002329 flowMode = ALL_VESSEL transfer = PUMP isTweakable = true diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/es-es.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/es-es.cfg index 8d4eef9a5..ac67d8c2f 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/es-es.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/es-es.cfg @@ -3,211 +3,226 @@ Localization es-es { //USI - #LOC_CRP_Hydrates_DisplayName = Hydrates - #LOC_CRP_Gypsum_DisplayName = Gypsum - #LOC_CRP_IntakeLqd_DisplayName = IntakeLqd - #LOC_CRP_ColonySupplies_DisplayName = ColonySupplies - #LOC_CRP_Lead_DisplayName = Lead - #LOC_CRP_CarbonDioxide_DisplayName = CarbonDioxide - #LOC_CRP_Chemicals_DisplayName = Chemicals - #LOC_CRP_Dirt_DisplayName = Dirt - #LOC_CRP_ExoticMinerals_DisplayName = ExoticMinerals - #LOC_CRP_Food_DisplayName = Food - #LOC_CRP_Supplies_DisplayName = Supplies - #LOC_CRP_Fertilizer_DisplayName = Fertilizer - #LOC_CRP_Mulch_DisplayName = Mulch - #LOC_CRP_Machinery_DisplayName = Machinery - #LOC_CRP_SpecializedParts_DisplayName = SpecializedParts - #LOC_CRP_Recyclables_DisplayName = Recyclables - #LOC_CRP_Hydrogen_DisplayName = Hydrogen - #LOC_CRP_Karbonite_DisplayName = Karbonite + #LOC_CRP_Hydrates_DisplayName = Hidratos + #LOC_CRP_Gypsum_DisplayName = Yeso + #LOC_CRP_IntakeLqd_DisplayName = Ingreso Lqd + #LOC_CRP_ColonySupplies_DisplayName = Suministros coloniales + #LOC_CRP_Lead_DisplayName = Plomo + #LOC_CRP_CarbonDioxide_DisplayName = Dióxido de carbono + #LOC_CRP_Chemicals_DisplayName = Productos químicos + #LOC_CRP_Dirt_DisplayName = Suciedad + #LOC_CRP_ExoticMinerals_DisplayName = Minerales exóticos + #LOC_CRP_Food_DisplayName = Comida + #LOC_CRP_Supplies_DisplayName = Suministros + #LOC_CRP_Fertilizer_DisplayName = Fertilizante + #LOC_CRP_Mulch_DisplayName = Mantillo + #LOC_CRP_Machinery_DisplayName = Maquinaria + #LOC_CRP_SpecializedParts_DisplayName = Piezas especializadas + #LOC_CRP_Recyclables_DisplayName = Reciclables + #LOC_CRP_Hydrogen_DisplayName = Hidrógeno + #LOC_CRP_Karbonite_DisplayName = Karbonita #LOC_CRP_Karborundum_DisplayName = Karborundum #LOC_CRP_LqdCO2_DisplayName = LqdCO2 #LOC_CRP_LqdCO_DisplayName = LqdCO - #LOC_CRP_MaterialKits_DisplayName = MaterialKits - #LOC_CRP_Metals_DisplayName = Metals - #LOC_CRP_Minerals_DisplayName = Minerals - #LOC_CRP_MetallicOre_DisplayName = MetallicOre - #LOC_CRP_Organics_DisplayName = Organics - #LOC_CRP_Oxygen_DisplayName = Oxygen - #LOC_CRP_Polymers_DisplayName = Polymers - #LOC_CRP_RareMetals_DisplayName = RareMetals - #LOC_CRP_RefinedExotics_DisplayName = RefinedExotics - #LOC_CRP_Rock_DisplayName = Rock - #LOC_CRP_RocketParts_DisplayName = RocketParts - #LOC_CRP_SpareParts_DisplayName = SpareParts - #LOC_CRP_Substrate_DisplayName = Substrate - #LOC_CRP_Uraninite_DisplayName = Uraninite - #LOC_CRP_Waste_DisplayName = Waste - #LOC_CRP_WasteWater_DisplayName = WasteWater - #LOC_CRP_Water_DisplayName = Water + #LOC_CRP_MaterialKits_DisplayName = Kits de materiales + #LOC_CRP_Metals_DisplayName = Metales + #LOC_CRP_Minerals_DisplayName = Minerales + #LOC_CRP_MetallicOre_DisplayName = Mineral metálico + #LOC_CRP_Organics_DisplayName = Orgánicos + #LOC_CRP_Oxygen_DisplayName = Oxígeno + #LOC_CRP_Polymers_DisplayName = Polímeros + #LOC_CRP_RareMetals_DisplayName = Metales raros + #LOC_CRP_RefinedExotics_DisplayName = Exóticos refinados + #LOC_CRP_Rock_DisplayName = Roca + #LOC_CRP_RocketParts_DisplayName = Piezas de cohetes + #LOC_CRP_SpareParts_DisplayName = Repuestos + #LOC_CRP_Substrate_DisplayName = Sustrato + #LOC_CRP_Uraninite_DisplayName = Uraninita + #LOC_CRP_Waste_DisplayName = Residuos + #LOC_CRP_WasteWater_DisplayName = Aguas residuales + #LOC_CRP_Water_DisplayName = Agua //NFT - #LOC_CRP_ArgonGas_DisplayName = Argon Gas + #LOC_CRP_ArgonGas_DisplayName = Gas argón #LOC_CRP_ArgonGas_Abbreviation = Ar - #LOC_CRP_Boron_DisplayName = Boron + #LOC_CRP_Boron_DisplayName = Boro #LOC_CRP_Boron_Abbreviation = Bo - #LOC_CRP_ResourceLode_DisplayName = ResourceLode - #LOC_CRP_EnrichedUranium_DisplayName = Enriched Uranium - #LOC_CRP_EnrichedUranium_Abbreviation = EnrU - #LOC_CRP_DepletedUranium_DisplayName = Depleted Uranium - #LOC_CRP_DepletedUranium_Abbreviation = DepU - #LOC_CRP_LqdHydrogen_DisplayName = Liquid Hydrogen + #LOC_CRP_ResourceLode_DisplayName = Lode de recursos + #LOC_CRP_EnrichedUranium_DisplayName = Uranio enriquecido + #LOC_CRP_EnrichedUranium_Abbreviation = UrEn + #LOC_CRP_DepletedUranium_DisplayName = Uranio empobrecido + #LOC_CRP_DepletedUranium_Abbreviation = UrEm + #LOC_CRP_LqdHydrogen_DisplayName = Hidrógeno líquido #LOC_CRP_LqdHydrogen_Abbreviation = LH2 - #LOC_CRP_StoredCharge_DisplayName = Stored Charge - #LOC_CRP_StoredCharge_Abbreviation = SC + #LOC_CRP_StoredCharge_DisplayName = Carga Almacenada + #LOC_CRP_StoredCharge_Abbreviation = CA //KSPI-E - #LOC_CRP_Actinides_DisplayName = Actinides + #LOC_CRP_Actinides_DisplayName = Actínidos #LOC_CRP_Actinides_Abbreviation = Act - #LOC_CRP_Aluminium_DisplayName = Aluminium + #LOC_CRP_Aluminium_DisplayName = Aluminio #LOC_CRP_Aluminium_Abbreviation = Al - #LOC_CRP_Alumina_DisplayName = Alumina + #LOC_CRP_Alumina_DisplayName = Alúmina #LOC_CRP_Alumina_Abbreviation = Aia - #LOC_CRP_Ammonia_DisplayName = Ammonia + #LOC_CRP_Ammonia_DisplayName = Amoníaco #LOC_CRP_Ammonia_Abbreviation = NH3 - #LOC_CRP_Antimatter_DisplayName = Antimatter + #LOC_CRP_Antimatter_DisplayName = Antimateria #LOC_CRP_Antimatter_Abbreviation = AM - #LOC_CRP_LqdArgon_DisplayName = LqdArgon + #LOC_CRP_AntiHydrogen_DisplayName = Anti Hidrógeno + #LOC_CRP_AntiHydrogen_Abbreviation = AH + #LOC_CRP_LqdArgon_DisplayName = ArgónLqd #LOC_CRP_LqdArgon_Abbreviation = Ar - #LOC_CRP_Borate_DisplayName = Borate + #LOC_CRP_Borate_DisplayName = Borato #LOC_CRP_Borate_Abbreviation = Br - #LOC_CRP_Caesium_DisplayName = Caesium + #LOC_CRP_Caesium_DisplayName = Cesio #LOC_CRP_Caesium_Abbreviation = Cs - #LOC_CRP_CarbonMonoxide_DisplayName = CarbonMonoxide + #LOC_CRP_Calcium_Abbreviation = Ca + #LOC_CRP_Calcium_DisplayName = Calcio + #LOC_CRP_CarbonMonoxide_DisplayName = Monóxido de carbono #LOC_CRP_CarbonMonoxide_Abbreviation = CO - #LOC_CRP_Carbon_DisplayName = Carbon + #LOC_CRP_Carbon_DisplayName = Carbón #LOC_CRP_Carbon_Abbreviation = C - #LOC_CRP_ChargedParticles_DisplayName = ChargedParticles - #LOC_CRP_ChargedParticles_Abbreviation = CP + #LOC_CRP_ChargedParticles_DisplayName = Partículas cargadas + #LOC_CRP_ChargedParticles_Abbreviation = PC #LOC_CRP_Chlorine_DisplayName = Cloro #LOC_CRP_Chlorine_Abbreviation = Cl - #LOC_CRP_Decaborane_DisplayName = Decaborane + #LOC_CRP_CompressedAir_DisplayName = Aire comprimido + #LOC_CRP_CompressedAir_Abbreviation = Aire + #LOC_CRP_Decaborane_DisplayName = Decaborano #LOC_CRP_Decaborane_Abbreviation = DeBo - #LOC_CRP_Deuterium_DisplayName = Deuterium + #LOC_CRP_Deuterium_DisplayName = Deuterio #LOC_CRP_Deuterium_Abbreviation = D - #LOC_CRP_LqdDeuterium_DisplayName = LqdDeuterium + #LOC_CRP_LqdDeuterium_DisplayName = DeuterioLqd #LOC_CRP_LqdDeuterium_Abbreviation = D - #LOC_CRP_DepletedFuel_DisplayName = DepletedFuel - #LOC_CRP_DepletedFuel_Abbreviation = DepF - #LOC_CRP_ExoticMatter_DisplayName = ExoticMatter - #LOC_CRP_ExoticMatter_Abbreviation = EcM - #LOC_CRP_FusionPellets_DisplayName = FusionPellets - #LOC_CRP_Fluorine_DisplayName = Fluorine + #LOC_CRP_DepletedFuel_DisplayName = Combustible agotado + #LOC_CRP_DepletedFuel_Abbreviation = Comb Agt + #LOC_CRP_ExoticMatter_DisplayName = Materia exótica + #LOC_CRP_ExoticMatter_Abbreviation = MeX + #LOC_CRP_FusionPellets_DisplayName = Pellets de fusión + #LOC_CRP_FusionPellets_Abbreviation = FP + #LOC_CRP_Fluorine_DisplayName = Flúor #LOC_CRP_Fluorine_Abbreviation = F - #LOC_CRP_HeavyWater_DisplayName = HeavyWater + #LOC_CRP_Fluorite_DisplayName = Fluorita + #LOC_CRP_Fluorite_Abbreviation = CaF2 + #LOC_CRP_HeavyWater_DisplayName = Agua pesada #LOC_CRP_HeavyWater_Abbreviation = D20 - #LOC_CRP_IntakeAtm_DisplayName = IntakeAtm - #LOC_CRP_IntakeAtm_Abbreviation = IntA - #LOC_CRP_KryptonGas_DisplayName = KryptonGas + #LOC_CRP_IntakeAtm_DisplayName = AdmisiónAtm + #LOC_CRP_IntakeAtm_Abbreviation = AdAtm + #LOC_CRP_KryptonGas_DisplayName = Gas kriptón #LOC_CRP_KryptonGas_Abbreviation = Kr - #LOC_CRP_LqdKrypton_DisplayName = LqdKrypton + #LOC_CRP_LqdKrypton_DisplayName = KriptónLqd #LOC_CRP_LqdKrypton_Abbreviation = Kr - #LOC_CRP_NeonGas_DisplayName = NeonGas + #LOC_CRP_NeonGas_DisplayName = Gas neón #LOC_CRP_NeonGas_Abbreviation = Ne - #LOC_CRP_LqdNeon_DisplayName = LqdNeon + #LOC_CRP_LqdNeon_DisplayName = NeónLqd #LOC_CRP_LqdNeon_Abbreviation = Ne - #LOC_CRP_Lithium_DisplayName = Lithium + #LOC_CRP_Lithium_DisplayName = Litio #LOC_CRP_Lithium_Abbreviation = Li7 - #LOC_CRP_Lithium6_DisplayName = Lithium6 + #LOC_CRP_Lithium6_DisplayName = Litio6 #LOC_CRP_Lithium6_Abbreviation = Li6 - #LOC_CRP_LithiumHydride_DisplayName = LithiumHydride + #LOC_CRP_LithiumHydride_DisplayName = Hidruro de litio #LOC_CRP_LithiumHydride_Abbreviation = Li7H - #LOC_CRP_LithiumHydride_Title = LithiumHydride - #LOC_CRP_LithiumDeuteride_DisplayName = LithiumDeuteride + #LOC_CRP_LithiumDeuteride_DisplayName = Deuterio de litio #LOC_CRP_LithiumDeuteride_Abbreviation = Li6D - #LOC_CRP_LithiumDeuteride_Title = LithiumDeuteride - #LOC_CRP_LqdAmmonia_DisplayName = LqdAmmonia + #LOC_CRP_LqdAmmonia_DisplayName = AmoníacoLqd #LOC_CRP_LqdAmmonia_Abbreviation = NH3 - #LOC_CRP_Helium3_DisplayName = Helium3 + #LOC_CRP_Helium3_DisplayName = Helio3 #LOC_CRP_Helium3_Abbreviation = He3 - #LOC_CRP_LqdHe3_DisplayName = LqdHe3 + #LOC_CRP_LqdHe3_DisplayName = He3Lqd #LOC_CRP_LqdHe3_Abbreviation = He3 - #LOC_CRP_Helium4_DisplayName = Helium4 + #LOC_CRP_Helium4_DisplayName = Helio4 #LOC_CRP_Helium4_Abbreviation = He4 - #LOC_CRP_LqdHelium_DisplayName = LqdHelium + #LOC_CRP_LqdHelium_DisplayName = HelioLqd #LOC_CRP_LqdHelium_Abbreviation = He4 - #LOC_CRP_Nitratine_DisplayName = Nitratine - #LOC_CRP_Nitratine_Title = Nitratine + #LOC_CRP_Nitratine_DisplayName = Nitratina + #LOC_CRP_Nitratine_Abbreviation = Nit #LOC_CRP_Hexaborane_DisplayName = Hexaborane - #LOC_CRP_LqdNitrogen_DisplayName = LqdNitrogen + #LOC_CRP_Hexaborane_Abbreviation = HxBo + #LOC_CRP_LqdNitrogen_DisplayName = NitrógenoLqd #LOC_CRP_LqdNitrogen_Abbreviation = N14 - #LOC_CRP_LqdNitrogen15_DisplayName = LqdNitrogen15 + #LOC_CRP_LqdNitrogen15_DisplayName = Nitrógeno15Lqd #LOC_CRP_LqdNitrogen15_Abbreviation = N15 - #LOC_CRP_Megajoules_DisplayName = Megajoules + #LOC_CRP_Megajoules_DisplayName = Megajulios #LOC_CRP_Megajoules_Abbreviation = Meg3 - #LOC_CRP_Monazite_DisplayName = Monazite - #LOC_CRP_Monazite_Abbreviation = Monz - #LOC_CRP_LqdOxygen18_DisplayName = LqdOxygen18 + #LOC_CRP_Monazite_DisplayName = Monacita + #LOC_CRP_Monazite_Abbreviation = Monc + #LOC_CRP_LqdOxygen18_DisplayName = Oxígeno18Lqd #LOC_CRP_LqdOxygen18_Abbreviation = O18 - #LOC_CRP_Sodium_DisplayName = Sodium + #LOC_CRP_Salt_DisplayName = Sal + #LOC_CRP_Salt_Abbreviation = Sal + #LOC_CRP_Sodium_DisplayName = Sodio #LOC_CRP_Sodium_Abbreviation = Na - #LOC_CRP_PolyvinylChloride_DisplayName = PolyvinylChloride + #LOC_CRP_Sulphur_DisplayName = Azufre + #LOC_CRP_Sulphur_Abbreviation = Az + #LOC_CRP_SolidHydrogen_DisplayName = Hidrógeno sólido + #LOC_CRP_SolidHydrogen_Abbreviation = HS + #LOC_CRP_PolyvinylChloride_DisplayName = Cloruro de polivinilo #LOC_CRP_PolyvinylChloride_Abbreviation = PVC - #LOC_CRP_Plutonium-238_DisplayName = Plutonium-238 + #LOC_CRP_Plutonium-238_DisplayName = Plutonio-238 #LOC_CRP_Plutonium-238_Abbreviation = Pu238 - #LOC_CRP_Regolith_DisplayName = Regolith + #LOC_CRP_Regolith_DisplayName = Regolito #LOC_CRP_Regolith_Abbreviation = R #LOC_CRP_UF4_DisplayName = UF4 #LOC_CRP_UF4_Abbreviation = UF4 - #LOC_CRP_Silicates_DisplayName = Silicates - #LOC_CRP_Silicates_Abbreviation = Silica - #LOC_CRP_Silicon_DisplayName = Silicon + #LOC_CRP_Silicates_DisplayName = Silicatos + #LOC_CRP_Silicates_Abbreviation = Sílice + #LOC_CRP_Silicon_DisplayName = Silicio #LOC_CRP_Silicon_Abbreviation = Si - #LOC_CRP_SolarWind_DisplayName = SolarWind - #LOC_CRP_SolarWind_Abbreviation = SW - #LOC_CRP_ThermalPower_DisplayName = ThermalPower - #LOC_CRP_ThermalPower_Abbreviation = ThP - #LOC_CRP_Thorium_DisplayName = Thorium + #LOC_CRP_Spodumene_DisplayName = Espodumena + #LOC_CRP_Spodumene_Abbreviation = LiAl + #LOC_CRP_SolarWind_DisplayName = Viento solar + #LOC_CRP_SolarWind_Abbreviation = VS + #LOC_CRP_ThermalPower_DisplayName = Energía térmica + #LOC_CRP_ThermalPower_Abbreviation = EnTe + #LOC_CRP_Thorium_DisplayName = Torio + #LOC_CRP_Thorium_Abbreviation = To #LOC_CRP_ThF4_DisplayName = ThF4 #LOC_CRP_ThF4_Abbreviation = ThF4 - #LOC_CRP_Tritium_DisplayName = Tritium + #LOC_CRP_Tritium_DisplayName = Tritio #LOC_CRP_Tritium_Abbreviation = T - #LOC_CRP_Tritium_Title = Tritium Gas - #LOC_CRP_LqdTritium_DisplayName = LqdTritium + #LOC_CRP_LqdTritium_DisplayName = TritioLqd #LOC_CRP_LqdTritium_Abbreviation = T - #LOC_CRP_UraniumNitride_DisplayName = UraniumNitride + #LOC_CRP_UraniumNitride_DisplayName = Nitruro de uranio #LOC_CRP_UraniumNitride_Abbreviation = UN - #LOC_CRP_VacuumPlasma_DisplayName = VacuumPlasma - #LOC_CRP_VacuumPlasma_Abbreviation = VP - #LOC_CRP_WasteHeat_DisplayName = WasteHeat - #LOC_CRP_WasteHeat_Abbreviation = WH - #LOC_CRP_LqdXenon_DisplayName = LqdXenon + #LOC_CRP_VacuumPlasma_DisplayName = Plasma de vacío + #LOC_CRP_VacuumPlasma_Abbreviation = PV + #LOC_CRP_WasteHeat_DisplayName = Calor residual + #LOC_CRP_WasteHeat_Abbreviation = CR + #LOC_CRP_LqdXenon_DisplayName = XenónLqd #LOC_CRP_LqdXenon_Abbreviation = Xe - #LOC_CRP_LqdXenon_Title = Liquid Xenon //RealFuels #LOC_CRP_Aerozine50_DisplayName = Aerozine50 #LOC_CRP_AK20_DisplayName = AK20 #LOC_CRP_AK27_DisplayName = AK27 - #LOC_CRP_Aniline_DisplayName = Aniline + #LOC_CRP_Aniline_DisplayName = Anilina #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 = Ethylene + #LOC_CRP_Diborane_DisplayName = Diborano + #LOC_CRP_Ethane_DisplayName = Etano + #LOC_CRP_Ethanol_DisplayName = Etanol + #LOC_CRP_Ethanol75_DisplayName = Etanol75 + #LOC_CRP_Ethanol90_DisplayName = Etanol90 + #LOC_CRP_Ethylene_DisplayName = Etileno #LOC_CRP_FLOX30_DisplayName = FLOX30 #LOC_CRP_FLOX70_DisplayName = FLOX70 #LOC_CRP_FLOX88_DisplayName = FLOX88 - #LOC_CRP_Furfuryl_DisplayName = Furfuryl - #LOC_CRP_Helium_DisplayName = Helium + #LOC_CRP_Furfuryl_DisplayName = Furfurilo + #LOC_CRP_Helium_DisplayName = Helio #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_Hydrazine_DisplayName = Hidracina + #LOC_CRP_Hydyne_DisplayName = Hidina #LOC_CRP_IRFNA-III_DisplayName = IRFNA-III #LOC_CRP_IRFNA-IV_DisplayName = IRFNA-IV #LOC_CRP_IWFNA_DisplayName = IWFNA - #LOC_CRP_Kerosene_DisplayName = Kerosene - #LOC_CRP_LeadBallast_DisplayName = LeadBallast - #LOC_CRP_LqdFluorine_DisplayName = LqdFluorine - #LOC_CRP_LqdMethane_DisplayName = LqdMethane - #LOC_CRP_LqdOxygen_DisplayName = LqdOxygen - #LOC_CRP_Methane_DisplayName = Methane - #LOC_CRP_Methanol_DisplayName = Methanol + #LOC_CRP_Kerosene_DisplayName = Queroseno + #LOC_CRP_LeadBallast_DisplayName = Lastre de plomo + #LOC_CRP_LqdFluorine_DisplayName = FlúorLqd + #LOC_CRP_LqdMethane_DisplayName = MetanoLqd + #LOC_CRP_LqdOxygen_DisplayName = OxígenoLqd + #LOC_CRP_Methane_DisplayName = Metano + #LOC_CRP_Methanol_DisplayName = Metanol #LOC_CRP_MMH_DisplayName = MMH #LOC_CRP_MON1_DisplayName = MON1 #LOC_CRP_MON3_DisplayName = MON3 @@ -217,20 +232,20 @@ Localization #LOC_CRP_MON25_DisplayName = MON25 #LOC_CRP_NGNC_DisplayName = NGNC #LOC_CRP_N2F4_DisplayName = N2F4 - #LOC_CRP_Nitrogen_DisplayName = Nitrogen - #LOC_CRP_NitrousOxide_DisplayName = NitrousOxide + #LOC_CRP_Nitrogen_DisplayName = Nitrógeno + #LOC_CRP_NitrousOxide_DisplayName = Óxido nitroso #LOC_CRP_NTO_DisplayName = NTO #LOC_CRP_OF2_DisplayName = OF2 #LOC_CRP_PBAN_DisplayName = PBAN - #LOC_CRP_Pentaborane_DisplayName = Pentaborane + #LOC_CRP_Pentaborane_DisplayName = Pentaborano #LOC_CRP_PSPC_DisplayName = PSPC - #LOC_CRP_Syntin_DisplayName = Syntin + #LOC_CRP_Syntin_DisplayName = Sintina #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 = Glykerol + #LOC_CRP_Glykerol_DisplayName = Glikerol } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/ru.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/ru.cfg index 45b79d7ef..ef6be2eed 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/ru.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/ru.cfg @@ -2,235 +2,235 @@ Localization { ru { - //USI - #LOC_CRP_Hydrates_DisplayName = Hydrates - #LOC_CRP_Gypsum_DisplayName = Gypsum - #LOC_CRP_IntakeLqd_DisplayName = IntakeLqd - #LOC_CRP_ColonySupplies_DisplayName = ColonySupplies - #LOC_CRP_Lead_DisplayName = Lead + //USI & TAC LS + #LOC_CRP_Hydrates_DisplayName = Гидраты + #LOC_CRP_Gypsum_DisplayName = Гипс + #LOC_CRP_IntakeLqd_DisplayName = Забортная жидкость + #LOC_CRP_ColonySupplies_DisplayName = Колониальные припасы + #LOC_CRP_Lead_DisplayName = Свинец #LOC_CRP_CarbonDioxide_DisplayName = Углекислый газ - #LOC_CRP_Chemicals_DisplayName = Chemicals - #LOC_CRP_Dirt_DisplayName = Dirt - #LOC_CRP_ExoticMinerals_DisplayName = ExoticMinerals + #LOC_CRP_Chemicals_DisplayName = Химикаты + #LOC_CRP_Dirt_DisplayName = Грунт + #LOC_CRP_ExoticMinerals_DisplayName = Экзотические минералы #LOC_CRP_Food_DisplayName = Еда - #LOC_CRP_Supplies_DisplayName = Supplies - #LOC_CRP_Fertilizer_DisplayName = Fertilizer - #LOC_CRP_Mulch_DisplayName = Mulch - #LOC_CRP_Machinery_DisplayName = Machinery - #LOC_CRP_SpecializedParts_DisplayName = SpecializedParts - #LOC_CRP_Recyclables_DisplayName = Recyclables - #LOC_CRP_Hydrogen_DisplayName = Hydrogen - #LOC_CRP_Karbonite_DisplayName = Karbonite - #LOC_CRP_Karborundum_DisplayName = Karborundum - #LOC_CRP_LqdCO2_DisplayName = LqdCO2 - #LOC_CRP_LqdCO_DisplayName = LqdCO - #LOC_CRP_MaterialKits_DisplayName = MaterialKits - #LOC_CRP_Metals_DisplayName = Metals - #LOC_CRP_Minerals_DisplayName = Minerals - #LOC_CRP_MetallicOre_DisplayName = MetallicOre - #LOC_CRP_Organics_DisplayName = Organics + #LOC_CRP_Supplies_DisplayName = Припасы + #LOC_CRP_Fertilizer_DisplayName = Удобрения + #LOC_CRP_Mulch_DisplayName = Мульча + #LOC_CRP_Machinery_DisplayName = Машинерия + #LOC_CRP_SpecializedParts_DisplayName = Специальные компоненты + #LOC_CRP_Recyclables_DisplayName = Вторсырьё + #LOC_CRP_Hydrogen_DisplayName = Водород + #LOC_CRP_Karbonite_DisplayName = Карбонит + #LOC_CRP_Karborundum_DisplayName = Карборунд + #LOC_CRP_LqdCO2_DisplayName = жидк. CO2 + #LOC_CRP_LqdCO_DisplayName = жидк. CO + #LOC_CRP_MaterialKits_DisplayName = Конструкционные материалы + #LOC_CRP_Metals_DisplayName = Металлы + #LOC_CRP_Minerals_DisplayName = Минералы + #LOC_CRP_MetallicOre_DisplayName = Металлическая руда + #LOC_CRP_Organics_DisplayName = Органика #LOC_CRP_Oxygen_DisplayName = Кислород - #LOC_CRP_Polymers_DisplayName = Polymers - #LOC_CRP_RareMetals_DisplayName = RareMetals - #LOC_CRP_RefinedExotics_DisplayName = RefinedExotics - #LOC_CRP_Rock_DisplayName = Rock - #LOC_CRP_RocketParts_DisplayName = RocketParts - #LOC_CRP_SpareParts_DisplayName = SpareParts - #LOC_CRP_Substrate_DisplayName = Substrate - #LOC_CRP_Uraninite_DisplayName = Uraninite + #LOC_CRP_Polymers_DisplayName = Полимеры + #LOC_CRP_RareMetals_DisplayName = Редкие металлы + #LOC_CRP_RefinedExotics_DisplayName = Аффинированная экзотика + #LOC_CRP_Rock_DisplayName = Камень + #LOC_CRP_RocketParts_DisplayName = Ракетные запчасти + #LOC_CRP_SpareParts_DisplayName = Запчасти + #LOC_CRP_Substrate_DisplayName = Субстрат + #LOC_CRP_Uraninite_DisplayName = Урановая смолка // Possible variants: "Настуран" (obsolete) or "Уранинит" (looks like typo in "Уранит") #LOC_CRP_Waste_DisplayName = Отходы #LOC_CRP_WasteWater_DisplayName = Грязная вода #LOC_CRP_Water_DisplayName = Вода //NFT - #LOC_CRP_ArgonGas_DisplayName = Argon Gas + #LOC_CRP_ArgonGas_DisplayName = Аргон #LOC_CRP_ArgonGas_Abbreviation = Ar - #LOC_CRP_Boron_DisplayName = Boron - #LOC_CRP_Boron_Abbreviation = Bo - #LOC_CRP_ResourceLode_DisplayName = ResourceLode - #LOC_CRP_EnrichedUranium_DisplayName = Enriched Uranium - #LOC_CRP_EnrichedUranium_Abbreviation = EnrU - #LOC_CRP_DepletedUranium_DisplayName = Depleted Uranium - #LOC_CRP_DepletedUranium_Abbreviation = DepU - #LOC_CRP_LqdHydrogen_DisplayName = Liquid Hydrogen - #LOC_CRP_LqdHydrogen_Abbreviation = LH2 - #LOC_CRP_StoredCharge_DisplayName = Stored Charge - #LOC_CRP_StoredCharge_Abbreviation = SC + #LOC_CRP_Boron_DisplayName = Бор + #LOC_CRP_Boron_Abbreviation = B + #LOC_CRP_ResourceLode_DisplayName = Ресурсный самородок // Literally - "resource nugget" It's a movable thing! + #LOC_CRP_EnrichedUranium_DisplayName = Обогащённый Уран + #LOC_CRP_EnrichedUranium_Abbreviation = обгщ.U + #LOC_CRP_DepletedUranium_DisplayName = Обеднённый уран + #LOC_CRP_DepletedUranium_Abbreviation = обдн.U + #LOC_CRP_LqdHydrogen_DisplayName = Жидкий водород + #LOC_CRP_LqdHydrogen_Abbreviation = ЖВ + #LOC_CRP_StoredCharge_DisplayName = Накопленный заряд + #LOC_CRP_StoredCharge_Abbreviation = НЗ //KSPI-E - #LOC_CRP_Actinides_DisplayName = Actinides - #LOC_CRP_Actinides_Abbreviation = Act - #LOC_CRP_Aluminium_DisplayName = Aluminium + #LOC_CRP_Actinides_DisplayName = Актиноиды + #LOC_CRP_Actinides_Abbreviation = Акт + #LOC_CRP_Aluminium_DisplayName = Алюминий #LOC_CRP_Aluminium_Abbreviation = Al - #LOC_CRP_Alumina_DisplayName = Alumina - #LOC_CRP_Alumina_Abbreviation = Aia - #LOC_CRP_Ammonia_DisplayName = Ammonia + #LOC_CRP_Alumina_DisplayName = Глинозём + #LOC_CRP_Alumina_Abbreviation = Al2O3 + #LOC_CRP_Ammonia_DisplayName = Аммиак #LOC_CRP_Ammonia_Abbreviation = NH3 - #LOC_CRP_Antimatter_DisplayName = Antimatter - #LOC_CRP_Antimatter_Abbreviation = AM - #LOC_CRP_LqdArgon_DisplayName = LqdArgon + #LOC_CRP_Antimatter_DisplayName = Антиматерия + #LOC_CRP_Antimatter_Abbreviation = АМ + #LOC_CRP_LqdArgon_DisplayName = Жидкий аргон #LOC_CRP_LqdArgon_Abbreviation = Ar - #LOC_CRP_Borate_DisplayName = Borate - #LOC_CRP_Borate_Abbreviation = Br - #LOC_CRP_Caesium_DisplayName = Caesium + #LOC_CRP_Borate_DisplayName = Борат + #LOC_CRP_Borate_Abbreviation = Брт + #LOC_CRP_Caesium_DisplayName = Цезий #LOC_CRP_Caesium_Abbreviation = Cs - #LOC_CRP_CarbonMonoxide_DisplayName = CarbonMonoxide + #LOC_CRP_CarbonMonoxide_DisplayName = Угарный газ #LOC_CRP_CarbonMonoxide_Abbreviation = CO - #LOC_CRP_Carbon_DisplayName = Carbon + #LOC_CRP_Carbon_DisplayName = Углерод #LOC_CRP_Carbon_Abbreviation = C - #LOC_CRP_ChargedParticles_DisplayName = ChargedParticles - #LOC_CRP_ChargedParticles_Abbreviation = CP + #LOC_CRP_ChargedParticles_DisplayName = Заряженные частицы + #LOC_CRP_ChargedParticles_Abbreviation = ЗЧ #LOC_CRP_Chlorine_DisplayName = Хлор #LOC_CRP_Chlorine_Abbreviation = Cl - #LOC_CRP_Decaborane_DisplayName = Decaborane - #LOC_CRP_Decaborane_Abbreviation = DeBo - #LOC_CRP_Deuterium_DisplayName = Deuterium + #LOC_CRP_Decaborane_DisplayName = Декаборан // Possible variant "Декаборан(14)" though it's the same shit. + #LOC_CRP_Decaborane_Abbreviation = B10H14 + #LOC_CRP_Deuterium_DisplayName = Дейтерий #LOC_CRP_Deuterium_Abbreviation = D - #LOC_CRP_LqdDeuterium_DisplayName = LqdDeuterium + #LOC_CRP_LqdDeuterium_DisplayName = Жидкий дейтерий #LOC_CRP_LqdDeuterium_Abbreviation = D - #LOC_CRP_DepletedFuel_DisplayName = DepletedFuel - #LOC_CRP_DepletedFuel_Abbreviation = DepF - #LOC_CRP_ExoticMatter_DisplayName = ExoticMatter - #LOC_CRP_ExoticMatter_Abbreviation = EcM - #LOC_CRP_FusionPellets_DisplayName = FusionPellets - #LOC_CRP_Fluorine_DisplayName = Fluorine + #LOC_CRP_DepletedFuel_DisplayName = Обеднённое топливо + #LOC_CRP_DepletedFuel_Abbreviation = обдн.Т + #LOC_CRP_ExoticMatter_DisplayName = Экзотическая материя + #LOC_CRP_ExoticMatter_Abbreviation = ЭкзМ + #LOC_CRP_FusionPellets_DisplayName = Термоядерные пеллеты // Placeholder. Suggest something better if you are a nuclear physicist. + #LOC_CRP_Fluorine_DisplayName = Фтор #LOC_CRP_Fluorine_Abbreviation = F - #LOC_CRP_HeavyWater_DisplayName = HeavyWater + #LOC_CRP_HeavyWater_DisplayName = Тяжёлая вода #LOC_CRP_HeavyWater_Abbreviation = D20 - #LOC_CRP_IntakeAtm_DisplayName = IntakeAtm - #LOC_CRP_IntakeAtm_Abbreviation = IntA - #LOC_CRP_KryptonGas_DisplayName = KryptonGas + #LOC_CRP_IntakeAtm_DisplayName = Атмосферные газы + #LOC_CRP_IntakeAtm_Abbreviation = АтмГ + #LOC_CRP_KryptonGas_DisplayName = Криптон #LOC_CRP_KryptonGas_Abbreviation = Kr - #LOC_CRP_LqdKrypton_DisplayName = LqdKrypton + #LOC_CRP_LqdKrypton_DisplayName = Жидкий криптон #LOC_CRP_LqdKrypton_Abbreviation = Kr - #LOC_CRP_NeonGas_DisplayName = NeonGas + #LOC_CRP_NeonGas_DisplayName = Неон #LOC_CRP_NeonGas_Abbreviation = Ne - #LOC_CRP_LqdNeon_DisplayName = LqdNeon + #LOC_CRP_LqdNeon_DisplayName = Жидкий неон #LOC_CRP_LqdNeon_Abbreviation = Ne - #LOC_CRP_Lithium_DisplayName = Lithium - #LOC_CRP_Lithium_Abbreviation = Li7 - #LOC_CRP_Lithium6_DisplayName = Lithium6 + #LOC_CRP_Lithium_DisplayName = Литий + #LOC_CRP_Lithium_Abbreviation = Li + #LOC_CRP_Lithium6_DisplayName = Литий-6 #LOC_CRP_Lithium6_Abbreviation = Li6 - #LOC_CRP_LithiumHydride_DisplayName = LithiumHydride - #LOC_CRP_LithiumHydride_Abbreviation = Li7H - #LOC_CRP_LithiumHydride_Title = LithiumHydride - #LOC_CRP_LithiumDeuteride_DisplayName = LithiumDeuteride + #LOC_CRP_LithiumHydride_DisplayName = Гидрид лития + #LOC_CRP_LithiumHydride_Abbreviation = LiH + #LOC_CRP_LithiumHydride_Title = Гидрид лития + #LOC_CRP_LithiumDeuteride_DisplayName = Дейтерид лития #LOC_CRP_LithiumDeuteride_Abbreviation = Li6D - #LOC_CRP_LithiumDeuteride_Title = LithiumDeuteride - #LOC_CRP_LqdAmmonia_DisplayName = LqdAmmonia + #LOC_CRP_LithiumDeuteride_Title = Дейтерид лития + #LOC_CRP_LqdAmmonia_DisplayName = Жидкий аммиак #LOC_CRP_LqdAmmonia_Abbreviation = NH3 - #LOC_CRP_Helium3_DisplayName = Helium3 + #LOC_CRP_Helium3_DisplayName = Гелий-3 #LOC_CRP_Helium3_Abbreviation = He3 - #LOC_CRP_LqdHe3_DisplayName = LqdHe3 + #LOC_CRP_LqdHe3_DisplayName = Жидкий гелий-3 #LOC_CRP_LqdHe3_Abbreviation = He3 - #LOC_CRP_Helium4_DisplayName = Helium4 + #LOC_CRP_Helium4_DisplayName = Гелий-4 #LOC_CRP_Helium4_Abbreviation = He4 - #LOC_CRP_LqdHelium_DisplayName = LqdHelium + #LOC_CRP_LqdHelium_DisplayName = Жидкий гелий #LOC_CRP_LqdHelium_Abbreviation = He4 - #LOC_CRP_Nitratine_DisplayName = Nitratine - #LOC_CRP_Nitratine_Title = Nitratine - #LOC_CRP_Hexaborane_DisplayName = Hexaborane - #LOC_CRP_LqdNitrogen_DisplayName = LqdNitrogen + #LOC_CRP_Nitratine_DisplayName = Натриевая селитра + #LOC_CRP_Nitratine_Title = Натриевая селитра + #LOC_CRP_Hexaborane_DisplayName = Гексаборан // Possible variant is "Гексаборан(10)" though it's the default meaning anyway. + #LOC_CRP_LqdNitrogen_DisplayName = Жидкий азот #LOC_CRP_LqdNitrogen_Abbreviation = N14 - #LOC_CRP_LqdNitrogen15_DisplayName = LqdNitrogen15 + #LOC_CRP_LqdNitrogen15_DisplayName = Жидкий азот-15 #LOC_CRP_LqdNitrogen15_Abbreviation = N15 - #LOC_CRP_Megajoules_DisplayName = Megajoules - #LOC_CRP_Megajoules_Abbreviation = Meg3 - #LOC_CRP_Monazite_DisplayName = Monazite - #LOC_CRP_Monazite_Abbreviation = Monz - #LOC_CRP_LqdOxygen18_DisplayName = LqdOxygen18 + #LOC_CRP_Megajoules_DisplayName = Мегаджоули + #LOC_CRP_Megajoules_Abbreviation = МДж + #LOC_CRP_Monazite_DisplayName = Монацит + #LOC_CRP_Monazite_Abbreviation = Мнцт + #LOC_CRP_LqdOxygen18_DisplayName = Жидкий кислород-18 #LOC_CRP_LqdOxygen18_Abbreviation = O18 - #LOC_CRP_Sodium_DisplayName = Sodium + #LOC_CRP_Sodium_DisplayName = Натрий #LOC_CRP_Sodium_Abbreviation = Na - #LOC_CRP_PolyvinylChloride_DisplayName = PolyvinylChloride - #LOC_CRP_PolyvinylChloride_Abbreviation = PVC - #LOC_CRP_Plutonium-238_DisplayName = Plutonium-238 + #LOC_CRP_PolyvinylChloride_DisplayName = Поливинилхлорид + #LOC_CRP_PolyvinylChloride_Abbreviation = ПВХ + #LOC_CRP_Plutonium-238_DisplayName = Плутоний-238 #LOC_CRP_Plutonium-238_Abbreviation = Pu238 - #LOC_CRP_Regolith_DisplayName = Regolith - #LOC_CRP_Regolith_Abbreviation = R - #LOC_CRP_UF4_DisplayName = UF4 + #LOC_CRP_Regolith_DisplayName = Реголит + #LOC_CRP_Regolith_Abbreviation = Р + #LOC_CRP_UF4_DisplayName = Тетрафторид урана #LOC_CRP_UF4_Abbreviation = UF4 - #LOC_CRP_Silicates_DisplayName = Silicates - #LOC_CRP_Silicates_Abbreviation = Silica - #LOC_CRP_Silicon_DisplayName = Silicon + #LOC_CRP_Silicates_DisplayName = Силикаты + #LOC_CRP_Silicates_Abbreviation = Сил + #LOC_CRP_Silicon_DisplayName = Кремний #LOC_CRP_Silicon_Abbreviation = Si - #LOC_CRP_SolarWind_DisplayName = SolarWind - #LOC_CRP_SolarWind_Abbreviation = SW - #LOC_CRP_ThermalPower_DisplayName = ThermalPower - #LOC_CRP_ThermalPower_Abbreviation = ThP - #LOC_CRP_Thorium_DisplayName = Thorium - #LOC_CRP_ThF4_DisplayName = ThF4 + #LOC_CRP_SolarWind_DisplayName = Солнечный ветер + #LOC_CRP_SolarWind_Abbreviation = СВ + #LOC_CRP_ThermalPower_DisplayName = Тепловая энергия + #LOC_CRP_ThermalPower_Abbreviation = ТЭ + #LOC_CRP_Thorium_DisplayName = Торий + #LOC_CRP_ThF4_DisplayName = Тетрафторид тория #LOC_CRP_ThF4_Abbreviation = ThF4 - #LOC_CRP_Tritium_DisplayName = Tritium + #LOC_CRP_Tritium_DisplayName = Тритий #LOC_CRP_Tritium_Abbreviation = T - #LOC_CRP_Tritium_Title = Tritium Gas - #LOC_CRP_LqdTritium_DisplayName = LqdTritium + #LOC_CRP_Tritium_Title = Тритий + #LOC_CRP_LqdTritium_DisplayName = Жидкий тритий #LOC_CRP_LqdTritium_Abbreviation = T - #LOC_CRP_UraniumNitride_DisplayName = UraniumNitride + #LOC_CRP_UraniumNitride_DisplayName = Нитрид урана #LOC_CRP_UraniumNitride_Abbreviation = UN - #LOC_CRP_VacuumPlasma_DisplayName = VacuumPlasma - #LOC_CRP_VacuumPlasma_Abbreviation = VP - #LOC_CRP_WasteHeat_DisplayName = WasteHeat - #LOC_CRP_WasteHeat_Abbreviation = WH - #LOC_CRP_LqdXenon_DisplayName = LqdXenon + #LOC_CRP_VacuumPlasma_DisplayName = Квантовый вакуум //Proper name in english is "Quantum Vacuum" or "Quantum Vacuum Virtual Plasma", rather than "Vacuum Plasma", and it's a physical effect rather than anything storeable. + #LOC_CRP_VacuumPlasma_Abbreviation = КвВ + #LOC_CRP_WasteHeat_DisplayName = Избыточное тепло + #LOC_CRP_WasteHeat_Abbreviation = Изб.Т + #LOC_CRP_LqdXenon_DisplayName = Жидкий ксенон #LOC_CRP_LqdXenon_Abbreviation = Xe - #LOC_CRP_LqdXenon_Title = Liquid Xenon + #LOC_CRP_LqdXenon_Title = Жидкий ксенон //RealFuels - #LOC_CRP_Aerozine50_DisplayName = Aerozine50 + #LOC_CRP_Aerozine50_DisplayName = Аэрозин #LOC_CRP_AK20_DisplayName = AK20 #LOC_CRP_AK27_DisplayName = AK27 - #LOC_CRP_Aniline_DisplayName = Aniline - #LOC_CRP_AvGas_DisplayName = AvGas + #LOC_CRP_Aniline_DisplayName = Анилин + #LOC_CRP_AvGas_DisplayName = Авиационный бензин #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 = Ethylene + #LOC_CRP_ClF3_DisplayName = Трифторид хлора + #LOC_CRP_ClF5_DisplayName = Пентафторид хлора + #LOC_CRP_Diborane_DisplayName = Диборан + #LOC_CRP_Ethane_DisplayName = Этан + #LOC_CRP_Ethanol_DisplayName = Этанол + #LOC_CRP_Ethanol75_DisplayName = Этанол 75% + #LOC_CRP_Ethanol90_DisplayName = Этанол 90% + #LOC_CRP_Ethylene_DisplayName = Этилен #LOC_CRP_FLOX30_DisplayName = FLOX30 #LOC_CRP_FLOX70_DisplayName = FLOX70 #LOC_CRP_FLOX88_DisplayName = FLOX88 - #LOC_CRP_Furfuryl_DisplayName = Furfuryl - #LOC_CRP_Helium_DisplayName = Helium - #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_Furfuryl_DisplayName = Фурфуриловый спирт + #LOC_CRP_Helium_DisplayName = Гелий + #LOC_CRP_HNIW_DisplayName = HNIW // "Гексанитрогексаазаизовюрцитан" is too long, no? + #LOC_CRP_HTP_DisplayName = Пероксид водорода + #LOC_CRP_HTPB_DisplayName = HTPB // "Полибутадиен с концевыми гидроксильными группами" is too long, no? + #LOC_CRP_Hydrazine_DisplayName = Гидразин + #LOC_CRP_Hydyne_DisplayName = Гидин #LOC_CRP_IRFNA-III_DisplayName = IRFNA-III #LOC_CRP_IRFNA-IV_DisplayName = IRFNA-IV #LOC_CRP_IWFNA_DisplayName = IWFNA - #LOC_CRP_Kerosene_DisplayName = Kerosene - #LOC_CRP_LeadBallast_DisplayName = LeadBallast - #LOC_CRP_LqdFluorine_DisplayName = LqdFluorine - #LOC_CRP_LqdMethane_DisplayName = LqdMethane - #LOC_CRP_LqdOxygen_DisplayName = LqdOxygen - #LOC_CRP_Methane_DisplayName = Methane - #LOC_CRP_Methanol_DisplayName = Methanol - #LOC_CRP_MMH_DisplayName = MMH + #LOC_CRP_Kerosene_DisplayName = Керосин + #LOC_CRP_LeadBallast_DisplayName = Свинцовый балласт + #LOC_CRP_LqdFluorine_DisplayName = Жидкий фтор + #LOC_CRP_LqdMethane_DisplayName = Жидкий метан + #LOC_CRP_LqdOxygen_DisplayName = Жидкий кислород + #LOC_CRP_Methane_DisplayName = Метан + #LOC_CRP_Methanol_DisplayName = Метанол + #LOC_CRP_MMH_DisplayName = Монометилгидразин #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 = Nitrogen - #LOC_CRP_NitrousOxide_DisplayName = NitrousOxide - #LOC_CRP_NTO_DisplayName = NTO - #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_NGNC_DisplayName = NGNC // "Нитроглицерин/Нитроцеллюлоза" is too long, no? + #LOC_CRP_N2F4_DisplayName = Тетрафторгидразин + #LOC_CRP_Nitrogen_DisplayName = Азот + #LOC_CRP_NitrousOxide_DisplayName = Оксид диазота + #LOC_CRP_NTO_DisplayName = Тетраоксид азота + #LOC_CRP_OF2_DisplayName = Дифторид кислорода + #LOC_CRP_PBAN_DisplayName = Перхлорат аммония + #LOC_CRP_Pentaborane_DisplayName = Пентаборан + #LOC_CRP_PSPC_DisplayName = PSPC // Don't know this mark of solid fuel. + #LOC_CRP_Syntin_DisplayName = Синтин + #LOC_CRP_TEATEB_DisplayName = Триэтилборан #LOC_CRP_Tonka250_DisplayName = Tonka250 #LOC_CRP_Tonka500_DisplayName = Tonka500 - #LOC_CRP_UDMH_DisplayName = UDMH + #LOC_CRP_UDMH_DisplayName = Несимметричный диметилгидразин #LOC_CRP_UH25_DisplayName = UH25 //DeepFreeze - #LOC_CRP_Glykerol_DisplayName = Glykerol + #LOC_CRP_Glykerol_DisplayName = Гликерол // It's a fantastic spirit-like cryogenic fluid rather than a typo in common glycerine. } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/zh-cn.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/zh-cn.cfg index 8c3dd451d..28e8dc4fe 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/Localization/zh-cn.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/Localization/zh-cn.cfg @@ -7,11 +7,11 @@ Localization #LOC_CRP_Gypsum_DisplayName = 石膏 #LOC_CRP_IntakeLqd_DisplayName = 摄入液体 #LOC_CRP_ColonySupplies_DisplayName = 殖民地用品 - #LOC_CRP_Lead_DisplayName = 铅 + #LOC_CRP_Lead_DisplayName = 鉛者 #LOC_CRP_CarbonDioxide_DisplayName = 二氧化碳 #LOC_CRP_Chemicals_DisplayName = 化学制品 - #LOC_CRP_Dirt_DisplayName = 土 - #LOC_CRP_ExoticMinerals_DisplayName = 奇异矿物 + #LOC_CRP_Dirt_DisplayName = 污垢 + #LOC_CRP_ExoticMinerals_DisplayName = 奇异矿物 #LOC_CRP_Food_DisplayName = 食物 #LOC_CRP_Supplies_DisplayName = 资源 #LOC_CRP_Fertilizer_DisplayName = 肥料 @@ -19,7 +19,7 @@ Localization #LOC_CRP_Machinery_DisplayName = 机械 #LOC_CRP_SpecializedParts_DisplayName = 专业零件 #LOC_CRP_Recyclables_DisplayName = 可回收 - #LOC_CRP_Hydrogen_DisplayName = 氢 + #LOC_CRP_Hydrogen_DisplayName = 气态氢 #LOC_CRP_Karbonite_DisplayName = Karbonite #LOC_CRP_Karborundum_DisplayName = Karborundum #LOC_CRP_LqdCO2_DisplayName = 液态二氧化碳 @@ -29,7 +29,7 @@ Localization #LOC_CRP_Minerals_DisplayName = 矿产 #LOC_CRP_MetallicOre_DisplayName = 金属矿物 #LOC_CRP_Organics_DisplayName = 有机物 - #LOC_CRP_Oxygen_DisplayName = 氧 + #LOC_CRP_Oxygen_DisplayName = 气态氧 #LOC_CRP_Polymers_DisplayName = 聚合物 #LOC_CRP_RareMetals_DisplayName = 稀有金属 #LOC_CRP_RefinedExotics_DisplayName = 精炼奇异矿物 @@ -40,7 +40,8 @@ Localization #LOC_CRP_Uraninite_DisplayName = 沥青铀矿 #LOC_CRP_Waste_DisplayName = 垃圾 #LOC_CRP_WasteWater_DisplayName = 污水 - #LOC_CRP_Water_DisplayName = 水 + #LOC_CRP_Water_DisplayName = 液态水 + //NFT #LOC_CRP_ArgonGas_DisplayName = 氩气 #LOC_CRP_ArgonGas_Abbreviation = 氩气 @@ -55,6 +56,7 @@ Localization #LOC_CRP_LqdHydrogen_Abbreviation = 液态氢 #LOC_CRP_StoredCharge_DisplayName = 存储的电力 #LOC_CRP_StoredCharge_Abbreviation = 存储的电力 + //KSPI-E #LOC_CRP_Actinides_DisplayName = 锕系元素 #LOC_CRP_Actinides_Abbreviation = 锕系元素 @@ -104,8 +106,8 @@ Localization #LOC_CRP_Fluorite_Abbreviation = 萤石 #LOC_CRP_HeavyWater_DisplayName = 重水 #LOC_CRP_HeavyWater_Abbreviation = 重水 - #LOC_CRP_IntakeAtm_DisplayName = 近气 - #LOC_CRP_IntakeAtm_Abbreviation = 近气 + #LOC_CRP_IntakeAtm_DisplayName = 进气 + #LOC_CRP_IntakeAtm_Abbreviation = 进气 #LOC_CRP_KryptonGas_DisplayName = 氪气 #LOC_CRP_KryptonGas_Abbreviation = 氪气 #LOC_CRP_LqdKrypton_DisplayName = 液态氪 @@ -140,8 +142,8 @@ Localization #LOC_CRP_LqdNitrogen_Abbreviation = 液态氮 #LOC_CRP_LqdNitrogen15_DisplayName = 液态氮-15 #LOC_CRP_LqdNitrogen15_Abbreviation = 液态氮-15 - #LOC_CRP_Megajoules_DisplayName = 兆焦 - #LOC_CRP_Megajoules_Abbreviation = 兆焦 + #LOC_CRP_Megajoules_DisplayName = 兆焦能量 + #LOC_CRP_Megajoules_Abbreviation = 兆焦能量 #LOC_CRP_Mopedantte_DisplayName = 独居石 #LOC_CRP_Mopedantte_Abbreviation = 独居石 #LOC_CRP_LqdOxygen18_DisplayName = 液态氧-18 @@ -188,6 +190,7 @@ Localization #LOC_CRP_WasteHeat_Abbreviation = 废热 #LOC_CRP_LqdXenon_DisplayName = 液态氙 #LOC_CRP_LqdXenon_Abbreviation = 液态氙 + //RealFuels #LOC_CRP_Aerozine50_DisplayName = Aerozine50 #LOC_CRP_AK20_DisplayName = AK20 @@ -206,18 +209,18 @@ Localization #LOC_CRP_FLOX30_DisplayName = FLOX30 #LOC_CRP_FLOX70_DisplayName = FLOX70 #LOC_CRP_FLOX88_DisplayName = FLOX88 - #LOC_CRP_Furfuryl_DisplayName = 糠 - #LOC_CRP_Helium_DisplayName = 氦 + #LOC_CRP_Furfuryl_DisplayName = 糠醇 + #LOC_CRP_Helium_DisplayName = 氦气 #LOC_CRP_HNIW_DisplayName = 六硝基六氮杂异伍兹烷 #LOC_CRP_HTP_DisplayName = 过氧化氢 #LOC_CRP_HTPB_DisplayName = 端羟基聚丁二烯 - #LOC_CRP_Hydrazine_DisplayName = 肼 + #LOC_CRP_Hydrazine_DisplayName = 联氨 #LOC_CRP_Hydyne_DisplayName = Hydyne #LOC_CRP_IRFNA-III_DisplayName = 红发烟硝酸-3 #LOC_CRP_IRFNA-IV_DisplayName = 红发烟硝酸-4 #LOC_CRP_IWFNA_DisplayName = 白发烟硝酸 #LOC_CRP_Kerosene_DisplayName = 煤油 - #LOC_CRP_LeadBallast_DisplayName = + #LOC_CRP_LeadBallast_DisplayName = 铅镇流器 #LOC_CRP_LqdFluorine_DisplayName = 液态氟 #LOC_CRP_LqdMethane_DisplayName = 液态甲烷 #LOC_CRP_LqdOxygen_DisplayName = 液态氧 @@ -232,7 +235,7 @@ Localization #LOC_CRP_MON25_DisplayName = MON25 #LOC_CRP_NGNC_DisplayName = NGNC #LOC_CRP_N2F4_DisplayName = 四氟肼 - #LOC_CRP_Nitrogen_DisplayName = 氮 + #LOC_CRP_Nitrogen_DisplayName = 液态氮 #LOC_CRP_NitrousOxide_DisplayName = 一氧化氮 #LOC_CRP_NTO_DisplayName = 四氧化二氮 #LOC_CRP_OF2_DisplayName = 二氟化氧 @@ -243,9 +246,11 @@ Localization #LOC_CRP_TEATEB_DisplayName = TEATEB #LOC_CRP_Tonka250_DisplayName = 通卡250 #LOC_CRP_Tonka500_DisplayName = 通卡500 - #LOC_CRP_UDMH_DisplayName = 二甲基肼 + #LOC_CRP_UDMH_DisplayName = 偏二甲肼 #LOC_CRP_UH25_DisplayName = UH25 - //DeepFreeze + + + //DeepFreeze #LOC_CRP_Glykerol_DisplayName = 甘油 } } diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version index 824079eda..dbe17b3ce 100644 --- a/FOR_RELEASE/GameData/Firespitter/Firespitter.version +++ b/FOR_RELEASE/GameData/Firespitter/Firespitter.version @@ -3,18 +3,18 @@ "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version", "VERSION": { "MAJOR": 7, - "MINOR": 6, + "MINOR": 7, "PATCH": 0 }, "KSP_VERSION":{ "MAJOR":1, "MINOR":3, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":2, - "PATCH":9 + "MINOR":3, + "PATCH":1 }, "KSP_VERSION_MAX":{ "MAJOR":1, diff --git a/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version b/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version index 52f578334..563682eec 100644 --- a/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version +++ b/FOR_RELEASE/GameData/GroundConstruction/GroundConstruction.version @@ -1,25 +1,25 @@ { "NAME":"GroundConstruction", "URL":"https://raw.githubusercontent.com/allista/GroundConstruction/master/GameData/GroundConstruction/GroundConstruction.version", - "DOWNLOAD":"https://github.com/allista/GroundConstruction/releases", + "DOWNLOAD":"https://spacedock.info/mod/1123/Ground%20Construction", "CHANGE_LOG_URL":"https://github.com/allista/GroundConstruction/blob/master/ChangeLog.md", "VERSION": { "MAJOR":1, "MINOR":2, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION_MIN": { "MAJOR":1, "MINOR":3, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MAX": { "MAJOR":1, "MINOR":3, - "PATCH":0 + "PATCH":1 } } diff --git a/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll b/FOR_RELEASE/GameData/GroundConstruction/Plugins/GroundConstruction.dll index 790aae208..3ef0e7c0a 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/ModuleManager.2.8.1.dll b/FOR_RELEASE/GameData/ModuleManager.2.8.1.dll deleted file mode 100644 index a3822cd25..000000000 Binary files a/FOR_RELEASE/GameData/ModuleManager.2.8.1.dll and /dev/null differ diff --git a/FOR_RELEASE/GameData/ModuleManager.3.0.4.dll b/FOR_RELEASE/GameData/ModuleManager.3.0.4.dll new file mode 100644 index 000000000..5ecfde07e Binary files /dev/null and b/FOR_RELEASE/GameData/ModuleManager.3.0.4.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 f10fde8bb..5caee3c5b 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Akita/Parts/Akita_Cab.cfg @@ -25,7 +25,7 @@ PART subcategory = 0 title = Akita Core manufacturer = Umbra Space Industries - description = The Akita Core has mounting locations for wheels, cargo racks, and a crew cage. It also includes illumination, and an integrated monopropellant generator. + description = The Akita Core has mounting locations for wheels, cargo racks, and a crew cage. It also includes illumination, integrated monopropellant generator, and a ground tether module. tags = cck-rovers //USI Konstruction Akita rover core mount cargo construct gen MonoPropellant Mono ElectricCharge e/c @@ -94,6 +94,11 @@ PART 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 e6008d4ae..6557c3c34 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt @@ -1,3 +1,8 @@ +0.5.1 - 2017.03.06 +------------------ +Updated CryoTanks compatibility for better interop and consistency (Thanks Wyzard256!) +Multiple kontainer amount/cost fixes (Thanks Wyzard256!) + 0.5.0 - 2017.10.09 ------------------ KSP 1.3.1 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt index 13e2b1e09..181a1377f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt @@ -1,3 +1,8 @@ +0.3.1 - 2017.03.06 +------------------ +Depencency Updates +The Akita Cab now has ground tethering (Thanks sh1pman!) + 0.3.0 - 2017.10.09 ------------------ KSP 1.3.1 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.dll index f821d47d0..dc4d30fe9 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 e71f019fb..8efa77050 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 047a759e7..d03125125 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 0199b99e0..1a6007a2e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":3, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg index 98b76152c..b140d8245 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg @@ -1,9 +1,9 @@ -@PART[C3_Tank_*,C3_RTank_*,RadialLqdTank,MountableLqdTank]:NEEDS[SimpleBoiloff] +@PART[C3_Tank_*,C3_RTank_*,C3_FlatRnd_*,C3_LqdTrussTank,RadialLqdTank,MountableLqdTank]:NEEDS[SimpleBoiloff] { MODULE { name = ModuleCryoTank - CoolingCost = 0.08 + CoolingCost = 0.09 CoolingEnabled = False BOILOFFCONFIG { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_01.cfg index 928dfb96e..82f50c31a 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;60000;54,66;600;600;600;2400;120;120 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 2400000;24000;630;55.2;0.48;9600;0;88.2;96;144 + resourceAmounts = 600;6000;192000;54,66;600;600;600;600;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 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 4cbb2c64a..0d0ff0a6b 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;450000;405,495;4500;4500;4500;18000;900;900 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 18000000;180000;4725;414;3.6;72000;0;661.5;720;1080 + resourceAmounts = 4500;45000;1440000;405,495;4500;4500;4500;4500;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 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 6709e5daa..51f918f37 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;1500000;1350,1650;15000;15000;15000;60000;3000;3000 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 60000000;600000;15750;1380;12;240000;0;2205;2400;3600 + resourceAmounts = 15000;150000;4800000;1350,1650;15000;15000;15000;15000;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 basePartMass = 1.8750 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatRnd_04.cfg index 6abd289ed..d834ab38d 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;3750000;3375,4125;37500;37500;37500;150000;7500;7500 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 150000000;1500000;39375;3450;30;600000;0;5512.5;6000;9000 + resourceAmounts = 37500;375000;12000000;3375,4125;37500;37500;37500;37500;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 basePartMass = 4.6875 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg index b99977ff0..c060e2222 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_01.cfg @@ -70,7 +70,7 @@ bulkheadProfiles = size0,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 600;600;600;600;600;300,300;600;600;600;600;120;600;600;600;600;600;600;600;600;600;600;600;600;600 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 - tankCost = 1056;420;180;480;192;90000;1200;8544;4800;1500;2.4;9480;4200;19200;1200;300;6;180;6;12;150000;9000;300;300 + tankCost = 1056;420;180;480;192;90000;1200;8544;4800;1500;2.4;9480;4200;19200;1200;300;6;180;6;12;150000;9000;300;0.006 basePartMass = .075 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg index ced3974b7..9a195ce34 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_02.cfg @@ -70,7 +70,7 @@ bulkheadProfiles = size0,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 4500;4500;4500;4500;4500;2250,2250;4500;4500;4500;4500;900;4500;4500;4500;4500;4500;4500;4500;4500;4500;4500;4500;4500;4500 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 - tankCost = 7920;3150;1350;3600;1440;675000;9000;64080;36000;11250;18;71100;31500;144000;9000;2250;45;1350;45;90;1125000;67500;2250;2250 + tankCost = 7920;3150;1350;3600;1440;675000;9000;64080;36000;11250;18;71100;31500;144000;9000;2250;45;1350;45;90;1125000;67500;2250;0.045 basePartMass = 0.5625 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg index ddad983f1..e2641ffa0 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_03.cfg @@ -70,7 +70,7 @@ bulkheadProfiles = size0,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 15000;15000;15000;15000;15000;7500,7500;15000;15000;15000;15000;3000;15000;15000;15000;15000;15000;15000;15000;15000;15000;15000;15000;15000;15000 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 - tankCost = 26400;10500;4500;12000;4800;2250000;30000;213600;120000;37500;60;237000;105000;480000;30000;7500;150;4500;150;300;3750000;225000;7500;7500 + tankCost = 26400;10500;4500;12000;4800;2250000;30000;213600;120000;37500;60;237000;105000;480000;30000;7500;150;4500;150;300;3750000;225000;7500;0.15 basePartMass = 1.875 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg index 09ea715dd..71d5cc286 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/FlatTank_04.cfg @@ -70,7 +70,7 @@ bulkheadProfiles = size0,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 37500;37500;37500;37500;37500;18750,18750;37500;37500;37500;37500;7500;37500;37500;37500;37500;37500;37500;37500;37500;37500;37500;37500;37500;37500 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 - tankCost = 66000;26250;11250;30000;12000;5625000;75000;534000;300000;93750;150;592500;262500;1200000;75000;18750;375;11250;375;750;9375000;562500;18750;18750 + tankCost = 66000;26250;11250;30000;12000;5625000;75000;534000;300000;93750;150;592500;262500;1200000;75000;18750;375;11250;375;750;9375000;562500;18750;0.375 basePartMass = 4.6875 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg index 5cdb8f48b..f946158d5 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg @@ -74,7 +74,7 @@ bulkheadProfiles = size1,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 2000;2000;2000;2000;2000;1000,1000;2000;2000;2000;2000;400;2000;2000;2000;2000;2000;2000;2000;2000;2000;2000;2000;2000;2000 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 - tankCost = 3520;1400;600;1600;640;300000;4000;28480;16000;5000;8;31600;14000;64000;4000;1000;20;600;20;40;500000;30000;1000;1000 + tankCost = 3520;1400;600;1600;640;300000;4000;28480;16000;5000;8;31600;14000;64000;4000;1000;20;600;20;40;500000;30000;1000;0.02 basePartMass = 0.25 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg index 24cb73d82..13380320f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg @@ -74,7 +74,7 @@ bulkheadProfiles = size2,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 16000;16000;16000;16000;16000;8000,8000;16000;16000;16000;16000;3200;16000;16000;16000;16000;16000;16000;16000;16000;16000;16000;16000;16000;16000 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 - tankCost = 28160;11200;4800;12800;5120;2400000;32000;227840;128000;40000;64;252800;112000;512000;32000;8000;160;4800;160;320;4000000;240000;8000;8000 + tankCost = 28160;11200;4800;12800;5120;2400000;32000;227840;128000;40000;64;252800;112000;512000;32000;8000;160;4800;160;320;4000000;240000;8000;0.16 basePartMass = 2 tankMass = 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/Kontainer_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg index 575d960d6..646de7901 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg @@ -74,7 +74,7 @@ bulkheadProfiles = size3,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 54000;54000;54000;54000;54000;27000,27000;54000;54000;54000;54000;10800;54000;54000;54000;54000;54000;54000;54000;54000;54000;54000;54000;54000;54000 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 - tankCost = 95040;37800;16200;43200;17280;8100000;108000;768960;432000;135000;216;853200;378000;1728000;108000;27000;540;16200;540;1080;13500000;810000;27000;27000 + tankCost = 95040;37800;16200;43200;17280;8100000;108000;768960;432000;135000;216;853200;378000;1728000;108000;27000;540;16200;540;1080;13500000;810000;27000;0.54 basePartMass = 6.75 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg index 8ed1ee3e6..b4e5e1fe3 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg @@ -74,7 +74,7 @@ bulkheadProfiles = size4,srf resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock resourceAmounts = 128000;128000;128000;128000;128000;64000,64000;128000;128000;128000;128000;25600;128000;128000;128000;128000;128000;128000;128000;128000;128000;128000;128000;128000;128000 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 - tankCost = 225280;89600;38400;102400;40960;19200000;256000;1822720;1024000;320000;512;2022400;896000;4096000;256000;64000;1280;38400;1280;2560;32000000;1920000;64000;64000 + tankCost = 225280;89600;38400;102400;40960;19200000;256000;1822720;1024000;320000;512;2022400;896000;4096000;256000;64000;1280;38400;1280;2560;32000000;1920000;64000;1.28 basePartMass = 16 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/LqdTrussTank.cfg index 84339b214..afce11ee1 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;1400000;1260,1540;14000;14000;14000;56000;2800;2800 - initialResourceAmounts = 0;35000;350000;0;0;0;0;0;0;0 - tankCost = 56000000;560000;14700;1288;11.2;224000;0;2058;2240;3360 + resourceAmounts = 14000;140000;4480000;1260,1540;14000;14000;14000;14000;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 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 dae5350b7..c729ee6d1 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg @@ -54,9 +54,9 @@ PART:NEEDS[KIS] { name = FSfuelSwitch resourceNames = LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant - resourceAmounts = 90,110;1000;1000;1000;4000;200;200 - initialResourceAmounts = 0;0;0;0;0;0;0 - tankCost = 91.8;0.8;16000;0;147.15;160;240 + resourceAmounts = 90,110;1000;1000;1000;1000;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 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 0eca973e7..6dadc3fb7 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg @@ -56,7 +56,7 @@ PART:NEEDS[KIS] 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 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 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 - tankCost = 1760;700;300;800;320;150000;2000;14240;8000;2500;4;15800;7000;32000;2000;500;10;300;10;20;250000;15000;500;500 + 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 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg index 3cb1ed1df..e81e1d68d 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;5000;250;250 - initialResourceAmounts = 0;0;0;0;0;0;0 - tankCost = 114.75;1;20000;0;183.9375;200;300 + resourceAmounts = 112.5,137.5;1250;1250;1250;1250;250;250 + initialResourceAmounts = 0,0;0;0;0;0;0;0 + tankCost = 114.75;1;20000;0;45.9375;200;300 basePartMass = 0.15625 tankMass = 0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg index 0e56120ce..a8c590619 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg @@ -82,7 +82,7 @@ PART 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 resourceAmounts = 1250;1250;1250;1250;1250;625,625;1250;1250;1250;1200,50;250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250;1250 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 - tankCost = 2200;875;375;1000;400;187500;2500;17800;10000;3125;5;19750;8750;40000;2500;625;12.5;375;12.5;25;312500;18750;625;625 + tankCost = 2200;875;375;1000;400;187500;2500;17800;10000;3000;5;19750;8750;40000;2500;625;12.5;375;12.5;25;312500;18750;625;0.0125 basePartMass = 0.15625 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 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg index f8cf75fe6..c190c2409 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;45000;40.5,49.5;450;450;450;1800;90;90 - initialResourceAmounts = 0;4500;45000;0;0;0;0;0;0;0 - tankCost = 1800000;18000;472.5;41.31;0.45;7200;0;66.075;72;108 + resourceAmounts = 450;4500;144000;40.5,49.5;450;450;450;450;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 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 a43398df3..a352246ca 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;350000;315,385;3500;3500;3500;14000;700;700 - initialResourceAmounts = 0;35000;350000;0;0;0;0;0;0;0 - tankCost = 14000000;140000;3675;321.3;2.8;56000;0;514;560;840 + resourceAmounts = 3500;35000;1120000;315,385;3500;3500;3500;3500;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 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 85c4d99df..c6d77cf66 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;3000000;2700,3300;30000;30000;30000;120000;6000;6000 - initialResourceAmounts = 0;300000;3000000;0;0;0;0;0;0;0 - tankCost = 120000000;1200000;31500;2754;24;480000;0;4410;4800;7200 + resourceAmounts = 30000;300000;9600000;2700,3300;30000;30000;30000;30000;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 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 f9c6e2acf..2d54a1ef8 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;10000000;9000,11000;100000;100000;100000;400000;20000;20000 - initialResourceAmounts = 0;1000000;10000000;0;0;0;0;0;0;0 - tankCost = 400000000;4000000;105000;9180;80;1600000;0;14700;16000;24000 + resourceAmounts = 100000;1000000;32000000;9000,11000;100000;100000;100000;100000;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 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 59b50dadf..ec18f9271 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;23000000;20700,25300;230000;230000;230000;920000;46000;46000 - initialResourceAmounts = 0;2300000;23000000;0,0;0;0;0;0;0;0 - tankCost = 920000000;9200000;241500;21114;184;3680000;0;33811;36800;55200 + resourceAmounts = 230000;2300000;73600000;20700,25300;230000;230000;230000;230000;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 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 0361679f5..691344e3b 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;75000000;67500,82500;750000;750000;750000;3000000;150000;150000 - initialResourceAmounts = 0;7500000;75000000;0;0;0;0;0;0;0 - tankCost = 3000000000;30000000;787500;68850;600;12000000;0;110250;121280;180000 + resourceAmounts = 750000;7500000;240000000;67500,82500;750000;750000;750000;750000;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 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 99a323c83..cc83f8235 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;180000000;162000,198000;1800000;1800000;1800000;7200000;360000;360000 - initialResourceAmounts = 0;18000000;180000000;0;0;0;0;0;0;0 - tankCost = 7200000000;72000000;1890000;165240;1440;28800000;0;264600;288000;432000 + resourceAmounts = 1800000;18000000;576000000;162000,198000;1800000;1800000;1800000;1800000;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 basePartMass = 225 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg index 9c7be08ca..aab1849ad 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;250000;225,275;2500;2500;2500;10000;500;500 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 10000000;100000;2625;229.5;2;40000;0;367.875;400;600 + resourceAmounts = 2500;25000;800000;225,275;2500;2500;2500;2500;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 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 8c9274e49..729d56849 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;2000000;1800,2200;20000;20000;20000;80000;4000;4000 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 80000002;800000;21000;1836;16;320000;0;2940;3200;4800 + resourceAmounts = 20000;200000;6400000;1800,2200;20000;20000;20000;20000;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 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 5cc8bbb68..a1d9d058d 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;65000000;5850,7150;65000;65000;65000;260000;13000;13000 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 259999994;2600000;682500;5967;52;1040000;0;9554.5;10400;15600 + resourceAmounts = 65000;650000;20800000;5850,7150;65000;65000;65000;65000;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 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 e82e31473..d11464a8c 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;16000000;14400,17600;160000;160000;160000;640000;32000;32000 - initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0 - tankCost = 640000000;6400000;168000;14688;128;2560000;0;20880;25600;38400 + resourceAmounts = 160000;1600000;51200000;14400,17600;160000;160000;160000;160000;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 basePartMass = 20 tankMass = 0;0;0;0;0;0;0;0;0;0 hasGUI = false diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapBase.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapBase.png new file mode 100644 index 000000000..ef332756d Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapBase.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapStation.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapStation.png new file mode 100644 index 000000000..25ea46f2c Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Assets/UI/TrackingStation_ButtonMapStation.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt index 62f94bba9..e1059a570 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt @@ -1,3 +1,27 @@ +0.53.2 - 2017.03.06 +------------------- +Added Transport Credit support for OrbLog + +0.53.1 - 2017.03.06 +------------------ +Depencency Updates +Fixed an issue where habitation time would have unpredictable effects when entering/leaving shared life support range +Added antennas to the Karibou (Thanks Voicey99!) +Fixed the fuel cell water output patch (Thanks Wyzard256!) +Updated Kolonization Monitor to reflect crew count with booster traits (Thanks jd284!) +Normalized Tundra decal orientation (Thanks Doktorjet!) +Increased drill cost to balance with stock drills (Thanks Wyzard256!) +Added LH2 boiloff for Karibou tanks if CryoTanks is installed (Thanks Wyzard256!) +Removed duplicate resource from the Karibou short wheelbay (Thanks wile1411!) +Fixed the Habitation capability of the Karibou Crew Cab (Thanks voicey99!) +Orbital Logistics are back! +- Both Tundra and Duna Logistics Modules can now initiate transfers. +- Both sending and receiving vessels require a logistics module to be present. +Drills have received a balance pass. Mass will tend to drop a bit, efficiency will slightly increase for manned drills, decrease for unmanned drills. These tweaks are reflected on the USI Balance Worksheet. +An issue causing extreme lag when working with parts that have swappable converters has been corrected, and the configs of all parts with swappable converters have been updated. + + + 0.53.0 - 2017.10.09 ------------------ KSP 1.3.1 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll index 409f734ff..d3a25d67c 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 b2e355f96..4aedcdb9f 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 9344fbd82..3c0a7f9a1 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 ada256b8b..bb3992e8e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":53, - "PATCH":0, + "PATCH":2, "BUILD":0 }, "KSP_VERSION":{ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg index de4b10bfb..221985f77 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg @@ -436,10 +436,15 @@ PART MODULE { - name = ModuleSwappableConverter + name = ModuleSwapController + typeName = Config ResourceCosts = SpecializedParts,6,MaterialKits,30,ElectricCharge,30 + } + + MODULE + { + name = ModuleSwappableConverter bayName = C1 - typeName = Config } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg index 1e0b97c28..51a058896 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg @@ -175,10 +175,15 @@ PART MODULE { - name = ModuleSwappableConverter + name = ModuleSwapController + typeName = Config ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 + } + + MODULE + { + name = ModuleSwappableConverter bayName = C1 - typeName = Config } MODULE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg index eddcb4500..6883e0f29 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg @@ -152,4 +152,50 @@ PART { name = ModuleOrbitalLogistics } + + MODULE + { + name = ModuleResourceConverter_USI + ConverterName = Transport Credits + StartActionName = Start T-Credits + StopActionName = Stop T-Credits + + UseSpecialistBonus = false + Efficiency = 1 + + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.2 + } + INPUT_RESOURCE + { + ResourceName = LiquidFuel + Ratio = 0.45 + } + INPUT_RESOURCE + { + ResourceName = Oxidizer + Ratio = 0.55 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 10 + } + OUTPUT_RESOURCE + { + ResourceName = TransportCredits + Ratio = 1 + DumpExcess = true + } + } + + RESOURCE + { + name = TransportCredits + amount = 0 + maxAmount = 100000 + isTweakable = false + } } 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 656609891..482f9c033 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg @@ -31,7 +31,7 @@ PART // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 1,1,0,0,0 - mass = 0.278 + mass = 0.2 dragModelType = default maximum_drag = 0.2 minimum_drag = 0.2 @@ -49,17 +49,21 @@ PART } MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator - ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + MODULE + { + name = ModuleSwappableConverter + bayName = S1 } MODULE { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 5 + Efficiency = 6.1 ResourceName = Dirt ConverterName = Dirt StartActionName = Start Dirt Drill @@ -67,7 +71,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -100,7 +104,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Gypsum ConverterName = Gypsum StartActionName = Start Gypsum Drill @@ -108,7 +112,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -141,7 +145,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Minerals ConverterName = Minerals StartActionName = Start Mineral Drill @@ -149,7 +153,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -183,7 +187,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Substrate ConverterName = Substrate StartActionName = Start Substrate Drill @@ -191,7 +195,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -225,7 +229,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = MetallicOre ConverterName = MetallicOre StartActionName = Start MetallicOre Drill @@ -233,7 +237,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -266,7 +270,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Water ConverterName = Water StartActionName = Start Water Drill @@ -274,7 +278,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -308,7 +312,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.2 ResourceName = Hydrates ConverterName = Hydrates StartActionName = Start Hydrates Drill @@ -316,7 +320,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -350,7 +354,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Uraninite ConverterName = Uraninite StartActionName = Start Uraninite Drill @@ -358,7 +362,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -392,7 +396,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = RareMetals ConverterName = RareMetals StartActionName = Start RareMetals Drill @@ -400,7 +404,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -434,7 +438,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = ExoticMinerals ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill @@ -442,7 +446,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -475,7 +479,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Silicates ConverterName = Silicates StartActionName = Start Silicates Drill @@ -483,7 +487,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -516,7 +520,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 5 + Efficiency = 6.1 ResourceName = Rock ConverterName = Rock StartActionName = Start Rock Drill @@ -524,7 +528,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -557,7 +561,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = 1.22 ResourceName = Ore ConverterName = Ore StartActionName = Start Ore Drill @@ -565,7 +569,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -598,7 +602,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.25 + Efficiency = 1.22 ResourceName = Karbonite ConverterName = Karbonite StartActionName = Start Karbonite Drill @@ -606,7 +610,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -639,7 +643,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.25 + Efficiency = 1.22 ResourceName = Karborundum ConverterName = Karborundum StartActionName = Start Karborundum Drill @@ -647,7 +651,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 12.2 } ImpactTransform = ImpactTransform ImpactRange = 7 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 494758813..892cf13fe 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg @@ -49,17 +49,22 @@ PART } MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = S1 } MODULE { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 5 + Efficiency = 4 ResourceName = Dirt ConverterName = Dirt StartActionName = Start Dirt Drill @@ -67,7 +72,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -97,7 +102,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Gypsum ConverterName = Gypsum StartActionName = Start Gypsum Drill @@ -105,7 +110,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -135,7 +140,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Minerals ConverterName = Minerals StartActionName = Start Mineral Drill @@ -143,7 +148,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -174,7 +179,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Substrate ConverterName = Substrate StartActionName = Start Substrate Drill @@ -182,7 +187,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -213,7 +218,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = MetallicOre ConverterName = MetallicOre StartActionName = Start MetallicOre Drill @@ -221,7 +226,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -251,7 +256,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Water ConverterName = Water StartActionName = Start Water Drill @@ -259,7 +264,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -290,7 +295,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Hydrates ConverterName = Hydrates StartActionName = Start Hydrates Drill @@ -298,7 +303,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -329,7 +334,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Uraninite ConverterName = Uraninite StartActionName = Start Uraninite Drill @@ -337,7 +342,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -368,7 +373,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = RareMetals ConverterName = RareMetals StartActionName = Start RareMetals Drill @@ -376,7 +381,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -407,7 +412,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = ExoticMinerals ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill @@ -415,7 +420,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -445,7 +450,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Silicates ConverterName = Silicates StartActionName = Start Silicates Drill @@ -453,7 +458,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -483,7 +488,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1 + Efficiency = .8 ResourceName = Ore ConverterName = Ore StartActionName = Start Ore Drill @@ -491,7 +496,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -521,7 +526,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 5 + Efficiency = 4 ResourceName = Rock ConverterName = Rock StartActionName = Start Rock Drill @@ -529,7 +534,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -558,8 +563,7 @@ PART MODULE:NEEDS[Karbonite] { name = ModuleResourceHarvester_USI - HarvesterType = 0 - Efficiency = 0.25 + HarvesterType = 0.8 ResourceName = Karbonite ConverterName = Karbonite StartActionName = Start Karbonite Drill @@ -567,7 +571,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 @@ -597,7 +601,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.25 + Efficiency = 0.8 ResourceName = Karborundum ConverterName = Karborundum StartActionName = Start Karborundum Drill @@ -605,7 +609,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 10 + Ratio = 8 } ImpactTransform = ImpactTransform ImpactRange = 7 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 7b3113445..b3f11c2f8 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg @@ -34,7 +34,7 @@ PART // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 0,1,0,0,0 - mass = 1.666 + mass = 0.984 dragModelType = default maximum_drag = 0.2 minimum_drag = 0.2 @@ -49,26 +49,28 @@ PART { name = ModuleOverheatDisplay } + MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 + ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 } + MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter + bayName = S1 + } + MODULE + { + name = ModuleSwappableConverter bayName = S2 - typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S3 - typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 } MODULE @@ -608,7 +610,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.5 + Efficiency = 2 ResourceName = Karbonite ConverterName = Karbonite StartActionName = Start Karbonite Drill @@ -649,7 +651,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.5 + Efficiency = 2 ResourceName = Karborundum ConverterName = Karborundum StartActionName = Start Karborundum Drill 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 fed71a516..b75b885d5 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg @@ -34,7 +34,7 @@ PART // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 0,1,0,0,0 - mass = 1.666 + mass = 0.983 dragModelType = default maximum_drag = 0.2 minimum_drag = 0.2 @@ -49,33 +49,35 @@ PART { name = ModuleOverheatDisplay } + MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 + ResourceCosts = SpecializedParts,2,MaterialKits,10,ElectricCharge,10 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = S1 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S2 - typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S3 - typeName = Separator - ResourceCosts = SpecializedParts,3,MaterialKits,15,ElectricCharge,15 } MODULE { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 10 + Efficiency = 6.55 ResourceName = Dirt ConverterName = Dirt StartActionName = Start Dirt Drill @@ -83,7 +85,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -113,7 +115,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Gypsum ConverterName = Gypsum StartActionName = Start Gypsum Drill @@ -121,7 +123,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -151,7 +153,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Minerals ConverterName = Minerals StartActionName = Start Mineral Drill @@ -159,7 +161,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -192,7 +194,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Substrate ConverterName = Substrate StartActionName = Start Substrate Drill @@ -200,7 +202,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -230,7 +232,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = MetallicOre ConverterName = MetallicOre StartActionName = Start MetallicOre Drill @@ -238,7 +240,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -268,7 +270,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Water ConverterName = Water StartActionName = Start Water Drill @@ -276,7 +278,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -306,7 +308,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Hydrates ConverterName = Hydrates StartActionName = Start Hydrates Drill @@ -314,7 +316,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -344,7 +346,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Uraninite ConverterName = Uraninite StartActionName = Start Uraninite Drill @@ -352,7 +354,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -382,7 +384,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = RareMetals ConverterName = RareMetals StartActionName = Start RareMetals Drill @@ -390,7 +392,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -420,7 +422,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = ExoticMinerals ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill @@ -428,7 +430,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -458,7 +460,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Silicates ConverterName = Silicates StartActionName = Start Silicates Drill @@ -466,7 +468,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -496,7 +498,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 2 + Efficiency = 1.31 ResourceName = Ore ConverterName = Ore StartActionName = Start Ore Drill @@ -504,7 +506,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -534,7 +536,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 10 + Efficiency = 6.55 ResourceName = Rock ConverterName = Rock StartActionName = Start Rock Drill @@ -542,7 +544,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -572,7 +574,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.5 + Efficiency = 1.31 ResourceName = Karbonite ConverterName = Karbonite StartActionName = Start Karbonite Drill @@ -580,7 +582,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 @@ -610,7 +612,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 0.5 + Efficiency = 1.31 ResourceName = Karborundum ConverterName = Karborundum StartActionName = Start Karborundum Drill @@ -618,7 +620,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 20 + Ratio = 13.1 } ImpactTransform = ImpactTransform ImpactRange = 5 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 0f2000b11..b0a47c798 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg @@ -19,7 +19,7 @@ PART // --- editor parameters --- - cost = 39994 + cost = 6000 category = Utility subcategory = 0 title = Industrial Strip Miner @@ -29,7 +29,7 @@ PART tags = USI MKS drill industrial miner resources surface harvester converter thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water TechRequired = advScienceTech - entryCost = 119981 + entryCost = 3000 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 0,1,0,0,0 @@ -49,41 +49,39 @@ PART { name = ModuleOverheatDisplay } + MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } + + MODULE + { + name = ModuleSwappableConverter + bayName = S1 + } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S2 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S3 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S4 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S5 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 - } + } MODULE { @@ -715,7 +713,7 @@ PART 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 = 6000 //Maximum amount of radiator capacity we can consume - 50 = 1 small + MaxCoolant = 250 //Maximum amount of radiator capacity we can consume - 50 = 1 small } MODULE 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 b60c4deac..a42c6cac5 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg @@ -34,7 +34,7 @@ PART // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 0,1,0,0,0 - mass = 8.332 + mass = 6.55 dragModelType = default maximum_drag = 0.2 minimum_drag = 0.2 @@ -49,47 +49,45 @@ PART { name = ModuleOverheatDisplay } + MODULE { - name = ModuleSwappableConverter - bayName = S1 + name = ModuleSwapController typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 + ResourceCosts = SpecializedParts,7,MaterialKits,35,ElectricCharge,35 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = S1 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S2 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S3 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S4 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = S5 - typeName = Separator - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 } MODULE { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 30 + Efficiency = 26.2 ResourceName = Dirt ConverterName = Dirt StartActionName = Start Dirt Drill @@ -97,7 +95,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -127,7 +125,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Gypsum ConverterName = Gypsum StartActionName = Start Gypsum Drill @@ -135,7 +133,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -165,7 +163,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Minerals ConverterName = Minerals StartActionName = Start Mineral Drill @@ -173,7 +171,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -203,7 +201,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Substrate ConverterName = Substrate StartActionName = Start Substrate Drill @@ -211,7 +209,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -241,7 +239,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = MetallicOre ConverterName = MetallicOre StartActionName = Start MetallicOre Drill @@ -249,7 +247,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -279,7 +277,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Water ConverterName = Water StartActionName = Start Water Drill @@ -287,7 +285,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -317,7 +315,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Hydrates ConverterName = Hydrates StartActionName = Start Hydrates Drill @@ -325,7 +323,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -355,7 +353,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Uraninite ConverterName = Uraninite StartActionName = Start Uraninite Drill @@ -363,7 +361,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -393,7 +391,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = RareMetals ConverterName = RareMetals StartActionName = Start RareMetals Drill @@ -401,7 +399,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -431,7 +429,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = ExoticMinerals ConverterName = ExoticMinerals StartActionName = Start ExoticMinerals Drill @@ -439,7 +437,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -469,7 +467,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Silicates ConverterName = Silicates StartActionName = Start Silicates Drill @@ -477,7 +475,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -507,7 +505,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 6 + Efficiency = 5.24 ResourceName = Ore ConverterName = Ore StartActionName = Start Ore Drill @@ -515,7 +513,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -545,7 +543,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 30 + Efficiency = 26.2 ResourceName = Rock ConverterName = Rock StartActionName = Start Rock Drill @@ -553,7 +551,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -583,7 +581,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1.5 + Efficiency = 5.24 ResourceName = Karbonite ConverterName = Karbonite StartActionName = Start Karbonite Drill @@ -591,7 +589,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 @@ -621,7 +619,7 @@ PART { name = ModuleResourceHarvester_USI HarvesterType = 0 - Efficiency = 1.5 + Efficiency = 5.24 ResourceName = Karborundum ConverterName = Karborundum StartActionName = Start Karborundum Drill @@ -629,7 +627,7 @@ PART INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 60 + Ratio = 52.4 } ImpactTransform = ImpactTransform ImpactRange = 15 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg index f3598aea9..c4085683d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg @@ -351,13 +351,17 @@ PART name = ModuleWeightDistributableCargo } + MODULE + { + name = ModuleSwapController + typeName = Bay + ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B1 - typeName = Bay - ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg index a2e9bc87e..4e79be831 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Crusher.cfg @@ -207,10 +207,15 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = C1 + name = ModuleSwapController typeName = Config ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = C1 } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg index b51894bfc..c733ef7d0 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_HabModule.cfg @@ -43,10 +43,15 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay - ResourceCosts = SpecializedParts,61,MaterialKits,305,ElectricCharge,305 + ResourceCosts = SpecializedParts,61,MaterialKits,305,ElectricCharge,305 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg index b5061c91b..94fdb01fd 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Smelter.cfg @@ -253,14 +253,20 @@ PART { name = MKSModule } + + MODULE + { + name = ModuleSwapController + typeName = Config + ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 + } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = C1 - typeName = Config - ResourceCosts = SpecializedParts,1,MaterialKits,5,ElectricCharge,5 } + MODULE { name = ModuleWeightDistributableCargo diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg index 7742134fc..e294cb74b 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Workshop.cfg @@ -299,10 +299,15 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay - ResourceCosts = SpecializedParts,75,MaterialKits,375,ElectricCharge,375 + ResourceCosts = SpecializedParts,75,MaterialKits,375,ElectricCharge,375 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } MODULE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/ScoutLanderMk2.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/ScoutLanderMk2.cfg index 0e3182572..e74dee235 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/ScoutLanderMk2.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/ScoutLanderMk2.cfg @@ -25,7 +25,7 @@ PART subcategory = 0 title = 'Scout' Landing Module - Mk2 manufacturer = Umbra Space Industries - description = Light, with a wide landing stance, the Scout landing module is ideal for landing your first colony modules, even on rough terrain. + description = Light, with a wide landing stance, the Scout landing module is ideal for landing your first colony modules, even on rough terrain. Includes rudimentary workshop and construction facilities. tags = USI MKS base utility KIS land legs gear stabil ground support contain Scout weight distribut cargo connect ElectricCharge e/c @@ -68,4 +68,10 @@ PART { name = USI_InertialDampener } + + MODULE + { + name = GroundWorkshop + Efficiency = 0.5 + } } 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 2deeee04e..b97bbc1b4 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_275_Hab.cfg @@ -66,12 +66,18 @@ PART amount = 0 maxAmount = 500 } + MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay - ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } MODULE 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 db4dd424b..abb950ca4 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_425_Hab.cfg @@ -66,12 +66,18 @@ PART amount = 0 maxAmount = 500 } + MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay - ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg index e96d3f9bf..0395dbd29 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_ASM.cfg @@ -390,24 +390,25 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 + } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B3 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } RESOURCE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg index 3b45136fe..b9d303038 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture250.cfg @@ -411,10 +411,14 @@ PART MODULE { - name = ModuleSwappableConverter - ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 - bayName = C1 + name = ModuleSwapController typeName = Config + ResourceCosts = SpecializedParts,8,MaterialKits,40,ElectricCharge,40 + } + MODULE + { + name = ModuleSwappableConverter + bayName = C1 } MODULE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg index c2cd37de9..c65c40a6a 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Agriculture375.cfg @@ -425,17 +425,19 @@ PART MODULE { - name = ModuleSwappableConverter - ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 - bayName = B1 + name = ModuleSwapController typeName = Bay + ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 + } + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } MODULE { - name = ModuleSwappableConverter - ResourceCosts = SpecializedParts,14,MaterialKits,70,ElectricCharge,70 + name = ModuleSwappableConverter bayName = B2 - typeName = Bay } MODULE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg index 08ea776b3..e702a452e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_AssemblyPlant.cfg @@ -347,24 +347,25 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 + ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } + MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter + bayName = B1 + } + MODULE + { + name = ModuleSwappableConverter bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B3 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } RESOURCE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg index ac59240fe..2aa3d9d2c 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_HabRing.cfg @@ -146,14 +146,17 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = C1 + name = ModuleSwapController typeName = Config - ResourceCosts = SpecializedParts,316,MaterialKits,1580,ElectricCharge,1580 - } - + ResourceCosts = SpecializedParts,316,MaterialKits,1580,ElectricCharge,1580 + } - + MODULE + { + name = ModuleSwappableConverter + bayName = C1 + } + MODULE { name = ModuleLifeSupport diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg index 103a81e7b..0f384487f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat250.cfg @@ -168,10 +168,15 @@ PART MODULE { - name = ModuleSwappableConverter + name = ModuleSwapController + typeName = Config ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135 + } + + MODULE + { + name = ModuleSwappableConverter bayName = C1 - typeName = Config } MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg index c65d221bc..8eaf816bf 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Kerbitat375.cfg @@ -183,11 +183,17 @@ PART MODULE { - name = ModuleSwappableConverter + name = ModuleSwapController + typeName = Config ResourceCosts = SpecializedParts,47,MaterialKits,235,ElectricCharge,235 + } + + MODULE + { + name = ModuleSwappableConverter bayName = C1 - typeName = Config } + MODULE { name = USI_ModuleFieldRepair diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg index 9fdedff29..e5c302127 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_NukeProc.cfg @@ -240,17 +240,20 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } + MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter + bayName = B1 + } + MODULE + { + name = ModuleSwappableConverter bayName = B2 - typeName = Bay - ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,110 } RESOURCE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg index 39d5870b0..08359913c 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg @@ -192,4 +192,50 @@ PART { name = ModuleOrbitalLogistics } + + MODULE + { + name = ModuleResourceConverter_USI + ConverterName = Transport Credits + StartActionName = Start T-Credits + StopActionName = Stop T-Credits + + UseSpecialistBonus = false + Efficiency = 1 + + INPUT_RESOURCE + { + ResourceName = MaterialKits + Ratio = 0.2 + } + INPUT_RESOURCE + { + ResourceName = LiquidFuel + Ratio = 0.45 + } + INPUT_RESOURCE + { + ResourceName = Oxidizer + Ratio = 0.55 + } + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 10 + } + OUTPUT_RESOURCE + { + ResourceName = TransportCredits + Ratio = 1 + DumpExcess = true + } + } + + RESOURCE + { + name = TransportCredits + amount = 0 + maxAmount = 100000 + isTweakable = false + } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg index 60613e494..4a8609653 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Refinery.cfg @@ -34,7 +34,7 @@ PART tags = USI MKS Tundra Crew ?iva Control command base utility station colony coloni refin industr config bay resourc products work convert swap sciencecontainer repair Recycle LifeSupport liv MetalicOre Substrate Minerals ExoticMinerals RareMetals MaterialKits Metals Polymers Ore Recyclables SpecializedParts Silicates Silicon RefinedExotics Chemicals ElectricCharge e/c attachRules = 1,0,1,1,0 - mass = 3.471 + mass = 3.420 dragModelType = default maximum_drag = 0.05 minimum_drag = 0.05 @@ -393,24 +393,30 @@ PART MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B1 typeName = Bay ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } MODULE { - name = ModuleSwappableConverter + name = ModuleSwappableConverter bayName = B2 typeName = Bay ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 } + MODULE { - name = ModuleSwappableConverter - bayName = B3 - typeName = Bay + name = ModuleSwapController + typeName = Separator ResourceCosts = SpecializedParts,22,MaterialKits,110,ElectricCharge,3300 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B3 } RESOURCE { diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg index 817dc74f7..dafcf03da 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_Workshop250.cfg @@ -305,11 +305,17 @@ PART MODULE { - name = ModuleSwappableConverter - bayName = B1 + name = ModuleSwapController typeName = Bay ResourceCosts = SpecializedParts,20,MaterialKits,100,ElectricCharge,100 + } + + MODULE + { + name = ModuleSwappableConverter + bayName = B1 } + MODULE { name = ModuleWeightDistributableCargo diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg index 468b56944..04f18dc71 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/OSE.cfg @@ -283,6 +283,142 @@ } +@PART[ScoutLanderMk2]:NEEDS[Workshop] //Scout is smallest +{ + MODULE + { + 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 + UpkeepResource = ElectricCharge // This resource will be consumed 1 per second during processing + MinimumCrew = 0 // Amount of Kerbals needed for the Workshop to work + MaxPartVolume = 500.0 + Animate = true + } + + MODULE + { + name = OseModuleRecycler + ConversionRate = 0.10 // How much of a parts mass will be recycled + 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 + OutputResource = MaterialKits // This resource will be created + MinimumCrew = 0 // Amount of Kerbals needed for the Recycler to work + } + RESOURCE + { + name = MaterialKits + amount = 0 + maxAmount = 100 + isTweakable = True + } + MODULE + { + name = OseModuleCategoryAddon + Category = Aero + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_advaerodynamics + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Communication + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_advunmanned + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Control + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_largecontrol + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Coupling + IconPath = Squad/PartList/SimpleIcons/cs_size3 + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Electrical + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_electrics + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Engine + IconPath = Squad/PartList/SimpleIcons/RDicon_propulsionSystems + } + + MODULE + { + name = OseModuleCategoryAddon + Category = FuelTank + IconPath = Squad/PartList/SimpleIcons/RDicon_fuelSystems-advanced + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Ground + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_advancedmotors + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Payload + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_composites + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Pods + IconPath = Squad/PartList/SimpleIcons/RDicon_commandmodules + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Science + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_advsciencetech + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Structural + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_generalconstruction + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Thermal + IconPath = Squad/PartList/SimpleIcons/fuels_monopropellant + } + + MODULE + { + name = OseModuleCategoryAddon + Category = Utility + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_generic + } + + MODULE + { + name = OseModuleCategoryAddon + Category = none + IconPath = Squad/PartList/SimpleIcons/R&D_node_icon_robotics + } + +} + @PART[Tundra_Workshop250]:NEEDS[Workshop] //Tundra-250 is smaller, less efficient { MODULE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Settings.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Settings.cfg index 40e8a89b3..9ec7fb45d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Settings.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Settings.cfg @@ -8,3 +8,16 @@ KOLONIZATION_SETTINGS RepMultiplier = 0.00001 FundsMultiplier = 0.01 } + +RESOURCE_DEFINITION +{ + name = TransportCredits + displayName = TransportCredits + density = 0.0 + unitCost = 0.0 + flowMode = NO_FLOW + transfer = NONE + isTweakable = false + isVisible = false + volume = 1 +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg index 5bf60459e..93c280b2e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg @@ -37,7 +37,7 @@ PART attachRules = 1,1,1,1,0 // --- standard part parameters --- - mass = 0.8 + mass = 1.041 dragModelType = default maximum_drag = 0.20 minimum_drag = 0.15 @@ -58,18 +58,18 @@ PART INPUT_RESOURCE { ResourceName = EnrichedUranium - Ratio = 0.00000078 + Ratio = 0.00000092 } OUTPUT_RESOURCE { ResourceName = DepletedFuel - Ratio = 0.00000052 + Ratio = 0.00000061 DumpExcess = true } OUTPUT_RESOURCE { ResourceName = XenonGas - Ratio = 0.00000026 + Ratio = 0.00000031 DumpExcess = true } OUTPUT_RESOURCE 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 089e1467a..cb3059bea 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg @@ -23,8 +23,8 @@ PART // --- editor parameters --- TechRequired = advScienceTech - entryCost = 3795 - cost = 37950 + entryCost = 660 + cost = 6600 category = Electrical subcategory = 0 title = Nuclear Reactor (1.25m Short) @@ -37,7 +37,7 @@ PART attachRules = 1,1,1,1,0 // --- standard part parameters --- - mass = 0.8 + mass = 0.206 dragModelType = default maximum_drag = 0.20 minimum_drag = 0.15 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg index 236b16328..8e9f7241a 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg @@ -38,7 +38,7 @@ PART attachRules = 1,1,1,1,0 // --- standard part parameters --- - mass = 5 + mass = 7.014 dragModelType = default maximum_drag = 0.20 minimum_drag = 0.15 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg index aa8f08922..8239bd3df 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg @@ -37,7 +37,7 @@ PART attachRules = 1,1,1,1,0 // --- standard part parameters --- - mass = 15 + mass = 20.363 dragModelType = default maximum_drag = 0.20 minimum_drag = 0.15 @@ -58,18 +58,18 @@ PART INPUT_RESOURCE { ResourceName = EnrichedUranium - Ratio = 0.0000168 + Ratio = 0.000018 } OUTPUT_RESOURCE { ResourceName = DepletedFuel - Ratio = 0.0000112 + Ratio = 0.000018 DumpExcess = true } OUTPUT_RESOURCE { ResourceName = XenonGas - Ratio = 0.0000054 + Ratio = 0.000006 DumpExcess = true } OUTPUT_RESOURCE diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg index f57735415..485a51e4a 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg @@ -37,7 +37,7 @@ PART attachRules = 1,1,1,1,0 // --- standard part parameters --- - mass = 0.1 + mass = 0.136 dragModelType = default maximum_drag = 0.20 minimum_drag = 0.15 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version index 3c75528e7..b6eba4870 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version @@ -10,7 +10,7 @@ "VERSION":{ "MAJOR":0, "MINOR":5, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION":{ diff --git a/Source/KolonyTools/.vs/KolonyTools/v14/.suo b/Source/KolonyTools/.vs/KolonyTools/v14/.suo index d3b2147c7..9ef40caab 100644 Binary files a/Source/KolonyTools/.vs/KolonyTools/v14/.suo and b/Source/KolonyTools/.vs/KolonyTools/v14/.suo differ diff --git a/Source/KolonyTools/KolonyTools/Kolonization/KolonizationSetup.cs b/Source/KolonyTools/KolonyTools/Kolonization/KolonizationSetup.cs index 68fd6d587..5b53d7b41 100644 --- a/Source/KolonyTools/KolonyTools/Kolonization/KolonizationSetup.cs +++ b/Source/KolonyTools/KolonyTools/Kolonization/KolonizationSetup.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using KolonyTools.Kolonization; using UnityEngine; @@ -18,12 +19,25 @@ public static KolonizationSetup Instance //Static data holding variables private static KolonizationConfig _Config; + private static List _autoCon; public KolonizationConfig Config { get { return _Config ?? (_Config = LoadKolonizationConfig()); } } + public List AutoConverters + { + get + { + if (_autoCon == null) + { + LoadAutoConverters(); + } + return _autoCon; + } + } + private KolonizationConfig LoadKolonizationConfig() { var kolonyNodes = GameDatabase.Instance.GetConfigNodes("KOLONIZATION_SETTINGS"); @@ -53,5 +67,17 @@ private KolonizationConfig LoadKolonizationConfig() } return finalSettings; } + + private void LoadAutoConverters() + { + var converterNodes = GameDatabase.Instance.GetConfigNodes("AUTOCONVERTER_SETTINGS"); + _autoCon = new List(); + + foreach (var node in converterNodes) + { + var con = ResourceUtilities.LoadNodeProperties(node); + _autoCon.Add(con); + } + } } } \ No newline at end of file diff --git a/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs b/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs index de652691e..58dcb752d 100644 --- a/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs +++ b/Source/KolonyTools/KolonyTools/ModuleBulkConverter.cs @@ -1,11 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; +using KSP.UI.Screens.Editor; using USITools; using UnityEngine; namespace KolonyTools { + public class AutoConverterConfig : PartModule + { + public string InputResource; + public string OutputResource; + public float yield; + } + public class ModuleBulkConverter : ModuleResourceConverter_USI { [KSPField] @@ -29,16 +37,39 @@ private void LoadPlanetYields(List inputs) var totalAbundance = planetResourceAbundance.Sum(r => r.Value); _resourceYields = new List(); + foreach (var res in planetResourceAbundance) { if (res.Value > MinAbundance) { var resourceYield = Yield * res.Value / totalAbundance; - _resourceYields.Add(new ResourceRatio { + var newYield = new ResourceRatio { FlowMode = ResourceFlowMode.ALL_VESSEL, Ratio = resourceYield, ResourceName = res.Key, - DumpExcess = true }); + DumpExcess = true }; + + var con = KolonizationSetup.Instance.AutoConverters.Where(c => c.InputResource == res.Key).ToArray(); + var count = con.Count(); + if (count > 0) + { + for (int i = 0; i < count; ++i) + { + var thisCon = con[i]; + var conYield = new ResourceRatio + { + FlowMode = ResourceFlowMode.ALL_VESSEL, + Ratio = newYield.Ratio * thisCon.yield, + ResourceName = thisCon.OutputResource, + DumpExcess = true + }; + _resourceYields.Add(conYield); + } + } + else + { + _resourceYields.Add(newYield); + } } } }