Skip to content

Commit

Permalink
Merge branch 'release-setup/Stage2' into Release
Browse files Browse the repository at this point in the history
  • Loading branch information
DanStaal committed Aug 1, 2017
2 parents 1c36144 + 8c14185 commit e019273
Show file tree
Hide file tree
Showing 11 changed files with 385 additions and 45 deletions.
26 changes: 17 additions & 9 deletions CHANGELOG
@@ -1,5 +1,13 @@

- New version for MKS 0.50+. New features include:
- Life Support Revision - New version in conjunction with KPBS 1.5
- Added Planetary Cultivation parts
- Added resource-cost for switching Algae container modes.
- Added deployment costs for MK2-Hab, Greenhouses, and ScienceLab
- Removed ReplacementParts from the Workbenches.
- Racks no longer generate Kolony Rewards.
- Rock added to Containers

- New version for MKS 0.50+. New features include:
- Fully functional Kontainers (The old tanks are depreciated)
- Ground Construction support
- Construction Ports in KPBS form-factors
Expand All @@ -8,11 +16,11 @@
- Weight Transfer for the KPBS racks and containers.
- Probably more I've forgotten.

- 2017-02-06 Added MM file to remove Pathfinder additions.
- 2017-02-02 Deduplicated module insertions.
- 2017-02-01 Rebalanced Logistics.
- 2017-02-01 Added Inertial Dampers and MKSModules to everything.
- 2017-02-01 Removed most EL adaptations. (KPBS supports that in base now.)
- 2017-02-01 Removed MKS adaptor.
- 2017-02-01 Revamped to use Git-Flow workflow.
- 2016-08-01 Added MKS adaptor (start).
- 2017-02-06 Added MM file to remove Pathfinder additions.
- 2017-02-02 Deduplicated module insertions.
- 2017-02-01 Rebalanced Logistics.
- 2017-02-01 Added Inertial Dampers and MKSModules to everything.
- 2017-02-01 Removed most EL adaptations. (KPBS supports that in base now.)
- 2017-02-01 Removed MKS adaptor.
- 2017-02-01 Revamped to use Git-Flow workflow.
- 2016-08-01 Added MKS adaptor (start).
10 changes: 5 additions & 5 deletions KPBStoMKS.version
@@ -1,8 +1,8 @@
{
"NAME":"MKS Patches for KPBS",
"URL":"http://github.com/DanStall/KPBStoMKS/Release/KPBStoMKS.version",
"URL":"http://github.com/DanStaal/KPBStoMKS/Release/KPBStoMKS.version",
"DOWNLOAD":"http://github.com/DanStaal/KPBStoMKS/releases",
"CHANGE_LOG_URL":"http://github.com/DanStall/KPBStoMKS/Release/CHANGELOG"
"CHANGE_LOG_URL":"http://github.com/DanStaal/KPBStoMKS/Release/CHANGELOG"
"GITHUB":
{
"USERNAME":"DanStaal",
Expand All @@ -11,9 +11,9 @@
},
"VERSION":
{
"MAJOR":0,
"MINOR":9,
"PATCH":5,
"MAJOR":1,
"MINOR":0,
"PATCH":0,
"BUILD":0
}
}
3 changes: 3 additions & 0 deletions New_Parts/Assets/34Rock.dds
Git LFS file not shown
252 changes: 252 additions & 0 deletions New_Parts/GreenHouses.cfg
@@ -0,0 +1,252 @@
// Make the greenhouse a full-spectrum greenhouse under MKS.
@PART[KKAOSS_Greenhouse_g]:AFTER[PlanetarySurfaceStructures]:NEEDS[USILifeSupport]:NEEDS[KolonyTools]
{
// Replace the current greenhouse entirely - it's cleaner, since they have different options.
!MODULE[PlanetaryGreenhouse] {}
RESOURCE
{
name = Machinery
amount = 200
maxAmount = 200
}
MODULE
{
name = ModuleResourceConverter_USI
ConverterName = Agroponics
StartActionName = Start Agroponics
StopActionName = Stop Agroponics
UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
ExperienceEffect = BotanySkill
Efficiency = 1
INPUT_RESOURCE
{
ResourceName = Mulch
Ratio = 0.0012
}
INPUT_RESOURCE
{
ResourceName = Fertilizer
Ratio = 0.00012
}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.00132
DumpExcess = False
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 2.64
}
INPUT_RESOURCE
{
ResourceName = Machinery
Ratio = 0.0000040
}
OUTPUT_RESOURCE
{
ResourceName = Recyclables
Ratio = 0.0000040
DumpExcess = true
}
REQUIRED_RESOURCE
{
ResourceName = Machinery
Ratio = 200
}
}
}
// Part: Cultivate (Substrate)
+PART[KKAOSS_Greenhouse_g]:AFTER[PlanetarySurfaceStructures]:NEEDS[USILifeSupport]:NEEDS[KolonyTools]
{
@name = KKAOSS_LS_MKSAddon_Greenhouse_Substrate
@title = K&K Planetary Cultivator (Substrate)
@description = To increase production, K&K developed a version of the greenhouse that uses a Substrate-soil base to grow the plants in. It's still not green though.

// Replace the current greenhouse entirely - it's cleaner, since they have different options.
!MODULE[PlanetaryGreenhouse] {}
RESOURCE
{
name = Machinery
amount = 200
maxAmount = 200
}
@RESOURCE[Fertilizer]
{
@amount /= 2
@maxAmount /= 2
}
RESOURCE
{
name = Substrate
amount = #$/RESOURCE[Fertilizer]/amount$
maxAmount = #$/RESOURCE[Fertilizer]/maxAmount$
}
// We're duping the part just above us...
!MODULE[ModuleResourceConverter_USI] {}

MODULE
{
name = ModuleResourceConverter_USI
ConverterName = Cultivate(S)
StartActionName = Start Cultivate(S)
StopActionName = Stop Cultivate(S)

UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
ExperienceEffect = BotanySkill
Efficiency = 1

INPUT_RESOURCE
{
ResourceName = Substrate
Ratio = 0.003
}
INPUT_RESOURCE
{
ResourceName = Water
Ratio = 0.003
}
INPUT_RESOURCE
{
ResourceName = Fertilizer
Ratio = 0.00003
}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.0003
DumpExcess = False
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 6.33
}
INPUT_RESOURCE
{
ResourceName = Machinery
Ratio = 0.0000040
}
OUTPUT_RESOURCE
{
ResourceName = Recyclables
Ratio = 0.0000040
DumpExcess = true
}
REQUIRED_RESOURCE
{
ResourceName = Machinery
Ratio = 200
}
}
}

