Skip to content

Commit fc0cd28

Browse files
DMagic1DMagic1
committed
Merge pull request #86 from DMagic1/dev
SCANsat v9
2 parents 61e6ae7 + 32efa85 commit fc0cd28

36 files changed

+6118
-3061
lines changed

‎README.md‎

Lines changed: 256 additions & 126 deletions
Large diffs are not rendered by default.

‎SCANassets/SCANsat.version‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"NAME":"SCANsat",
3+
"URL":"https://github.com/S-C-A-N/SCANsat/blob/dev/SCANassets/SCANsat.version",
4+
"DOWNLOAD":"https://github.com/S-C-A-N/SCANsat/releases",
5+
"GITHUB":{
6+
"USERNAME":"S-C-A-N",
7+
"REPOSITORY":"SCANsat",
8+
"ALLOW_PRE_RELEASE":true,
9+
},
10+
"VERSION":{
11+
"MAJOR":1,
12+
"MINOR":0,
13+
"PATCH":9,
14+
"BUILD":1
15+
},
16+
"KSP_VERSION":{
17+
"MAJOR":0,
18+
"MINOR":25,
19+
"PATCH":0
20+
},
21+
"KSP_VERSION_MIN":{
22+
"MAJOR":0,
23+
"MINOR":25,
24+
"PATCH":0
25+
}
26+
"KSP_VERSION_MAX":{
27+
"MAJOR":0,
28+
"MINOR":25,
29+
"PATCH":0
30+
}
31+
}

‎SCANsat/CHANGELOG.txt‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
Build 8 - 2014-08-02
1+
Version 9 - 2014-10-14
2+
------------------------
3+
4+
- Total UI replacement
5+
- All UI elements have been overhauled
6+
- Each window is its own Object
7+
- UI support moved to Technogeeky's modification of TriggerAu's KSP Platform
8+
- KSP Map added
9+
- A map similar to the standard big map
10+
- Available in Space center and tracking station scenes
11+
- All textures replaced with .mbm format files
12+
13+
14+
Version 8 - 2014-10-8
215
---------------------
316

4-
- Updated for KSP 0.24.2
17+
- Updated for KSP 0.25
518

619
Resource Scanning:
720
- Planetary resource overlay for big map
8-
- Supports latest Kethane version - 0.8.8.1
9-
- Supports ORS resources
21+
- Supports ORSX resources
1022
- All resources types can be scanned in the background; no need to remain in control of a vessel while scanning
1123
- All resource scanning data is persistent; no different from standard SCANsat sensors
1224
- Resource types controlled through the SCANsat settings menu
13-
- Resources require explicit support from SCANsat
14-
- Users cannot add or change which resource types are supported
15-
16-
- Module Manager configs included for Kethane, Extraplanetary Launchpad and Interstellar resources
25+
- Resources scanner types defined through included config file
1726
- Support for Modular Kolonization System and Karbonite are provided in their respective packages
1827

19-
- ORS resources
20-
- Resources displayed on the big map with a place holder color overlay
21-
- ORS plugin included with SCANsat package; compatible with any version of ORS included in other mods
22-
23-
- Kethane resources
24-
- Background scanning requires using the SCANsat modules added through the included Module Manager configs
25-
- This function is separate from standard Kethane scanning; both are accessed through the right-click context menu
26-
- SCANsat will read existing Kethane scanning data if present; no SCANsat scanners are required for this
27-
- Kethane grid can be updated through the SCANsat settings menu
28-
- Grid must be forced to reset before changes become visible; saving/loading or switching which resource type is displayed works
29-
- Kethane resources displayed with their specified color values based on deposit concentration
28+
- ORSX resources
29+
- Resources displayed on the big map
30+
- Overlay colors can be defined in the included resource scanner config file
3031

3132
Parts:
3233
- MapTraq deprecated
@@ -65,7 +66,7 @@ Bug Fixes:
6566
- Active scanners no longer play through their animation on startup; they start fully deployed
6667
- Toolbar icons fallback to place holder textures if the default SCANsat icons are moved/altered/deleted
6768
- Prevent small map from opening improperly in non-toolbar version
68-
69+
- Prevent debug spam on EVA science collection
6970
- Improved support for command pods/cockpits using Raster Prop Monitor
7071
- Possibly prevent problems such as issue #63
7172

‎SCANsat/LICENSE.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,36 @@ organization, their logo patch is public domain, and therefore so is this logo.
5151
LICENSING INFORMATION FOR THIRD-PARTY LIBRARIES
5252
-----------------------------------------------
5353

