From 81f0c26a81f63704809d76d71fa1389e607d47a4 Mon Sep 17 00:00:00 2001
From: NathanKell <nathankell@gmail.com>
Date: Thu, 9 Apr 2015 04:21:12 -0400
Subject: [PATCH] Fix a couple avionics bugs

Thanks, chrisl
* Was locking when current crew > required crew, rather than <
* Was skipping avionics modules that weren't on the same part as a
command module.
---
 GameData/RP-0/Plugins/RP0.dll | Bin 20992 -> 20992 bytes
 Source/ControlLocker.cs       |  12 +++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/GameData/RP-0/Plugins/RP0.dll b/GameData/RP-0/Plugins/RP0.dll
index 26eced490b55ee4531eefe880602106cb7d823fb..9067a3a7967d53e3abaf52b147cdd700b729e486 100644
GIT binary patch
delta 1519
zcmY+De{54#6vxj!_g=d8^}W7sWi8vlm1RG{K`BfIBePqwSVlIcFk$QuhWyw93UkcJ
zH0cJoA0ZNIMMI{6g_*eoC#K1Ogz!rsXw(dX#E8U942mwnMGcb3@Vwh5X77)0zn^o?
zJ@>r(ZaW8A=O8=O%L65O(F5&9Su;Q_(9;R9nn(R<F+Y327RKFp-j;Qd0oVZCGaW+C
zwTg1n9QAHTeY&>v-S~ukK9d{Va{i04Z0-5w0iK>FiEJXb#%)_yZ}YCxY`AkXfTMil
z)RQNoM%I*IdXcwi4i;>oXwh8s7HqRjd_+5)7CBOA?a=Kr&<ANSkRTZ57M)1ar;2)u
zR3(fmnn==F{w7u4oBw|o55yHkeLM99+yj3kaxj-WzyqC6C%U8xA5n9pIDvB%?oN;z
z#sfzZlrkdDQRzuV`{8p@N%Z;xYu$brQ|taw)UC$$fG1$(uEK3$P^DO8Q8!pG;epjj
zx~tYrE{Y_QQ{oaOA0?BTyaY2LC78%%5T%1RL25KF)F?`9;f1x+avP`RPEO06PUe<L
zA9&&4AXxi%Lxo&LxNEVs;Z=CZQo#qmC25Li7I>DZVbt~+kTs3U6m>yAE`|(PlcYNN
z6=cHKiY}|3S-?uHE|<aTIU8mX#W(pgc;plY@Pc*&O7Umy3k>0;=72CxY2RQSraEup
zdVJgV9qBUX9c;pK=TGQ|u(O}FqJg(q7w&cbjV%~;O5TUZof?l)+|7@W`pBPgW|Lk~
zI_A6qQ5+}j!#`E!W9N+sbfH7f=UwQd8`Fh(%9rRt@+(xNS}*4VxYs^Ho2{cr3vMRu
z0|VFaLQ)?Lu-Ejhd>DK5?Ysr75eL{|{Z;r3Pw4G@030HV{5idYvUl{o{0#oCJD`*u
zwe|ACi-^WSDl)L2U$>@)04y|wxX((BVRoN2*zIDHRT!?=@!Z0B&xkr~H*R78Vn&4+
z#|HazA^@XCt(YXgmi+fdqhP$jzA5%FH;1*xGV^jGn)LIa!z}~cz}d1CtSi8<!xfUP
zEas|`Avo?bAWW;OWtdwxA_Q?)ovh<$T|OvPU(gTNT=jB2|JBtfTPeO(hT*Ymn1w-_
zFViaBOr=We>xSu0S&>u~p*M<9I|KK~9i+Ed2(rx{N#|r9l6}0%d`}MJ4!d=7+s$XG
za<@rGz&gwiXsiP&@;*hbv!muQihOL+^?(oUL*!4Hby5ctwtxmp;Vm$r3=TpuyaBZ{
ziXjN!%3|0Kr8DS{o(7)~WWp$Ej!Mjf+vMAzib|KmFXSs#`~{^Oz%}D81o?U7EXW)A
zKGrV_<VEZkgM3^m<Cgc64)c)mO{5R_M%zoWM|9fS<TY`O^p3cYM?ZgwZR{w^#znXa
zci|9DU^PF?^Ti6$BKC-VB3-t{#`Bj*pLj|{;+X{>Wtu5XSC&VAxEG4&`F^xFmwy=_
ks~kd?%ciBIIFTM_YUiVrcu&<Cj<7ivS{aDHvhp3<e^4<n0ssI2

delta 1523
zcmY+DdrVYE6voe-nPJ)8d+%O$kzJl)Ay7byuAl|$gGW-cLJiQCq76-r5Tue?e5FB?
z1*H^XYrEOBra?-H7{xTS&05jKShdtXVp1iMqz_GqZK8c@tZkYU?76d>G~7SF{eI`1
zIdksZ*`6`hGsfN;;O|vtg%9pFDz^gE0zEwd^*rqNMEvXzRu)adPi+}f48R7Ew8$Z3
zj#ZTBaW*A6n^K(RhoisRi&<hvk}PiXdK{5VXXC0RJjLTkaunM{-i9PwbCb>6?6l$b
zRshG^midPd#Rj?IF-$4)7G+^U8%2w9&|A=M8Hk>Ap7Df^6k5CV`waAf2gYIq<J_W;
z;`E`S*NapooK|!<PUrYOs{Fb5|1QZesVMB*t}o@u@MkOsIotus(D!Jpi(B}JIzuHf
z%u@JDjMOm6FdU=A32~lEPbuny&qNK;z9rVWKDesZ{i~>7jhzg>fR(!p-wT5(6PH=k
z57tX0!_#rPrPe)I7K$b3#U)D4#gk5X2^N7?8q1{-r9gU&)M#F4R21973mX^YS{LL_
zEy$gV=T=G|cmc}5+P@#FWgX$JGHb)j@HcaV4}Oo+JW(q6maAdZ_Gys4fGQRB!Vs20
z8Z^hLL0*A$xTa`I^~?ad!s;>wR?kexB#J)oPvfC87{Ck8X{f*-onK=W-g7!2i1W^G
zumRoLb=-(=*uEuQsoliQxK_J`eh6wqtP2gCVZFFt`wKfTtR?V4JgR9tOmR1Vmo%09
zS<O%SxzelJG=y=MbP(^W$~kR11ik3c3wSU3=*IM7zVa*dGV-fcq*kxwqqyHbL7O#G
zqyt+?2f@H+cp<3|M%f;{osZ*ddMEDyYs69Zw!Q;C#t-y8d=wlagZz1YFJ*7&2l!e1
zMR!028?g=Y!i$K;n^a`r5q^!P_CWxa8dBV06~;Kb!#3F+;vTCu%*aSy;o@@9fV++B
z7=VaTBW7`vJtzWj+Nc-z$TyMy&S(*gZ?bQR+|SEpJ0jlv+>j>yywu^A0d8QHtN`l@
zFzj|!%Ptmit&>%7)MY@BR@KQMw{AogL|u)tfuD2vphA5?KYZzWR&M0CT`jVU;_WgB
zbFOg~1ZloRt8~*%mDbk{(w(v*ZWW<73Q;=)yJaWo46A}{b3oELnPEA|H=Bp$ICk2t
zliOxiQspj_j(~NW!!*`G6*)|iYiz_ErN{}Bt_KX;PmrH98>J2=w1E@K;Z-nT6&!*R
z*bDUuB~S`8vIMrl$^`nOdtibf9VSV0RbnyxKz=8zqteIWHu)MAe@f|dU?$vxQhotB
zE9EWx02`8p@*)n2V|-RA<Cgc6p5#@^ZzjFVU$AYF1ER;aQ+_4hC%q{y<kQas(auI#
zHZH?Dd>N19Z&=6Q;RRxicu{nVKH-(SA~zmcE>lIe=!tp@j-{K`IJ@Sjk}sb8<YGxz
q?U>AoUa2{brfJg>6E&nqbNBp{h|&E|oaJn5WcB($bjSKbw*LTI<1ifn

diff --git a/Source/ControlLocker.cs b/Source/ControlLocker.cs
index 34fd868fcd2..d4cae51848b 100644
--- a/Source/ControlLocker.cs
+++ b/Source/ControlLocker.cs
@@ -50,10 +50,8 @@ public static bool ShouldLock(List<Part> parts, bool countClamps, out float maxM
                 // if we count clamps, they can give control. If we don't, this works only if the part isn't a clamp.
                 if ((countClamps || !clamp) && cmd && !science && !avionics)
                     return false;
-
                 if (cmd && avionics) // check if need crew
                 {
-                    bool flag = true;
                     if (mC.minimumCrew > 0) // if we need crew
                     {
                         if (crewCount < 0) // see if we cached crew
@@ -64,14 +62,14 @@ public static bool ShouldLock(List<Part> parts, bool countClamps, out float maxM
                                 crewCount = CMAssignmentDialog.Instance.GetManifest().GetAllCrew(false).Count;
                             else crewCount = 0; // or assume no crew (should never trip this)
                         }
-                        if (mC.minimumCrew < crewCount)
-                            flag = false;
+                        if (mC.minimumCrew > crewCount)
+                            avionics = false; // not operational
                     }
-                    if(flag)
-                        maxMass += partAvionicsMass;
                 }
+                if (avionics)
+                    maxMass += partAvionicsMass;
             }
-            if (maxMass >= vesselMass) // will only be reached if the best we have is avionics.
+            if (maxMass > vesselMass) // will only be reached if the best we have is avionics.
                 return false; // unlock if our max avionics mass is >= vessel mass
             // NOTE: we don't update for fuel burnt, because avionics needs to be able to handle the size
             // as well as the fuel.