small refactor

ontrigger · Aug 23, 2020 · 96351ff · 96351ff
1 parent 719d025
commit 96351ff
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 33 deletions.
diff --git a/ItemStats/ItemStats.csproj b/ItemStats/ItemStats.csproj
@@ -69,18 +69,17 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs"/>
-    <Compile Include="src\Api\ProvidesItemStats.cs"/>
     <Compile Include="src\ContextProvider.cs"/>
-    <Compile Include="src\ItemStatDef.cs"/>
     <Compile Include="src\ItemStatDefinitions.cs"/>
     <Compile Include="src\ItemStatProvider.cs"/>
     <Compile Include="src\ItemStatsMod.cs"/>
     <Compile Include="src\Modifiers.cs"/>
     <Compile Include="src\StatCalculation\DefaultStatCalculationStrategy.cs"/>
     <Compile Include="src\StatCalculation\IStatCalculationStrategy.cs"/>
-    <Compile Include="src\StatContext.cs"/>
     <Compile Include="src\Stat\IStat.cs"/>
     <Compile Include="src\Stat\ItemStat.cs"/>
+    <Compile Include="src\Stat\ItemStatDef.cs"/>
+    <Compile Include="src\Stat\StatContext.cs"/>
     <Compile Include="src\ValueFormatters\Colors.cs"/>
     <Compile Include="src\ValueFormatters\Extensions.cs"/>
     <Compile Include="src\ValueFormatters\IStatFormatter.cs"/>

diff --git a/ItemStats/src/Api/ProvidesItemStats.cs b/ItemStats/src/Api/ProvidesItemStats.cs
diff --git a/ItemStats/src/ItemStatDef.cs b/ItemStats/src/ItemStatDef.cs
diff --git a/ItemStats/src/ItemStatsMod.cs b/ItemStats/src/ItemStatsMod.cs
@@ -11,6 +11,7 @@ namespace ItemStats
 {
     [BepInDependency("com.bepis.r2api")]
     [BepInPlugin("dev.ontrigger.itemstats", "ItemStats", "1.5.0")]
+    [NetworkCompatibility(CompatibilityLevel.NoNeedForSync, VersionStrictness.DifferentModVersionsAreOk)]
     public class ItemStatsMod : BaseUnityPlugin
     {
         private readonly Dictionary<ItemInventoryDisplay, CharacterMaster> _displayToMasterRef =

diff --git a/ItemStats/src/Stat/ItemStatDef.cs b/ItemStats/src/Stat/ItemStatDef.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using ItemStats.Stat;
+using ItemStats.StatCalculation;
+
+namespace ItemStats
+{
+    public class ItemStatDef
+    {
+        public IStatCalculationStrategy StatCalculationStrategy = new DefaultStatCalculationStrategy();
+
+        public List<ItemStat> Stats;
+
+        // additional text that only appears on stat tooltip and not the logbook
+        public string AdditionalText;
+
+        public string ProcessItem(int count, StatContext context)
+        {
+            return StatCalculationStrategy.ProcessItem(Stats, count, context, AdditionalText);
+        }
+    }
+}
diff --git a/ItemStats/src/StatContext.cs → ItemStats/src/Stat/StatContext.cs b/ItemStats/src/StatContext.cs → ItemStats/src/Stat/StatContext.cs
diff --git a/ItemStats/src/StatCalculation/DefaultStatCalculationStrategy.cs b/ItemStats/src/StatCalculation/DefaultStatCalculationStrategy.cs
@@ -2,16 +2,24 @@
 using System.Collections.Generic;
 using System.Text;
 using ItemStats.Stat;
+using JetBrains.Annotations;
 
 namespace ItemStats.StatCalculation
 {
     public class DefaultStatCalculationStrategy : IStatCalculationStrategy
     {
-        public string ProcessItem(List<ItemStat> stats, int count, StatContext context)
+        public string ProcessItem(List<ItemStat> stats, int count, StatContext context,
+            [CanBeNull] string additionalText)
         {
             var fullStatText = new StringBuilder();
             fullStatText.Append("\n\n");
 
+            if (additionalText != null)
+            {
+                fullStatText.Append(additionalText);
+                fullStatText.Append("\n\n");
+            }
+
             foreach (var stat in stats)
             {
                 var m = stat.GetInitialStat(count, context);

diff --git a/ItemStats/src/StatCalculation/IStatCalculationStrategy.cs b/ItemStats/src/StatCalculation/IStatCalculationStrategy.cs
@@ -5,6 +5,6 @@ namespace ItemStats.StatCalculation
 {
     public interface IStatCalculationStrategy
     {
-        string ProcessItem(List<ItemStat> stats, int count, StatContext context);
+        string ProcessItem(List<ItemStat> stats, int count, StatContext context, string additionalText);
     }
 }