1
0
mirror of https://github.com/veden/Rampant.git synced 2025-03-17 20:58:35 +02:00

Merge branch 'master' of git://github.com/oralordos/Rampant

This commit is contained in:
Aaron Veden 2020-11-27 16:48:48 -08:00
commit bca0699a8b
No known key found for this signature in database
GPG Key ID: FF5990B1C6DD3F84
4 changed files with 8 additions and 8 deletions

View File

@ -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
--[[

View File

@ -1,10 +1,10 @@
{
"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",
"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"]
}

View File

@ -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")

View File

@ -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,