updated readme, exiled package, added roledamagereceived multiplier

ExMod-Team · Sep 30, 2024 · 03b7120 · 03b7120
1 parent 61ec80a
commit 03b7120
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 225 deletions.
diff --git a/Common Utilities/Common Utilities.csproj b/Common Utilities/Common Utilities.csproj
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="EXILEDOFFICIAL" Version="8.11.0" />
+        <PackageReference Include="EXILED-OFFICIAL" Version="8.12.2" />
         <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)" IncludeAssets="All" PrivateAssets="All" />
     </ItemGroup>
 

diff --git a/Common Utilities/Config.cs b/Common Utilities/Config.cs
@@ -137,7 +137,7 @@ public class Config : IConfig
             },
         };
 
-        [Description("The list of custom 914 recipies. OriginalItem is the item being upgraded, NewItem is the item to upgrade to, and Chance is the percent chance of the upgrade happening. You can specify multiple upgrade choices for the same item.")]
+        [Description("The list of custom 914 recipies. OriginalItem is the item being upgraded, NewItem is the item to upgrade to, and Chance is the percent chance of the upgrade happening. You can specify multiple upgrade choices for the same item. For custom items use the item's name.")]
         public Dictionary<Scp914KnobSetting, List<ItemUpgradeChance>> Scp914ItemChances { get; set; } = new()
         {
             {
@@ -153,7 +153,7 @@ public class Config : IConfig
             },
         };
 
-        [Description("The list of custom 914 recipies for roles. Original is the role to be changed, New is the new role to assign, Chance is the % chance of the upgrade occuring.")]
+        [Description("The list of custom 914 recipies for roles. Original is the role to be changed, New is the new role to assign, Chance is the % chance of the upgrade occuring. For custom roles use the role's name.")]
         public Dictionary<Scp914KnobSetting, List<PlayerUpgradeChance>> Scp914ClassChanges { get; set; } = new()
         {
             {
@@ -228,8 +228,16 @@ public class Config : IConfig
         [Description("If item cleanup should only happen in the Pocket Dimension or not.")]
         public bool ItemCleanupOnlyPocket { get; set; } = false;
 
-        [Description("A list of all roles and their damage modifiers. The number here is a multiplier, not a raw damage amount. Thus, setting it to 1 = normal damage, 1.5 = 50% more damage, and 0.5 = 50% less damage.")]
-        public Dictionary<RoleTypeId, float> RoleDamageMultipliers { get; set; } = new()
+        [Description("A list of all roles and their damage dealt modifiers. The number here is a multiplier, not a raw damage amount. Thus, setting it to 1 = normal damage, 1.5 = 50% more damage, and 0.5 = 50% less damage.")]
+        public Dictionary<RoleTypeId, float> RoleDamageDealtMultipliers { get; set; } = new()
+        {
+            {
+                RoleTypeId.Scp173, 1.0f
+            },
+        };
+
+        [Description("List of roles and their damage received multipliers. 1 = normal damage, 1.5 = 50% more damage, 0.5 = 50% less damage.")]
+        public Dictionary<RoleTypeId, float> RoleDamageReceivedMultipliers { get; set; } = new()
         {
             {
                 RoleTypeId.Scp173, 1.0f

diff --git a/Common Utilities/EventHandlers/PlayerHandlers.cs b/Common Utilities/EventHandlers/PlayerHandlers.cs
@@ -101,9 +101,12 @@ public void OnPlayerDied(DiedEventArgs ev)
 
     public void OnPlayerHurting(HurtingEventArgs ev)
     {
-        if (config.RoleDamageMultipliers != null && ev.Attacker != null && config.RoleDamageMultipliers.TryGetValue(ev.Attacker.Role, out var damageMultiplier))
+        if (config.RoleDamageDealtMultipliers != null && ev.Attacker != null && config.RoleDamageDealtMultipliers.TryGetValue(ev.Attacker.Role, out var damageMultiplier))
             ev.Amount *= damageMultiplier;
 
+        if (config.RoleDamageReceivedMultipliers != null && config.RoleDamageReceivedMultipliers.TryGetValue(ev.Player.Role, out damageMultiplier))
+            ev.Amount *= damageMultiplier;
+
         if (config.DamageMultipliers != null && config.DamageMultipliers.TryGetValue(ev.DamageHandler.Type, out damageMultiplier))
             ev.Amount *= damageMultiplier;