From fa04cfca0d072dc9212574b2c6dba73845ad0939 Mon Sep 17 00:00:00 2001 From: FluffierThanThou Date: Wed, 28 Jul 2021 00:47:08 +0200 Subject: [PATCH] fix disease tooltips (hopefully) --- Assemblies/DynamicPawnTable.dll | Bin 4608 -> 4608 bytes Assemblies/MedicalInfo.dll | Bin 40448 -> 40448 bytes Assemblies/MedicalInfo.pdb | Bin 17512 -> 17536 bytes .../PawnColumnWorker_Diseases.cs | 79 +++++++++--------- modinfo.json | 11 ++- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/Assemblies/DynamicPawnTable.dll b/Assemblies/DynamicPawnTable.dll index f265fb8f44c0b4d9772d6cc6795046621e0ee4bb..fa3a24fe686511c7e2f104a6bc40c9d33e19e9c0 100644 GIT binary patch delta 73 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 delta 15086 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 diff --git a/Assemblies/MedicalInfo.pdb b/Assemblies/MedicalInfo.pdb index 951670ac8e1541eb39ea4918674263596d09e932..1ee9a7de571b815a68c0d13f45689819d361067b 100644 GIT binary patch delta 3401 zcmZ9Oe{56N701uLwx6F9J0v(HB*DQ1$FZH*`DKzo3UQz;{4hV-kcL7-!Vjr1x&SQ{ zWfM4|Ticb172I~^M@q(4%FwpbTB2(ISUpO+!McoUKsBiqnP@fEZ4yITp;TMhmb8o+X~e|7RUkRLG2KCX2vyA=-}tm9o%~u>Q1>tmq={& zS?Ma|skBlf^fdGV^l>F>$VSC}8%3c3=%>(|&?q#m%0?%k6m-6dYc*Qq)2K9{(PilK z0LSc97_`$W=mzvZXhz6Rz0h`OC`1VqIp}oAL8H*MP!74OxucT~Ry!#LjY3zTPoV42 zR}j@W$qwZ~QRuhO1!!K_NgJTO&~fOsFprh_<`kULS;||6ol%qmiURaq^hicv?Qhh!g#1r zf_#ga-(m7>@GSTQJBIzna{NJg=(tP(AYZjn^mWVFVfwm}d^4gBumz z4xUB1)Mn=SqM8)mtZ)hZDAbI6%&f=u!NuQWzTw$f#)@h{U`{qb^c=WVVK+8Kh8H2n zcW@u_?dAlz;JFH8pW|lk<J0MJDt7!~-r?3NC|}D9m@XRAE0ju5ccB zITd6l;LV(2ew|)u1@cSG3*c9>a-5C%@wSN`Aa}Nap8#_l9ZKOJHF+7h0)7(eM6c!M zfX(1l3KxUBpiEwa&u3wV?eM#edhBTaabUGFKtA|kh4~4rQJC*|t-?IPBMQ#|_b7Z4 z)2supFfW+vdzlkv;C3beZi1gSc_nxa{9RBVIy_+3?*Xq@cpZ3y!u{Zl3YUX7Da<## znWj)8GvEdUwjhvUKJ&h=i-~xXKXIF+#fVY8Hn|Xc(k1Na*KA|vQ&`z=> zvK=_EODVv)O}iE5{D8uI@PAKXzMwq{bA3W#&hNvE&RpP=;2%)pUVtZj29GFHFctiq z!h8q&C-9FH<~4C(0w2UVkQvX5{2_&Tz84bM$C&~?YJZ{(zy&W);KLL6$OJyB@Cx)l zrZ68~!wTbLfo#V)ko=cxoA@l*ljm{0f|Z&>cVTnsR`Qv=pvX(Uk+-bm3?h=gfhBTF z{s;UAd_nIdizj&&{M^W%L(YnQz`qY6Nq;ly-!rlw8$KIBhYkNT!+*oDw~|{Y&8nY* zk%`V4kw#bxc@VK0A2HbW#yI<7t>!9oBtM$8G??q>TM^_4@FNo>gZwT84TpFi3li1* z&m-vd)WZB$k(lfqvDql?8?k9L>Py4Vt4zZ$t|ZMydn>)LXJIvZw=xFb;pv0DTiJ(* z^pC&~!fF)pr{VALkHH@Clify>yqYncy_?XPFBe2VZY1qF6$zh}Raxd&dp%^S`44a0%7#cHtZ;p+gs_uh*y?QX$ zM)fr#u*YCEI#n|U-xnT(KPy~JP8+QY$DA6y6pp!UR23P4eI)hb$b6@W1+<$)G#wpA8uV`F!?RNA+?|Ut`_rxFl-SEvPQ>TmKR&U3pUtP-o z)9E|!pX~U>aQW|xD?YeozuMh@e$%IIH5ZR-b*ZAV+j8psFU}pLL41B*-+JfTjVnvv z9#~nicBbpUsmk)MvP3?%r*Jz2#iU+BLJq9rbH9+pRKyyjULXgbmH6K-(eUYFmw1^v z)!}VREYpoTI&2fvBK0DQOZ+jRKUTp2z7MgMQQPJ0F6W?Yx)2YFp}02GFNXT%cB$wX;pxLj*57N8u^grP_zX9_o4~W60447X+aEEv|8#uS}gH-RVQ&r3FC@;HGH*~GB>lC z$~V`9k7TN0M2TGt9g{U;bFBwcxkxO@yXqC@U0@D z>wtDEXhZXzopM`j99RM}E1hIu(uig{Voc zZGS<8Q#ae|g@`087R(W~$({vAW|aCG_}@?qHFHzZ8|J2Xlb@Su@vv5xEV#cLhrs^< D>4%i3 delta 3377 zcmZ9OeRNax8ONXB&CShCla} z^`@5NnBAzJJ3xVH?VQu;Hg=*LQMKa9F*0y-7VqoR6_d1+t0mySRa&3XamGBnJw136IFua693ueHsn75pKCWF zf1zFeZkyY|3*gU%u10=`ozEMhN#c_>cOoCBz@Uu?G^4;Zb_L!6^Ci~7EfVhpw~~hz z+2wgqZ4!S`;xel)VXz)rY?sGTqV^d!rk}WDCcuLs>Xi5~@HG+_ z?!W_HEHR&>B@!P7FQt5(H8h0&ttr1Y7XZJ5ICB>YTmnx(%%1}{A#WkL3%uO!5SIll zlb8?pa+)=h&okC7@iA}@xEuAkf8sT|&JHkhgDWI{7ratpexg+phrqoO7l8Y4e{cu< z<0Z{8FJ}O{0r@>7tp17DZHW8!F&(q@-_JV78}zYxBxdv6`0pa>;vB{G0(s)67v(UmzX=aRpPne4H7?(ZodHT zHS7^{g%k&Do|3o~e%9vek$*G%0ca!2_u1ti0&kLd19-E<+rhU$<8km#@LD^cm*5_WxxahKVaycZ5e-NMnD3L= z3%*}s&VN8+egQlvF%RfriMf1QV$L5X!!zD{8b2FILE zDhgy_{~F9XH98-hgx^#<3BRK@pgHN;+61iIpR#Nk_H1oh)9BOMEPQ_`3x8f{68@GD zxtz2o6o4%XBw&w)Qm~$I8uk%bjYh*`@ZJ6_Tf;wzDJ|(e?4(e5O4+-UNhmwB5hZ8C)-GY`YdKrR)YxwFfAu$)RW<@Vl(vK;4 zm6vI#>r$}RIyIve1v_`MjtbiZbtrl%^(lBap}rtxumQUUe_Z?PyvZt#=2r`GqZrzx z4eb&`yIiUe;*oKstpc4lp`&~S%Vf1)O;Ox23T}uyU9?acC@00JoNi8#N4*vMQyJ7n zu@(`LQsHz8N(z3liFP#8uju9ES8&)+XhkJndtwQ~6{?PH>p&30U$5vv%m6;GniV{f zHR8=01*x2|oefTghgvnf1mkuQml%3MX%Jg|el)oTP2QyFwOrSS8&|ADAgEwNAuta& zpxEFR3MM6dHI-^S5e~{zbe&q%!8$JE62(gTwNjzy3ECiriZhEleM+IV62)jLVXuUF z{i2KFKbfAzqeARA|FEQ9_)Rs@;<+Hcw_lWs11}FmGhK<05cTHPrQZ|{nafL?gov3< kT^%BB-qm%WyfQYQUwPX6c1~(iaZYA$32TjJcv=7d0h{Wc0ssI2 diff --git a/Source/MedicalInfo/ColumnWorkers/PawnColumnWorker_Diseases.cs b/Source/MedicalInfo/ColumnWorkers/PawnColumnWorker_Diseases.cs index f083394..40c1f7a 100644 --- a/Source/MedicalInfo/ColumnWorkers/PawnColumnWorker_Diseases.cs +++ b/Source/MedicalInfo/ColumnWorkers/PawnColumnWorker_Diseases.cs @@ -14,91 +14,90 @@ namespace Fluffy { public class PawnColumnWorker_Diseases : PawnColumnWorker { - private static readonly MethodInfo _getTooltipMethodInfo; - static PawnColumnWorker_Diseases() + public override int Compare(Pawn a, Pawn b) { - _getTooltipMethodInfo = - typeof( HealthCardUtility ).GetMethod( "GetTooltip", BindingFlags.NonPublic | BindingFlags.Static ); - if ( _getTooltipMethodInfo == null ) - throw new MissingMethodException( "HealthCardUtility.GetTooltip not found" ); + return GetValueToCompareTo(a).CompareTo(GetValueToCompareTo(b)); } - public override int Compare( Pawn a, Pawn b ) - { - return GetValueToCompareTo( a ).CompareTo( GetValueToCompareTo( b ) ); - } - - public override void DoCell( Rect rect, Pawn pawn, PawnTable table ) + public override void DoCell(Rect rect, Pawn pawn, PawnTable table) { var diseases = pawn.GetPotentiallyLethalHediffs(); - var diseaseRect = new Rect( rect.xMin - Constants.IconSize / 2f, - rect.yMin + ( rect.height - Constants.IconSize ) / 2f, - Constants.IconSize, Constants.IconSize ); + var diseaseRect = new Rect(rect.xMin - Constants.IconSize / 2f, + rect.yMin + (rect.height - Constants.IconSize) / 2f, + Constants.IconSize, Constants.IconSize); var n = diseases.Count(); - foreach ( var disease in diseases ) + foreach (var disease in diseases) { - diseaseRect.x += Constants.StatColumnMinWidth / ( n + 1 ); - DrawDiseaseIndicator( diseaseRect, (CapacityUtility.DiseaseProgress) disease ); + diseaseRect.x += Constants.StatColumnMinWidth / (n + 1); + DrawDiseaseIndicator(diseaseRect, (CapacityUtility.DiseaseProgress)disease); } - TooltipHandler.TipRegion( rect, () => GetTooltip( pawn, diseases ), pawn.GetHashCode() ); + TooltipHandler.TipRegion(rect, () => GetTooltip(pawn, diseases), pawn.GetHashCode()); } - private string GetTooltip( Pawn pawn, IEnumerable diseases ) + private string GetTooltip(Pawn pawn, IEnumerable diseases) { var tip = ""; - foreach ( var set in diseases.GroupBy( k => k.Part ) ) - tip += GetDiseaseTooltip( pawn, set, set.Key ) + "\n\n"; + foreach (var set in diseases.GroupBy(k => k.Part)) + tip += GetDiseaseTooltip(pawn, set, set.Key) + "\n\n"; return tip; } - public override void DoHeader( Rect rect, PawnTable table ) + public override void DoHeader(Rect rect, PawnTable table) { - def.headerIconSize = new Vector2( Constants.HeaderIconSize, Constants.HeaderIconSize ); - base.DoHeader( rect, table ); + def.headerIconSize = new Vector2(Constants.HeaderIconSize, Constants.HeaderIconSize); + base.DoHeader(rect, table); } - public void DrawDiseaseIndicator( Rect rect, CapacityUtility.DiseaseProgress disease ) + public void DrawDiseaseIndicator(Rect rect, CapacityUtility.DiseaseProgress disease) { // draw immunity - if ( disease.immunity > 0 ) + if (disease.immunity > 0) { - var immunityRect = rect.ContractedBy( Mathf.Lerp( rect.width / 2f, 0f, disease.immunity ) ); - GUI.color = new Color( 1f, 1f, 1f, Mathf.Lerp( .5f, 1f, disease.immunity ) ); - GUI.DrawTexture( immunityRect, Resources.Circle ); + var immunityRect = rect.ContractedBy(Mathf.Lerp(rect.width / 2f, 0f, disease.immunity)); + GUI.color = new Color(1f, 1f, 1f, Mathf.Lerp(.5f, 1f, disease.immunity)); + GUI.DrawTexture(immunityRect, Resources.Circle); } // draw disease progress - var diseaseProgressRect = rect.ContractedBy( Mathf.Lerp( rect.width / 2f, 0f, disease.severity ) ); + var diseaseProgressRect = rect.ContractedBy(Mathf.Lerp(rect.width / 2f, 0f, disease.severity)); GUI.color = disease.color; - GUI.DrawTexture( diseaseProgressRect, Resources.Circle ); + GUI.DrawTexture(diseaseProgressRect, Resources.Circle); GUI.color = Color.white; // draw indicator GUI.color = disease.tended ? Color.white : Color.gray; - GUI.DrawTexture( rect, Resources.DashCircle ); + GUI.DrawTexture(rect, Resources.DashCircle); } - public string GetDiseaseTooltip( Pawn pawn, IEnumerable diffs, BodyPartRecord part ) + public string GetDiseaseTooltip(Pawn pawn, IEnumerable diffs, BodyPartRecord part) { - return _getTooltipMethodInfo.Invoke( null, new object[] {diffs, pawn, part} ) as string; + var tips = diffs.Select(diff => diff.GetTooltip(pawn, false)); + if (part != null) + { + return $"{part.LabelCap}:\n{string.Join("\n", tips)}"; + } + else + { + return string.Join("\n", tips); + } } - public override int GetMinWidth( PawnTable table ) + public override int GetMinWidth(PawnTable table) { return Constants.StatColumnMinWidth; } - public float GetValueToCompareTo( Pawn pawn ) + public float GetValueToCompareTo(Pawn pawn) { var diseases = pawn.GetDiseases() - .Select( d => (CapacityUtility.DiseaseProgress) d ) + .Select(d => (CapacityUtility.DiseaseProgress)d) .ToList(); - if ( !diseases.Any() ) + if (!diseases.Any()) return -1; - return diseases.Max( d => d.severity - d.immunity ); + return diseases.Max(d => d.severity - d.immunity); } } } \ No newline at end of file diff --git a/modinfo.json b/modinfo.json index 99b9281..58072c3 100644 --- a/modinfo.json +++ b/modinfo.json @@ -6,7 +6,7 @@ "version": { "major": 4, "minor": 2, - "build": 101 + "build": 105 }, "author": { "name": "Fluffy", @@ -19,6 +19,15 @@ "url": "https://github.com/fluffy-mods/MedicalTab" }, "changelog": [ + { + "date": "2021-07-27T22:25:10.000Z", + "message": "fully move to sdk project, update refs", + "author": { + "name": "Fluffy", + "email": "fluffy.l2032@gmail.com" + }, + "hash": "e614724510822a19b3b2c21aff0fee7f89398855" + }, { "date": "2021-07-22T17:26:18.000Z", "message": "release v4.2.99",