Skip to content

Commit 318d2ed

Browse files
BobPalmerBobPalmer
authored
Merge branch 'DEVELOP' into master
2 parents 19d78c8 + 0f87c5b commit 318d2ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+3172
-2341
lines changed

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Parts/KER_CrewCab.cfg

+5-2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ PART
7070
usageReqMaskInternal = 5
7171
usageReqMaskExternal = -1
7272
}
73+
7374
MODULE
7475
{
7576
name = ModuleScienceContainer
@@ -78,6 +79,7 @@ PART
7879
evaOnlyStorage = True
7980
storageRange = 2.0
8081
}
82+
8183
MODULE
8284
{
8385
name = USIAnimation
@@ -102,15 +104,16 @@ PART
102104
maxAmount = 500
103105
isTweakable = True
104106
}
107+
105108
RESOURCE
106109
{
107110
name = Mulch
108111
amount = 0
109112
maxAmount = 500
110113
isTweakable = True
111-
}
114+
}
112115

113-
MODULE
116+
MODULE
114117
{
115118
name = ModuleHabitation
116119
BaseKerbalMonths = 21

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/Karibou/Patches/CryoTanks.cfg

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@PART[KER_Adapter,KER_Tank,KER_WheelBay*]:NEEDS[SimpleBoiloff]
2+
{
3+
MODULE
4+
{
5+
name = ModuleCryoTank
6+
CoolingCost = 0.09
7+
CoolingEnabled = False
8+
BOILOFFCONFIG
9+
{
10+
FuelName = LqdHydrogen
11+
// in % per hr
12+
BoiloffRate = 0.05
13+
}
14+
}
15+
}

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg

+5-1
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,9 @@ PART
147147
{
148148
name = USI_InertialDampener
149149
}
150-
150+
151+
MODULE
152+
{
153+
name = ModuleOrbitalLogistics
154+
}
151155
}

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PART
1616
}
1717

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

2828
TechRequired = advScienceTech
29-
entryCost = 125
29+
entryCost = 3336
3030

3131
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3232
attachRules = 1,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PART
1616
}
1717

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

2828
TechRequired = advScienceTech
29-
entryCost = 125
29+
entryCost = 3370
3030

3131
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3232
attachRules = 1,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PART
1919

2020

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

3131
TechRequired = advScienceTech
32-
entryCost = 50
32+
entryCost = 23990
3333

3434
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3535
attachRules = 0,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PART
1919

2020

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

3131
TechRequired = advScienceTech
32-
entryCost = 50
32+
entryCost = 26389
3333

3434
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3535
attachRules = 0,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PART
1919

2020

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

3131
TechRequired = advScienceTech
32-
entryCost = 3000
32+
entryCost = 119981
3333

3434
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3535
attachRules = 0,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PART
1919

2020

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

3131
TechRequired = advScienceTech
32-
entryCost = 3000
32+
entryCost = 131979
3333

3434
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
3535
attachRules = 0,1,0,0,0

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_ISM.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ PART
6767
{
6868
name = FSfuelSwitch
6969
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
70-
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
70+
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
7171
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
7272
tankCost = 3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500;3500
7373
hasGUI = false

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Tundra_PioneerLC.cfg

+6-13
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,13 @@ PART
5555
attachNodeNames = top
5656
reverseVisibility = true
5757
}
58-
5958
MODULE
6059
{
6160
name = ModuleStructuralNode
6261
rootObject = F125Bot
6362
attachNodeNames = bottom
6463
reverseVisibility = true
6564
}
66-
6765
MODULE
6866
{
6967
name = ModuleCommand
@@ -80,30 +78,25 @@ PART
8078
minimumCrew = 1
8179
multiHop = True
8280
}
83-
8481
RESOURCE
8582
{
8683
name = ElectricCharge
8784
amount = 1000
8885
maxAmount = 1000
8986
}
90-
9187
MODULE
9288
{
9389
name = ModuleLifeSupport
9490
}
95-
9691
MODULE
9792
{
9893
name = MKSModule
9994
ApplyBonuses = false
10095
}
101-
10296
MODULE
10397
{
10498
name = ModulePowerCoupler
10599
}
106-
107100
MODULE
108101
{
109102
name = ModuleLifeSupportRecycler
@@ -135,7 +128,6 @@ PART
135128
Ratio = 400
136129
}
137130
}
138-
139131
MODULE
140132
{
141133
name = ModuleKerbNetAccess
@@ -152,13 +144,11 @@ PART
152144
Effect = ScienceSkill
153145
}
154146
}
155-
156147
MODULE
157148
{
158-
name = ModuleExperienceManagement
159-
costPerKerbal = 0
149+
name = ModuleExperienceManagement
150+
costPerKerbal = 0
160151
}
161-
162152
RESOURCE
163153
{
164154
name = Machinery
@@ -198,5 +188,8 @@ PART
198188
{
199189
name = USI_InertialDampener
200190
}
191+
MODULE
192+
{
193+
name = ModuleOrbitalLogistics
194+
}
201195
}
202-

