FACTO-188: Removed layer-13 projectile

changelog.txt

@@ -1,3 +1,8 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.1.3
+  Bugfixes:
+    - Removed layer-13 from projectiles
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.1.2
   Contribution:

data-updates.lua

@@ -24,11 +24,6 @@ if settings.startup["rampant--useDumbProjectiles"].value or settings.startup["ra
 end
 
 for _, robot in pairs(data.raw["logistic-robot"]) do
-    -- if not robot.collision_mask then
-    --     robot.collision_mask = {}
-    -- end
-    -- robot.collision_mask[#robot.collision_mask+1] = "layer-13"
-
     if (settings.startup["rampant--unkillableLogisticRobots"].value) then
         robot.resistances = {}
         for damageType, _ in pairs(data.raw["damage-type"]) do
@@ -41,11 +36,6 @@ for _, robot in pairs(data.raw["logistic-robot"]) do
 end
 
 for _, robot in pairs(data.raw["construction-robot"]) do
-    -- if not robot.collision_mask then
-    --     robot.collision_mask = {}
-    -- end
-    -- robot.collision_mask[#robot.collision_mask+1] = "layer-13"
-
     if (settings.startup["rampant--unkillableConstructionRobots"].value) then
         robot.resistances = {}
         for damageType, _ in pairs(data.raw["damage-type"]) do
@@ -57,13 +47,6 @@ for _, robot in pairs(data.raw["construction-robot"]) do
     end
 end
 
--- for _, robot in pairs(data.raw["combat-robot"]) do
---     if not robot.collision_mask then
---         robot.collision_mask = {}
---     end
---     robot.collision_mask[#robot.collision_mask+1] = "layer-13"
--- end
-
 --[[
     try to make sure new maps use the correct map settings without having to completely load the mod.
     done because seeing desync issues with dynamic map-settings changes before re-saving the map.

prototypes/utils/ProjectileUtils.lua

@@ -25,7 +25,7 @@ function projectileUtils.makeProjectile(attributes, attack)
                 name = n,
                 flags = {"not-on-map"},
                 collision_box = attributes.attackCollisionBox or {{-0.025, -0.025}, {0.025, 0.025}},
-                collision_mask = attributes.attackCollisionMask or {"layer-13"},
+                collision_mask = attributes.attackCollisionMask,
                 direction_only = attributes.attackDirectionOnly,
                 piercing_damage = attributes.attackPiercingDamage or 0,
                 acceleration = attributes.attackAcceleration or 0.000001,