Skip to content

Commit

Permalink
Merge branch 'DEVELOP' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@BobPalmer
BobPalmer authored Mar 7, 2018
2 parents 19d78c8 + 0f87c5b commit 318d2ed
Show file tree
Hide file tree
Showing 43 changed files with 3,172 additions and 2,341 deletions.
7 changes: 5 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ PART
usageReqMaskInternal = 5
usageReqMaskExternal = -1
}

MODULE
{
name = ModuleScienceContainer
Expand All @@ -78,6 +79,7 @@ PART
evaOnlyStorage = True
storageRange = 2.0
}

MODULE
{
name = USIAnimation
Expand All @@ -102,15 +104,16 @@ PART
maxAmount = 500
isTweakable = True
}

RESOURCE
{
name = Mulch
amount = 0
maxAmount = 500
isTweakable = True
}
}

MODULE
MODULE
{
name = ModuleHabitation
BaseKerbalMonths = 21
Expand Down
15 changes: 15 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Patches/CryoTanks.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@PART[KER_Adapter,KER_Tank,KER_WheelBay*]:NEEDS[SimpleBoiloff]
{
MODULE
{
name = ModuleCryoTank
CoolingCost = 0.09
CoolingEnabled = False
BOILOFFCONFIG
{
FuelName = LqdHydrogen
// in % per hr
BoiloffRate = 0.05
}
}
}
6 changes: 5 additions & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,9 @@ PART
{
name = USI_InertialDampener
}


MODULE
{
name = ModuleOrbitalLogistics
}
}
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PART
}

// --- editor parameters ---
cost = 250
cost = 1112
category = Utility
subcategory = 0
title = MEU-100 Pulse Drill
Expand All @@ -26,7 +26,7 @@ PART
tags = USI MKS drill MEU pulse resources surface harvester thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 125
entryCost = 3336

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PART
}

// --- editor parameters ---
cost = 250
cost = 1223
category = Utility
subcategory = 0
title = MEU-100-A Pulse Drill
Expand All @@ -26,7 +26,7 @@ PART
tags = USI MKS drill MEU pulse resources surface harvester thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 125
entryCost = 3370

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PART


// --- editor parameters ---
cost = 1300
cost = 7997
category = Utility
subcategory = 0
title = MEU-500 Pulse Drill
Expand All @@ -29,7 +29,7 @@ PART
tags = USI MKS drill MEU pulse resources surface harvester converter thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 50
entryCost = 23990

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PART


// --- editor parameters ---
cost = 1300
cost = 8796
category = Utility
subcategory = 0
title = MEU-500-A Pulse Drill
Expand All @@ -29,7 +29,7 @@ PART
tags = USI MKS drill MEU pulse resources surface harvester converter thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 50
entryCost = 26389

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PART


// --- editor parameters ---
cost = 6000
cost = 39994
category = Utility
subcategory = 0
title = Industrial Strip Miner
Expand All @@ -29,7 +29,7 @@ PART
tags = USI MKS drill industrial miner resources surface harvester converter thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 3000
entryCost = 119981

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PART


// --- editor parameters ---
cost = 6000
cost = 43993
category = Utility
subcategory = 0
title = Automated Industrial Strip Miner
Expand All @@ -29,7 +29,7 @@ PART
tags = USI MKS drill industrial miner resources surface harvester converter thermal heat Uraninite Substrate Minerals ExoticMinerals RareMetals MaterialKits SpecializedParts Hydrates Gypsum Dirt Silicates Water

