From ed08916c7a622db664dd87f2e2d178f4c97bdcd5 Mon Sep 17 00:00:00 2001 From: Arvkus Date: Fri, 11 Sep 2020 14:58:46 +0300 Subject: [PATCH] v1.2 --- .vscode/build.bat | 2 +- .vscode/launch.json | 16 +++++++++++++++- .vscode/mod.csproj | 10 +++++----- .vscode/tasks.json | 3 ++- 1.2/Assemblies/Template.dll | Bin 0 -> 3584 bytes {1.1 => 1.2}/Defs/LetterDef.xml | 0 {1.1 => 1.2}/Languages/English/Data.xml | 0 {1.1 => 1.2}/Patches/Patches.xml | 0 About/About.xml | 4 ++-- Source/Main.cs | 24 +++++++++++------------- 10 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 1.2/Assemblies/Template.dll rename {1.1 => 1.2}/Defs/LetterDef.xml (100%) rename {1.1 => 1.2}/Languages/English/Data.xml (100%) rename {1.1 => 1.2}/Patches/Patches.xml (100%) diff --git a/.vscode/build.bat b/.vscode/build.bat index cb21c5f..3b6dd17 100644 --- a/.vscode/build.bat +++ b/.vscode/build.bat @@ -1,7 +1,7 @@ echo off REM remove unnecessary assemblies -DEL .\*\Assemblies\*.* +REM DEL .\*\Assemblies\*.* REM build dll dotnet build .vscode \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 6cd389a..cb53114 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,11 +10,25 @@ "request": "launch", "preLaunchTask": "build dll", "args": [], - "program": "../../RimWorldWin64.exe", + "program": "../../RimWorldWin64.exe", "cwd": "${workspaceFolder}", "console": "internalConsole", "internalConsoleOptions":"neverOpen", "stopAtEntry": true }, + + { // ignore + "name": ".NET Framework Attach", + "type": "clr", + "request": "attach", + "processId": "${command:pickProcess}", + "symbolOptions": { + "searchPaths": [ + ".vscode/obj/Debug/*" + ], + "searchMicrosoftSymbolServer": false, + "searchNuGetOrgSymbolServer": false + } + } ] } \ No newline at end of file diff --git a/.vscode/mod.csproj b/.vscode/mod.csproj index 0f86931..c2d0f83 100644 --- a/.vscode/mod.csproj +++ b/.vscode/mod.csproj @@ -7,10 +7,12 @@ Template Template - ../1.1/Assemblies + ../1.2/Assemblies 1.0.0.0 + none + false false @@ -25,10 +27,8 @@ - + --> diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 1d80d19..1241df7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,8 @@ "kind": "build", "isDefault": true }, - "command": ".vscode/build.bat", + // "command": ".vscode/build.bat", + "command": "dotnet build .vscode" }, ] } \ No newline at end of file diff --git a/1.2/Assemblies/Template.dll b/1.2/Assemblies/Template.dll new file mode 100644 index 0000000000000000000000000000000000000000..34ff51bb5e49ee78a183bb1b71d52dae87f7062f GIT binary patch literal 3584 zcmds3TWl0%6#izqUE69GS_(o$9fX8}y0lVJ@YX9*?Y7WeiWdydZvSpaW@k1tvz1kY zsF6rwR33cL_#n{-pNu9ZUJ{}t#$W_Pj88ro6QhYfs82o^MZfdU?zVtMAB|@--<;cj z{&UX!m(ASw0-69M`26`N@E+en{TeS0hiFb+{Xq)vw4Pq`o-uZMO>Wi+t#aTO1G{7u zY|rx}E3d4e;#rPo4NqjPl0U7|?d@&rYN2Yeo%p&Bj2Uag)`&ViU z*s;Jd9jOBm&<#p=>Q7!)Y!-1^B#f7dU$&48@6wY#(Uh`fCLwRi3w9p?KC<=;gfbp1TvLL6@FSq`*{@SCw2E8?E4qA0DF z{?y;h5R#MVIF9s=Av}=8*O)Ss=rIIu#*n!Lb970ffWt--mm4REA42dkjW20Dt8t9j zhN7{I{x6#+$UkOmU~k?s1;5w)S&ifLX+uf#PiyOQ8dpO+-_ZIeHNHv|iu03>8tlbB zV-s%Fyhv}Fn{XQ|G4TZ5KBIIa`2<_A-W>#XnuzB1ByAFIq>d`kT`q;V;B5trdU;uWY8*WyXywKzlE%rBM3E%<>r zr15U8&k~1lKYqni{ARx*aj4!q7NlttQC32o`q^F zN@2kdTqlo7r?iLMG`2h5G%_j-?V`ez3POdPDwSP3QW#eGO0j6?T{RGKRp%?z4TPa8 z<=tw|i59AJc2HE&b{@UzVL#Y^q5pQrRTAFuy$g+_-i#lV?1)C&UDRvH_hy`8CD4BJ zL5BQN*^WE;L90+pEqSCM#a#l$6#-PTp~yXo0oXtX#FM zhSki(Oru}1bgmg=DvDG<6SCDXQl)e)c)C_5&kBtBMX-DOV&80J7xp)Trl(!EHnb5z z&A6%{^b1I$} zVWm*uLfGf(l#v!+qJGtqA9n1b=ZB0JHnNGEm5x7y3bHDga~P+#dRQM9AH`Z8g#I*+JP&xw$!vJ#2rd&-Nj(+{19Nsi2kq%+s6dr1}*?v4T!LjKT^ zfsbieaNzNg`|OX@&)>b6_;&Ew&(CZ)_4$#nkgyD+rOATPOs1nl#FVg|15L@!Oe+#b zs&jW|#^l!Oe85bmS}bZ(om*4QFpZSi^6n#hr&jfSbA;Yoc|RL1hQ2C+tK>+_nJe}L zc6r?QMh+B|{wTTGz<)Rtzf1I9%otdm9v{gyHp+FiWpEqsmYdQyFi5JaVH|csZp7+1 zH&vI6vKkgkd$)7?#%4vEfo8p9c`c_{o2Wd-{Qo<4aIfs5Sz|arhrVF{XzZu0El4`drS@YEv81ZgVXqTpaye_=q0PQ z_;-=CPY>$9KIF**H=vbchZwJfvYw;Lifl?s$ItOCmU!M+w@r_!XFIHSOhM0GJ}0-o z8{5MbZZz_n;@E&y&DYb*yQ`=1fVW;d{iP$3_Vt*XyCB2!=SXwUy8H=s^Y$_@#&JbG zN~$dL)|4(4G0TX6#b;2@F;UY?2W5_WeImu(xY%5AA9pf_oEmbHL<_P6&L7KZ(WiTH g?wIpCa(+K<)?)_r86{sP&rGYV;-ALJeE)a)3rti#0ssI2 literal 0 HcmV?d00001 diff --git a/1.1/Defs/LetterDef.xml b/1.2/Defs/LetterDef.xml similarity index 100% rename from 1.1/Defs/LetterDef.xml rename to 1.2/Defs/LetterDef.xml diff --git a/1.1/Languages/English/Data.xml b/1.2/Languages/English/Data.xml similarity index 100% rename from 1.1/Languages/English/Data.xml rename to 1.2/Languages/English/Data.xml diff --git a/1.1/Patches/Patches.xml b/1.2/Patches/Patches.xml similarity index 100% rename from 1.1/Patches/Patches.xml rename to 1.2/Patches/Patches.xml diff --git a/About/About.xml b/About/About.xml index 48c7618..7eeed31 100644 --- a/About/About.xml +++ b/About/About.xml @@ -3,8 +3,8 @@ Arvkus Mod Template Arvkus -
  • 1.1
    • +
  • 1.2
    •  - Arvkus.Rimworld.ModTemplate + Arvkus.Rimworld.ModTemplate2 Template \ No newline at end of file diff --git a/Source/Main.cs b/Source/Main.cs index 94caba6..918be50 100644 --- a/Source/Main.cs +++ b/Source/Main.cs @@ -25,25 +25,23 @@ namespace Template public static LetterDef success_letter; } - [StaticConstructorOnStartup] - public static class Start - { - static Start() - { - Log.Message("Mod template: success"); - } - } - public class MyMapComponent : MapComponent { - public MyMapComponent(Map map) : base(map) - { - } - + public MyMapComponent(Map map) : base(map){} public override void FinalizeInit() { Messages.Message("Success", null, MessageTypeDefOf.PositiveEvent); Find.LetterStack.ReceiveLetter("Success", TemplateDefOf.success_letter.description, TemplateDefOf.success_letter, null); } } + + [StaticConstructorOnStartup] + public static class Start + { + static Start() // quick debug + { + Log.Message("Mod init"); + } + } + }