// Part: Cultivate: Dirt
+PART[KKAOSS_Greenhouse_g]:AFTER[PlanetarySurfaceStructures]:NEEDS[USILifeSupport]:NEEDS[KolonyTools]
{
@name = KKAOSS_LS_MKSAddon_Greenhouse_Dirt
@title = K&K Planetary Cultivator (Dirt)

@description = To increase production, K&K developed a version of the greenhouse that uses a Dirt base to grow the plants in. It's still not green though.
// Replace the current greenhouse entirely - it's cleaner, since they have different options.
!MODULE[PlanetaryGreenhouse] {}

// We're duping the part just above us...
!MODULE[ModuleResourceConverter_USI] {}
RESOURCE
{
name = Machinery
amount = 200
maxAmount = 200
}
@RESOURCE[Fertilizer]
{
@amount /= 2
@maxAmount /= 2
}
RESOURCE
{
name = Dirt
amount = #$/RESOURCE[Fertilizer]/amount$
maxAmount = #$/RESOURCE[Fertilizer]/maxAmount$
}
MODULE
{
name = ModuleResourceConverter_USI
ConverterName = Cultivate(D)
StartActionName = Start Cultivate(D)
StopActionName = Stop Cultivate(D)
UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
ExperienceEffect = BotanySkill
Efficiency = 1
INPUT_RESOURCE
{
ResourceName = Dirt
Ratio = 0.003
}
INPUT_RESOURCE
{
ResourceName = Water
Ratio = 0.003
}
INPUT_RESOURCE
{
ResourceName = Fertilizer
Ratio = 0.000012
}
OUTPUT_RESOURCE
{
ResourceName = Supplies
Ratio = 0.00012
DumpExcess = False
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 6.13
}
INPUT_RESOURCE
{
ResourceName = Machinery
Ratio = 0.0000040
}
OUTPUT_RESOURCE
{
ResourceName = Recyclables
Ratio = 0.0000040
DumpExcess = true
}
REQUIRED_RESOURCE
{
ResourceName = Machinery
Ratio = 200
}
}
}
5 changes: 4 additions & 1 deletion New_Parts/KPBS_Kontainers_Solids.cfg
Expand Up @@ -52,7 +52,7 @@
textureRefinedExotics = KPBStoMKS/New_Parts/Assets/21REX
textureColonySupplies = KPBStoMKS/New_Parts/Assets/22CSP
textureOrganics = KPBStoMKS/New_Parts/Assets/23ORG
textureRock = KPBStoMKS/New_Parts/Assets/34Rock
}
}
Expand Down Expand Up @@ -106,6 +106,7 @@
textureRefinedExotics = KPBStoMKS/New_Parts/Assets/21REX
textureColonySupplies = KPBStoMKS/New_Parts/Assets/22CSP
textureOrganics = KPBStoMKS/New_Parts/Assets/23ORG
textureRock = KPBStoMKS/New_Parts/Assets/34Rock
}

}
Expand Down Expand Up @@ -177,6 +178,7 @@
textureRefinedExotics = KPBStoMKS/New_Parts/Assets/21REX
textureColonySupplies = KPBStoMKS/New_Parts/Assets/22CSP
textureOrganics = KPBStoMKS/New_Parts/Assets/23ORG
textureRock = KPBStoMKS/New_Parts/Assets/34Rock
}

}
Expand Down Expand Up @@ -232,6 +234,7 @@
textureRefinedExotics = KPBStoMKS/New_Parts/Assets/21REX
textureColonySupplies = KPBStoMKS/New_Parts/Assets/22CSP
textureOrganics = KPBStoMKS/New_Parts/Assets/23ORG
textureRock = KPBStoMKS/New_Parts/Assets/34Rock
}
Expand Down

0 comments on commit e019273

Please sign in to comment.