TechRequired = advScienceTech
entryCost = 3000
entryCost = 131979

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
Expand Down
2 changes: 1 addition & 1 deletion FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_ISM.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PART
{
name = FSfuelSwitch
resourceNames = Silicates,Silicon;Substrate,Polymers;ExoticMinerals,RareMetals,Chemicals,RefinedExotics;Hydrates,Water;Karbonite,Water;Ore,Water;Minerals,Chemicals;Gypsum,Fertilizer;Minerals,Fertilizer;MetallicOre,Metals;Ore,LiquidFuel,Oxidizer;Ore,LiquidFuel;Ore,MonoPropellant;RefinedExotics,Silicon,SpecializedParts;Metals,Polymers,Chemicals,MaterialKits;Substrate,Water,Organics,Fertilizer;Dirt,Water,Organics,Fertilizer;Organics,SpecializedParts,MaterialKits,ColonySupplies;SpecializedParts,MaterialKits,Machinery;Recyclables,Metals,Polymers,Chemicals;Mulch,Fertilizer,Supplies;Substrate,Water,Fertilizer,Supplies;Dirt,Water,Fertilizer,Supplies
resourceAmounts = 55,11;55,11;11.5,11.5,34.5,11.5;46,23;55,11;55,11;55,11;46,23;55,11;55,11;55,6.05,4.95;55,11;55,11;4.38,43.75,21.88;14,14,7,35;30.6,30.6,8.6,1;32,32,5.8,1;21,7,7,35;7,28,35;35,7,7,7;31.5,3.5,35;78,78,1,7.8;34.2,34.2,1,1.4
resourceAmounts = 55,11;55,11;11.5,11.5,34.5,11.5;46,23;55,11;55,11;55,11;46,23;55,11;55,11;55,4.95,6.05;55,11;55,11;4.38,43.75,21.88;14,14,7,35;30.6,30.6,8.6,1;32,32,5.8,1;21,7,7,35;7,28,35;35,7,7,7;31.5,3.5,35;78,78,1,7.8;34.2,34.2,1,1.4
initialResourceAmounts = 0,0;0,0;0,0,0,0;0,0;0,0;0,0;0,0;0,0;0,0;0,0;0,0,0;0,0;0,0;0,0,0;0,0,0,0;0,0,0,0;0,0,0,0;0,0,0,0;0,0,0;0,0,0,0;0,0,0;0,0,0,0;0,0,0,0
tankCost = 3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500
hasGUI = false
Expand Down
19 changes: 6 additions & 13 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,13 @@ PART
attachNodeNames = top
reverseVisibility = true
}

MODULE
{
name = ModuleStructuralNode
rootObject = F125Bot
attachNodeNames = bottom
reverseVisibility = true
}

MODULE
{
name = ModuleCommand
Expand All @@ -80,30 +78,25 @@ PART
minimumCrew = 1
multiHop = True
}

RESOURCE
{
name = ElectricCharge
amount = 1000
maxAmount = 1000
}

MODULE
{
name = ModuleLifeSupport
}

MODULE
{
name = MKSModule
ApplyBonuses = false
}

MODULE
{
name = ModulePowerCoupler
}

MODULE
{
name = ModuleLifeSupportRecycler
Expand Down Expand Up @@ -135,7 +128,6 @@ PART
Ratio = 400
}
}

MODULE
{
name = ModuleKerbNetAccess
Expand All @@ -152,13 +144,11 @@ PART
Effect = ScienceSkill
}
}

MODULE
{
name = ModuleExperienceManagement
costPerKerbal = 0
name = ModuleExperienceManagement
costPerKerbal = 0
}

RESOURCE
{
name = Machinery
Expand Down Expand Up @@ -198,5 +188,8 @@ PART
{
name = USI_InertialDampener
}
MODULE
{
name = ModuleOrbitalLogistics
}
}

1 change: 1 addition & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
DumpExcess = true
}
}
}

