feat: Interop with Dynamic Trade Interface

ilyvion · May 15, 2024 · 4fcad8d · 4fcad8d
1 parent 1a49d30
commit 4fcad8d
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 5 deletions.
diff --git a/.deps/README.md b/.deps/README.md
@@ -4,3 +4,4 @@ For reference:
 
 -   1541408076: We Had a Trader?
 -   2695164414: Tweaks Galore
+-   3020706506: Dynamic Trade Interface
diff --git a/.deps/refs/3020706506/1.4/Assemblies/DynamicTradeInterface.dll b/.deps/refs/3020706506/1.4/Assemblies/DynamicTradeInterface.dll
diff --git a/.deps/refs/3020706506/1.5/Assemblies/DynamicTradeInterface.dll b/.deps/refs/3020706506/1.5/Assemblies/DynamicTradeInterface.dll
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,13 +29,15 @@ jobs:
                   dotnet build --configuration Release .vscode/mod.csproj
                   dotnet build --configuration Release .vscode/wehadatrader.interop.csproj
                   dotnet build --configuration Release .vscode/tweaksgalore.interop.csproj
+                  dotnet build --configuration Release .vscode/dynamictradeinterface.interop.csproj
 
             - name: Build Mod for 1.4
               env:
                   RimWorldVersion: 1.4
               run: |
                   dotnet build .vscode --configuration Release
                   dotnet build --configuration Release .vscode/wehadatrader.interop.csproj
+                  dotnet build --configuration Release .vscode/dynamictradeinterface.interop.csproj
 
             - name: Upload Mod Artifacts
               uses: actions/upload-artifact@v4
@@ -48,6 +50,8 @@ jobs:
                       1.5_WeHadATrader/
                       1.4_WeHadATrader/
                       1.5_TweaksGalore/
+                      1.5_DynamicTradeInterface/
+                      1.4_DynamicTradeInterface/
                       Common/
                       UpdateLog/
                       Defs/

diff --git a/.vscode/build.ps1 b/.vscode/build.ps1
@@ -21,6 +21,10 @@ dotnet build --configuration $Configuration .vscode/tweaksgalore.interop.csproj
 if ($LASTEXITCODE -gt 0) {
     throw "Build failed"
 }
+dotnet build --configuration $Configuration .vscode/dynamictradeinterface.interop.csproj
+if ($LASTEXITCODE -gt 0) {
+    throw "Build failed"
+}
 
 $env:RimWorldVersion = "1.4"
 dotnet build --configuration $Configuration .vscode/mod.csproj
@@ -31,6 +35,10 @@ dotnet build --configuration $Configuration .vscode/wehadatrader.interop.csproj
 if ($LASTEXITCODE -gt 0) {
     throw "Build failed"
 }
