Skip to content

Commit

Permalink
Merge pull request #3 from BobPalmer/master
Browse files Browse the repository at this point in the history
Update from parent.
  • Loading branch information
Kerbas-ad-astra committed Jul 24, 2015
2 parents e5398d3 + 5ba3153 commit 775aed5
Show file tree
Hide file tree
Showing 54 changed files with 282 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
obj/
bin/
*.cache
*.zip
8 changes: 8 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@PART[USILS_Greenhouse]:NEEDS[CommunityTechTree]
{
@TechRequired = recycling
}
@PART[USILS_Greenhouse_LG]:NEEDS[CommunityTechTree]
{
@TechRequired = hydroponics
}
18 changes: 18 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
USI Life Support - ChangeLog

0.1.4 - 2015.07.01
* Corrected collider and node issues with large greenhouse

0.1.3 - 2015.06.26
* You can now access the life support screen from the KSC, VAB, and Tracking Station
* Life Support should no longer cause unanticipated part activations
* Added 'Fertilizer' as a resource
* Increased the cost of Mulch
* Added token mulch storage to all inline tanks
* Added a larger greenhouse that can also use fertilizer to extend supplies
* Mini packs for mulch and fertilizer
* Only crewed vehicles are showed in the life support summary window
* Once supplis go in the red, replaced the negative time with 'crew lost'
* Added parameter for the altitude at which kerbals are considered supplied on Kerbin
* Added parameter to toggle the immunity of verterans (orange suits)



0.1.1 - 2015.05.04
* Added a new 100-liter radial NOMS tank
* Vets (Jeb/Val/Bill/Bob) should now be immune to supply deprivation
Expand Down
3 changes: 1 addition & 2 deletions GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@PART[*]:HAS[!MODULE[ModuleLifeSupport],#CrewCapacity[*],~CrewCapacity[0]]:FOR[LifeSupport]
@PART[*]:HAS[!MODULE[ModuleLifeSupport],#CrewCapacity[*],~CrewCapacity[0]]:FOR[USILifeSupport]
{
MODULE
{
name = ModuleLifeSupport
AlwaysActive = true
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 26 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,30 @@ PART
amount = 100
maxAmount = 100
}

MODULE
{
name = ModuleResourceConverter
ConverterName = Greenhouse
tag = Greenhouse
StartActionName = Start Greenhouse
StopActionName = Stop Greenhouse

INPUT_RESOURCE
{
ResourceName = Mulch
Ratio = 0.00005
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 3
}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.000025
DumpExcess = False
}
}
}
Binary file modified GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.mu
Binary file not shown.
108 changes: 108 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
PART
{
name = USILS_Greenhouse_LG
module = Part
author = RoverDude
rescaleFactor = 1
node_attach = 0,-.15,0,0,-1,0
node_stack_bottom = 0,-.25,0,0,-1,0
TechRequired = survivability
entryCost = 1000
cost = 5000
category = Utility
subcategory = 0
title = Nom-O-Matic 25000
manufacturer = Umbra Space Industries
description = The Nom-O-Matic offers the latest in automated gardening and food generation. Simply toss in mulch (not included!) and harvest bland but mildly nutritions noms. Now in a larger, more efficient model!
attachRules = 1,1,0,0,0
mass = 4.5
dragModelType = default
maximum_drag = 0.25
minimum_drag = 0.25
angularDrag = .5
crashTolerance = 45
breakingForce = 280
breakingTorque = 280
maxTemp = 1700

MODEL
{
model = UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 500
}
RESOURCE
{
name = Supplies
amount = 500
maxAmount = 500
}
RESOURCE
{
name = Fertilizer
amount = 500
maxAmount = 500
}

MODULE
{
name = ModuleResourceConverter
tag = Greenhouse
ConverterName = Greenhouse
StartActionName = Start Greenhouse
StopActionName = Stop Greenhouse
INPUT_RESOURCE
{
ResourceName = Mulch
Ratio = 0.0002
}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.0001
DumpExcess = False
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 12
}
}

MODULE
{
name = ModuleResourceConverter
tag = Agroponics
ConverterName = Agroponics
StartActionName = Start Agroponics
StopActionName = Stop Agroponics
INPUT_RESOURCE
{
ResourceName = Mulch
Ratio = 0.0002
}
INPUT_RESOURCE
{
ResourceName = Fertilizer
Ratio = 0.00004

}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.00024
DumpExcess = False
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 12
}
}

}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PART
cost = 100
category = Utility
subcategory = 0
title = Life Support MiniPak
title = Life Support MiniPak (Supplies)
manufacturer = Umbra Space Industries
description = While we firmly believe you can never have enough snacks, the engineers and load planners disagreed, and provided this smaller, more conveniently sized supply container.
attachRules = 0,1,0,0,0
Expand All @@ -23,11 +23,11 @@ PART
breakingForce = 280
breakingTorque = 280
maxTemp = 1700
bulkheadProfiles = srf

