Skip to content

Commit cfe8981

Browse files
zer0Kerbalzer0Kerbal
committed
1.1.0.0
1 parent 77f702d commit cfe8981

10 files changed

Lines changed: 53 additions & 38 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ obj/
8989
*.log
9090
TestResult.xml
9191

92+
*.ide-shm

‎GameData/FieldTrainingLab/Changelog.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ KERBALCHANGELOG //Required to have this name
77
VERSION
88
{
99
version = 1.2.0.0
10-
change = recompile for KSP 1.8
10+
change = recompile for KSP 1.9
1111
change = added game settings page
1212
change = added global setting to enable/disable PAW color
1313
change = added option to globally enable/disable

‎GameData/FieldTrainingLab/FieldTrainingLab.version‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
"VERSION" :
1313
{
1414
"MAJOR" : 1,
15-
"MINOR" : 0,
16-
"PATCH" : 3,
17-
"BUILD" : 5
15+
"MINOR" : 1,
16+
"PATCH" : 0,
17+
"BUILD" : 0
1818
},
1919
"KSP_VERSION" :
2020
{
2121
"MAJOR" : 1,
22-
"MINOR" : 7,
23-
"PATCH" : 3
22+
"MINOR" : 8,
23+
"PATCH" : 1
2424
},
2525
"KSP_VERSION_MIN" :
2626
{
2727
"MAJOR" : 1,
28-
"MINOR" : 7,
28+
"MINOR" : 8,
2929
"PATCH" : 1
3030
},
3131
"KSP_VERSION_MAX" :
3232
{
3333
"MAJOR" : 1,
34-
"MINOR" : 7,
34+
"MINOR" : 8,
3535
"PATCH" : 9999
3636
},
3737
"INSTALL_LOC" :

‎GameData/FieldTrainingLab/Readme.htm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h3 id="costs-2">Costs: [^2]</h3>
2222
<th>Stars</th>
2323
<th>Additional XP</th>
2424
<th>Total XP</th>
25-
<th></th>
25+
<th>Column4</th>
2626
</tr>
2727
</thead>
2828
<tbody>
@@ -91,7 +91,8 @@ <h3 id="and-you-can-have-both-installed">And you can have both installed</h3>
9191
<p>Now then, someone like me will want to use both. What happens?</p>
9292
</blockquote>
9393
<h4 id="both-field-training-facility-ftf-and-field-training-lab-ftl-work-together-when-you-have-both-of-them-installed-result-is-shown-below"><em>Both <a href="https://forum.kerbalspaceprogram.com/index.php?/topic/188841-*" title="Field Training Facility">Field Training Facility (FTF)</a> and <a href="https://forum.kerbalspaceprogram.com/index.php?/topic/188841-*" title="Field Training Lab">Field Training Lab (FTL)</a> work together when you have both of them installed. Result is shown below:</em></h4>
94-
<p><img src="https://i.imgur.com/FoeIXB6.png" title="with both Field Training Facility and Lab installed" alt="Kerbalnaut Field Training" /> The longer you train with FTF, the less science it costs to level immediately using the FTL.</p>
94+
<p><img src="https://i.imgur.com/FoeIXB6.png" title="with both Field Training Facility and Lab installed" alt="Kerbalnaut Field Training" /><br />
95+
The longer you train with FTF, the less science it costs to level immediately using the FTL.</p>
9596
<p>For example - Just using FTL, Level 4 -&gt; Level 5 consumes 640p of Science point. But Level 4(50% with FTF) -&gt; Level 5 consumes just 320p of science point. If 90% with FTF? Just pay 64p of science point or wait some more days. you can get level 5 kerbalnaut.</p>
9697
<p>More training means less science points needed, linearly.</p>
9798
<h4 id="these-two-addons-can-cooperate-if-you-want-one-thing-you-can-install-just-one-mod-if-you-install-both-they-will-cooperate-and-your-kerbals-profit">These two addons can cooperate, If you want one thing, you can install just one mod. If you install both, they will cooperate and your kerbals profit!</h4>

‎GameData/FieldTrainingLab/Readme.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ Field Training Lab provides a training method that consumes science points to ge
2020

2121
Pay 20 science and your kerbal recieved 1 experience. Once your kerbal has gained enough experience, they will level up (max of level 5). ***Must buy one entire level at a time.***
2222
### Costs: [^2]
23-
|Level| Stars | Additional XP | Total XP ||
24-
|-----|---------|---------------|----------|-----------------|
25-
|0 | ☆☆☆☆☆ | 0 | 0 | |
26-
|1 | ★☆☆☆☆ | 2 | 2 | +40 science|
27-
|2 | ★★☆☆☆ | 6 | 8 | +120 science|
28-
|3 | ★★★☆☆ | 8 | 16 | +160 science|
29-
|4 | ★★★★☆ | 16 | 32 | +320 science|
30-
|5 | ★★★★★ | 32 | 64 | +640 science|
23+
| Level | Stars | Additional XP | Total XP | Column4 |
24+
|-------|-------|---------------|----------|--------------|
25+
| 0 | ☆☆☆☆☆ | 0 | 0 | |
26+
| 1 | ★☆☆☆☆ | 2 | 2 | +40 science |
27+
| 2 | ★★☆☆☆ | 6 | 8 | +120 science |
28+
| 3 | ★★★☆☆ | 8 | 16 | +160 science |
29+
| 4 | ★★★★☆ | 16 | 32 | +320 science |
30+
| 5 | ★★★★★ | 32 | 64 | +640 science |
31+
3132

3233
#### Training costs will be reduced:
3334
- by 50% when your Field Training Lab is in orbit
@@ -45,7 +46,7 @@ If leveling up 'Immediately' is not realistic? Do you think Training needs time
4546
### And you can have both installed
4647
> Now then, someone like me will want to use both. What happens?
4748
#### *Both [Field Training Facility (FTF)][thread:FTF] and [Field Training Lab (FTL)][thread:FTL] work together when you have both of them installed. Result is shown below:*
48-
![Kerbalnaut Field Training][IMG:hero:2]
49+
![Kerbalnaut Field Training][IMG:hero:2]
4950
The longer you train with FTF, the less science it costs to level immediately using the FTL.
5051

5152
For example -

‎Readme.htm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h3 id="costs-2">Costs: [^2]</h3>
2222
<th>Stars</th>
2323
<th>Additional XP</th>
2424
<th>Total XP</th>
25-
<th></th>
25+
<th>Column4</th>
2626
</tr>
2727
</thead>
2828
<tbody>
@@ -91,7 +91,8 @@ <h3 id="and-you-can-have-both-installed">And you can have both installed</h3>
9191
<p>Now then, someone like me will want to use both. What happens?</p>
9292
</blockquote>
9393
<h4 id="both-field-training-facility-ftf-and-field-training-lab-ftl-work-together-when-you-have-both-of-them-installed-result-is-shown-below"><em>Both <a href="https://forum.kerbalspaceprogram.com/index.php?/topic/188841-*" title="Field Training Facility">Field Training Facility (FTF)</a> and <a href="https://forum.kerbalspaceprogram.com/index.php?/topic/188841-*" title="Field Training Lab">Field Training Lab (FTL)</a> work together when you have both of them installed. Result is shown below:</em></h4>
94-
<p><img src="https://i.imgur.com/FoeIXB6.png" title="with both Field Training Facility and Lab installed" alt="Kerbalnaut Field Training" /> The longer you train with FTF, the less science it costs to level immediately using the FTL.</p>
94+
<p><img src="https://i.imgur.com/FoeIXB6.png" title="with both Field Training Facility and Lab installed" alt="Kerbalnaut Field Training" /><br />
95+
The longer you train with FTF, the less science it costs to level immediately using the FTL.</p>
9596
<p>For example - Just using FTL, Level 4 -&gt; Level 5 consumes 640p of Science point. But Level 4(50% with FTF) -&gt; Level 5 consumes just 320p of science point. If 90% with FTF? Just pay 64p of science point or wait some more days. you can get level 5 kerbalnaut.</p>
9697
<p>More training means less science points needed, linearly.</p>
9798
<h4 id="these-two-addons-can-cooperate-if-you-want-one-thing-you-can-install-just-one-mod-if-you-install-both-they-will-cooperate-and-your-kerbals-profit">These two addons can cooperate, If you want one thing, you can install just one mod. If you install both, they will cooperate and your kerbals profit!</h4>

‎Source/FieldTrainingLab181.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>FieldTrainingLab</RootNamespace>
1111
<AssemblyName>FieldTrainingLab</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,7 +34,10 @@
3434
<Reference Include="$(DevDir181)\KSP_x64_Data\Managed\Assembly-CSharp*.dll" >
3535
<Private>False</Private>
3636
</Reference>
37-
<Reference Include="$(DevDir181)\KSP_x64_Data\Managed\UnityEngine*.dll" >
37+
<Reference Include="$(DevDir181)\KSP_x64_Data\Managed\Unity*.dll" >
38+
<Private>False</Private>
39+
</Reference>
40+
<Reference Include="$(DevDir181)\KSP_x64_Data\Managed\*.dll" >
3841
<Private>False</Private>
3942
</Reference>
4043
<Reference Include="System" />

‎Source/FieldTrainingLab191.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>FieldTrainingLab</RootNamespace>
1111
<AssemblyName>FieldTrainingLab</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎Source/Properties/AssemblyVersion.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66

77
using System.Reflection;
88

9-
[assembly: AssemblyFileVersion("1.0.3.5")]
10-
[assembly: AssemblyVersion("1.0.3.5")]
9+
[assembly: AssemblyFileVersion("1.1.0.0")]
10+
[assembly: AssemblyVersion("1.1.0.0")]

‎Source/Settings.cs‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
2-
using UnityEngine;
3-
using System.Collections.Generic;
42
using System.Collections;
3+
using System.Collections.Generic;
54
using System.Reflection;
5+
using UnityEngine;
6+
using KSP.Localization;
67

78
// This will add a tab to the Stock Settings in the Difficulty settings called "On Demand Fuel Cells"
89
// To use, reference the setting using the following:
@@ -19,10 +20,10 @@ namespace FieldTrainingLab
1920

2021
public class ODFC_Options : GameParameters.CustomParameterNode
2122
{
22-
public override string Title { get { return "Field Training Lab v1.0.4.0 Settings"; } }
23+
public override string Title { get { return "[WIP] Field Training Lab Settings"; } }
2324
public override GameParameters.GameMode GameMode { get { return GameParameters.GameMode.ANY; } }
24-
public override string Section { get { return "Field Training"; } }
25-
public override string DisplaySection { get { return "Field Training"; } }
25+
public override string Section { get { return "[WIP] Field Training"; } }
26+
public override string DisplaySection { get { return "[WIP] Field Training"; } }
2627
public override int SectionOrder { get { return 1; } }
2728

2829

@@ -33,16 +34,17 @@ public class ODFC_Options : GameParameters.CustomParameterNode
3334
public bool enableFTL = true;
3435

3536
[GameParameters.CustomStringParameterUI("Payment Label",
37+
toolTip = "Science/Reputation/Funds",
3638
autoPersistance = true,
3739
lines = 2,
3840
title = "How would you like to pay for your kerbal training?",
39-
toolTip = "Science/Reputation/Funds")]
41+
unlockedDuringMission = true)]
4042
public string UIstring = "";
4143

