Skip to content

Commit 0859cd2

Browse files
allistaallista
committed
Merged development branch
2 parents 3cc359b + 6f130c7 commit 0859cd2

File tree

11 files changed

+56
-61
lines changed

11 files changed

+56
-61
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ obj
77
Releases
88
Screenshots
99
/GameData/ConfigurableContainers/VolumeConfigs.user
10+
/CC.UI/CC.UI.csproj.DotSettings
11+
/GameData/ConfigurableContainers/Parts/@thumbs

‎CC.UI/AddTankControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private void setVolume(float part, bool updateState = false)
129129
var newVolume = currentUnits == VolumeUnits.CUBIC_METERS
130130
? partsToVolume(part)
131131
: part * 100;
132-
volumeField.SetTextWithoutNotify(newVolume.ToString("R"));
132+
volumeField.SetTextWithoutNotify(newVolume.ToString("G9"));
133133
if(!updateState)
134134
return;
135135
if(tankManager.AvailableVolume > 0)
@@ -181,7 +181,7 @@ private void onVolumeChange(string value)
181181
info = tankManager.OnVolumeChanged(tankType, newValue);
182182
break;
183183
case VolumeUnits.PARTS:
184-
if(newValue > tankManager.AvailableVolumePercent)
184+
if(newValue > 100)
185185
{
186186
volumeNotOk("Entered volume is greater than the available volume");
187187
return;

‎CC.UI/CC.UI.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,31 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="System">
40-
<HintPath>..\..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.dll</HintPath>
40+
<HintPath>..\..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
4141
<Private>False</Private>
4242
</Reference>
4343
<Reference Include="System.Core">
44-
<HintPath>..\..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.Core.dll</HintPath>
44+
<HintPath>..\..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Core.dll</HintPath>
4545
<Private>False</Private>
4646
</Reference>
4747
<Reference Include="UnityEngine">
48-
<HintPath>..\..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
48+
<HintPath>..\..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
4949
<Private>False</Private>
5050
</Reference>
5151
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
52-
<HintPath>..\..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
52+
<HintPath>..\..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
5353
<Private>False</Private>
5454
</Reference>
5555
<Reference Include="UnityEngine.UI">
56-
<HintPath>..\..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
56+
<HintPath>..\..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
5757
<Private>False</Private>
5858
</Reference>
5959
</ItemGroup>
6060
<ItemGroup>
6161
<ProjectReference Include="..\..\Unity\AT_Utils.UI.csproj">
6262
<Project>{0b711e55-8312-144f-53ad-eda5a8cee04a}</Project>
6363
<Name>AT_Utils.UI</Name>
64+
<Private>False</Private>
6465
</ProjectReference>
6566
</ItemGroup>
6667
<ItemGroup>

‎CC.UI/Interfaces/ITankManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public interface ITankManager
1919
IList<string> SupportedTankConfigs { get; }
2020
float Volume { get; }
2121
float AvailableVolume { get; }
22-
float AvailableVolumePercent { get; }
2322
IReadOnlyCollection<ITankInfo> Tanks { get; }
2423
ITankManagerCapabilities Capabilities { get; }
2524

‎ChangeLog.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Configurable Containers ChangeLog
22

3-
* **v2.6.1**
3+
4+
* **v2.6.2**
5+
* Compatible with KSP-1.11.1
6+
* UI: using G9 formatter instead of R for better performance
7+
* API: removed `ITankManager.AvailableVolumePercent`
8+
9+
* v2.6.1
410
* **Parts**
511
* **Hangar**: allow surface attachment of all the containers
612
* Fixed CC behaviour in symmetry groups

‎ConfigurableContainers.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<DebugType>full</DebugType>
1515
<Optimize>false</Optimize>
1616
<OutputPath>..\GameData\000_AT_Utils\Plugins</OutputPath>
17-
<DefineConstants>DEBUG;ENABLE_PROFILER;</DefineConstants>
17+
<DefineConstants>DEBUG;ENABLE_PROFILER;NIGHTBUILD</DefineConstants>
1818
<ErrorReport>prompt</ErrorReport>
1919
<WarningLevel>4</WarningLevel>
2020
<ConsolePause>false</ConsolePause>
@@ -35,43 +35,43 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="System">
38-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
38+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
3939
<Private>False</Private>
4040
</Reference>
4141
<Reference Include="Assembly-CSharp">
42-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
42+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
4343
<Private>False</Private>
4444
</Reference>
4545
<Reference Include="System.Core">
46-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Core.dll</HintPath>
46+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Core.dll</HintPath>
4747
<Private>False</Private>
4848
</Reference>
4949
<Reference Include="UnityEngine">
50-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.dll</HintPath>
50+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
5151
<Private>False</Private>
5252
</Reference>
5353
<Reference Include="KSPAssets">
54-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\KSPAssets.dll</HintPath>
54+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\KSPAssets.dll</HintPath>
5555
<Private>False</Private>
5656
</Reference>
5757
<Reference Include="Mono.Cecil">
58-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
58+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
5959
<Private>False</Private>
6060
</Reference>
6161
<Reference Include="System.Xml">
62-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Xml.dll</HintPath>
62+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Xml.dll</HintPath>
6363
<Private>False</Private>
6464
</Reference>
6565
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
66-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
66+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
6767
<Private>False</Private>
6868
</Reference>
6969
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
70-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
70+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
7171
<Private>False</Private>
7272
</Reference>
7373
<Reference Include="UnityEngine.UI">
74-
<HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
74+
<HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
7575
<Private>False</Private>
7676
</Reference>
7777
</ItemGroup>
@@ -152,4 +152,4 @@
152152
<Content Include="PatchContainers.py" />
153153
<Content Include="README.md" />
154154
</ItemGroup>
155-
</Project>
155+
</Project>

‎GameData/ConfigurableContainers/ConfigurableContainers.version

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
{
88
"MAJOR":2,
99
"MINOR":6,
10-
"PATCH":1,
10+
"PATCH":2,
1111
"BUILD":0
1212
},
1313
"KSP_VERSION_MIN":
1414
{
1515
"MAJOR":1,
16-
"MINOR":10,
17-
"PATCH":0
16+
"MINOR":11,
17+
"PATCH":1
1818
},
1919
"KSP_VERSION_MAX":
2020
{
2121
"MAJOR":1,
22-
"MINOR":10,
23-
"PATCH":0
22+
"MINOR":11,
23+
"PATCH":1
2424
}
2525
}

