diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt index eae7613..600a26f 100644 --- a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt @@ -1,6 +1,11 @@ -0.8.17 - 2017.03.17 +0.9.0 - KSP 1.3 ------------------- -Dependency Updates +KSP 1.3 Compatibility +Fix infinite loop with "prev loadout" when USILS is not installed + +0.8.18 - 2017.03.17 +------------------- +Fixed bugs related to ground tethers and PDU power transfers 0.8.16 - 2017.02.24 ------------------- diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll index 5632f0f..1040823 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 d31a3c2..3d5f817 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 4409e43..248e54a 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 2088169..b8cc7c3 100644 --- a/FOR_RELEASE/GameData/000_USITools/USITools.version +++ b/FOR_RELEASE/GameData/000_USITools/USITools.version @@ -9,23 +9,23 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":8, - "PATCH":17, + "MINOR":9, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":2, - "PATCH":0 + "PATCH":9 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":9 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll new file mode 100644 index 0000000..bc396e2 Binary files /dev/null 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 new file mode 100644 index 0000000..2002400 --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version @@ -0,0 +1,31 @@ +{ + "NAME": "Community Category Kit", + "URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version", + "VERSION": { + "BUILD": 0, + "MAJOR": 2, + "MINOR": 0, + "PATCH": 0 + }, + "DOWNLOAD": "https://github.com/BobPalmer/CommunityCategoryKit/releases", + "GITHUB": { + "ALLOW_PRE_RELEASE": false, + "REPOSITORY": "CommunityCategoryKit", + "USERNAME": "BobPalmer" + }, + "KSP_VERSION":{ + "MAJOR":1, + "MINOR":3, + "PATCH":0 + }, + "KSP_VERSION_MIN":{ + "MAJOR":1, + "MINOR":2, + "PATCH":9 + }, + "KSP_VERSION_MAX":{ + "MAJOR":1, + "MINOR":3, + "PATCH":9 + } +} \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt new file mode 100644 index 0000000..64f0801 --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/CHANGELOG.txt @@ -0,0 +1,28 @@ +2.0.0 - KSP 1.3 +------------------ +KSP 1.3 Compatibility +Added Rovers as a new standard category + +1.2.1 - 2016.12.12 +- [Change] Recompile for KSP 1.2.2 + +1.2.0 - 2016.12.2 +- [Enhancement] Define common filters via a config file. +- [Enhancement] Allow defining custom filters by updating via ModuleManager (read Wiki!). + +1.1.0 - 2016.11.29 +- [Fix #7] Add images for Containers category. +- [Fix #9] Sync up DLL's and mod's versions. + +0.1.2 - (KSP 1.2.1) +------------------- +Recompile for KSP 1.2.1 + +0.1.1 - 2016.10.15 +------------------ +Fixed initial tag for real this time + +0.1.0 - 2016.10.15 +------------------ +Initial Release! +Added tag of cck-lifesupport \ No newline at end of file diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg b/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg new file mode 100644 index 0000000..b1880cd --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/common-filters.cfg @@ -0,0 +1,32 @@ +// This file contains filters approved by CCK owners. +// Do not change this file via ModuleManager! If you need a new filter in +// the editor you should add it into "extra-filters.cfg". +// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki +CCKCommonFilterConfig +{ + Item + { + name = Containers + tag = cck-containers + normalIcon = CommunityCategoryKit/icons/Containers + usedByMod = Kerbal Inventory System (KIS) + usedByMod = Kerbal Attachment System (KAS) + } + Item + { + name = Life Support + tag = cck-lifesupport + normalIcon = CommunityCategoryKit/icons/LifeSupport_N + selectedIcon = CommunityCategoryKit/icons/LifeSupport_S + usedByMod = USI Life Support + } + Item + { + name = Rovers + tag = cck-rovers + normalIcon = CommunityCategoryKit/icons/Rovers_N + selectedIcon = CommunityCategoryKit/icons/Rovers_S + usedByMod = Malemute + usedByMod = Feline Utility Rovers + } +} diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/extra-filters.cfg b/FOR_RELEASE/GameData/CommunityCategoryKit/extra-filters.cfg new file mode 100644 index 0000000..6b0879e --- /dev/null +++ b/FOR_RELEASE/GameData/CommunityCategoryKit/extra-filters.cfg @@ -0,0 +1,43 @@ +// This file is always empty in CCK but third-party mods are allowed (and +// encouraged) to extend it with own custom filters. There will be a +// filter entry created in the editor for every Item record in this file if +// it has at least one matching part. +// +// In order to create a custom filter create a ModuleManager patch file and +// put it anywhere in your mod's folder structure: +// +// @CCKExtraFilterConfig +// { +// Item +// { +// name = Cool Mod Things +// tag = cck-cool-mod +// normalIcon = CoolMod/Textures/FilterIcon +// usedByMod = Cool Mod +// } +// } +// NOTE. If you want a special icon to be displayed when the filter is active +// use `selectedIcon` field to define one. +// +// See more info here: https://github.com/BobPalmer/CommunityCategoryKit/wiki +// +// NOTE. Avoid creating a brand new filter only because you feel you need +// one. You may improve players experience by re-using filters used by the +// other mods. To figure out if there are right candidates try the following: +// 1. Check CCK common filters (common-filters.cfg). +// 2. Try searching KSP add-ons forum for keyword "CCK" or +// "CommunityCategoryKit". When mod uses CCK it's usually stated in the +// description. +// 3. Ask community by posting a question on the CCK forum. +// 4. Find another mod (other than yours) which may benefit of the new +// filter, and suggest a new common filter on the CCK forum! +// +// Once you've found the right mod just use its tag and some icon texture +// (communicate with the author if they use own icon). CCK will automatically +// de-dupe filters so what there will be only one filter created with all the +// matching parts. + +CCKExtraFilterConfig +{ + // Add Item entires for custom filters via ModuleManager. +} diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers.png new file mode 100644 index 0000000..889bd48 Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Containers.png differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_N.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_N.png new file mode 100644 index 0000000..d355db3 Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_N.png differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_S.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_S.png new file mode 100644 index 0000000..9e862b0 Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/LifeSupport_S.png differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_N.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_N.png new file mode 100644 index 0000000..1f52204 Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_N.png differ diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_S.png b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_S.png new file mode 100644 index 0000000..7a7c63f Binary files /dev/null and b/FOR_RELEASE/GameData/CommunityCategoryKit/icons/Rovers_S.png differ diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt index ed31b5d..2c97032 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt @@ -1,3 +1,8 @@ +0.7.0 - KSP 1.3 +------------------ +KSP 1.3 Compatibility +Dependency Updates + 0.6.6 - 2017.02.04 ------------------ Added common resource Sodium a potential high efficient electric propellant diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version index 8ae3b8d..28c35c4 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version @@ -9,23 +9,23 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":6, - "PATCH":6, + "MINOR":7, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":1, - "PATCH":0 + "MINOR":2, + "PATCH":9 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":9 } } diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg index 0928c8d..c100aad 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg @@ -9,6 +9,7 @@ RESOURCE_DEFINITION { name = Hydrates + displayName = Hydrates density = 0.00150000000 flowMode = ALL_VESSEL transfer = PUMP @@ -22,6 +23,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Gypsum + displayName = Gypsum density = 0.00550000000 flowMode = ALL_VESSEL transfer = PUMP @@ -35,6 +37,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = IntakeLqd //Like IntakeAtm but for oceans + displayName = IntakeLqd //Like IntakeAtm but for oceans density = 0.0010000000 hsp = 4183 // specific heat capacity (kJ/tonne-K as units) flowMode = ALL_VESSEL @@ -49,6 +52,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ColonySupplies + displayName = ColonySupplies density = 0.001556 hsp = 500 flowMode = ALL_VESSEL @@ -62,6 +66,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Lead + displayName = Lead density = 0.01134 unitCost = 0.067392 hsp = 128 @@ -77,6 +82,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = CarbonDioxide + displayName = CarbonDioxide density = 0.000001951 flowMode = ALL_VESSEL transfer = PUMP @@ -90,6 +96,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Chemicals + displayName = Chemicals density = 0.00250000000 flowMode = ALL_VESSEL transfer = PUMP @@ -103,6 +110,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Dirt + displayName = Dirt density = 0.0016 flowMode = ALL_VESSEL transfer = PUMP @@ -116,6 +124,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ExoticMinerals + displayName = ExoticMinerals density = 0.0025 flowMode = ALL_VESSEL transfer = PUMP @@ -129,6 +138,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Food + displayName = Food density = 0.00028102905982906 hsp = 600 // specific heat capacity (kJ/tonne-K as units) // FIXME total guess flowMode = ALL_VESSEL @@ -143,6 +153,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Supplies + displayName = Supplies density = 0.001 flowMode = ALL_VESSEL transfer = PUMP @@ -155,6 +166,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Fertilizer + displayName = Fertilizer density = 0.001 flowMode = ALL_VESSEL transfer = PUMP @@ -167,6 +179,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Mulch + displayName = Mulch density = 0.001 flowMode = ALL_VESSEL transfer = PUMP @@ -179,6 +192,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Machinery + displayName = Machinery density = 0.00378 flowMode = ALL_VESSEL transfer = PUMP @@ -190,6 +204,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = SpecializedParts + displayName = SpecializedParts density = 0.00378 flowMode = ALL_VESSEL transfer = PUMP @@ -201,6 +216,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Recyclables + displayName = Recyclables density = 0.00378 flowMode = ALL_VESSEL transfer = PUMP @@ -212,6 +228,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Hydrogen + displayName = Hydrogen density = 0.00000008990 unitCost = 0.000055836 flowMode = ALL_VESSEL @@ -225,6 +242,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Karbonite + displayName = Karbonite density = 0.0025 unitCost = 0.32 flowMode = STAGE_PRIORITY_FLOW @@ -238,6 +256,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Karborundum + displayName = Karborundum density = 0.00580000000 unitCost = 4000 flowMode = STAGE_PRIORITY_FLOW @@ -251,6 +270,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdCO2 + displayName = LqdCO2 density = 0.00117325 unitCost = 0.0017247 flowMode = ALL_VESSEL @@ -265,6 +285,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdCO + displayName = LqdCO density = 0.000790 unitCost = 0.0021 flowMode = STACK_PRIORITY_SEARCH @@ -278,6 +299,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MaterialKits + displayName = MaterialKits density = 0.001 unitCost = 2 flowMode = ALL_VESSEL @@ -290,6 +312,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Metals + displayName = Metals density = 0.0078 unitCost = 14.24 flowMode = ALL_VESSEL @@ -303,6 +326,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Minerals + displayName = Minerals density = 0.00270000000 flowMode = ALL_VESSEL transfer = PUMP @@ -316,6 +340,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MetallicOre + displayName = MetallicOre density = 0.00550000000 flowMode = ALL_VESSEL transfer = PUMP @@ -329,6 +354,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Organics + displayName = Organics density = 0.001 flowMode = ALL_VESSEL transfer = PUMP @@ -341,6 +367,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Oxygen + displayName = Oxygen density = 0.00000141 flowMode = ALL_VESSEL transfer = PUMP @@ -355,6 +382,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Polymers + displayName = Polymers density = 0.00104000000 flowMode = ALL_VESSEL transfer = PUMP @@ -367,6 +395,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = RareMetals + displayName = RareMetals density = 0.0078 flowMode = ALL_VESSEL transfer = PUMP @@ -379,6 +408,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = RefinedExotics + displayName = RefinedExotics density = 0.0052 flowMode = ALL_VESSEL transfer = PUMP @@ -391,13 +421,14 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Rock + displayName = Rock density = 0.0025 flowMode = ALL_VESSEL transfer = PUMP isTweakable = true isVisible = true - cost = 0.00001 - volume = 1 + unitCost = 0.00001 + volume = 1 } @@ -405,6 +436,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = RocketParts + displayName = RocketParts density = 0.0025 unitCost = 1.5 flowMode = ALL_VESSEL @@ -418,6 +450,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = SpareParts + displayName = SpareParts density = 0.00378 flowMode = NO_FLOW transfer = NONE @@ -430,6 +463,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Substrate + displayName = Substrate density = 0.0016 flowMode = ALL_VESSEL transfer = PUMP @@ -443,6 +477,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Uraninite + displayName = Uraninite density = 0.0075 flowMode = ALL_VESSEL transfer = PUMP @@ -456,6 +491,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Waste + displayName = Waste density = 0.00075 hsp = 600 // specific heat capacity (kJ/tonne-K as units) // FIXME total guess flowMode = ALL_VESSEL @@ -470,6 +506,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = WasteWater + displayName = WasteWater density = 0.001005 hsp = 4183 // specific heat capacity (kJ/tonne-K as units) (FIXME same as water) flowMode = ALL_VESSEL @@ -484,6 +521,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Water + displayName = Water density = 0.0010000000 hsp = 4183 // specific heat capacity (kJ/tonne-K as units) flowMode = ALL_VESSEL @@ -503,6 +541,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ArgonGas // Common electric engine propellant + displayName = ArgonGas // Common electric engine propellant density = 0.00000178400 unitCost = 0.0105 flowMode = STAGE_PRIORITY_FLOW @@ -517,6 +556,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Boron + displayName = Boron density = 0.00246000000 unitCost = 0.851 flowMode = STAGE_PRIORITY_FLOW @@ -529,6 +569,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ResourceLode + displayName = ResourceLode density = 0.005 flowMode = ALL_VESSEL transfer = NONE @@ -541,6 +582,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = DepletedUranium // Depleted fuel to preserve mass when burned, can be recycled + displayName = DepletedUranium // Depleted fuel to preserve mass when burned, can be recycled unitCost = 0 density = 0.01097000000 flowMode = NO_FLOW @@ -554,6 +596,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = EnrichedUranium // Nuclear fuel + displayName = EnrichedUranium // Nuclear fuel density = 0.01097000000 unitCost = 865.0000000 isTweakable = true @@ -567,6 +610,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdHydrogen // General propellant, used for high thrust electric engines + displayName = LqdHydrogen // General propellant, used for high thrust electric engines density = 0.00007085000 unitCost = 0.0367500 hsp = 9690 // specific heat capacity (kJ/tonne-K as units) at Crygenic Storage temperature @@ -582,6 +626,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = StoredCharge // Capacitor resource. Translates to Ec + displayName = StoredCharge // Capacitor resource. Translates to Ec unitCost = 0 density = 0 flowMode = NO_FLOW @@ -600,6 +645,7 @@ RESOURCE_DEFINITION { abbreviation = Act name = Actinides + displayName = Actinides density = 0.01097 flowMode = NO_FLOW transfer = NONE @@ -614,6 +660,7 @@ RESOURCE_DEFINITION { abbreviation = Al name = Aluminium + displayName = Aluminium density = 0.00277 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -628,6 +675,7 @@ RESOURCE_DEFINITION { abbreviation = Aia name = Alumina + displayName = Alumina density = 0.00398 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -638,10 +686,25 @@ RESOURCE_DEFINITION ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Alumina } +RESOURCE_DEFINITION +{ + abbreviation = NH3 + name = Ammonia + displayName = Ammonia + density = 0.000000769 + unitCost = 0.00015 + hsp = 2175 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = AM name = Antimatter + displayName = Antimatter density = 0.000000001 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -656,6 +719,7 @@ RESOURCE_DEFINITION { abbreviation = Ar name = LqdArgon + displayName = LqdArgon density = 0.0013954 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -669,9 +733,10 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { - abbreviation = B + abbreviation = Br name = Borate - density = 0.000173 + displayName = Borate + density = 0.00173 flowMode = ALL_VESSEL transfer = PUMP isTweakable = true @@ -684,6 +749,7 @@ RESOURCE_DEFINITION { abbreviation = Cs name = Caesium + displayName = Caesium density = 0.00193 flowMode = ALL_VESSEL transfer = PUMP @@ -693,10 +759,25 @@ RESOURCE_DEFINITION volume = 1 } +RESOURCE_DEFINITION +{ + abbreviation = CO + name = CarbonMonoxide + displayName = CarbonMonoxide + density = 0.00000125 + unitCost = 0.00000332 + hsp = 1046 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = C - name = Carbon + name = Carbon + displayName = Carbon density = 0.0021 unitCost = 0.0 hsp = 710 @@ -710,6 +791,7 @@ RESOURCE_DEFINITION { abbreviation = CP name = ChargedParticles + displayName = ChargedParticles density = 0 flowMode = ALL_VESSEL transfer = NONE @@ -723,18 +805,20 @@ RESOURCE_DEFINITION { abbreviation = DeBo name = Decaborane + displayName = Decaborane density = 0.00094 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP isTweakable = true isVisible = true - unitCost = 3.252 + unitCost = 0.345 } RESOURCE_DEFINITION { abbreviation = D name = Deuterium + displayName = Deuterium density = 0.000000180 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -749,6 +833,7 @@ RESOURCE_DEFINITION { abbreviation = D name = LqdDeuterium + displayName = LqdDeuterium density = 0.0001624 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -762,6 +847,7 @@ RESOURCE_DEFINITION { abbreviation = DepF name = DepletedFuel + displayName = DepletedFuel density = 0.01097 flowMode = NO_FLOW transfer = NONE @@ -776,6 +862,7 @@ RESOURCE_DEFINITION { abbreviation = ExM name = ExoticMatter + displayName = ExoticMatter density = 0 flowMode = ALL_VESSEL transfer = NONE @@ -786,10 +873,23 @@ RESOURCE_DEFINITION ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ExoticMatter } +RESOURCE_DEFINITION +{ + name = FusionPellets + displayName = FusionPellets + density = 0.000216 + unitCost = 150 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = F name = Fluorine + displayName = Fluorine density = 0.000001696 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -803,6 +903,7 @@ RESOURCE_DEFINITION { abbreviation = D2O name = HeavyWater + displayName = HeavyWater density = 0.001107 hsp = 4183 flowMode = ALL_VESSEL @@ -818,6 +919,7 @@ RESOURCE_DEFINITION { abbreviation = IntA name = IntakeAtm + displayName = IntakeAtm density = 0.005 flowMode = ALL_VESSEL transfer = PUMP @@ -832,6 +934,7 @@ RESOURCE_DEFINITION { abbreviation = Kr name = KryptonGas + displayName = KryptonGas density = 0.000003749 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -841,10 +944,24 @@ RESOURCE_DEFINITION volume = 1 } +RESOURCE_DEFINITION +{ + abbreviation = Kr + name = LqdKrypton + displayName = LqdKrypton + density = 0.002413 + unitCost = 1.0298 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = Ne name = NeonGas + displayName = NeonGas density = 0.0000009002 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -854,16 +971,30 @@ RESOURCE_DEFINITION volume = 1 } +RESOURCE_DEFINITION +{ + abbreviation = Ne + name = LqdNeon + displayName = LqdNeon + density = 0.001207 + unitCost = 2.1453 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = Li7 name = Lithium + displayName = Lithium density = 0.000534 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP isTweakable = true isVisible = true - unitCost = 0.27 + unitCost = 0.6075 volume = 1 ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/Lithium } @@ -872,6 +1003,7 @@ RESOURCE_DEFINITION { abbreviation = Li6 name = Lithium6 + displayName = Lithium6 density = 0.000458 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -881,16 +1013,45 @@ RESOURCE_DEFINITION volume = 1 } +RESOURCE_DEFINITION +{ + abbreviation = Li7H + name = LithiumHydride + displayName = LithiumHydride + title = LithiumHydride + density = 0.00078 + unitCost = 0.4 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + +RESOURCE_DEFINITION +{ + abbreviation = Li6D + name = LithiumDeuteride + displayName = LithiumDeuteride + title = LithiumDeuteride + density = 0.00082 + unitCost = 5 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = NH3 name = LqdAmmonia + displayName = LqdAmmonia density = 0.0007021 flowMode = STACK_PRIORITY_SEARCH transfer = PUMP isTweakable = true isVisible = true - unitCost = 0.00006785 + unitCost = 0.142 hsp= 5170 volume = 1 ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdAmmonia @@ -902,6 +1063,7 @@ RESOURCE_DEFINITION { abbreviation = He3 name = Helium3 + displayName = Helium3 density = 0.000000125 flowMode = ALL_VESSEL transfer = PUMP @@ -917,6 +1079,7 @@ RESOURCE_DEFINITION { abbreviation = He3 name = LqdHe3 + displayName = LqdHe3 density = 0.000059 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -931,6 +1094,7 @@ RESOURCE_DEFINITION { abbreviation = He4 name = Helium4 + displayName = Helium4 density = 0.0000001786 flowMode = ALL_VESSEL transfer = PUMP @@ -945,6 +1109,7 @@ RESOURCE_DEFINITION { abbreviation = He4 name = LqdHelium + displayName = LqdHelium density = 0.0001786 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -956,10 +1121,37 @@ RESOURCE_DEFINITION ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/LqdHelium } +RESOURCE_DEFINITION +{ + name = Nitratine + displayName = Nitratine + title = Nitratine + density = 0.0024 + flowMode = ALL_VESSEL + transfer = PUMP + isTweakable = true + isVisible = true + unitCost = 0.001 + volume = 1 +} + +RESOURCE_DEFINITION +{ + name = Hexaborane + displayName = Hexaborane + density = 0.000670 + flowMode = ALL_VESSEL + transfer = PUMP + isTweakable = true + unitCost = 0.25 + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = N14 name = LqdNitrogen + displayName = LqdNitrogen density = 0.000824907 flowMode = STACK_PRIORITY_SEARCH transfer = PUMP @@ -974,7 +1166,8 @@ RESOURCE_DEFINITION { abbreviation = N15 name = LqdNitrogen15 - density = 0.008838 + displayName = LqdNitrogen15 + density = 0.0008838 flowMode = STACK_PRIORITY_SEARCH transfer = PUMP isTweakable = true @@ -988,6 +1181,7 @@ RESOURCE_DEFINITION { abbreviation = MegJ name = Megajoules + displayName = Megajoules density = 0 flowMode = ALL_VESSEL transfer = NONE @@ -1002,6 +1196,7 @@ RESOURCE_DEFINITION { abbreviation = Monz name = Monazite + displayName = Monazite density = 0.005 flowMode = ALL_VESSEL transfer = PUMP @@ -1016,6 +1211,7 @@ RESOURCE_DEFINITION { abbreviation = O18 name = LqdOxygen18 + displayName = LqdOxygen18 density = 0.001284 unitCost = 0.6 // about 13 times cost of LqdOxygen hsp = 918 // specific heat capacity (kJ/tonne-K as units) // recalc, mols are for O2 on wiki @@ -1031,6 +1227,7 @@ RESOURCE_DEFINITION { abbreviation = Na name = Sodium + displayName = Sodium density = 0.000968 flowMode = ALL_VESSEL transfer = PUMP @@ -1044,6 +1241,7 @@ RESOURCE_DEFINITION { abbreviation = PVC name = PolyvinylChloride + displayName = PolyvinylChloride density = 0.00149 hsp = 7981 flowMode = ALL_VESSEL @@ -1058,6 +1256,7 @@ RESOURCE_DEFINITION { abbreviation = Pu238 name = Plutonium-238 + displayName = Plutonium-238 density = 0.019816 flowMode = NO_FLOW transfer = NONE @@ -1073,12 +1272,13 @@ RESOURCE_DEFINITION { abbreviation = R name = Regolith + displayName = Regolith density = 0.002 flowMode = ALL_VESSEL transfer = PUMP isTweakable = true isVisible = true - unitCost = 0.355 + unitCost = 0 volume = 1 } @@ -1086,6 +1286,7 @@ RESOURCE_DEFINITION { abbreviation = UF4 name = UF4 + displayName = UF4 density = 0.00670 flowMode = ALL_VESSEL transfer = NONE @@ -1100,6 +1301,7 @@ RESOURCE_DEFINITION { abbreviation = Silica name = Silicates + displayName = Silicates density = 0.00025 flowMode = ALL_VESSEL transfer = PUMP @@ -1113,6 +1315,7 @@ RESOURCE_DEFINITION { abbreviation = Si name = Silicon + displayName = Silicon density = 0.0002329 flowMode = ALL_VESSEL transfer = PUMP @@ -1126,6 +1329,7 @@ RESOURCE_DEFINITION { abbreviation = SW name = SolarWind + displayName = SolarWind density = 0.00000124725 flowMode = ALL_VESSEL transfer = PUMP @@ -1139,6 +1343,7 @@ RESOURCE_DEFINITION { abbreviation = ThP name = ThermalPower + displayName = ThermalPower density = 0 unitCost = 0 flowMode = ALL_VESSEL @@ -1153,6 +1358,7 @@ RESOURCE_DEFINITION { abbreviation = ThF4 name = ThF4 + displayName = ThF4 density = 0.0063 flowMode = ALL_VESSEL transfer = NONE @@ -1163,10 +1369,25 @@ RESOURCE_DEFINITION ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/ThF4 } +RESOURCE_DEFINITION +{ + abbreviation = T + name = Tritium + displayName = Tritium + title = Tritium Gas + density = 0.0000002705 + unitCost = 0.016 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + RESOURCE_DEFINITION { abbreviation = T name = LqdTritium + displayName = LqdTritium density = 0.000320 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -1181,6 +1402,7 @@ RESOURCE_DEFINITION { abbreviation = UN name = UraniumNitride + displayName = UraniumNitride density = 0.0143 flowMode = STAGE_PRIORITY_FLOW transfer = PUMP @@ -1195,6 +1417,7 @@ RESOURCE_DEFINITION { abbreviation = VP name = VacuumPlasma + displayName = VacuumPlasma density = 0.005 flowMode = ALL_VESSEL transfer = NONE @@ -1210,6 +1433,7 @@ RESOURCE_DEFINITION { abbreviation = WH name = WasteHeat + displayName = WasteHeat density = 0 flowMode = ALL_VESSEL transfer = NONE @@ -1219,6 +1443,20 @@ RESOURCE_DEFINITION ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/WasteHeat } + RESOURCE_DEFINITION + { + abbreviation = Xe + name = LqdXenon + displayName = LqdXenon + title = Liquid Xenon + density = 0.002953 + unitCost = 118.12 + flowMode = STAGE_PRIORITY_FLOW + transfer = PUMP + isTweakable = true + volume = 1 +} + //****************************** //* SECTION 4 RealFuels Curated //****************************** @@ -1226,6 +1464,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Aerozine50 + displayName = Aerozine50 density = 0.0009 unitCost = 1.35 hsp = 2970.1 // specific heat capacity (kJ/tonne-K as units) // http://www.gentoogeek.org/steves_world/hypergol_properties.pdf @@ -1240,6 +1479,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = AK20 + displayName = AK20 density = 0.001499 unitCost = 0.2998 hsp = 1720 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for nitric acid, copied to AKx @@ -1253,6 +1493,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = AK27 + displayName = AK27 density = 0.001494 unitCost = 0.2988 hsp = 1720 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for nitric acid, copied to AKx @@ -1266,6 +1507,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Aniline + displayName = Aniline density = 0.00102 unitCost = 0.5213333 hsp = 2180 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for aniline, copied to others. Note http://pubs.acs.org/doi/abs/10.1021/ja01147a515 disagrees, says Aniline is ~2100. @@ -1279,6 +1521,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = AvGas + displayName = AvGas density = 0.000719 unitCost = 0.12 hsp = 2220 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html @@ -1292,6 +1535,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = CaveaB + displayName = CaveaB density = 0.001501 unitCost = 0.33022 flowMode = STACK_PRIORITY_SEARCH @@ -1304,6 +1548,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ClF3 + displayName = ClF3 density = 0.00177 unitCost = 10.62 flowMode = STACK_PRIORITY_SEARCH @@ -1316,6 +1561,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = ClF5 + displayName = ClF5 density = 0.0019 unitCost = 15.2 flowMode = STACK_PRIORITY_SEARCH @@ -1328,6 +1574,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Diborane + displayName = Diborane density = 0.000421 unitCost = 4.21 flowMode = STACK_PRIORITY_SEARCH @@ -1340,6 +1587,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Ethane + displayName = Ethane density = 0.000544 unitCost = 0.09248 flowMode = STACK_PRIORITY_SEARCH @@ -1352,6 +1600,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Ethanol + displayName = Ethanol density = 0.000789 unitCost = 0.12624 hsp = 2720 @@ -1365,6 +1614,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Ethanol75 + displayName = Ethanol75 density = 0.00084175 unitCost = 0.12624 hsp = 3156 @@ -1378,6 +1628,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Ethanol90 + displayName = Ethanol90 density = 0.0008101 unitCost = 0.12624 hsp = 2901 @@ -1391,6 +1642,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Ethylene + displayName = Ethylene density = 0.000568 unitCost = 0.09656 flowMode = STACK_PRIORITY_SEARCH @@ -1403,6 +1655,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = FLOX30 + displayName = FLOX30 density = 0.0012517 unitCost = 2.403264 flowMode = STACK_PRIORITY_SEARCH @@ -1415,6 +1668,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = FLOX70 + displayName = FLOX70 density = 0.0013993 unitCost = 6.184906 flowMode = STACK_PRIORITY_SEARCH @@ -1427,6 +1681,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = FLOX88 + displayName = FLOX88 density = 0.0014657 unitCost = 8.134635 flowMode = STACK_PRIORITY_SEARCH @@ -1439,6 +1694,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Furfuryl + displayName = Furfuryl density = 0.00113 unitCost = 0.1808 hsp = 2096 // specific heat capacity (kJ/tonne-K as units) // http://pubs.acs.org/doi/abs/10.1021/ja01147a515 @@ -1452,6 +1708,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Helium + displayName = Helium density = 0.0000001786 unitCost = 0.0000091 flowMode = STACK_PRIORITY_SEARCH @@ -1464,6 +1721,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = HNIW + displayName = HNIW density = 0.002044 unitCost = 0.4504976 hsp = 920 // FIXME, total guess but based on 'standardized' solids and the stock SolidFuel hsp. @@ -1477,6 +1735,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = HTP + displayName = HTP density = 0.001431 unitCost = 2.1465 hsp = 2721 // specific heat capacity (kJ/tonne-K as units) // http://www.h2o2.com/technical-library/physical-chemical-properties/thermodynamic-properties/default.aspx?pid=36&name=Heat-Capacity @@ -1490,6 +1749,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = HTPB + displayName = HTPB density = 0.00177 unitCost = 1.8585 hsp = 920 // FIXME, total guess but based on 'standardized' solids and the stock SolidFuel hsp. @@ -1503,6 +1763,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Hydrazine + displayName = Hydrazine density = 0.001004 unitCost = 2.008 hsp = 3120.6 // specific heat capacity (kJ/tonne-K as units) // http://webbook.nist.gov/cgi/cbook.cgi?ID=C302012&Units=SI&Mask=1A8F&Type=JANAFL&Plot=on#JANAFL @@ -1516,6 +1777,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Hydyne + displayName = Hydyne density = 0.00086 unitCost = 0.688 hsp = 2625 // specific heat capacity (kJ/tonne-K as units) // UDMH + DETA. UDMH is above, DETA is 2466 per wiki. Mix was 60:40, so... @@ -1529,6 +1791,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = IRFNA-III + displayName = IRFNA-III density = 0.001658 unitCost = 0.34818 hsp = 1720 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for nitric acid, copied to AKx @@ -1542,6 +1805,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = IRFNA-IV + displayName = IRFNA-IV density = 0.001995 unitCost = 0.399 hsp = 1720 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for nitric acid, copied to AKx @@ -1555,6 +1819,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = IWFNA + displayName = IWFNA density = 0.001513 unitCost = 0.31773 hsp = 1720 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html for nitric acid, copied to AKx @@ -1568,6 +1833,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Kerosene + displayName = Kerosene density = 0.00082 unitCost = 0.041 hsp = 2010 // specific heat capacity (kJ/tonne-K as units) @@ -1581,6 +1847,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LeadBallast + displayName = LeadBallast density = 0.01134 unitCost = 0.067392 hsp = 128 // specific heat capacity (kJ/tonne-K as units) // http://hyperphysics.phy-astr.gsu.edu/hbase/tables/sphtt.html @@ -1594,6 +1861,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdFluorine + displayName = LqdFluorine density = 0.001505 unitCost = 9.03 flowMode = STACK_PRIORITY_SEARCH @@ -1606,6 +1874,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdMethane + displayName = LqdMethane density = 0.00042561 unitCost = 0.45 hsp = 3348.8 // http://neutronresearch.com/parch/1995/01/199501006440.pdf @@ -1620,6 +1889,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = LqdOxygen + displayName = LqdOxygen density = 0.001141 unitCost = 0.04564 hsp = 918 // specific heat capacity (kJ/tonne-K as units) // recalc, mols are for O2 on wiki @@ -1634,6 +1904,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Methane + displayName = Methane density = 0.000000717 unitCost = 0.0018642 flowMode = STACK_PRIORITY_SEARCH @@ -1646,6 +1917,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Methanol + displayName = Methanol density = 0.0007918 unitCost = 0.126688 hsp = 2510 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html @@ -1659,6 +1931,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MMH + displayName = MMH density = 0.00088 unitCost = 1.748 hsp = 2928.8 // specific heat capacity (kJ/tonne-K as units) @@ -1672,6 +1945,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON1 + displayName = MON1 density = 0.001429 unitCost = 0.21435 hsp = 1513.46 // NTO + N2O @@ -1685,6 +1959,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON3 + displayName = MON3 density = 0.001423 unitCost = 0.21345 hsp = 1497.2 // NTO + N2O @@ -1698,6 +1973,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON10 + displayName = MON10 density = 0.001407 unitCost = 0.23919 hsp = 1440.24 // NTO + N2O @@ -1711,6 +1987,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON15 + displayName = MON15 density = 0.001397 unitCost = 0.23749 hsp = 1399.56 // NTO + N2O @@ -1724,6 +2001,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON20 + displayName = MON20 density = 0.00138 unitCost = 0.2484 hsp = 1358.88 // NTO + N2O @@ -1737,6 +2015,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = MON25 + displayName = MON25 density = 0.00138 unitCost = 0.2484 hsp = 1318.2 // NTO + N2O @@ -1749,6 +2028,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = NGNC + displayName = NGNC density = 0.0016 unitCost = 0.01 hsp = 920 // FIXME, total guess but based on 'standardized' solids and the stock SolidFuel hsp. @@ -1762,6 +2042,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = N2F4 + displayName = N2F4 density = 0.001604 unitCost = 24.06 flowMode = STACK_PRIORITY_SEARCH @@ -1774,6 +2055,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Nitrogen + displayName = Nitrogen density = 0.000001251 unitCost = 0.00005 hsp = 1039 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/nitrogen-d_977.html @@ -1787,6 +2069,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = NitrousOxide + displayName = NitrousOxide density = 0.00000196 unitCost = 0.000392 hsp = 708 // https://books.google.com/books?id=6-VdBgAAQBAJ&lpg=PA337&ots=drEom6Tx9D&dq=nitrous%20oxide%20liquid%20heat%20capacity&pg=PA110#v=onepage&q&f=false @@ -1800,6 +2083,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = NTO + displayName = NTO density = 0.00145 unitCost = 0.2175 hsp = 1521.6 // specific heat capacity (kJ/tonne-K as units) // http://webbook.nist.gov/cgi/cbook.cgi?ID=C10544726&Type=JANAFL&Plot=on#JANAFL @@ -1813,6 +2097,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = OF2 + displayName = OF2 density = 0.0019 unitCost = 28.5 flowMode = STACK_PRIORITY_SEARCH @@ -1825,6 +2110,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = PBAN + displayName = PBAN density = 0.001772 unitCost = 1.593 hsp = 920 // FIXME, total guess but based on 'standardized' solids and the stock SolidFuel hsp. @@ -1838,6 +2124,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Pentaborane + displayName = Pentaborane density = 0.000618 unitCost = 6.18 flowMode = STACK_PRIORITY_SEARCH @@ -1850,6 +2137,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = PSPC + displayName = PSPC density = 0.00174 unitCost = 0.01 hsp = 920 // FIXME, total guess but based on 'standardized' solids and the stock SolidFuel hsp. @@ -1863,6 +2151,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Syntin + displayName = Syntin density = 0.000851 unitCost = 0.4255 flowMode = STACK_PRIORITY_SEARCH @@ -1875,6 +2164,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = TEATEB + displayName = TEATEB density = 0.00070031 unitCost = 2.80124 flowMode = NO_FLOW @@ -1887,6 +2177,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Tonka250 + displayName = Tonka250 density = 0.000873 unitCost = 0.4365 flowMode = STACK_PRIORITY_SEARCH @@ -1899,6 +2190,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Tonka500 + displayName = Tonka500 density = 0.000811 unitCost = 0.44605 flowMode = STACK_PRIORITY_SEARCH @@ -1911,6 +2203,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = UDMH + displayName = UDMH density = 0.000791 unitCost = 0.791 hsp = 2729.6 // specific heat capacity (kJ/tonne-K as units) // http://webbook.nist.gov/cgi/cbook.cgi?ID=C10544726&Type=JANAFL&Plot=on#JANAFL @@ -1924,6 +2217,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = UH25 + displayName = UH25 density = 0.000829 unitCost = 1.03625 hsp = 2850 // specific heat capacity (kJ/tonne-K as units) // guesstimate based on Hydrazine and UDMH and AZ50 @@ -1941,6 +2235,7 @@ RESOURCE_DEFINITION RESOURCE_DEFINITION { name = Glykerol + displayName = Glykerol density = 0.012 unitCost = 2 hsp = 2430 // specific heat capacity (kJ/tonne-K as units) // http://www.engineeringtoolbox.com/specific-heat-fluids-d_151.html diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg index 74f3570..f8a9576 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karbonite.cfg @@ -10,21 +10,6 @@ // //Express all numbers as percentages 0.0-100.0, not 0.0-1.0! // -PLANETARY_RESOURCE -{ - ResourceName = Karbonite - ResourceType = 0 - PlanetName = Jool - - Distribution - { - PresenceChance = 0 - MinAbundance = 0 - MaxAbundance = 0 - Variance = 0 - Dispersal = 0 - } -} GLOBAL_RESOURCE { @@ -40,6 +25,7 @@ GLOBAL_RESOURCE Dispersal = 3 } } + GLOBAL_RESOURCE { ResourceName = Karbonite @@ -142,6 +128,7 @@ PLANETARY_RESOURCE Variance = 10 } } + PLANETARY_RESOURCE { ResourceName = Karbonite @@ -175,6 +162,22 @@ PLANETARY_RESOURCE } } +PLANETARY_RESOURCE +{ + ResourceName = Karbonite + ResourceType = 0 + PlanetName = Jool + + Distribution + { + PresenceChance = 0 + MinAbundance = 0 + MaxAbundance = 0 + Variance = 0 + Dispersal = 0 + } +} + PLANETARY_RESOURCE { ResourceName = Karbonite @@ -191,4 +194,4 @@ PLANETARY_RESOURCE MinRange = .1 MaxRange = .1 } -} \ No newline at end of file +} diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karborundum.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karborundum.cfg index 4a8186a..db423bd 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karborundum.cfg +++ b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Karborundum.cfg @@ -35,8 +35,8 @@ PLANETARY_RESOURCE Distribution { PresenceChance = 100 - MinAbundance = .001 - MaxAbundance = .01 + MinAbundance = 10 + MaxAbundance = 50 Variance = 50 Dispersal = 3 } @@ -50,8 +50,8 @@ PLANETARY_RESOURCE Distribution { PresenceChance = 100 - MinAbundance = .001 - MaxAbundance = .01 + MinAbundance = 1 + MaxAbundance = 10 Variance = 50 Dispersal = 3 } @@ -66,7 +66,7 @@ PLANETARY_RESOURCE { PresenceChance = 100 MinAbundance = 10 - MaxAbundance = 10 + MaxAbundance = 100 MinAltitude = 40 MaxAltitude = 40 MinRange = 5 diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version index 818e3de..824079e 100644 --- a/FOR_RELEASE/GameData/Firespitter/Firespitter.version +++ b/FOR_RELEASE/GameData/Firespitter/Firespitter.version @@ -3,22 +3,22 @@ "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version", "VERSION": { "MAJOR": 7, - "MINOR": 5, - "PATCH": 1 + "MINOR": 6, + "PATCH": 0 }, - "KSP_VERSION":{ - "MAJOR":1, - "MINOR":2, - "PATCH":2 - }, - "KSP_VERSION_MIN":{ - "MAJOR":1, - "MINOR":2, - "PATCH":0 - }, - "KSP_VERSION_MAX":{ - "MAJOR":1, - "MINOR":2, - "PATCH":2 - } + "KSP_VERSION":{ + "MAJOR":1, + "MINOR":3, + "PATCH":0 + }, + "KSP_VERSION_MIN":{ + "MAJOR":1, + "MINOR":2, + "PATCH":9 + }, + "KSP_VERSION_MAX":{ + "MAJOR":1, + "MINOR":3, + "PATCH":9 + } } diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll index 0b9ffce..09a07dc 100644 Binary files a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll and b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll differ diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb index d3b561b..8cbb131 100644 Binary files a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb and b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb differ diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb index 50ec965..2f2ad9b 100644 Binary files a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb and b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/CHANGELOG.txt index 11ffe85..e6ce879 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/CHANGELOG.txt @@ -1,3 +1,8 @@ +0.3.0 - KSP 1.3 +------------------ +KSP 1.3 Compatibility +Dependency Updates + 0.2.8 - 2017.03.17 ------------------- Removed all references to ReplacementParts as those are not being currently used diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Malemute.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Malemute.version index acb619e..22056ad 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Malemute.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Malemute.version @@ -9,23 +9,23 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":2, - "PATCH":8, + "MINOR":3, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":2, - "PATCH":0 + "PATCH":9 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":2, - "PATCH":2 + "MINOR":3, + "PATCH":9 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverCrewCab.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverCrewCab.cfg index 6c3a535..81afe9d 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverCrewCab.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverCrewCab.cfg @@ -22,6 +22,8 @@ node_stack_wheel4 = -0.265,0.42,0.664,-1.0,0.0,0.0,0 node_stack_wheel5 = 0.265,-0.32,0.664,1.0,0.0,0.0,0 node_stack_wheel6 = -0.265,-0.32,0.664,-1.0,0.0,0.0,0 +node_stack_roof = 0.0, 0.0, -0.66425, 0.0, 0.0, -1.0, 0 + node_stack_top = 0, 0.75, 0.0, 0.0, 1.0, 0.0, 1 node_stack_bottom = 0, -0.75, 0.0, 0.0, -1.0, 0.0, 1 diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverTankLong.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverTankLong.cfg index 6304d90..9d4818e 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverTankLong.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Malemute/Parts/RoverTankLong.cfg @@ -22,6 +22,8 @@ node_stack_wheel4 = -0.265,0.42,0.664,-1.0,0.0,0.0,0 node_stack_wheel5 = 0.265,-0.32,0.664,1.0,0.0,0.0,0 node_stack_wheel6 = -0.265,-0.32,0.664,-1.0,0.0,0.0,0 +node_stack_roof = 0.0, 0.0, -0.66425, 0.0, 0.0, -1.0, 0 + node_stack_top = 0, 0.75, 0.0, 0.0, 1.0, 0.0, 1 node_stack_bottom = 0, -0.75, 0.0, 0.0, -1.0, 0.0, 1