54+
TriggerAu's KSP Platform Framework
55+
-------------
56+
Extensively modified by technogeeky and DMagic
57+
58+
The MIT License (MIT)
59+
60+
Copyright (c) 2014 Trigger Au
61+
Copyright (c) 2014 David Grandy <david.grandy@gmail.com>
62+
Copyright (c) 2014 technogeeky <technogeeky@gmail.com>
63+
64+
Permission is hereby granted, free of charge, to any person obtaining a copy
65+
of this software and associated documentation files (the "Software"), to deal
66+
in the Software without restriction, including without limitation the rights
67+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
68+
copies of the Software, and to permit persons to whom the Software is
69+
furnished to do so, subject to the following conditions:
70+
71+
The above copyright notice and this permission notice shall be included in all
72+
copies or substantial portions of the Software.
73+
74+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
75+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
76+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
77+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
78+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
79+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
80+
SOFTWARE.
81+
82+
----------------------------
83+
5484
CLZF2:
5585
* Improved version to C# LibLZF Port:
5686
* Copyright (c) 2010 Roman Atachiants <kelindar@gmail.com>

‎SCANsat/RemoteView.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void drawOverlay ( Rect where , GUIStyle style , bool identified ) {
130130
}
131131
ticking = false;
132132
int chars = (int)((Time.realtimeSinceStartup - switchTime) * tickRate);
133-
Rect r = new Rect (0 , 0 , 200 , 20);
133+
Rect r = new Rect (0 , 0 , 240 , 30);
134134
string info = "no structures found";
135135
if (cons.Count == 1) {
136136
info = "identified 1 structure";

‎SCANsat/SCAN_KSPPP/Extensions/Colors/UnityEngine.Color_.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public static void initColorTable() {
8686
if (knownColors.ContainsKey (col)) {
8787
var collision = "";
8888
if (knownColors.TryGetValue (col, out collision))
89-
Log.Now("{0} -> {1} and {2}", col, collision, name);
89+
Log.Debug("{0} -> {1} and {2}", col, collision, name);
9090
} else {
9191
knownColors.Add (col,name);
92-
Log.Now("{0} -> {1}", col, name);
92+
Log.Debug("{0} -> {1}", col, name);
9393
}
9494
}
9595

@@ -103,10 +103,10 @@ public static void initColorTable() {
103103
if (knownColors.ContainsKey (col)) {
104104
var collision = "";
105105
if (knownColors.TryGetValue (col, out collision))
106-
Log.Now("{0} -> {1} and {2}", col, collision, name);
106+
Log.Debug("{0} -> {1} and {2}", col, collision, name);
107107
} else {
108108
knownColors.Add (col,name);
109-
Log.Now("{0} -> {1}", col, name);
109+
Log.Debug("{0} -> {1}", col, name);
110110
}
111111
}
112112

‎SCANsat/SCAN_KSPPP/Extensions/GUI/UnityEngine.GUISkin_.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public static void dumpSkins(this GUISkin s) {
1515
foreach (Object f in fonts) {
1616
msg += "found a font: " + ((UnityEngine.Font) f).name + "\n";
1717
}
18-
19-
Log.Now("----------------------------------\n{0}",msg);
18+
19+
Log.Debug("----------------------------------\n{0}", msg);
2020

2121
foreach (KeyValuePair<string,GUISkin> e in SCAN_SkinsLibrary.knownSkins) {
2222
string k = e.Key;
@@ -47,7 +47,7 @@ public static void dumpSkins(this GUISkin s) {
4747
GUIStyle_.knownStyles.Add (v.verticalScrollbarThumb.dumpStyle(prefix + k + ".VScrollbarThumb"));
4848

4949
int i = 0;
50-
Log.Now("GUISkin {0}.customStyles contains {1} custom styles:",k,cs.Length);
50+
Log.Debug("GUISkin {0}.customStyles contains {1} custom styles:", k, cs.Length);
5151
foreach(GUIStyle sty in cs) {
5252
string csi = ".customStyles[" + i++ + "]";
5353
GUIStyle_.knownStyles.Add (sty.dumpStyle(prefix + k + csi));

‎SCANsat/SCAN_KSPPP/Extensions/GUI/UnityEngine.GUIStyleState_.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public static void PPP(this GUIStyleState s, string breadcrumbs) {
4141
if (s.background != null) bkg = s.background.ToString ();
4242

4343
if (Color_.knownColors.TryGetValue (s.textColor, out colorName)) {
44-
Log.Now ("{0} {{ GUIss: textColor: {1} bkg: {2} }}",breadcrumbs, colorName,bkg);
44+
Log.Debug("{0} {{ GUIss: textColor: {1} bkg: {2} }}", breadcrumbs, colorName, bkg);
4545
} else {
46-
Log.Now ("{0} {{ GUIss: textColor: {1} bkg: {2} }}",breadcrumbs, s.textColor.ToString (),bkg);
46+
Log.Debug("{0} {{ GUIss: textColor: {1} bkg: {2} }}", breadcrumbs, s.textColor.ToString(), bkg);
4747
}
4848
}
4949
}

‎SCANsat/SCAN_KSPPP/Extensions/GUI/UnityEngine.GUIStyle_.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ public static class GUIStyle_ {
1111

1212
public static GUIStyle dumpStyle(this GUIStyle s, string breadcrumbs) {
1313
var hash = s.GetHashCode ();
14-
15-
if (knownStyles.Contains(s)) { Log.Now ("{0} => #[{2:X8}] {1} skipped",breadcrumbs,s.ToString(), hash); return s; }
16-
1714

18-
19-
Log.Now ("{0} => #[{2:X8}] {1}", breadcrumbs, s.ToString(),s.GetHashCode ());
20-
Log.Now (" ------------------------------------------------------------------------------------------------ ");
21-
Log.Now (" -> contentOffset => {0}",s.contentOffset);
22-
Log.Now (" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
23-
Log.Now (" -> border => {0}",s.border);
24-
Log.Now (" -> padding => {0}",s.border);
25-
Log.Now (" -> margin => {0}",s.border);
26-
Log.Now (" -> overflow => {0}",s.border);
15+
if (knownStyles.Contains(s)) { Log.Debug("{0} => #[{2:X8}] {1} skipped", breadcrumbs, s.ToString(), hash); return s; }
16+
17+
18+
19+
Log.Debug("{0} => #[{2:X8}] {1}", breadcrumbs, s.ToString(), s.GetHashCode());
20+
Log.Debug(" ------------------------------------------------------------------------------------------------ ");
21+
Log.Debug(" -> contentOffset => {0}", s.contentOffset);
22+
Log.Debug(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
23+
Log.Debug(" -> border => {0}", s.border);
24+
Log.Debug(" -> padding => {0}", s.border);
25+
Log.Debug(" -> margin => {0}", s.border);
26+
Log.Debug(" -> overflow => {0}", s.border);
2727
// print all of the non-trivialGUIStyleState components
28-
Log.Now (" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
28+
Log.Debug(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
2929
s.active.PPP (" -> active => ");
3030
s.onActive.PPP (" -> onActive => ");
3131
s.normal.PPP (" -> normal => ");
@@ -34,20 +34,20 @@ public static GUIStyle dumpStyle(this GUIStyle s, string breadcrumbs) {
3434
s.onHover.PPP (" -> onHover => ");
3535
s.focused.PPP (" -> focused => ");
3636
s.onFocused.PPP (" -> onFocused => ");
37-
Log.Now (" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
38-
Log.Now (" -> alignment => {0}",s.alignment);
39-
Log.Now (" -> wordwrap => {0}",s.alignment);
40-
Log.Now (" -> clipping => {0}",s.clipping);
41-
Log.Now (" -> richText? => {0}",s.richText);
42-
Log.Now (" -> lineHeight=> {0}",s.lineHeight);
43-
Log.Now (" -> font => {0}",s.fontPP ());
44-
Log.Now (" -> fontSize => {0}",s.fontSize);
45-
Log.Now (" -> fontStyle => {0}",s.fontStyle);
46-
Log.Now (" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
47-
Log.Now (" -> fixedW, stretchW? => {0} ({1})",s.fixedWidth, s.stretchWidth);
48-
Log.Now (" -> fixedH, stretchH? => {0} ({1})",s.fixedHeight,s.stretchHeight);
49-
Log.Now (" -> isHdepW? => {0}",s.isHeightDependantOnWidth);
50-
Log.Now (" ------------------------------------------------------------------------------------------------ ");
37+
Log.Debug(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
38+
Log.Debug(" -> alignment => {0}", s.alignment);
39+
Log.Debug(" -> wordwrap => {0}", s.alignment);
40+
Log.Debug(" -> clipping => {0}", s.clipping);
41+
Log.Debug(" -> richText? => {0}", s.richText);
42+
Log.Debug(" -> lineHeight=> {0}", s.lineHeight);
43+
Log.Debug(" -> font => {0}", s.fontPP());
44+
Log.Debug(" -> fontSize => {0}", s.fontSize);
45+
Log.Debug(" -> fontStyle => {0}", s.fontStyle);
46+
Log.Debug(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
47+
Log.Debug(" -> fixedW, stretchW? => {0} ({1})", s.fixedWidth, s.stretchWidth);
48+
Log.Debug(" -> fixedH, stretchH? => {0} ({1})", s.fixedHeight, s.stretchHeight);
49+
Log.Debug(" -> isHdepW? => {0}", s.isHeightDependantOnWidth);
50+
Log.Debug(" ------------------------------------------------------------------------------------------------ ");
5151

5252
return s;
5353
}

0 commit comments

Comments
 (0)