From 09f7e207a52ae40afb04e1fa710fb6c50e8b26d6 Mon Sep 17 00:00:00 2001 From: Jonathan Bayer Date: Thu, 30 Jan 2020 20:00:56 -0500 Subject: [PATCH] Fixed shaders for KSP 1.8 Added additional check for EvaFuel --- .vs/EvaFollower/v15/.suo | Bin 175616 -> 176128 bytes .vs/EvaFollower/v15/sqlite3/storage.ide | Bin 4378624 -> 4378624 bytes Changelog.txt | 4 +++ EvaFollower.version | 2 +- GameData/EvaFollower/EvaFollower.version | 2 +- Source/AssemblyVersion.cs | 2 +- Source/StockSettings.cs | 33 ++++++++++++++++++++++- 7 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.vs/EvaFollower/v15/.suo b/.vs/EvaFollower/v15/.suo index 76a19ece7af55787b7541132426073959551f04a..7eb2bfd881c98547003e5f401b252f14cb69ea5b 100644 GIT binary patch delta 1699 zcmb7^ZERCj7{~8(cDLQTH@h*`(bctd!YX!eY?fIDn;XpH%!&glQKxef7|Q}RUMCpi z7JP}u`ocXi%@V#)ut7nS^(1RFnwX$r2_a6SpYX#7d_q4+(x{7W^?&NRTo+8_B)^<< zp65BwbMF6~b0>c)nw&3szhm7&MN#s=QYMo@rw~{N0{lC@eme3RnQTlSD%kc?(fJ?g zka&T;O;pZFbxk~rD7nho>S4PJXrK~226BEKV-F|*8-Wch!r6j;El@!pr~+W>uqrV5Vfd)_tn~ag0xEu2& zeoJfBYcZ168VKOxkLWgjL$mRDz4~NCE442>Wq^}U>4&oFd=RjxV`|M4vT9C>B8+oV zlMAuMkWkTl#(0WjJthjbmcH2k6NO6+BZi>_~|JZ*4m2e zaK0RFG?D2cmK>G~ya!qbsCDqG2a z4I$Y#qbRX!)oe{HTFkn{K;x%mo(ifxmIT5$6(#eSM|ch_5qAf?>T?z^Hv%C>qq)2y z9VnrA8{?A>5BE4c+8|>0|0~`R(n(77gvBb-4lHYD@nM$ia5LfVKTDdtgkeii{v0Of z#6oAGYQE_fZtt1wx0htU9WL1tX=3L1*P1;48jw?pr-LCq`?}>T$XVG2;^Qw4r~?+8 zNbmBg!oB?*sd%U>q51NUaZ@aW>I;PX*gVDetL8|M&)R*$7>QCW`6pG0s;6$|-Qkz> zwBy@<^cb>Mdl!=lzHt2V?Qd25Ae%|jRkC%Cy?3ed$cXpKZ(H)dKQY+Kr$^Vurn{M4 z*hhCWTc7VONAUWUigKrI*Dq%CkaUaam_hN)Ecs*)^t0pc4&p?fM?t4$2gUM-B>#kH zsmxABEOCJ`vrXlyzm0V$JmB{`Tj7*P>B41Q59E0JvW-Xm2TJ^yY|R<|@(0Vq%TY2i z+xVkL&nJ7E$Tl!|H8{oIx%}|;kBaR3KJLR-EBT&>K9ObPFRP}%ojo9{_N#K;9b`8n zxGN{-8{!5_CU;b6d$FHqK<*N}YRsmLS*kl8i+x6iXS(sJeDjBGvB>XKklOk=eM2+7 xtSc|o^(B3^Db{d_Dq~Fs(^F*z`#C?Q{Yrn7Cf;DRygTYlITP$gVd5-fe*;m=4txLr delta 2021 zcmZ{lYfzL`7{}k|?7OnNu(Sa#m)Z+cc^8T_}wThw`z@uD=Po3J$? z5tu}ji3qedN06k0b9W~upKmm7r_qD0(OF3fXAaH zg!lX#OlG=Rm)=fOo*NyngZ-cz8~|^CgWwSG0uQ(jpkaLB!<$2&pS(f45ntFU4~PTQ zF2_ZfYUOy$Qco_@tlksA0(i0KB9_%Nf@i^I9FR0vR*yH$OjmC+@(wT?CKi-Mj`m1bah<%Bus{zL$C0+PU#!wsrRED7 zkX>mW>eI*53S$K>3+J)b(>gu8gDVXU5rJQ)+uBJ!5 zEy+eFA~>J)l?Z=Pwc3FJQ%k#w>V&d4x(_{66i0z&yusQ*QY)v8G`@sjOrI!?QTsAQ zV1EJGO5V-=dBk_DVAk)8U#Vy+x-N(ICdr2GFZ|V)%#)XeFX7Zmq3Sv_p$=izIhr+Q z;kT)>yJoGdnqR1gYVuUwv0{Ksd<6M!P7S<syoLB!0+gW6(kBqTKGAFGK$ZQ0BU?ABke~&|V_y>r(q7uoF%=>?JKE#Qw zzHDm2Pky}kd^x5UU);v!si{~0Q>jovzV2+iMgG>yCN9|HMLsxLWWGOKRNW``&ZAu58 z&0Wf?+LmEz)Y^wBO}hZ^qcfDGjSZ7sD?3AFTK+jIljXj-n(w%<1&3CO_Y6VrH{=yo zd{yB$bUCE8%CC;k(Z|`-n~NS?H2wY;s>hgtX4KcJ=*QxC^1;uA%-n@17fUA-}AdX lZQ)?$ZC&ZnYe*pVOV9Wpj diff --git a/.vs/EvaFollower/v15/sqlite3/storage.ide b/.vs/EvaFollower/v15/sqlite3/storage.ide index cf996eb8d73935e138a25bf1e064595901b69079..d32f2915d17933e2fa281ece6e34a1c4e58f68fe 100644 GIT binary patch delta 2154 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 O-YyB|#S3i>%6|YZm&MEg diff --git a/Changelog.txt b/Changelog.txt index 9ca08e8..dd352d1 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,9 @@ Changelog +1.1.1.5 + Fixed shaders for KSP 1.8 + Added additional check for EvaFuel + 1.1.1.4 Moved initializations into Start() method diff --git a/EvaFollower.version b/EvaFollower.version index ab9bcaf..2d3373e 100644 --- a/EvaFollower.version +++ b/EvaFollower.version @@ -10,7 +10,7 @@ "MAJOR": 1, "MINOR": 1, "PATCH": 1, - "BUILD": 4 + "BUILD": 5 }, "KSP_VERSION_MIN": { "MAJOR": 1, diff --git a/GameData/EvaFollower/EvaFollower.version b/GameData/EvaFollower/EvaFollower.version index 9920a82..2d3373e 100644 --- a/GameData/EvaFollower/EvaFollower.version +++ b/GameData/EvaFollower/EvaFollower.version @@ -10,7 +10,7 @@ "MAJOR": 1, "MINOR": 1, "PATCH": 1, - "BUILD": 3 + "BUILD": 5 }, "KSP_VERSION_MIN": { "MAJOR": 1, diff --git a/Source/AssemblyVersion.cs b/Source/AssemblyVersion.cs index fcb8498..af604dc 100644 --- a/Source/AssemblyVersion.cs +++ b/Source/AssemblyVersion.cs @@ -5,4 +5,4 @@ using System.Reflection; - [assembly: AssemblyVersion("1.1.1.3")] + [assembly: AssemblyVersion("1.1.1.5")] diff --git a/Source/StockSettings.cs b/Source/StockSettings.cs index 72120db..e106fba 100644 --- a/Source/StockSettings.cs +++ b/Source/StockSettings.cs @@ -17,7 +17,30 @@ public class EVAFuelGlobals : MonoBehaviour void Start() { changeEVAPropellent = false; + if (!modsFound) + { + buildModList(); + modsFound = true; + } + } + + bool modsFound = false; + static List installedMods = new List(); + void buildModList() + { + //https://github.com/Xaiier/Kreeper/blob/master/Kreeper/Kreeper.cs#L92-L94 <- Thanks Xaiier! + foreach (AssemblyLoader.LoadedAssembly a in AssemblyLoader.loadedAssemblies) + { + string name = a.name; + //Log.Info(string.Format("Loading assembly: {0}", name)); + installedMods.Add(name); + } } + static public bool hasMod(string modIdent) + { + return installedMods.Contains(modIdent); + } + } [KSPAddon(KSPAddon.Startup.EveryScene, false)] @@ -66,12 +89,20 @@ void Start() smallScrollBar = new GUIStyle(HighLogic.Skin.verticalScrollbar); smallScrollBar.fixedWidth = 8f; - MOD = Assembly.GetAssembly(typeof(EvaFuelManager)).GetName().Name; + // The follopwing + if (EVAFuelGlobals.hasMod("EvaFuel")) + MOD = GetEvaFuel(); + else + MOD = null; settingsRect = new Rect(200, 200, 275, 400); ROOT_PATH = KSPUtil.ApplicationRootPath; } + string GetEvaFuel() + { + return Assembly.GetAssembly(typeof(EvaFuelManager)).GetName().Name; + } void OnGUI() { if (answer == Answer.inActive)