Skip to content

Commit dfde094

Browse files
DMagic1DMagic1
authored
Merge pull request #262 from DMagic1/dev
Version 17.5
2 parents a701529 + 84a6448 commit dfde094

Some content is hidden

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

56 files changed

+728
-527
lines changed

‎SCANassets/PluginData/Settings.cfg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ SCAN_Settings_Config
55
ShowGroundTracks = True
66
GroundTracksActiveOnly = True
77
MechJebTarget = False
8+
MechJebTargetLoad = False
89
OverlayTooltips = True
910
WindowTooltips = True
11+
LegendTooltips = True
1012
StockToolbar = True
1113
ToolbarMenu = True
1214
StockUIStyle = False
15+
MapGenerationSpeed = 2
1316
UIScale = 1
1417
BiomeLock = True
1518
RequireNarrowBand = True
@@ -24,8 +27,11 @@ SCAN_Settings_Config
2427
TrueGreyScale = False
2528
ExportCSV = False
2629
BiomeTransparency = 0.400000006
27-
BiomeBorder = True
28-
StockBiomes = False
30+
BigMapBiomeBorder = False
31+
BigMapStockBiomes = True
32+
ZoomMapBiomeBorder = True
33+
SmallMapBiomeBorder = False
34+
SmallMapStockBiomes = True
2935
LowBiomeColor = 0.321568608,0.396078408,0.145098001,1
3036
HighBiomeColor = 0.988235295,0.752941191,0.0235294104,1
3137
SlopeCutoff = 1
@@ -34,12 +40,6 @@ SCAN_Settings_Config
3440
TopLowSlopeColor = 0.992156923,1,0.321568608,1
3541
TopHighSlopeColor = 0.992156923,0.254902005,0.117647097,1
3642
CheatMapFill = False
37-
CheatStartLoTerrain = False
38-
CheatStartHiTerrain = False
39-
CheatStartBiome = False
40-
CheatStartFuzzyResources = False
41-
CheatStartOre = False
42-
CheatStartAllResources = False
4343
BigMapWidth = 720
4444
ZoomMapWidth = 240
4545
BigMapPosition = 400,-400

‎SCANassets/Resources/SCANlocalization.cfg

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,14 @@ SCAN_Localization
7070
instrumentsToggle = Instruments Readout
7171
settingsToggle = Settings
7272
mainMapColor = Map Color
73+
mainMapTerminator = Map Day/Night Terminator
7374
mainMapType = Terrain/Biome Toggle
7475
mainMapMinimize = Show/Hide Vessel Info
7576
mainMapStatus = Scanner Status Indicators
7677
mainMapPercentage = Active Scanner Completion Percentage
7778
bigMapRefresh = Map Refresh
7879
bigMapColor = Map Color
80+
bigMapTerminator = Map Day/Night Terminator
7981
bigMapGrid = Grid Overlay
8082
bigMapOrbit = Orbit Overlay
8183
bigMapWaypoints = Waypoints
@@ -103,13 +105,13 @@ SCAN_Localization
103105
waypointCancel = Cancel Waypoint
104106
waypointMechJeb = Set MechJeb Landing Target
105107
waypointNameRefresh = Reset Waypoint
106-
warningDataResetCurrent = Erase all map data for [0]?
107-
warningDataResetAll = Erase map data for all celestial bodies?
108-
warningSCANResourceResetCurrent = Erase SCANsat resource data for [0]?
109-
warningSCANResourceResetAll = Erase SCANsat resource data for all celestial bodies?
108+
warningDataResetCurrent = Erase [0] map for [1]?
109+
warningDataResetAll = Erase [0] for all celestial bodies?
110110
warningStockResourceResetCurrent = Erase stock resource data for [0]?
111111
warningStockResourceResetAll = Erase stock resource data for all celestial bodies?
112112
warningStockResourceResetAll = Erase stock resource data for all celestial bodies?
113+
warningMapFillCurrent = Fill in [0] map for [1]?
114+
warningMapFillAll = Fill in [0] for all celestial bodies?
113115
warningModuleManagerResource = Warning\nModule Manager is required for all SCANsat resource scanning functions.
114116
warningSaveToConfig = Overwrite existing config file on disk?
115117
}

‎SCANassets/Resources/scan_prefabs.scan

4 KB
Binary file not shown.

‎SCANassets/SCANsat.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"MAJOR":1,
1212
"MINOR":1,
1313
"PATCH":7,
14-
"BUILD":4
14+
"BUILD":5
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,

‎SCANmechjeb/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.7.4.0")]
36-
[assembly: AssemblyFileVersion("1.7.4.0")]
37-
[assembly: AssemblyInformationalVersion ("v17.4")]
35+
[assembly: AssemblyVersion("1.7.5.0")]
36+
[assembly: AssemblyFileVersion("1.7.5.0")]
37+
[assembly: AssemblyInformationalVersion ("v17.5")]
3838

3939
[assembly: KSPAssembly ("SCANmechjeb", 0, 5)]
4040
[assembly: KSPAssemblyDependency ("SCANsat", 1, 7)]