‎FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Patches/StockTweaks.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
DumpExcess = true
7373
}
7474
}
75+
}
7576

7677
@PART[MiniDrill]
7778
{

‎Source/KolonyTools/.vs/KolonyTools/v14/ (DESKTOP-5SHPNPE's conflicted copy 2016-07-18).suo

-145 KB
Binary file not shown.

‎Source/KolonyTools/KolonyTools/AC/CustomAstronautComplexUI.cs

+28-19
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class StaticLoader : MonoBehaviour
4444
{
4545
public StaticLoader()
4646
{
47-
Debug.Log("InitStaticData");
47+
//Debug.Log("InitStaticData");
4848
for (int level = 1; level <= 5; level++)
4949
{
5050
var expValue = GetExperienceNeededFor(level);
@@ -74,19 +74,28 @@ private void Awake()
7474

7575
public void Initialize(Rect guiRect)
7676
{
77-
var uiScaleMultiplier = GameSettings.UI_SCALE;
77+
//var uiScaleMultiplier = GameSettings.UI_SCALE;
7878

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

8789
_areaRect = correctedRect;
8890

8991
enabled = true;
92+
93+
// Reset of the basic Stupidity and Courage if the customization of Kerbonauts is disabled during game
94+
if (!KolonyACOptions.CustomKerbonautsEnabled)
95+
{
96+
KStupidity = 50;
97+
KCourage = 50;
98+
}
9099
}
91100

92101
private void kHire()
@@ -95,7 +104,7 @@ private void kHire()
95104
{
96105
double myFunds = Funding.Instance.Funds;
97106
Funding.Instance.AddFunds(-costMath(), TransactionReasons.CrewRecruited);
98-
Debug.Log("KSI :: Total Funds removed " + costMath());
107+
//Debug.Log("KSI :: Total Funds removed " + costMath());
99108
}
100109

101110
for (int i = 0; i < KBulki; i++)
@@ -143,12 +152,12 @@ private void kHire()
143152
{
144153
newKerb.experience = 9999;
145154
newKerb.experienceLevel = 5;
146-
Debug.Log("KSI :: Level set to 5 - Non-Career Mode default.");
155+
//Debug.Log("KSI :: Level set to 5 - Non-Career Mode default.");
147156
}
148157
}
149158

150159
// Refreshes the AC so that new kerbal shows on the available roster.
151-
Debug.Log("PSH :: Hiring Function Completed.");
160+
//Debug.Log("PSH :: Hiring Function Completed.");
152161
GameEvents.onGUIAstronautComplexDespawn.Fire();
153162
GameEvents.onGUIAstronautComplexSpawn.Fire();
154163

@@ -216,19 +225,20 @@ private string hireStatus()
216225
if (HighLogic.CurrentGame.Mode == Game.Modes.CAREER)
217226
{
218227
double kredits = Funding.Instance.Funds;
219-
if (costMath() > kredits)
220-
{
221-
bText = "Not Enough Funds!";
222-
hTest = false;
223-
}
224228
if (HighLogic.CurrentGame.CrewRoster.GetActiveCrewCount() >= GameVariables.Instance.GetActiveCrewLimit(ScenarioUpgradeableFacilities.GetFacilityLevel(SpaceCenterFacility.AstronautComplex)))
225229
{
226230
bText = "Roster is Full!";
227231
hTest = false;
228232
}
229233
else
230234
{
231-
hTest = true;
235+
if (costMath() > kredits)
236+
{
237+
bText = "Not Enough Funds!";
238+
hTest = false;
239+
}
240+
else
241+
hTest = true;
232242
}
233243
}
234244
return bText;
@@ -390,15 +400,14 @@ private void OnGUI()
390400
GUILayout.BeginHorizontal();
391401
GUILayout.FlexibleSpace();
392402

403+
string statusText = hireStatus();
393404
if (hTest)
394405
{
395-
if (GUILayout.Button(hireStatus(), GUILayout.Width(200f)))
406+
if (GUILayout.Button(statusText, GUILayout.Width(200f)))
396407
kHire();
397408
}
398-
if (!hTest)
399-
{
400-
GUILayout.Button(hireStatus(), GUILayout.Width(200f));
401-
}
409+
else
410+
GUILayout.Button(statusText, GUILayout.Width(200f));
402411

403412
GUILayout.FlexibleSpace();
404413
GUILayout.EndHorizontal();
@@ -413,7 +422,7 @@ void Update()
413422
{
414423
if (ac.ScrollListApplicants.Count > 0)
415424
{
416-
Debug.Log("TRP: Clearing Applicant List");
425+
//Debug.Log("TRP: Clearing Applicant List");
417426
ac.ScrollListApplicants.Clear(true);
418427
}
419428
}

0 commit comments

Comments
 (0)