From 99c40bad532d7f71160361415f0a6bf708993d48 Mon Sep 17 00:00:00 2001 From: Tobias Berger Date: Sun, 18 Oct 2020 13:09:03 +0200 Subject: [PATCH] Add Fog Tools --- About/Manifest.xml | 6 +++ Assemblies/ClaimDoors.dll | Bin 5632 -> 8704 bytes Patches/DesignationCategories.xml | 10 +++++ Source/ClaimDoors.csproj | 10 ++++- Source/ClaimDoorsMain.cs | 39 ++++++++++++++++++ Source/Designator_AddFog.cs | 16 ++++++++ Source/Designator_Fog.cs | 62 +++++++++++++++++++++++++++++ Source/Designator_RemoveFog.cs | 16 ++++++++ Source/Patches.cs | 25 ++++-------- Source/Properties/AssemblyInfo.cs | 5 +-- Textures/UI/Designators/Hide.png | Bin 0 -> 1211 bytes Textures/UI/Designators/Reveal.png | Bin 0 -> 450 bytes 12 files changed, 168 insertions(+), 21 deletions(-) create mode 100644 About/Manifest.xml create mode 100644 Patches/DesignationCategories.xml create mode 100644 Source/ClaimDoorsMain.cs create mode 100644 Source/Designator_AddFog.cs create mode 100644 Source/Designator_Fog.cs create mode 100644 Source/Designator_RemoveFog.cs create mode 100644 Textures/UI/Designators/Hide.png create mode 100644 Textures/UI/Designators/Reveal.png diff --git a/About/Manifest.xml b/About/Manifest.xml new file mode 100644 index 0000000..f077152 --- /dev/null +++ b/About/Manifest.xml @@ -0,0 +1,6 @@ + + + 1.1.0 + https://raw.githubusercontent.com/Toby222/ClaimDoors/About/Manifest.xml + https://github.com/Toby222/ClaimDoors/releases/v1.1.0 + \ No newline at end of file diff --git a/Assemblies/ClaimDoors.dll b/Assemblies/ClaimDoors.dll index d5c2ff26059edf2c0efbb3711843ccbf64650612..0e878ab1357b42363dadfacdd2ca0cf3dba54311 100644 GIT binary patch literal 8704 zcmeHMYj7M@c0RXfre`!3vNX0O8-!{30fQc6Jq*}jjAcD+84KBxZ0{0nlsF0%gL5gHeAXGV<6yZl| zLsDh(o!c{`L3TFDk7WPkN`3mg?z!ild+)io?~FeD1citwjOUY2h+e>(%MJy9GgyGQ z;kFkW==r+W+g=cRUvHb7wLGKfIyu)Y7#Y*H9p6Yx!!6l{WgCNI6Gp+w%G6Ca#W$2q z?;9f8D?;?aclUh1(%KbTXDk!lL^p$@2i$LL#oNHM0}oN7!nMF}W|Y;47C?Z{B}9kM zvMT>CzRM)DP5*ccWX$69^<&8 zux}bg=!Nw}S5^`U#r>ay%UW|1V}XCog^l8T6H#1q0gLkqg(BL;mgEZH^JpjD9$(%5 zVn|D_0-kIJ=v-5wT0m(hVI|yhO^WjMkeH7!p2E=9VmUCC&5bRUd3_l;}^_t<9EAFO6s16UUPF2n%uMPO14f*KA@1b zEemV{jos3XY=O40yf7b5?tu6d@bJd2mfKIkf$%jQGgSBbA=tRUk|ektNnjmt#~B2F zS;z9IgM1dRkF9iu@usM=3$L!Le~Z9IqYf5XoZe{{$VVD&rCTOx8JeV&hlQXoa4YR_ zZG^Sj-B8KEP;C35*)2$o0DpjG!O%ZO}X5&H9~rC(X(z z2$MLp>SA489K^qgKEhH(bsE3}(<&_?KvahZt}1(ojnaWB9z&(Wbs}Xx%ZYv*W*#rA z&xFqFI{mqV=d|tma{3W^pwsi(Xhf&`LJV6Kd``g=3Z7T+HKp@y&4qAcxrgc+jHqZ^=V&Wub>~NV}ZBIlTp~zsWHN^H_Y~rEBkAd&Owd!-%vdz#qU`}wqZoW2Mq1C5&!8y%p^OzAdtuPSbQ`EA@;0`gR%-@6dMim}0}=bFKa2g4hdub!0E_ z_lR*#aW+NvgG1n-rq>mpNB%sm#~6P^dxS-ncu=ze=S2zdz0fIoM7$k6gH?WW^l|9S z=ugsVu{-uOnPQK)NKc6$M88ANh@Xq^)3ah+dmcJ}9eI)dNL+~h9Qao83cV_R8hM@m zN?eTT^ejAl6R;urHoc8LHUd726?sW{{;s$)auxUr@gcn{GRO+g63>9E;>qx@=~d$K ze^qIIMDOaYVkPhn@v&H;^#I-*8xyV6tRE2@XjN=pw2429o)Jyj12IW!w2hdZS5@6M z(I5G;sMFq$d`+aV;@$^bLH`7J3)O2WT2HG0J7^ZdGI3C5`UnlswoxZr%FFFEi4%UwmA!+s zOWFrUXy`=I@#LWCo3z_>3ywXv*Gf~t%Q$Wx$hPennwax^Sx5~y`Mk{dmScM<)RnH4 zAwJz_<&0U%`-9TUkmr=_>_jP(kuoc@H0G5CV_;Thj;5Uxd(E`WLm?;q>3-NO`XI&~XJ(gcWy!4|Xhkt*%5ONQ=y9uX2))SC zkex;N3I()F19{Ub3_6bMAtE#?{aL&?dN_kjS6ur~JYHm@t|b0ygaywtbFw-d7%UnY zv^+$W2Tu8Z(DE$C57?GJH)Q85TOyjS4929EO_Os)Nrz^oD;L8KJTNHfpmaS+ldgG8 zArlBs20=Mc%p$rp;7WdRxb_8~yXX+}okG#dOIM8=7}$mklV{)cVxD@gRs6It=(MUaF7xIIg?ZOkMx?T(jDNjgz$wnTR&Mr&qC(NM z=N9XXmu%lENNyADq^&##dQrMd`UlN?2}8=uV^GeF%~VkuHH(--v%`5aN4Tl5bL1;n zUUg;5sd8*s9vqk}leRi39d{Zlp_c5=W|wfrWx+WnnYkBFdBN{9{md+3GL}=!J~ML^ za_4AeX{&WeO07SiuUSH=EXeBWo`7?CIUrfZw5x2z$S_yhJhjmJq~qkv^Lw%Sv|5_9 z6EbPqi&oRVgV#j765=l@I^b z;vciCi-Dz;iPkkRF>AWTik-cd{Rk&9q>-c24TfjzI8vW7i7cal-&i9$}lUHQLpkW8MMrtjorh_ zcu4y@d7633u@O6KWu!+O{|dfjW?`FO#uCi)G8{wB3lbjBB96L8 zS>81i#vw-BgX}ekwPUNs(9hB3z@HY!aIJ0oiP9t}DbHx6OLb&i*phKJeU z7EGTkdmNdU#?nXl1>N!t9JE|!pc@ppuO=(joV(M-vZ}JHy&|VLJyIyZrrbY0M!aQkOb7BXr% z07+oukdhu%Ez)f#shj3uu?x>h>Z!qdfr}N3^{O5}Fpj!~ve!5EjJYl}3b6X=KEdaX z-|RD6=XjWW*Kr5;C5^tM2uCIGEZEF~7xXZt{K%qz168SkXjJ6XHl!kwhLq!4iT$L~ z$ipt(B5O1Pc}2?S&{q%b{)cxWeS4nhpZ~oNcMLvCVMB;m$RH5`($vIc0|QMrG?B0x zG`%6VDzWgCNG$xmPTC6GGlX^EVS^HLQQQ(VjV9(IB$`GP{|_`>tBZ!Urje$hrXk$` zziAZal@Qk?F!Phvn4#g-aBC|Btsxx0m*J}^(Z4FOUo?$|qgqU9UxG(5RMv0Rq7-gu zXl-r9*vXhixXwTg*j_;#Pt^uuxPlNPkvJV;-vNnX>}QWo z9bB{d%9lfW(@;oH7;(Mo1ws~6eHl`4v<}sSz(LZ0fe?u~m}HMbNs8goVgjG*T-Ne; z&ZO3S$Tf=(Irh*AK0qTUPR_c{aZf-mDp+s1p!i}E$3>Xpwg^g8Pe8^mo;8f#?p|EG z-YICqUES#|ee#~WyV4nROV{S~)-7FI?%I4;*VgXMcbi$+*WGKHxb#N@J*ght0HWHc zpw`qwLzC4LU}yP2b3g6~?@9H-(}tB*As=_KSw4i*;!3V%R3(Pe#wEVV^<}DdXY4eV zY~!6qrIDUgZ|a`A?%I;-?djXn-DwOU$s*U^Z_ASJn)yy+Unz|g{GgnhbdE~o~v+!VgE%z{}gdQ%yEt~mBoVda;WfIp3|lEHj_l#g5L6HrQZ#0#XKY=o7i zU0Z7Ke}U#(JtF+bvhZo+!FPQ34fw3L8_#EU5OpHuR7z(ExBPSvw+z#OLo^O-1i!RB z1bPH;IQZ3#UJieFEx0ELM!j-lfctq>!hk&fwPg^5fK}exhLPzxXOEQkE!NwhZUrVG zHNo{%#>Y7Vx!f+B`C<4Rj0*VVL(2j`cLPhaN~aq;U+}jXI}BogJ74ya_u~Tocwg{& zhfrl*jjX8JpF?j=rB_zLUDq;bRXh*&=F7leFZ|#KKNrDDt({5wxP0w#!A7*K@it(rGEsgZjIB!vP`q2wd^@&dtbBMryRgc^I YtrZLm-_d`wCX4;neEI)||IZ`vADbg@82|tP delta 1991 zcmYjSZERCj7=F&ZZMT&%y1T7x-5BjAFuSf<-PlK%gt4*@VQf-1SR9PDyRu@}J9=+n z8)2Oe$xsuWH>iI!!XHEpF^&i%_yg1*CTd*#NQ?x~_yZFY0tsJ67vFO>kdxf!ywCH# z=RNQFxc5#5Cw*^BmwhyU_nL+CVbwqm3AP2X*EjQFZ;r(Wba7z=FfGq`^0M~; z*~Hr`fd5WMSjOYqrugD|tQdDuZj1cwY$(0V}lR6;*mQ_{DS5J^;nYUS~O1*#_t0uXpg49ZF zIdOYswoNM}BVQ{bv}rEFs=uzxuUjbLB+uI=$w3>l5iMGEhDNoTolW-iWdt1yW`fFXwMo1E*L$r~*)G?x&qw=&2Co z0%^WIpt(i=Fo>@TrWAB0Es89yjkYq>trgV`K{VSiMVejG;Nxkw#xp&9U*MR)7YS`R zLFmFIVb2MD4zJTbpT?Z*rPnVi*QN0rPNE6Miy3$R!WJb>3S4#v*XRvr^6 zF5q)%0=M9ir{KpDoFUA^Il^N6OjwRv)D?J^X5~*P|88)=!o&Z`?iRhlE(6qi0 zO`Y0cDz2_KQ%h@0x5b8cXvz2>7Na9^6&=BtKBDR2NZh=iv&PvO9_bDz)r2w7t?34_ zHZ`FpXE!f9!p!@Q)s5}pkb>yAqZ@a$I%iG$A*KNmel=&L_=e`p$wadqZbPA`3&al_R=eyQ+>;QMu@j?)8ovdo>! zSEf61GBa3#(#MotvP~JzC{R>M*(F)s5-TZmI+#?Tq*y5)qAHa_ve+rw#wBG}rki|y zEDywa5{sMerq#`uGA6qz)D2~f&RiMGJU8CoTU2}f7)|5Iq-ZgZgRT>^(sfsQXb{b8 zHWgJ$63kdpgjJj06m7R!_}9>MyK1rn{`%U$T7ONTE>LFLtIQER@!e~8fBLfZz<|+^0(-YFJkv zll>!u5%?DWems4v&+IOCNewe*jb?4{0Z aURh5#wsJblz3|)J*)*H$zR6~)GyVg{41st6 diff --git a/Patches/DesignationCategories.xml b/Patches/DesignationCategories.xml new file mode 100644 index 0000000..15f8e11 --- /dev/null +++ b/Patches/DesignationCategories.xml @@ -0,0 +1,10 @@ + + + + /Defs/DesignationCategoryDef[defName="Orders"]/specialDesignatorClasses + +
  • ClaimDoors.Designator_RemoveFog
    • +
  • ClaimDoors.Designator_AddFog
    • +     +     +     \ No newline at end of file diff --git a/Source/ClaimDoors.csproj b/Source/ClaimDoors.csproj index 68bae83..f45a778 100644 --- a/Source/ClaimDoors.csproj +++ b/Source/ClaimDoors.csproj @@ -48,10 +48,18 @@ ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll False + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + - + + + + + diff --git a/Source/ClaimDoorsMain.cs b/Source/ClaimDoorsMain.cs new file mode 100644 index 0000000..868b814 --- /dev/null +++ b/Source/ClaimDoorsMain.cs @@ -0,0 +1,39 @@ +using HarmonyLib; +using Verse; + +namespace ClaimDoors +{ + internal class ClaimDoorsMod : Mod + { + public ClaimDoorsMod(ModContentPack content) : base(content) + { + GetSettings(); + new Harmony("tobs.claimdoors.mod").PatchAll(); + } + + public override string SettingsCategory() => "Claim Doors"; + + public override void DoSettingsWindowContents(UnityEngine.Rect inRect) + { + Listing_Standard listingStandard = new Listing_Standard(); + listingStandard.Begin(inRect); + listingStandard.CheckboxLabeled("Enable Fog Tools", ref ClaimDoorsSettings.enableFogTool); + listingStandard.End(); + base.DoSettingsWindowContents(inRect); + } + } + + internal class ClaimDoorsSettings : ModSettings + { + public static bool enableFogTool = true; + + /// + /// The part that writes our settings to file. Note that saving is by ref. + /// + public override void ExposeData() + { + Scribe_Values.Look(ref enableFogTool, nameof(enableFogTool)); + base.ExposeData(); + } + } +} \ No newline at end of file diff --git a/Source/Designator_AddFog.cs b/Source/Designator_AddFog.cs new file mode 100644 index 0000000..f004267 --- /dev/null +++ b/Source/Designator_AddFog.cs @@ -0,0 +1,16 @@ +using RimWorld; +using UnityEngine; +using Verse; + +namespace ClaimDoors +{ + public class Designator_AddFog : Designator_Fog + { + public Designator_AddFog() : base(DesignateMode.Add) + { + defaultLabel = "Fog Map"; + defaultDesc = "Cover the map with fog of war."; + icon = ContentFinder.Get("UI/Designators/Hide"); + } + } +} \ No newline at end of file diff --git a/Source/Designator_Fog.cs b/Source/Designator_Fog.cs new file mode 100644 index 0000000..24b5cde --- /dev/null +++ b/Source/Designator_Fog.cs @@ -0,0 +1,62 @@ +using HarmonyLib; +using RimWorld; +using Verse; + +namespace ClaimDoors +{ + public class Designator_Fog : Designator + { + public override int DraggableDimensions => 2; + + public override AcceptanceReport CanDesignateCell(IntVec3 loc) => loc.InBounds(Map) && loc.Fogged(Map) == (mode == DesignateMode.Remove); + + private readonly DesignateMode mode; + public override bool DragDrawMeasurements => true; + public override bool Visible => ClaimDoorsSettings.enableFogTool; + + public Designator_Fog(DesignateMode mode) + { + this.mode = mode; + soundDragSustain = SoundDefOf.Designate_DragStandard; + soundDragChanged = SoundDefOf.Designate_DragStandard_Changed; + useMouseIcon = true; + soundSucceeded = SoundDefOf.Designate_Claim; + } + + public override void DesignateSingleCell(IntVec3 cell) + { + if (CanDesignateCell(cell).Accepted) + { + switch (mode) + { + case DesignateMode.Add: + FogWorker(cell); + break; + + case DesignateMode.Remove: + Traverse.Create(Map.fogGrid).Method("UnfogWorker", cell).GetValue(); + break; + } + } + } + + public override void SelectedUpdate() + { + GenUI.RenderMouseoverBracket(); + } + + public override void RenderHighlight(System.Collections.Generic.List dragCells) => DesignatorUtility.RenderHighlightOverSelectableCells(this, dragCells); + + private void FogWorker(IntVec3 c) + { + Log.Message($"{c} - {Map.cellIndices.CellToIndex(c)} - {Map.fogGrid.fogGrid[Map.cellIndices.CellToIndex(c)]}"); + int index = Map.cellIndices.CellToIndex(c); + Map.fogGrid.fogGrid[index] = true; + if (Current.ProgramState == ProgramState.Playing) + { + Map.mapDrawer.MapMeshDirty(c, MapMeshFlag.Things | MapMeshFlag.FogOfWar); + Map.roofGrid.Drawer.SetDirty(); + } + } + } +} \ No newline at end of file diff --git a/Source/Designator_RemoveFog.cs b/Source/Designator_RemoveFog.cs new file mode 100644 index 0000000..c0fb7c1 --- /dev/null +++ b/Source/Designator_RemoveFog.cs @@ -0,0 +1,16 @@ +using RimWorld; +using UnityEngine; +using Verse; + +namespace ClaimDoors +{ + public class Designator_RemoveFog : Designator_Fog + { + public Designator_RemoveFog() : base(DesignateMode.Remove) + { + defaultLabel = "Unfog Map"; + defaultDesc = "Remove fog of war from the map."; + icon = ContentFinder.Get("UI/Designators/Reveal"); + } + } +} \ No newline at end of file diff --git a/Source/Patches.cs b/Source/Patches.cs index 6209ee5..380edc0 100644 --- a/Source/Patches.cs +++ b/Source/Patches.cs @@ -3,25 +3,16 @@ using System.Linq; using Verse; -namespace ClaimDoors +namespace ClaimDoors.Patches { - [StaticConstructorOnStartup] - internal static class ClaimDoorsMain + [HarmonyPatch(typeof(MapGenerator), nameof(MapGenerator.GenerateMap))] + internal static class UnclaimAllDoorsOnGeneratedMap { - static ClaimDoorsMain() + private static void Postfix(Map __result) { - new Harmony("tobs.claimdoors.mod").PatchAll(); - } - - [HarmonyPatch(typeof(MapGenerator), nameof(MapGenerator.GenerateMap))] - internal static class MapParent_PostMapGenerate - { - private static void Postfix(Map __result) - { - var doors = __result.spawnedThings.Where(thing => thing is Building_Door && thing.Faction != Faction.OfPlayer); - foreach (var door in doors) - door.SetFactionDirect(null); - } + var doors = __result.spawnedThings.Where(thing => thing is Building_Door && thing.Faction != Faction.OfPlayer).Cast(); + foreach (var door in doors) + door.SetFactionDirect(null); } } -} +} \ No newline at end of file diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 7d56e6f..3ed8962 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -32,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] \ No newline at end of file diff --git a/Textures/UI/Designators/Hide.png b/Textures/UI/Designators/Hide.png new file mode 100644 index 0000000000000000000000000000000000000000..ccb6a429171475b1a4d8c325ca5e17642c1fe16c GIT binary patch literal 1211 zcmV;s1VsCZP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1W-vtK~#8N-J3mc z)G!=}9gwObIu!LqNL;u32ryhFRPhPQ((VW`Ffgzof;lWS^PB_;-n&g>MI&vKp092(K&v1WFK7ajxtxcG!)nX<1|J(djXJ z-9MGJpd5p#K(QDBPYE%@o3Q1|?0YyTSe5z1gJu3QoK)qf=f=@ecUxAmQ?(39)6`l{ zSJyJ(FF$_BUj6N8CgA-;1Zhf4X@)ML#z;O2uMW2yC**~WAy&aEbDK*khOBEh6gl+ z#s&72DS(Gg`H&bE)XU&wKC{i=H}B;q{+Rk@D3!=HsN*AH#Nkzj?_U(vF!V-^r`*)a zO_uii?CkSbQO7IlcwZ&PX-^o&zy8J+FHZ)G=QezxZA5Xwb|#GR$mf6=b)~XPXRg7) zKHd29^dg19S~7WLH#q_7KV^>GF-wFMG{Q=MOh*wObj5<+*NZYK&65}vR~ zhz_otYQrH{(p<;%2OXb>9J;z=d$gmlFQ?t2q6(;b8xig3;q@soet_lDIYkdMTh`L{$mS0_qr^FiGHjUFXjb!~X|Sgp+_ehbIgY4tbw@WfDpS zG$A|@BEc%4N#O}!355ch7@qKvU=+~g@Pw;`oPaijC%A+)-v5uX3UU%M0@@Uw;1YT~ zhx+w7BVj0@jo}HK1R-c)}hOdvLH%)bzwO}xANTm4Aipdz Z_8(YeU8=L)kbD3D002ovPDHLkV1jZzB|QKD literal 0 HcmV?d00001 diff --git a/Textures/UI/Designators/Reveal.png b/Textures/UI/Designators/Reveal.png new file mode 100644 index 0000000000000000000000000000000000000000..238dae9ceaddaeabc77e159db6f086835be2c924 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4dI?Hjv*CsZ!bskH5>4-1ibkB-X~Q=S>0m7 zQL~V_-e}$;G6@f1r~xdCAfV hCn{lK#PHy~&S~+LU1dVLjS?q8qMojPF6*2Ung9fIv%>%Y literal 0 HcmV?d00001