‎SCANsat.Unity/Interfaces/ISCAN_BigMap.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public interface ISCAN_BigMap
3535

3636
bool ColorToggle { get; set; }
3737

38+
bool TerminatorToggle { get; set; }
39+
3840
bool GridToggle { get; set; }
3941

4042
bool OrbitToggle { get; set; }

‎SCANsat.Unity/Interfaces/ISCAN_MainMap.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public interface ISCAN_MainMap
2525

2626
bool Color { get; set; }
2727

28+
bool TerminatorToggle { get; set; }
29+
2830
bool MapType { get; set; }
2931

3032
bool Minimized { get; set; }

‎SCANsat.Unity/Interfaces/ISCAN_Settings.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,22 @@ public interface ISCAN_Settings
2727

2828
string DataResetAll { get; }
2929

30-
string SCANResourceResetCurrent { get; }
31-
32-
string SCANResourceResetAll { get; }
33-
3430
string StockResourceResetCurrent { get; }
3531

3632
string StockResourceResetAll { get; }
3733

34+
string WarningMapFillCurrent { get; }
35+
36+
string WarningMapFillAll { get; }
37+
3838
string ModuleManagerWarning { get; }
3939

4040
string SaveToConfig { get; }
4141

4242
string CurrentBody { get; }
4343

44+
string CurrentMapData { get; set; }
45+
4446
int MapGenSpeed { get; set; }
4547

4648
int TimeWarp { get; set; }
@@ -99,8 +101,6 @@ public interface ISCAN_Settings
99101

100102
bool ExportCSV { get; set; }
101103

102-
bool ShowSCANsatReset { get; }
103-
104104
bool ShowStockReset { get; }
105105

106106
bool ShowMapFill { get; }
@@ -115,6 +115,8 @@ public interface ISCAN_Settings
115115

116116
IList<string> BackgroundBodies { get; }
117117

118+
IList<string> MapDataTypes { get; }
119+
118120
ISCAN_Color ColorInterface { get; }
119121

120122
void ClampToScreen(RectTransform rect);
@@ -123,10 +125,6 @@ public interface ISCAN_Settings
123125

124126
void ResetAll();
125127

126-
void ResetSCANResourceCurrent();
127-
128-
void ResetSCANResourceAll();
129-
130128
void ResetStockResourceCurrent();
131129

132130
void ResetStockResourceAll();

‎SCANsat.Unity/Interfaces/ISCAN_ZoomMap.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public interface ISCAN_ZoomMap
3737

3838
bool ColorToggle { get; set; }
3939

40+
bool TerminatorToggle { get; set; }
41+
4042
bool OrbitToggle { get; set; }
4143

4244
bool IconsToggle { get; set; }

‎SCANsat.Unity/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("0c523d04-a52e-48bb-85b6-d75e8b7a63b9")]
2424

25-
[assembly: AssemblyVersion("1.7.4.0")]
26-
[assembly: AssemblyFileVersion("1.7.4.0")]
25+
[assembly: AssemblyVersion("1.7.5.0")]
26+
[assembly: AssemblyFileVersion("1.7.5.0")]

