Skip to content

Commit

Permalink
Merge pull request #167 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer committed May 15, 2015
2 parents 3038281 + 239d69d commit 254e873
Show file tree
Hide file tree
Showing 200 changed files with 311 additions and 190 deletions.
6 changes: 3 additions & 3 deletions GameData/000_USITools/USI.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"VERSION":{
"MAJOR":0,
"MINOR":4,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":0,
"PATCH":0
"PATCH":2
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -26,6 +26,6 @@
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
"PATCH":0
"PATCH":2
}
}
Binary file modified GameData/000_USITools/USITools.dll
Binary file not shown.
22 changes: 11 additions & 11 deletions GameData/CommunityResourcePack/CRP.version
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":3,
"PATCH":3,
"MINOR":4,
"PATCH":2,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":0,
"MINOR":90,
"PATCH":0
"MAJOR":1,
"MINOR":0,
"PATCH":2
},
"KSP_VERSION_MIN":{
"MAJOR":0,
"MINOR":24,
"PATCH":2
"MAJOR":1,
"MINOR":0,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":0,
"MINOR":90,
"PATCH":0
"MAJOR":1,
"MINOR":0,
"PATCH":2
}
}
44 changes: 37 additions & 7 deletions GameData/CommunityResourcePack/CommonResources.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RESOURCE_DEFINITION
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
unitCost = 0
unitCost = 0.0000028637
}

RESOURCE_DEFINITION
Expand Down Expand Up @@ -88,6 +88,16 @@ RESOURCE_DEFINITION
isTweakable = true
}

RESOURCE_DEFINITION
{
name = LqdCO
density = 0.000790
unitCost = 0.0021
flowMode = STACK_PRIORITY_SEARCH
transfer = PUMP
isTweakable = true
}

RESOURCE_DEFINITION
{
name = Metals
Expand Down Expand Up @@ -164,8 +174,8 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = RocketParts
density = 0.0005
unitCost = 1
density = 0.0025
unitCost = 5
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
Expand Down Expand Up @@ -335,11 +345,11 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = Antimatter
density = 0.00007085
density = 0.000000001
flowMode = STAGE_PRIORITY_FLOW
transfer = PUMP
isTweakable = true
unitCost = 150000
isTweakable = false
unitCost = 100
}

RESOURCE_DEFINITION
Expand Down Expand Up @@ -402,6 +412,16 @@ RESOURCE_DEFINITION
unitCost = 0.0068
}

RESOURCE_DEFINITION
{
name = NeonGas
density = 0.0000009002
flowMode = STAGE_PRIORITY_FLOW
transfer = PUMP
isTweakable = true
unitCost = 0.0016
}

RESOURCE_DEFINITION
{
name = Lithium
Expand Down Expand Up @@ -502,6 +522,16 @@ RESOURCE_DEFINITION
unitCost = 716
}

RESOURCE_DEFINITION
{
name = ThermalPower
density = 0
unitCost = 0
flowMode = ALL_VESSEL
transfer = NONE
isTweakable = false
}

RESOURCE_DEFINITION
{
name = UraniumNitride
Expand All @@ -515,7 +545,7 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = VacuumPlasma
density = 0
density = 0.005
flowMode = ALL_VESSEL
transfer = NONE
isTweakable = false
Expand Down
68 changes: 68 additions & 0 deletions GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//
// Community Resource Pack
// Resource:
//
//Resource types:
// 0 = Crustal (Stuff you dig up)
// 1 = Oceanic (Stuff in the oceans)
// 2 = Atmospheric (Stuff in the air, varies with pressure)
// 3 = Interplanetary (Stuff you find between planets)
//
//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
//
PLANETARY_RESOURCE
{
ResourceName = CarbonDioxide
ResourceType = 2
PlanetName = Eve

Distribution
{
PresenceChance = 100
MinAbundance = 95
MaxAbundance = 97
Variance = 0
}
}
PLANETARY_RESOURCE
{
ResourceName = CarbonDioxide
ResourceType = 2
PlanetName = Kerbin

Distribution
{
PresenceChance = 100
MinAbundance = 1
MaxAbundance = 2
Variance = 0
}
}
PLANETARY_RESOURCE
{
ResourceName = CarbonDioxide
ResourceType = 2
PlanetName = Duna

Distribution
{
PresenceChance = 100
MinAbundance = 95
MaxAbundance = 97
Variance = 0
}
}
PLANETARY_RESOURCE
{
ResourceName = CarbonDioxide
ResourceType = 2
PlanetName = Laythe

Distribution
{
PresenceChance = 100
MinAbundance = 5
MaxAbundance = 10
Variance = 0
}
}
12 changes: 6 additions & 6 deletions GameData/Firespitter/Firespitter.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
"VERSION": {
"MAJOR": 7,
"MINOR": 0,
"PATCH": 0
"MINOR": 1,
"PATCH": 2
},
"KSP_VERSION": {
"MAJOR": 0,
"MINOR": 90,
"PATCH": 0
"MAJOR": 1,
"MINOR": 0,
"PATCH": 2
}
}
}
Binary file modified GameData/Firespitter/Plugins/Firespitter.dll
Binary file not shown.
Binary file added GameData/ModuleManager.2.6.2.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 254e873

Please sign in to comment.