1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00

Merge pull request #96 from Gerkiz/dev

Minor changes to misc and color_presets
This commit is contained in:
Gerkiz 2019-11-10 22:15:04 +01:00 committed by GitHub
commit 2fb854a06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions

View File

@ -112,8 +112,8 @@ commands.add_command(
p = log
end
end
if param > 50 then player.print("[ERROR] Value is too big.", Color.fail) return end
if param == nil then player.print("[ERROR] Must specify radius!", Color.fail) return end
if param > 50 then player.print("[ERROR] Value is too big.", Color.fail) return end
if not _a.generate_map then
_a.generate_map = true
@ -292,8 +292,9 @@ commands.add_command(
p = log
end
end
if param > 500 then player.print("[ERROR] Value is too big.", Color.warning) return end
if param == nil then player.print("[ERROR] Must specify radius!", Color.warning) return end
if param == nil then player.print("[ERROR] Must specify radius!", Color.fail) return end
if param > 500 then player.print("[ERROR] Value is too big.", Color.fail) return end
local radius = {{x = -param, y = -param}, {x = param, y = param}} or {{x = -1, y = -1}, {x = 1, y = 1}}
for _, entity in pairs(player.surface.find_entities_filtered{area = radius, type = "corpse"}) do
player.print("Cleared biter-corpses.", Color.success)

View File

@ -145,18 +145,11 @@ return {
white_smoke = {r = 245, g = 245, b = 245},
white = {r = 255, g = 255, b = 255},
jailed = {r = 255, g = 255, b = 255},
probation = {r = 255, g = 255, b = 255},
guest = {r = 255, g = 255, b = 255},
auto_trusted = {r = 192, g = 192, b = 192},
trusted = {r = 192, g = 192, b = 192},
regular = {r = 0.155, g = 0.540, b = 0.898},
admin = {r = 0.093, g = 0.768, b = 0.172},
[-10] = {r = 255, g = 255, b = 255}, -- probation
[0] = {r = 255, g = 255, b = 255}, -- guest
[10] = {r = 192, g = 192, b = 192}, -- auto_trusted
[20] = {r = 0.155, g = 0.540, b = 0.898}, -- regular
[30] = {r = 0.093, g = 0.768, b = 0.172}, -- admin
success = {r = 0, g = 255, b = 0},
warning = {r = 255, g = 255, b = 0},
fail = {r = 255, g = 0, b = 0},
fail = {r = 255, g = 51, b = 51},
info = {r = 255, g = 255, b = 255}
}