From d5f87d0e4509fb3bf3145b5e05e780b65fe7fd16 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 14 May 2022 11:00:17 -0700 Subject: [PATCH] Refactor IsDangerDay into a switch. --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 152064 -> 152064 bytes .../HediffComps/HediffComp_InducedOvulator.cs | 16 +++++++++------ .../HediffComps/HediffComp_Menstruation.cs | 19 ++++++++++-------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index ceb76c514ac68266c27f0793a29eba97de8480e0..7c36a5b655e7d10ed52415ca27798857b26d97dd 100644 GIT binary patch delta 13442 zcmZvj30zdw`~RQk&YiilunfpHIvauliYT&)fQpKU;DVrnVv3-M(ZVk?N&Ain;#x|h zj--GX=9+2azM(j-ji&+ScMo@JD=+Hv}vq?b7o*3k7&#|sSHQUqse~udGMgP-? zTKlGezNmBF35XET#cApsfavN>3|fll<~$qR7t!7B(PcjB?NwbipocxN>r?c!CxqIu zo&9X61-b6>AA1)7`*@!b_@cD~X#8PVe0)z5-zD~T%nM~C*S zJuB>!`VT{Y=Z^lLN!Zc(=8zb~0O!Z4sYuFc8QRW%IMvPGerOX0I$MTLP-16$V#aY| zHJPh1$i6;v0NKBj8AGi9s0a*pjv5t&7~*_q^d7`6_Nc4^QgU_HQtayNmfav=sPo>q zr2;AEotG{su$^<%BpqT`dv4x*0(bIA!QJey6kNhEd&<-+*xepd_%-%${#j^4>|uZB z<=-*f`DRh70(;tzzV-=5IE!EJs=!El^&3|(%K6Up(;`OOhnD<~G0vp7pNiPanP}T1 zV63yXv{u00_R@Ky?Dxytv%L^|&w0bx-Yl^l9VLk?jCNziKvHmS#ROuHR^(xvz0>@! zQRQr%AE!{y{r`-oK3Y|hf*f}tA2LcHl=}QLraE?w5oYZL5MS;X5fRZ>n01uw3$s2W zHv8qVe+gZD?Jib7`|-tA`|ZV-Nt$Cz6p~yF8M4kF?ZeuU(-OYnGdD3v9>-R@-|lCm zHt#))$q1|4vs5IT@Pms5?Cd;rcrlVq$`PGF&+LCsAnKj|jbD2cdVH}~O|I999}6(Z z`R9*6k&)!Qb3NIOw*GaTf^6RXja(iV=g`&xbW{0sxIwz?u7V!%iH=)d7-#Wu6JcKa z0|pTe1g#cCI6C~8n+jA>+tC98A}>1I zerQka7tGc%yOY`Xm=!uu^#R-WV*6b>#5n5wuvqeOL-;J&XOF>vWHk9W_I1Dz+fgwZ zY<;NRq^I_=KefM&qW0Bx)Sh>x_E3k}nrN^jec%!eo#Uy!>zUC$8n$$)c8`WpA=GY8 z9ixqg05@vA@~C|;l-dafYKJguX6ltu^hloD7#rEV#13_zN)O%erdAtCt%}(y_big8 zD_(78xU;@j1P3jD)M4Zua@W7zH!?(snE1W}kJ&Xn3E~4&Tkj7}(0`H^UBN zFF3-fL(D##F&363$_;;w{>&H$XE@!C{?eELTL;KmEulUj4wPvNp}z1rr&|SI8T&zS zlB`{fzGUnVdk4vMGWw=52~H==q|dl-Ook_n8sW9>e+#z3FqPg2p@Q{y2)xdy2{NJ{ z8Hd0ePXCP)O=+;7Q6rAc@iV2v!8YwiLZhq!)kebEHd+Q;Y@=ns%{E%54eqxQGvR3) zaTF+0Xlacs=qS)Lk_#OTelJk4OmHF(VKf8|VO@e{ehJ3Wu$NJj+SuumdJKFk6C{sn zz%gK3n@U}qpury@3*yr#l|wHgW^^p&7DP7N208 z082R0(k8;%(XwWo5@pJTz_Bv5o6^UW2Ls1bs!-R(MT-TH#%XPzp{4@JWF(hX0BgtF zm@BC}gNT7IF@nu;8Ky#5!-)1b$MiBBoItfE){9qQ)kI3A(3=$VD&$O+sbhWvz6R<- znY!p3@O4|GbWttD8-~3m54_;!l5^Qb(>i6JnPAmG@O-o@1B^wzEW8+tw zmci#-oDyGWs)S37D%7=uI&183TP8L|?O>ciQB^t*_~=X zaC)23T~28xs{O&pR-yJ`qVN{0TiuC?T22{E^WtPkrp2t}w3L-r!^wqte#GfyAWgB2 z(>g}GIZgAT+7U)gHu&0|)*Vnn(>KBXu#F}=bmFwlbDL>7OyuP2jj#gFF)D{^-STxS z;L+QxY}nX|YWeh;8!Di*H>KqN$h11=7_NX3oXQ3r!PYM5QdM0S0v!CX$M2@Xu9uAz*|p+1{Z<~&(z?nbFc1#1Vf2{ej+zDy5T%N(STD6f=Bn0nc?0rKCMX?ee&OLdMosWwgxPF64DT~+glWSA%nh)PksP!EHZv+$Z#UOq100q;H8(OS zeZxo&(*VEA8Ws#E�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 delta 13586 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 IOFPT|3m@5TX#fBK diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs index dae3f79..a56bad4 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs @@ -56,14 +56,18 @@ namespace RJW_Menstruation { if (parent.pawn.health.hediffSet.HasHediff(VariousDefOf.RJW_IUD)) return false; - if (curStage == Stage.Follicular || curStage == Stage.ClimactericFollicular) return true; - else if (curStage == Stage.Luteal || curStage == Stage.ClimactericLuteal) + switch (curStage) { - if (!IsEggExist) return false; - else return curStageHrs < Props.eggLifespanDays * 24; + case Stage.Follicular: + case Stage.ClimactericFollicular: + case Stage.Ovulatory: + return true; + case Stage.Luteal: + case Stage.ClimactericLuteal: + return IsEggExist && curStageHrs < Props.eggLifespanDays * 24; + default: + return false; } - else if (curStage == Stage.Ovulatory) return true; - return false; } } diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index b361dcb..ebd671c 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -397,16 +397,19 @@ namespace RJW_Menstruation { if (parent.pawn.health.hediffSet.HasHediff(VariousDefOf.RJW_IUD)) return false; - if (curStage == Stage.Follicular || curStage == Stage.ClimactericFollicular) + switch (curStage) { - if (curStageHrs > 0.7f * (follicularIntervalhours - bleedingIntervalhours)) return true; + case Stage.Follicular: + case Stage.ClimactericFollicular: + return curStageHrs > 0.7f * (follicularIntervalhours - bleedingIntervalhours); + case Stage.Ovulatory: + return true; + case Stage.Luteal: + case Stage.ClimactericLuteal: + return curStageHrs < Props.eggLifespanDays * 24; + default: + return false; } - else if (curStage == Stage.Luteal || curStage == Stage.ClimactericLuteal) - { - if (curStageHrs < Props.eggLifespanDays * 24) return true; - } - else if (curStage == Stage.Ovulatory) return true; - return false; } } public int GetNumofEggs