Skip to content

Commit

Permalink
Merge pull request UmbraSpaceIndustries#93 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer committed Jun 21, 2016
2 parents 3de763e + ca40929 commit a448452
Show file tree
Hide file tree
Showing 18 changed files with 289 additions and 43 deletions.
16 changes: 16 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg
@@ -0,0 +1,16 @@
@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[ModuleCommand]]
{
MODULE
{
name = ModuleLogisticsConsumer
}
}

@PART[*]:HAS[!MODULE[ModuleLogisticsConsumer],@MODULE[KerbalSeat]]
{
MODULE
{
name = ModuleLogisticsConsumer
}
}

6 changes: 6 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,9 @@
0.7.4 - (KSP 1.1.3)
------------------
Compatibility for KSP 1.1.3
Ensured all parts with command capabilities are resource consumers
Resource Distributors benefit from their own extended range when self-supplying

0.7.2.1 - 2016.04.30
--------------------
KSP 1.1.2 compatibility
Expand Down
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
8 changes: 4 additions & 4 deletions FOR_RELEASE/GameData/000_USITools/USITools.version
Expand Up @@ -10,13 +10,13 @@
"VERSION":{
"MAJOR":0,
"MINOR":7,
"PATCH":2,
"BUILD":1
"PATCH":4,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -26,6 +26,6 @@
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
}
}
11 changes: 11 additions & 0 deletions FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,14 @@
0.5.4 - (KSP 1.1.3)
------------------
Update for KSP 1.1.3
Updated cost of Plutonium
Added Lithium6, Carbon, and Monazite
Karborundum is now tweakable, and 4000 funds per unit (versus 400).
The Kerbol Karburundum harvesting zone is back... now go find it :)
Alumina and Monazite are now planetary resources.
Hydrates are a bit more common.
Added Glykerol (curated by DeepFreeze).

0.5.2 - 2016.05.14
------------------
Added Volume and reverted UF4 and ThF4 to original KSPI density & cost
Expand Down
6 changes: 3 additions & 3 deletions FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
Expand Up @@ -10,13 +10,13 @@
"VERSION":{
"MAJOR":0,
"MINOR":5,
"PATCH":2,
"PATCH":4,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -26,6 +26,6 @@
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":1,
"PATCH":2
"PATCH":3
}
}
77 changes: 72 additions & 5 deletions FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
Expand Up @@ -217,10 +217,10 @@ RESOURCE_DEFINITION
{
name = Karborundum
density = 0.00580000000
unitCost = 400
unitCost = 4000
flowMode = STAGE_PRIORITY_FLOW
transfer = PUMP
isTweakable = false
isTweakable = true
isVisible = true
color = 1,0,0
volume = 1
Expand Down Expand Up @@ -586,6 +586,17 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
name = Carbon
density = 0.0021
unitCost = 0.0
hsp = 710
flowMode = NO_FLOW
transfer = NONE
isTweakable = false
}

RESOURCE_DEFINITION
{
name = ChargedParticles
Expand All @@ -604,7 +615,7 @@ RESOURCE_DEFINITION
flowMode = NO_FLOW
transfer = NONE
isTweakable = false
isVisible = true
isVisible = true
unitCost = 0
volume = 1
}
Expand Down Expand Up @@ -672,7 +683,7 @@ RESOURCE_DEFINITION
RESOURCE_DEFINITION
{
name = Lithium
density = 0.00053400000
density = 0.000534
flowMode = STAGE_PRIORITY_FLOW
transfer = PUMP
isTweakable = true
Expand All @@ -681,6 +692,18 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
name = Lithium6
density = 0.000458
flowMode = STAGE_PRIORITY_FLOW
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 4
volume = 1
}

RESOURCE_DEFINITION
{
name = LqdAmmonia
Expand All @@ -706,6 +729,19 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
name = Helium3
density = 0.000000125
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 1.1127
hsp = 4560
volume = 1
}

RESOURCE_DEFINITION
{
name = LqdHe3
Expand Down Expand Up @@ -770,6 +806,20 @@ RESOURCE_DEFINITION
volume = 1
}

