From 2b6cb13521b8698d410ab532ee56ab72a7970106 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 26 Nov 2020 15:13:08 -0800 Subject: [PATCH 1/2] Update to Factorio 1.1 --- data-updates.lua | 6 +++--- info.json | 4 ++-- prototypes/utils/BiterUtils.lua | 2 +- prototypes/utils/ProjectileUtils.lua | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data-updates.lua b/data-updates.lua index 472994a..e53c455 100755 --- a/data-updates.lua +++ b/data-updates.lua @@ -11,7 +11,7 @@ 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-11" + -- robot.collision_mask[#robot.collision_mask+1] = "layer-13" if (settings.startup["rampant-unkillableLogisticRobots"].value) then robot.resistances = {} @@ -28,7 +28,7 @@ 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-11" + -- robot.collision_mask[#robot.collision_mask+1] = "layer-13" if (settings.startup["rampant-unkillableConstructionRobots"].value) then robot.resistances = {} @@ -45,7 +45,7 @@ end -- if not robot.collision_mask then -- robot.collision_mask = {} -- end --- robot.collision_mask[#robot.collision_mask+1] = "layer-11" +-- robot.collision_mask[#robot.collision_mask+1] = "layer-13" -- end --[[ diff --git a/info.json b/info.json index 33b0f18..ca0960b 100755 --- a/info.json +++ b/info.json @@ -1,7 +1,7 @@ { "name" : "Rampant", - "factorio_version" : "1.0", - "version" : "1.0.0", + "factorio_version" : "1.1", + "version" : "1.0.1", "title" : "Rampant", "author" : "Veden", "homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445", diff --git a/prototypes/utils/BiterUtils.lua b/prototypes/utils/BiterUtils.lua index e5220d8..1e8b4f4 100755 --- a/prototypes/utils/BiterUtils.lua +++ b/prototypes/utils/BiterUtils.lua @@ -1,6 +1,6 @@ local biterFunctions = {} -local sounds = require("__base__.prototypes.entity.demo-sounds") +local sounds = require("__base__.prototypes.entity.sounds") local particleUtils = require("ParticleUtils") local unitSpawnerUtils = require("UnitSpawnerUtils") local unitUtils = require("UnitUtils") diff --git a/prototypes/utils/ProjectileUtils.lua b/prototypes/utils/ProjectileUtils.lua index 3b610fa..7007421 100755 --- a/prototypes/utils/ProjectileUtils.lua +++ b/prototypes/utils/ProjectileUtils.lua @@ -8,7 +8,7 @@ function projectileUtils.makeProjectile(attributes, attack) name = n, flags = {"not-on-map"}, collision_box = attributes.attackCollisionBox or {{-0.01, -0.01}, {0.01, 0.01}}, - collision_mask = attributes.attackCollisionMask or {"layer-11"}, + collision_mask = attributes.attackCollisionMask or {"layer-13"}, direction_only = attributes.attackDirectionOnly, piercing_damage = attributes.attackPiercingDamage or 0, acceleration = attributes.attackAcceleration or 0.02, From ca75ad7b62ac445d0763f4299879c97b1e97ac0e Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 26 Nov 2020 15:17:25 -0800 Subject: [PATCH 2/2] Update base mod dependency --- info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.json b/info.json index ca0960b..bfbd7e6 100755 --- a/info.json +++ b/info.json @@ -6,5 +6,5 @@ "author" : "Veden", "homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445", "description" : "Improves the enemies tactics by using potential fields/pheromones allowing probing of defenses, retreats, reinforcements, counterattacking, breaching, raids, rallying death cry, and player hunting. Uses blockable biter projectiles. Adds new Enemies (disabled by default). Difficulty setting in mod options menu.", - "dependencies" : ["base >= 1.0.0", "? bobenemies", "? Natural_Evolution_Enemies >= 0.17.0", "? Clockwork", "? Orbital Ion Cannon", "? RampantArsenal", "? RampantResources", "? ArmouredBiters"] + "dependencies" : ["base >= 1.1.0", "? bobenemies", "? Natural_Evolution_Enemies >= 0.17.0", "? Clockwork", "? Orbital Ion Cannon", "? RampantArsenal", "? RampantResources", "? ArmouredBiters"] }