@PART[MiniDrill]
{
Expand Down
Binary file removed Source/KolonyTools/.vs/KolonyTools/v14/ (DESKTOP-5SHPNPE's conflicted copy 2016-07-18).suo
View file
Binary file not shown.
47 changes: 28 additions & 19 deletions Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class StaticLoader : MonoBehaviour
{
public StaticLoader()
{
Debug.Log("InitStaticData");
//Debug.Log("InitStaticData");
for (int level = 1; level <= 5; level++)
{
var expValue = GetExperienceNeededFor(level);
Expand Down Expand Up @@ -74,19 +74,28 @@ private void Awake()

public void Initialize(Rect guiRect)
{
var uiScaleMultiplier = GameSettings.UI_SCALE;
//var uiScaleMultiplier = GameSettings.UI_SCALE;

// the supplied rect will have the UI scalar already factored in
//
// to respect the player's UI scale wishes, work out what the unscaled rect
// would be. Then we'll apply the scale again in OnGUI so all of our GUILayout elements
// will respect the multiplier
var correctedRect = new Rect(guiRect.x, guiRect.y, guiRect.width / uiScaleMultiplier,
guiRect.height / uiScaleMultiplier);
//var correctedRect = new Rect(guiRect.x, guiRect.y, guiRect.width / uiScaleMultiplier,
// guiRect.height / uiScaleMultiplier);

var correctedRect = new Rect(guiRect.x, guiRect.y, guiRect.width, guiRect.height);

_areaRect = correctedRect;

enabled = true;

// Reset of the basic Stupidity and Courage if the customization of Kerbonauts is disabled during game
if (!KolonyACOptions.CustomKerbonautsEnabled)
{
KStupidity = 50;
KCourage = 50;
}
}

private void kHire()
Expand All @@ -95,7 +104,7 @@ private void kHire()
{
double myFunds = Funding.Instance.Funds;
Funding.Instance.AddFunds(-costMath(), TransactionReasons.CrewRecruited);
Debug.Log("KSI :: Total Funds removed " + costMath());
//Debug.Log("KSI :: Total Funds removed " + costMath());
}

for (int i = 0; i < KBulki; i++)
Expand Down Expand Up @@ -143,12 +152,12 @@ private void kHire()
{
newKerb.experience = 9999;
newKerb.experienceLevel = 5;
Debug.Log("KSI :: Level set to 5 - Non-Career Mode default.");
//Debug.Log("KSI :: Level set to 5 - Non-Career Mode default.");
}
}

// Refreshes the AC so that new kerbal shows on the available roster.
Debug.Log("PSH :: Hiring Function Completed.");
//Debug.Log("PSH :: Hiring Function Completed.");
GameEvents.onGUIAstronautComplexDespawn.Fire();
GameEvents.onGUIAstronautComplexSpawn.Fire();

Expand Down Expand Up @@ -216,19 +225,20 @@ private string hireStatus()
if (HighLogic.CurrentGame.Mode == Game.Modes.CAREER)
{
double kredits = Funding.Instance.Funds;
if (costMath() > kredits)
{
bText = "Not Enough Funds!";
hTest = false;
}
if (HighLogic.CurrentGame.CrewRoster.GetActiveCrewCount() >= GameVariables.Instance.GetActiveCrewLimit(ScenarioUpgradeableFacilities.GetFacilityLevel(SpaceCenterFacility.AstronautComplex)))
{
bText = "Roster is Full!";
hTest = false;
}
else
{
hTest = true;
if (costMath() > kredits)
{
bText = "Not Enough Funds!";
hTest = false;
}
else
hTest = true;
}
}
return bText;
Expand Down Expand Up @@ -390,15 +400,14 @@ private void OnGUI()
GUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();

string statusText = hireStatus();
if (hTest)
{
if (GUILayout.Button(hireStatus(), GUILayout.Width(200f)))
if (GUILayout.Button(statusText, GUILayout.Width(200f)))
kHire();
}
if (!hTest)
{
GUILayout.Button(hireStatus(), GUILayout.Width(200f));
}
else
GUILayout.Button(statusText, GUILayout.Width(200f));

GUILayout.FlexibleSpace();
GUILayout.EndHorizontal();
Expand All @@ -413,7 +422,7 @@ void Update()
{
if (ac.ScrollListApplicants.Count > 0)
{
Debug.Log("TRP: Clearing Applicant List");
//Debug.Log("TRP: Clearing Applicant List");
ac.ScrollListApplicants.Clear(true);
}
}
Expand Down
Loading

0 comments on commit 318d2ed

Please sign in to comment.