FACTO-176: Fixed disallowFriendlyFire not covering all attacks and

enabled disallowFriendlyFire by default

changelog.txt

@@ -7,6 +7,7 @@ Version: 3.1.2
     - Reduced resource patch pheromone when enemy structures exist on chunk by 100x
     - Increased enemy pheromone weight for pathing by 2.5x
     - Increased hive spawning outside resources chunks by 5x
+    - Changed mod setting to default to disallowFriendlyFire
   Bugfixes:
     - Fixed sent aggressive squads, builder count, squad count could be negative
     - Added missing sent and max siege groups on debug log
@@ -15,6 +16,7 @@ Version: 3.1.2
     - Fixed resource pheromone generator not be cancelled out by enemy structures
     - Fixed unit groups gathering and then being disbanded immediately after they finish gathering, which will prevent biter clumps when groups are disbanded at extreme distances from the player
     - Fixed max squads and builders being exhausted by the game engine with gathering unit groups
+    - Fixed electric biter attack causing biters to attack each other and expanded friendly fire protection to additional projectiles
   Framework:
     - Updated visualizer tool for debugging
 

prototypes/utils/AttackBall.lua

@@ -114,6 +114,7 @@ function AttackBall.createAttackBall(attributes)
         templateArea,
         {
             type = "direct",
+            force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
             action_delivery = {
                 type = "instant",
                 target_effects = targetEffects

prototypes/utils/BeamUtils.lua

@@ -16,6 +16,8 @@
 
 local beamUtils = {}
 
+local DISALLOW_FRIENDLY_FIRE = settings.startup["rampant--disallowFriendlyFire"].value
+
 function beamUtils.makeBubble(attributes)
     local name = attributes.name .. "-bubble-rampant"
     data:extend({{
@@ -53,6 +55,7 @@ function beamUtils.makeLaser(attributes)
                 action =
                     {
                         type = "direct",
+                        force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
                         action_delivery =
                             {
                                 type = "instant",
@@ -96,6 +99,7 @@ function beamUtils.makeBeam(attributes)
             action =
                 {
                     type = "direct",
+                    force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
                     action_delivery =
                         {
                             type = "instant",

prototypes/utils/BiterUtils.lua

@@ -40,6 +40,8 @@ local makeDamagedParticle = particleUtils.makeDamagedParticle
 local biter_water_reflection = unitUtils.biter_water_reflection
 local spitter_water_reflection = unitUtils.spitter_water_reflection
 
+local DISALLOW_FRIENDLY_FIRE = settings.startup["rampant--disallowFriendlyFire"].value
+
 local function makeSpitterCorpse(attributes)
     local name = attributes.name .. "-corpse-rampant"
 
@@ -1102,6 +1104,7 @@ function biterUtils.createElectricAttack(attributes, electricBeam, animation)
                             type = "line",
                             range = (attributes.range and (attributes.range + 2)) or 15,
                             width = attributes.width or 0.5,
+                            force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
                             action_delivery = (attributes.actions and attributes.actions(attributes, electricBeam)) or
                                 {
                                     type = "beam",

prototypes/utils/DroneUtils.lua

@@ -18,6 +18,8 @@ local util = require ("util")
 
 local droneUtils = {}
 
+local DISALLOW_FRIENDLY_FIRE = settings.startup["rampant--disallowFriendlyFire"].value
+
 function droneUtils.makeDrone(attributes)
     local n = attributes.name .. "-drone-rampant"
     local resistances = {}
@@ -224,6 +226,7 @@ function droneUtils.createCapsuleProjectile(attributes, entityName)
     local actions = {
         {
             type = "direct",
+            force = (DISALLOW_FRIENDLY_FIRE and "not-same") or nil,
             action_delivery =
                 {
                     type = "instant",

settings.lua

@@ -211,7 +211,7 @@ data:extend({
             type = "bool-setting",
             name = "rampant--disallowFriendlyFire",
             setting_type = "startup",
-            default_value = false,
+            default_value = true,
             order = "c[modifier]-k[trigger]",
             per_user = false
         },