+dotnet build --configuration $Configuration .vscode/dynamictradeinterface.interop.csproj
+if ($LASTEXITCODE -gt 0) {
+    throw "Build failed"
+}
 
 # remove pdbs (for release)
 if ($Configuration -eq "Release") {
@@ -41,6 +49,9 @@ if ($Configuration -eq "Release") {
     Remove-Item -Path .\1.4_WeHadATrader\Assemblies\RealisticOrbitalTrade.WeHadATrader.pdb -ErrorAction SilentlyContinue
 
     Remove-Item -Path .\1.5_TweaksGalore\Assemblies\RealisticOrbitalTrade.TweaksGalore.pdb -ErrorAction SilentlyContinue
+
+    Remove-Item -Path .\1.5_DynamicTradeInterface\Assemblies\RealisticOrbitalTrade.DynamicTradeInterface.pdb -ErrorAction SilentlyContinue
+    Remove-Item -Path .\1.4_DynamicTradeInterface\Assemblies\RealisticOrbitalTrade.DynamicTradeInterface.pdb -ErrorAction SilentlyContinue
 }
 
 # remove mod folder
@@ -54,6 +65,8 @@ Copy-Item -Path 1.4 $Target\1.4 -Recurse
 Copy-Item -Path 1.5_WeHadATrader $Target\1.5_WeHadATrader -Recurse
 Copy-Item -Path 1.4_WeHadATrader $Target\1.4_WeHadATrader -Recurse
 Copy-Item -Path 1.5_TweaksGalore $Target\1.5_TweaksGalore -Recurse
+Copy-Item -Path 1.5_DynamicTradeInterface $Target\1.5_DynamicTradeInterface -Recurse
+Copy-Item -Path 1.4_DynamicTradeInterface $Target\1.4_DynamicTradeInterface -Recurse
 
 Copy-Item -Path Common $Target\Common -Recurse
 Copy-Item -Path UpdateLog $Target\UpdateLog -Recurse

diff --git a/.vscode/dynamictradeinterface.interop.csproj b/.vscode/dynamictradeinterface.interop.csproj
@@ -0,0 +1,77 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net48</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <LangVersion>10.0</LangVersion>
+        <Nullable>enable</Nullable>
+
+        <RootNamespace>RealisticOrbitalTrade.DynamicTradeInterface</RootNamespace>
+        <AssemblyName>RealisticOrbitalTrade.DynamicTradeInterface</AssemblyName>
+        <VersionPrefix>0.4.0</VersionPrefix>
+
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+
+        <!-- Intellisense doesn't work without specifying these explicitly -->
+        <!-- !! Don't check in with these uncommented !! -->
+        <!-- <RimWorldSteamWorkshopFolderPath>C:\Program Files (x86)\Steam\steamapps\workshop\content\294100</RimWorldSteamWorkshopFolderPath>
+        <RimWorldVersion>1.5</RimWorldVersion> -->
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <DebugType>none</DebugType>
+        <DebugSymbols>false</DebugSymbols>
+        <Optimize>true</Optimize>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <DebugSymbols>true</DebugSymbols>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!-- Mod -->
+        <Compile Include="../Source/RealisticOrbitalTrade.DynamicTradeInterface/**" />
+    </ItemGroup>
+
+    <Choose>
+        <When Condition="'$(RimWorldVersion)' == '1.5'">
+            <PropertyGroup>
+                <DefineConstants>$(DefineConstants);v1_5</DefineConstants>
+                <OutputPath>../1.5_DynamicTradeInterface/Assemblies</OutputPath>
+            </PropertyGroup>
+            <ItemGroup>
+                <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.*-*">
+                    <ExcludeAssets>runtime</ExcludeAssets>
+                </PackageReference>
+            </ItemGroup>
+        </When>
+        <When Condition="'$(RimWorldVersion)' == '1.4'">
+            <PropertyGroup>
+                <DefineConstants>$(DefineConstants);v1_4</DefineConstants>
+                <OutputPath>../1.4_DynamicTradeInterface/Assemblies</OutputPath>
+            </PropertyGroup>
+            <ItemGroup>
+                <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.*-*">
+                    <ExcludeAssets>runtime</ExcludeAssets>
+                </PackageReference>
+            </ItemGroup>
+        </When>
+    </Choose>
+
+    <ItemGroup>
+        <PackageReference Include="Lib.Harmony" Version="2.2.2">
+            <ExcludeAssets>runtime</ExcludeAssets>
+        </PackageReference>
+        <ProjectReference Include=".\mod.csproj">
+            <CopyLocal>False</CopyLocal>
+            <Private>false</Private>
+        </ProjectReference>
+        <Reference Include="DynamicTradeInterface">
+            <HintPath>$(RimWorldSteamWorkshopFolderPath)\3020706506\$(RimWorldVersion)\Assemblies\DynamicTradeInterface.dll</HintPath>
+            <CopyLocal>False</CopyLocal>
+            <Private>false</Private>
+        </Reference>
+    </ItemGroup>
+</Project>
diff --git a/About/About.xml b/About/About.xml
@@ -36,5 +36,6 @@ This is version 0.4.0 for RimWorld 1.5 and 1.4
         <li>Ludeon.RimWorld.Royalty</li>
         <li>Mlie.WeHadATrader</li>
         <li>Neronix17.TweaksGalore</li>
+        <li>zeracronius.dynamictradeinterface</li>
     </loadAfter>
 </ModMetaData>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+-   Added a compatibility layer for [Dynamic Trade Interface](https://steamcommunity.com/sharedfiles/filedetails/?id=3020706506). This is required because Dynamic Trade Interface uses a custom trade dialog instead of modifying the original, so Realistic Orbital Trade wasn't notified when a trade was cancelled when using it, leading to Realistic Orbital Trade thinking a trader had an active trade agreement when there wasn't any. This has now been corrected.
+
 ### Fixed
 
 -   The fix for minified items from last version had a bug where it would show items with multiple counts as "ItemName x<stackCountInStorage> x<stackCountNeeded>" in the shuttle's "Content" tab. This has now been fixed to be just "ItemName x<stackCountNeeded>" as it should be.

diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -3,12 +3,14 @@
         <li>Common</li>
         <li>1.4</li>
         <li IfModActive="Mlie.WeHadATrader">1.4_WeHadATrader</li>
+        <li IfModActive="zeracronius.dynamictradeinterface">1.4_DynamicTradeInterface</li>
     </v1.4>
     <v1.5>
         <li>Common</li>
         <li>1.5</li>
         <li IfModActive="Mlie.WeHadATrader">1.5_WeHadATrader</li>
         <li IfModActive="Neronix17.TweaksGalore">1.5_TweaksGalore</li>
+        <li IfModActive="zeracronius.dynamictradeinterface">1.5_DynamicTradeInterface</li>
         <li IfModActive="neronix17.toolbox">UpdateLog</li>
     </v1.5>
 </loadFolders>
diff --git a/RealisticOrbitalTrade.sln b/RealisticOrbitalTrade.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wehadatrader.interop", ".vs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tweaksgalore.interop", ".vscode\tweaksgalore.interop.csproj", "{7825084C-72F7-46DB-8E54-A8F3A373C819}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dynamictradeinterface.interop", ".vscode\dynamictradeinterface.interop.csproj", "{60801FAF-2AAE-4497-A80D-9E8FD7F5B093}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{7825084C-72F7-46DB-8E54-A8F3A373C819}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7825084C-72F7-46DB-8E54-A8F3A373C819}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7825084C-72F7-46DB-8E54-A8F3A373C819}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60801FAF-2AAE-4497-A80D-9E8FD7F5B093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60801FAF-2AAE-4497-A80D-9E8FD7F5B093}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60801FAF-2AAE-4497-A80D-9E8FD7F5B093}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60801FAF-2AAE-4497-A80D-9E8FD7F5B093}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Source/RealisticOrbitalTrade.DynamicTradeInterface/Core/DynamicTradeInterfaceMod.cs b/Source/RealisticOrbitalTrade.DynamicTradeInterface/Core/DynamicTradeInterfaceMod.cs
@@ -0,0 +1,16 @@
+using HarmonyLib;
+using Verse;
+using System.Reflection;
+
+namespace RealisticOrbitalTrade.DynamicTradeInterface;
+
+public class DynamicTradeInterfaceMod : Mod
+{
+    public DynamicTradeInterfaceMod(ModContentPack content)
+        : base(content)
+    {
+        new Harmony(Constants.Id).PatchAll(Assembly.GetExecutingAssembly());
+
+        RealisticOrbitalTradeMod.Message("\"Dynamic Trade Interface\" interop loaded successfully!");
+    }
+}
diff --git a/...TradeInterface/Patch/DynamicTradeInterface_UserInterface_Window_DynamicTrade_PostClose.cs b/...TradeInterface/Patch/DynamicTradeInterface_UserInterface_Window_DynamicTrade_PostClose.cs
@@ -0,0 +1,18 @@
+using HarmonyLib;
+using System.Reflection;
+
+namespace RealisticOrbitalTrade.DynamicTradeInterface.Patch;
+
+[HarmonyPatch]
+internal static class DynamicTradeInterface_UserInterface_Window_DynamicTrade_PostClose
+{
+    private static MethodInfo TargetMethod()
+    {
+        return AccessTools.Method("DynamicTradeInterface.UserInterface.Window_DynamicTrade:PostClose");
+    }
+
+    private static void Postfix()
+    {
+        TradeShipData.EndTradeAgreementIfExists();
+    }
+}
diff --git a/Source/RealisticOrbitalTrade/Core/RealisticOrbitalTradeMod.cs b/Source/RealisticOrbitalTrade/Core/RealisticOrbitalTradeMod.cs
@@ -7,6 +7,7 @@
 
 [assembly: InternalsVisibleTo("RealisticOrbitalTrade.TweaksGalore")]
 [assembly: InternalsVisibleTo("RealisticOrbitalTrade.WeHadATrader")]
