added PwBomberMinimumIpFloor (5) and PwBomberSelfIpRate (0.5)

Author: Licho1

Zero-K.info/Controllers/PlanetwarsController.cs

@@ -70,19 +70,23 @@ public ActionResult BombPlanet(int planetID, int count, bool? useWarp)
                 double ipKillAmmount = ipKillCount * GlobalConst.BomberKillIpAmount;
                 if (ipKillAmmount > 0)
                 {
-                    var influenceDecayMin = planet.PlanetStructures.Where(x => x.IsActive && x.StructureType.EffectPreventInfluenceDecayBelow != null).Select(x => x.StructureType.EffectPreventInfluenceDecayBelow).OrderByDescending(x => x).FirstOrDefault() ?? 0;
+                    var structureFloor = planet.PlanetStructures.Where(x => x.IsActive && x.StructureType.EffectPreventInfluenceDecayBelow != null).Select(x => x.StructureType.EffectPreventInfluenceDecayBelow).OrderByDescending(x => x).FirstOrDefault() ?? 0;
+                    var globalFloor = DynamicConfig.Instance.PwBomberMinimumIpFloor;
+                    var selfRate = DynamicConfig.Instance.PwBomberSelfIpRate;
 
-
-                    foreach (PlanetFaction pf in planet.PlanetFactions.Where(x => x.FactionID != acc.FactionID))
+                    foreach (PlanetFaction pf in planet.PlanetFactions)
                     {
-                        pf.Influence -= ipKillAmmount;
-                        if (pf.Influence < 0) pf.Influence = 0;
-
-                        // prevent bombing below influence decaymin for owner - set by active structures
-                        if (pf.FactionID == planet.OwnerFactionID && pf.Influence < influenceDecayMin) pf.Influence = influenceDecayMin;
-                    }
+                        bool isOwn = pf.FactionID == acc.FactionID;
+                        double damage = isOwn ? ipKillAmmount * selfRate : ipKillAmmount;
+                        if (damage <= 0) continue;
 
+                        // owner gets max of global floor and any structure-provided floor; everyone else gets global only
+                        double floor = (pf.FactionID == planet.OwnerFactionID) ? Math.Max(globalFloor, structureFloor) : globalFloor;
 
+                        // floor only prevents pushing below it — a faction already below the floor is not raised by bombing
+                        double effectiveFloor = Math.Min(pf.Influence, floor);
+                        pf.Influence = Math.Max(pf.Influence - damage, Math.Max(effectiveFloor, 0));
+                    }
                 }
 
                 var args = new List<object>

ZkData/Ef/DynamicConfig.cs

@@ -47,7 +47,13 @@ public class DynamicConfig
         public int PwAttackChargesMax { get; set; } = 2;
 
         [Description("PlanetWars: minutes a player must sit below max charges before gaining one passively.")]
-        public int PwAttackChargesRechargeMinutes { get; set; } = 60;        
+        public int PwAttackChargesRechargeMinutes { get; set; } = 60;
+
+        [Description("PlanetWars: fraction of enemy bomber IP damage also applied to the bomber's own faction. 0 disables self-damage.")]
+        public double PwBomberSelfIpRate { get; set; } = 0.5;
+
+        [Description("PlanetWars: minimum IP (0-100) below which bombers cannot push any faction. 0 disables the floor.")]
+        public double PwBomberMinimumIpFloor { get; set; } = 5.0;
 
 
         public static DynamicConfig Instance;

ZkData/Migrations/202604231826040_AddPwBomberNerfConfigs.Designer.cs

@@ -0,0 +1,20 @@
+namespace ZkData.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddPwBomberNerfConfigs : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.DynamicConfigs", "PwBomberSelfIpRate", c => c.Double(nullable: false, defaultValue: 0.5));
+            AddColumn("dbo.DynamicConfigs", "PwBomberMinimumIpFloor", c => c.Double(nullable: false, defaultValue: 5.0));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.DynamicConfigs", "PwBomberMinimumIpFloor");
+            DropColumn("dbo.DynamicConfigs", "PwBomberSelfIpRate");
+        }
+    }
+}

ZkData/Migrations/202604231826040_AddPwBomberNerfConfigs.cs

@@ -503,6 +503,10 @@
     <Compile Include="Migrations\202604231755110_AddStructureBlockFlags.Designer.cs">
       <DependentUpon>202604231755110_AddStructureBlockFlags.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202604231826040_AddPwBomberNerfConfigs.cs" />
+    <Compile Include="Migrations\202604231826040_AddPwBomberNerfConfigs.Designer.cs">
+      <DependentUpon>202604231826040_AddPwBomberNerfConfigs.cs</DependentUpon>
+    </Compile>
     <Compile Include="SpringFilesUnitsyncAttempt.cs" />
     <Compile Include="SteamWebApi.cs" />
     <Compile Include="UserLanguageNoteAttribute.cs" />
@@ -960,6 +964,9 @@
     <EmbeddedResource Include="Migrations\202604231755110_AddStructureBlockFlags.resx">
       <DependentUpon>202604231755110_AddStructureBlockFlags.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202604231826040_AddPwBomberNerfConfigs.resx">
+      <DependentUpon>202604231826040_AddPwBomberNerfConfigs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ZkDataResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ZkDataResources.Designer.cs</LastGenOutput>