‎SCANsat.Unity/SCAN_Toggle.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class SCAN_Toggle : Toggle, IPointerEnterHandler, IPointerExitHandler, IP
2323
{
2424
private Sprite normalImage;
2525
public Sprite HoverCheckmark;
26+
private bool inToggle;
2627

2728
protected override void Awake()
2829
{
@@ -38,13 +39,16 @@ protected override void Awake()
3839
if (!isOn)
3940
return;
4041

41-
((Image)graphic).sprite = HoverCheckmark;
42+
if (inToggle)
43+
((Image)graphic).sprite = HoverCheckmark;
4244
}
4345

4446
new public void OnPointerEnter(PointerEventData eventData)
4547
{
4648
base.OnPointerEnter(eventData);
4749

50+
inToggle = true;
51+
4852
if (!isOn)
4953
return;
5054

@@ -55,6 +59,8 @@ protected override void Awake()
5559
{
5660
base.OnPointerExit(eventData);
5761

62+
inToggle = false;
63+
5864
if (!isOn)
5965
return;
6066

‎SCANsat.Unity/Unity/SCAN_BigMap.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public class SCAN_BigMap : CanvasFader, IDragHandler, IBeginDragHandler, IEndDra
4646
[SerializeField]
4747
private SCAN_Toggle m_ColorToggle = null;
4848
[SerializeField]
49+
private SCAN_Toggle m_TerminatorToggle = null;
50+
[SerializeField]
4951
private SCAN_Toggle m_GridToggle = null;
5052
[SerializeField]
5153
private SCAN_Toggle m_OrbitToggle = null;
@@ -241,6 +243,9 @@ public void setMap(ISCAN_BigMap map)
241243
if (m_ColorToggle != null)
242244
m_ColorToggle.isOn = map.ColorToggle;
243245

246+
if (m_TerminatorToggle != null)
247+
m_TerminatorToggle.isOn = map.TerminatorToggle;
248+
244249
if (m_GridToggle != null)
245250
m_GridToggle.isOn = map.GridToggle;
246251

@@ -1090,13 +1095,18 @@ private void SetResource(string selection)
10901095

10911096
bigInterface.CurrentResource = selection;
10921097

1098+
loaded = false;
1099+
if (m_ResourcesToggle != null)
1100+
m_ResourcesToggle.isOn = true;
1101+
loaded = true;
1102+
1103+
bigInterface.ResourceToggle = true;
1104+
10931105
dropDown.FadeOut();
10941106
dropDown = null;
10951107

10961108
if (m_DropDownToggles != null)
10971109
m_DropDownToggles.SetAllTogglesOff();
1098-
1099-
RefreshIcons();
11001110
}
11011111

11021112
public void ToggleCelestialBodySelection(bool isOn)
@@ -1165,6 +1175,16 @@ public void ToggleColor(bool isOn)
11651175
SetLegend(bigInterface.LegendToggle);
11661176
}
11671177

1178+
public void ToggleTerminator(bool isOn)
1179+
{
1180+
if (!loaded || bigInterface == null)
1181+
return;
1182+
1183+
bigInterface.TerminatorToggle = isOn;
1184+
1185+
RefreshIcons();
1186+
}
1187+
11681188
public void ToggleGrid(bool isOn)
11691189
{
11701190
if (!loaded || bigInterface == null)

‎SCANsat.Unity/Unity/SCAN_ColorAltimetry.cs

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -198,22 +198,36 @@ public override void OnPointerDown(PointerEventData eventData)
198198
if (SCAN_Settings.Instance == null)
199199
return;
200200

201-
if (SCAN_Settings.Instance.DropDown == null)
202-
return;
203-
204-
RectTransform r = SCAN_Settings.Instance.DropDown.GetComponent<RectTransform>();
205-
206-
if (r == null)
207-
return;
208-
209-
if (RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
210-
return;
211-
212-
SCAN_Settings.Instance.DropDown.FadeOut();
213-
SCAN_Settings.Instance.DropDown = null;
201+
if (SCAN_Settings.Instance.DropDown != null)
202+
{
203+
RectTransform r = SCAN_Settings.Instance.DropDown.GetComponent<RectTransform>();
204+
205+
if (r != null)
206+
{
207+
if (!RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
208+
{
209+
SCAN_Settings.Instance.DropDown.FadeOut();
210+
SCAN_Settings.Instance.DropDown = null;
211+
212+
if (m_DropDownToggles != null)
213+
m_DropDownToggles.SetAllTogglesOff();
214+
}
215+
}
216+
}
214217

215-
if (m_DropDownToggles != null)
216-
m_DropDownToggles.SetAllTogglesOff();
218+
if (SCAN_Settings.Instance.WarningPopup != null)
219+
{
220+
RectTransform r = SCAN_Settings.Instance.WarningPopup.GetComponent<RectTransform>();
221+
222+
if (r != null)
223+
{
224+
if (!RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
225+
{
226+
SCAN_Settings.Instance.WarningPopup.FadeOut();
227+
SCAN_Settings.Instance.WarningPopup = null;
228+
}
229+
}
230+
}
217231
}
218232

219233
public void PaletteStyleDropDown(bool isOn)

‎SCANsat.Unity/Unity/SCAN_ColorResource.cs

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,36 @@ public override void OnPointerDown(PointerEventData eventData)
143143
if (SCAN_Settings.Instance == null)
144144
return;
145145

146-
if (SCAN_Settings.Instance.DropDown == null)
147-
return;
148-
149-
RectTransform r = SCAN_Settings.Instance.DropDown.GetComponent<RectTransform>();
150-
151-
if (r == null)
152-
return;
153-
154-
if (RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
155-
return;
156-
157-
SCAN_Settings.Instance.DropDown.FadeOut();
158-
SCAN_Settings.Instance.DropDown = null;
146+
if (SCAN_Settings.Instance.DropDown != null)
147+
{
148+
RectTransform r = SCAN_Settings.Instance.DropDown.GetComponent<RectTransform>();
149+
150+
if (r != null)
151+
{
152+
if (!RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
153+
{
154+
SCAN_Settings.Instance.DropDown.FadeOut();
155+
SCAN_Settings.Instance.DropDown = null;
156+
157+
if (m_DropDownToggles != null)
158+
m_DropDownToggles.SetAllTogglesOff();
159+
}
160+
}
161+
}
159162

160-
if (m_DropDownToggles != null)
161-
m_DropDownToggles.SetAllTogglesOff();
163+
if (SCAN_Settings.Instance.WarningPopup != null)
164+
{
165+
RectTransform r = SCAN_Settings.Instance.WarningPopup.GetComponent<RectTransform>();
166+
167+
if (r != null)
168+
{
169+
if (!RectTransformUtility.RectangleContainsScreenPoint(r, eventData.position, eventData.pressEventCamera))
170+
{
171+
SCAN_Settings.Instance.WarningPopup.FadeOut();
172+
SCAN_Settings.Instance.WarningPopup = null;
173+
}
174+
}
175+
}
162176
}
163177

164178
public void PlanetDropDown(bool isOn)

0 commit comments

Comments
 (0)