+[assembly: InternalsVisibleTo("RealisticOrbitalTrade.DynamicTradeInterface")]
 
 namespace RealisticOrbitalTrade;
 

diff --git a/Source/RealisticOrbitalTrade/Core/TradeShipData.cs b/Source/RealisticOrbitalTrade/Core/TradeShipData.cs
@@ -23,6 +23,15 @@ public TradeShipData(TradeShip tradeShip, bool getting)
 
     public bool HasActiveTradeAgreement { get => activeTradeAgreement != null; }
 
+    public static void EndTradeAgreementIfExists()
+    {
+        if (tradeAgreementForQuest != null)
+        {
+            RealisticOrbitalTradeGameComponent.Current.EndTradeAgreement(tradeAgreementForQuest);
+            tradeAgreementForQuest = null;
+        }
+    }
+
     public void ExposeData()
     {
         Scribe_Values.Look(ref ticksUntilCommsClosed, "ticksUntilCommsClosed", 0);

diff --git a/Source/RealisticOrbitalTrade/Patch/Rimworld_Dialog_Trade_Close.cs b/Source/RealisticOrbitalTrade/Patch/Rimworld_Dialog_Trade_Close.cs
@@ -8,10 +8,6 @@ internal static class Rimworld_Dialog_Trade_Close
 {
     private static void Postfix()
     {
-        if (TradeShipData.tradeAgreementForQuest != null)
-        {
-            RealisticOrbitalTradeGameComponent.Current.EndTradeAgreement(TradeShipData.tradeAgreementForQuest);
-            TradeShipData.tradeAgreementForQuest = null;
-        }
+        TradeShipData.EndTradeAgreementIfExists();
     }
 }