RESOURCE_DEFINITION
{
name = Monazite
density = 0.005
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
isVisible = true
unitCost = 0.1
color = 0,0.8,0.2
volume = 1
}


RESOURCE_DEFINITION
{
name = Plutonium-238
Expand All @@ -778,7 +828,7 @@ RESOURCE_DEFINITION
transfer = NONE
isTweakable = true
isVisible = true
unitCost = 0.019816
unitCost = 4000
volume = 1
}

Expand Down Expand Up @@ -1568,6 +1618,23 @@ RESOURCE_DEFINITION
ksparpicon = RealFuels/Resources/ARPIcons/UH25
}

//******************************
//* SECTION 5 DeepFreeze Curated
//******************************

RESOURCE_DEFINITION
{
name = 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
flowMode = ALL_VESSEL
transfer = PUMP
isTweakable = true
ksparpicon = REPOSoftTech/DeepFreeze/Icons/Glykerol
ksparpdisplayvalueas = Units
}

//******************************
//* END
//******************************
122 changes: 122 additions & 0 deletions FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Alumina.cfg
@@ -0,0 +1,122 @@
//
// Community Resource Pack
// Resource: Alumina
//
//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 = Alumina
ResourceType = 0
PlanetName = Jool

Distribution
{
PresenceChance = 0
MinAbundance = 0
MaxAbundance = 0
Variance = 0
Dispersal = 0
}
}

GLOBAL_RESOURCE
{
ResourceName = Alumina
ResourceType = 0

Distribution
{
PresenceChance = 70
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}
PLANETARY_RESOURCE
{
ResourceName = Alumina
ResourceType = 0
PlanetName = Kerbin

Distribution
{
PresenceChance = 100
MinAbundance = .001
MaxAbundance = 10
Variance = 50
Dispersal = 3
}
}

PLANETARY_RESOURCE
{
ResourceName = Alumina
ResourceType = 0
PlanetName = Mun

Distribution
{
PresenceChance = 100
MinAbundance = .01
MaxAbundance = 50
Variance = 50
Dispersal = 3
}
}

PLANETARY_RESOURCE
{
ResourceName = Alumina
ResourceType = 0
PlanetName = Moho

Distribution
{
PresenceChance = 100
MinAbundance = .01
MaxAbundance = 50
Variance = 50
Dispersal = 3
}
}

PLANETARY_RESOURCE
{
ResourceName = Alumina
ResourceType = 0
PlanetName = Duna

Distribution
{
PresenceChance = 100
MinAbundance = .001
MaxAbundance = 1
Variance = 50
Dispersal = 3
}
}

PLANETARY_RESOURCE
{
ResourceName = Alumina
ResourceType = 0
PlanetName = Dres

Distribution
{
PresenceChance = 100
MinAbundance = .01
MaxAbundance = 50
Variance = 50
Dispersal = 3
}
}
Expand Up @@ -34,9 +34,9 @@ GLOBAL_RESOURCE

Distribution
{
PresenceChance = 70
MinAbundance = .001
MaxAbundance = 10
PresenceChance = 80
MinAbundance = .1
MaxAbundance = 25
Variance = 50
Dispersal = 3
}
Expand All @@ -50,8 +50,8 @@ PLANETARY_RESOURCE
Distribution
{
PresenceChance = 100
MinAbundance = .001
MaxAbundance = 10
MinAbundance = .1
MaxAbundance = 25
Variance = 50
Dispersal = 3
}
Expand Down
Expand Up @@ -65,12 +65,12 @@ PLANETARY_RESOURCE
Distribution
{
PresenceChance = 100
MinAbundance = 1
MaxAbundance = 5
MinAltitude = 1.14678899
MaxAltitude = 1.14678899
MinRange = 0.1911315
MaxRange = 0.1911315
MinAbundance = 10
MaxAbundance = 10
MinAltitude = 40
MaxAltitude = 40
MinRange = 5
MaxRange = 5
Variance = 50
}
}
Expand Down

0 comments on commit a448452

Please sign in to comment.