‎Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#if NIGHTBUILD
2828
[assembly: AssemblyVersion("2.6.*")]
2929
#else
30-
[assembly: AssemblyVersion("2.6.1")]
30+
[assembly: AssemblyVersion("2.6.2")]
3131
#endif
3232
[assembly: KSPAssembly("ConfigurableContainers", 2, 6)]
3333

@@ -43,8 +43,8 @@ public class CCModInfo : KSP_AVC_Info
4343
{
4444
public CCModInfo()
4545
{
46-
MinKSPVersion = new Version(1, 9, 0);
47-
MaxKSPVersion = new Version(1, 10, 0);
46+
MinKSPVersion = new Version(1, 11, 1);
47+
MaxKSPVersion = new Version(1, 11, 1);
4848

4949
VersionURL =
5050
"https://github.com/allista/ConfigurableContainers/tree/master/GameData/ConfigurableContainers/ConfigurableContainers.version";

‎SwitchableTankManager.cs

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,18 @@ public class SwitchableTankManager : ConfigNodeObject, ITankManager
7777
/// </summary>
7878
public float Volume
7979
{
80-
get => volume;
80+
get => totalVolume;
8181
set
8282
{
83-
volume = value;
83+
totalVolume = value;
8484
InvalidateCaches();
8585
}
8686
}
8787

88-
private float volume;
88+
private float totalVolume;
8989

90-
private float tanks_volume = -1;
90+
private float tanksVolume = -1;
9191
private float availableVolume = -1;
92-
private float availableVolumePercent = -1;
9392

9493
public float AvailableVolume
9594
{
@@ -101,16 +100,6 @@ public float AvailableVolume
101100
}
102101
}
103102

104-
public float AvailableVolumePercent
105-
{
106-
get
107-
{
108-
if(availableVolumePercent < 0)
109-
availableVolumePercent = AvailableVolume / Volume;
110-
return availableVolume;
111-
}
112-
}
113-
114103
public bool EnablePartControls
115104
{
116105
get => enable_part_controls;
@@ -132,9 +121,9 @@ public float TanksVolume
132121
{
133122
get
134123
{
135-
if(tanks_volume < 0)
136-
tanks_volume = tanks.Aggregate(0f, (v, t) => v + t.Volume);
137-
return tanks_volume;
124+
if(tanksVolume < 0)
125+
tanksVolume = tanks.Aggregate(0f, (v, t) => v + t.Volume);
126+
return tanksVolume;
138127
}
139128
}
140129

@@ -164,9 +153,8 @@ string ITankManager.GetTypeInfo(string tankType)
164153

165154
public void InvalidateCaches()
166155
{
167-
tanks_volume = -1;
156+
tanksVolume = -1;
168157
availableVolume = -1;
169-
availableVolumePercent = -1;
170158
}
171159

172160
public void ClampNewVolume(float oldVolume, ref float newVolume)

‎SwitchableTankManagerUI.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ protected override void init_controller()
3232
pos = manager.uiPos;
3333
}
3434

35-
private void toggleColors() => Controller.ToggleStylesUI();
36-
3735
private void highlightPart(PointerEventData _)
3836
{
3937
var part = manager?.part;

0 commit comments

Comments
 (0)