MODEL
{
model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01
}

RESOURCE
Expand Down
39 changes: 39 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_02.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
PART
{
name = FertilizerMiniPack
module = Part
author = RoverDude
rescaleFactor = 1
node_attach = 0,0,.15,0,0,-1
TechRequired = survivability
entryCost = 1000
cost = 100
category = Utility
subcategory = 0
title = Life Support MiniPak (Fertilizer)
manufacturer = Umbra Space Industries
description = For the larger Nom-O-Matic, provided a starter (Fertilizer) to dramatically extend life support capabilities.
attachRules = 0,1,0,0,0
mass = 0.02
dragModelType = default
maximum_drag = 0.25
minimum_drag = 0.25
angularDrag = .5
crashTolerance = 45
breakingForce = 280
breakingTorque = 280
maxTemp = 1700

MODEL
{
model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03
}

RESOURCE
{
name = Fertilizer
amount = 100
maxAmount = 100
}
}
39 changes: 39 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_03.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
PART
{
name = MulchMiniPack
module = Part
author = RoverDude
rescaleFactor = 1
node_attach = 0,0,.15,0,0,-1
TechRequired = survivability
entryCost = 1000
cost = 100
category = Utility
subcategory = 0
title = Life Support MiniPak (Mulch)
manufacturer = Umbra Space Industries
description = When tossing stuff out the airlock is simply not an option.
attachRules = 0,1,0,0,0
mass = 0.02
dragModelType = default
maximum_drag = 0.25
minimum_drag = 0.25
angularDrag = .5
crashTolerance = 45
breakingForce = 280
breakingTorque = 280
maxTemp = 1700

MODEL
{
model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 100
}
}
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.
6 changes: 6 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,11 @@ RESOURCE
maxAmount = 500
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 10
}

}
6 changes: 6 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,11 @@ RESOURCE
maxAmount = 4500
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 150
}

}
7 changes: 7 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,12 @@ RESOURCE
maxAmount = 15000
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 300
}


}
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.
11 changes: 10 additions & 1 deletion GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ RESOURCE_DEFINITION
density = 0.001
flowMode = ALL_VESSEL
transfer = PUMP
unitCost = 0.0001
unitCost = 2.5
isTweakable = true
}
RESOURCE_DEFINITION
{
name = Fertilizer
density = 0.001
flowMode = ALL_VESSEL
transfer = PUMP
unitCost = 5
isTweakable = true
}
2 changes: 2 additions & 0 deletions GameData/UmbraSpaceIndustries/LifeSupport/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ LIFE_SUPPORT_SETTINGS
SupplyTime = 324000
CausesDeath = false
ECAmount = 0.01
OrangeImmunity = true
HomeworldAltitude = 50000
}
6 changes: 3 additions & 3 deletions GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"VERSION":{
"MAJOR":0,
"MINOR":1,
"PATCH":1,
"PATCH":5,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":0,
"PATCH":2
"PATCH":4
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -26,6 +26,6 @@
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
"PATCH":2
"PATCH":4
}
}
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 775aed5

Please sign in to comment.