4244
/// <summary>require science points
4345
/// to gain experience</summary>
4446
[GameParameters.CustomParameterUI("Require Science Points to advance",
45-
toolTip = "If enabled, requires expending Science points to gain experience.",
47+
toolTip = "If enabled, requires expending Science points to gain experience.",
4648
newGameOnly = false,
4749
unlockedDuringMission = true)]
4850
public bool requireSciencePoints = true;
@@ -56,7 +58,7 @@ public class ODFC_Options : GameParameters.CustomParameterNode
5658
minValue = 0.0f,
5759
maxValue = 100.0f,
5860
stepCount = 1)]
59-
public double costScience = 10.0f;
61+
public double costScience = 20.0f;
6062

6163
/// <summary>require Reputation
6264
/// to gain experience</summary>
@@ -95,6 +97,12 @@ public class ODFC_Options : GameParameters.CustomParameterNode
9597
stepCount = 1)]
9698
public double costFunds = 1000f;
9799

100+
[GameParameters.CustomParameterUI("KSPMail",
101+
toolTip = "Recieve a colorful Joyntmail announcing graduation to a new rank?.",
102+
newGameOnly = false,
103+
unlockedDuringMission = true)]
104+
public bool KSPMail = true;
105+
98106
[GameParameters.CustomParameterUI("PAW Color",
99107
toolTip = "allow color coding in Field Training Lab PAW (part action window) / RMB (right menu button).",
100108
newGameOnly = false,
@@ -117,7 +125,7 @@ public override void SetDifficultyPreset(GameParameters.Preset preset)
117125
requireSciencePoints = true;
118126
requireReputationPoints = false;
119127
requireFunds = false;
120-
costScience = 10;
128+
costScience = 15;
121129
costFunds = 100;
122130
costReputation = .1;
123131
// autoSwitch = true;
@@ -128,7 +136,7 @@ public override void SetDifficultyPreset(GameParameters.Preset preset)
128136
requireSciencePoints = true;
129137
requireFunds = true;
130138
requireReputationPoints = false;
131-
costScience = 10;
139+
costScience = 20;
132140
costFunds = 1000;
133141
costReputation = 1;
134142
// autoSwitch = true;
@@ -139,7 +147,7 @@ public override void SetDifficultyPreset(GameParameters.Preset preset)
139147
requireSciencePoints = true;
140148
requireFunds = true;
141149
requireReputationPoints = true;
142-
costScience = 10;
150+
costScience = 25;
143151
costFunds = 1000;
144152
costReputation = 1.5;
145153
//autoSwitch = true;
@@ -150,7 +158,7 @@ public override void SetDifficultyPreset(GameParameters.Preset preset)
150158
requireSciencePoints = true;
151159
requireFunds = true;
152160
requireReputationPoints = true;
153-
costScience = 10;
161+
costScience = 30;
154162
costFunds = 1000;
155163
costReputation = 2.0;
156164
//autoSwitch = false;

0 commit comments

Comments
 (0)