mirror of
https://github.com/Refactorio/RedMew.git
synced 2024-12-12 10:04:40 +02:00
Using blur instead of value +/- based on distance to center
This commit is contained in:
Lynn
Maik Wild
parent
ab3c30bd06
commit
7e1a15eb96
@ -9,7 +9,7 @@ local Config = {
|
||||
cheats = true,
|
||||
|
||||
-- initial starting position size, values higher than 30 might break
|
||||
starting_size = 7,
|
||||
starting_size = 5,
|
||||
|
||||
-- the daytime value used for cave lighting
|
||||
daytime = 0.5,
|
||||
@ -36,14 +36,9 @@ local Config = {
|
||||
enabled = true,
|
||||
register = require 'Diggy.Feature.DiggyCaveCollapse'.register,
|
||||
initialize = require 'Diggy.Feature.DiggyCaveCollapse'.initialize,
|
||||
out_of_map_support_beam_range = 14,
|
||||
support_beam_entities = {
|
||||
{name = "stone-wall", range = 10},
|
||||
{name = "stone-brick", range = 1},
|
||||
{name = "concrete", range = 2},
|
||||
{name = "hazard-concrete", range = 2},
|
||||
{name = "refined-concrete", range = 3},
|
||||
{name = "refined-hazard-concrete", range = 3},
|
||||
{name = 'stone-wall', strength = 7},
|
||||
{name = 'sand-rock-big', strength = 5},
|
||||
},
|
||||
},
|
||||
RefreshMap = {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
-- dependencies
|
||||
local Inspect = require 'Diggy.Inspect'
|
||||
|
||||
-- this
|
||||
local Debug = {}
|
||||
@ -23,14 +24,17 @@ function Debug.disable_cheats()
|
||||
cheats = true
|
||||
end
|
||||
|
||||
local message_count = 0
|
||||
|
||||
--[[--
|
||||
Shows the given message if _DEBUG == true.
|
||||
|
||||
@param message string
|
||||
]]
|
||||
function Debug.print(message)
|
||||
message_count = message_count + 1
|
||||
if (debug) then
|
||||
game.print(message)
|
||||
game.print('[' .. message_count .. '] ' .. message)
|
||||
end
|
||||
end
|
||||
|
||||
@ -45,4 +49,13 @@ function Debug.cheat(callback)
|
||||
end
|
||||
end
|
||||
|
||||
--[[--
|
||||
Inspects T and prints it.
|
||||
]]
|
||||
function Debug.inspect(T)
|
||||
if (debug) then
|
||||
game.print(Inspect.inspect(T))
|
||||
end
|
||||
end
|
||||
|
||||
return Debug
|
||||
|
||||
@ -9,7 +9,6 @@ local Event = require 'utils.event'
|
||||
local Template = require 'Diggy.Template'
|
||||
local Mask = require 'Diggy.Mask'
|
||||
local PressureMap = require 'Diggy.PressureMap'
|
||||
local DiggyHole = require 'Diggy.Feature.DiggyHole'
|
||||
|
||||
-- this
|
||||
local DiggyCaveCollapse = {}
|
||||
@ -17,41 +16,29 @@ local DiggyCaveCollapse = {}
|
||||
--[[--
|
||||
@param surface LuaSurface
|
||||
@param position Position with x and y
|
||||
@param support_beam_range the supported range from this position
|
||||
@param support_removed boolean true if the location was removed
|
||||
@param strength positive increases pressure, negative decreases pressure
|
||||
]]
|
||||
local function update_pressure_map(surface, position, support_beam_range, support_removed)
|
||||
Mask.circle(position.x, position.y, support_beam_range, function(x, y, tile_distance_to_center)
|
||||
local fraction = 1
|
||||
local modifier = -1
|
||||
|
||||
if (support_removed) then
|
||||
modifier = 1
|
||||
end
|
||||
|
||||
if (0 ~= tile_distance_to_center) then
|
||||
fraction = tile_distance_to_center / support_beam_range
|
||||
end
|
||||
|
||||
PressureMap.add(surface, {x = x, y = y}, fraction * modifier)
|
||||
local function update_pressure_map(surface, position, strength)
|
||||
require 'Diggy.Debug'.print(position.x .. ',' .. position.y .. ' :: update_pressure_map')
|
||||
Mask.blur(position.x, position.y, strength, function (x, y, fraction)
|
||||
PressureMap.add(surface, {x = x, y = y}, fraction)
|
||||
end)
|
||||
|
||||
if (support_removed) then
|
||||
PressureMap.process_maxed_values_buffer(surface, function ()
|
||||
require 'Diggy.Debug'.print('Cave collapsed at: ' .. position.x .. ',' .. position.y)
|
||||
end)
|
||||
end
|
||||
PressureMap.process_maxed_values_buffer(surface, function (position)
|
||||
require 'Diggy.Debug'.print('Cave collapsed at: ' .. position.x .. ',' .. position.y)
|
||||
Template.insert(surface, {{name = 'lab-dark-2', position = position}})
|
||||
end)
|
||||
end
|
||||
|
||||
--[[--
|
||||
@param config Table {@see Diggy.Config}.
|
||||
@param entity LuaEntity
|
||||
@return number the range this entity supports the cave
|
||||
@return number the strength this entity supports the cave
|
||||
]]
|
||||
local function get_entity_support_range(config, entity)
|
||||
local function get_entity_strength(config, entity)
|
||||
for _, support_entity in pairs(config.features.DiggyCaveCollapse.support_beam_entities) do
|
||||
if (support_entity.name == entity.name) then
|
||||
return entity.range
|
||||
return support_entity.strength
|
||||
end
|
||||
end
|
||||
|
||||
@ -65,75 +52,68 @@ end
|
||||
]]
|
||||
function DiggyCaveCollapse.register(config)
|
||||
Event.add(defines.events.on_robot_built_entity, function(event)
|
||||
local range = get_entity_support_range(config, event.created_entity)
|
||||
local strength = get_entity_strength(config, event.created_entity)
|
||||
|
||||
if (0 == range) then
|
||||
if (0 == strength) then
|
||||
return
|
||||
end
|
||||
|
||||
update_pressure_map(event.created_entity.surface, {
|
||||
x = event.created_entity.position.x,
|
||||
y = event.created_entity.position.y,
|
||||
}, range, false)
|
||||
}, -1 * strength)
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_built_entity, function(event)
|
||||
local range = get_entity_support_range(config, event.created_entity)
|
||||
local strength = get_entity_strength(config, event.created_entity)
|
||||
|
||||
if (0 == range) then
|
||||
if (0 == strength) then
|
||||
return
|
||||
end
|
||||
|
||||
update_pressure_map(event.created_entity.surface, {
|
||||
x = event.created_entity.position.x,
|
||||
y = event.created_entity.position.y,
|
||||
}, range, false)
|
||||
}, -1 * strength)
|
||||
end)
|
||||
|
||||
Event.add(Template.events.on_entity_placed, function(event)
|
||||
local range = get_entity_support_range(config, event.entity)
|
||||
Event.add(Template.events.on_placed_entity, function(event)
|
||||
local strength = get_entity_strength(config, event.entity)
|
||||
|
||||
if (0 == range) then
|
||||
if (0 == strength) then
|
||||
return
|
||||
end
|
||||
|
||||
update_pressure_map(event.entity.surface, {
|
||||
x = event.entity.position.x,
|
||||
y = event.entity.position.y,
|
||||
}, range, false)
|
||||
end)
|
||||
|
||||
Event.add(DiggyHole.events.on_out_of_map_removed, function(event)
|
||||
update_pressure_map(event.surface, {
|
||||
x = event.position.x,
|
||||
y = event.position.y,
|
||||
}, config.features.DiggyCaveCollapse.out_of_map_support_beam_range, false)
|
||||
}, -1 * strength)
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_entity_died, function(event)
|
||||
local range = get_entity_support_range(config, event.entity)
|
||||
local strength = get_entity_strength(config, event.entity)
|
||||
|
||||
if (0 == range) then
|
||||
if (0 == strength) then
|
||||
return
|
||||
end
|
||||
|
||||
update_pressure_map(event.surface, {
|
||||
x = event.position.x,
|
||||
y = event.position.y,
|
||||
}, range, true)
|
||||
update_pressure_map(event.entity.surface, {
|
||||
x = event.entity.position.x,
|
||||
y = event.entity.position.y,
|
||||
}, strength)
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_player_mined_entity, function(event)
|
||||
local range = get_entity_support_range(config, event.entity)
|
||||
local strength = get_entity_strength(config, event.entity)
|
||||
|
||||
if (0 == range) then
|
||||
if (0 == strength) then
|
||||
return
|
||||
end
|
||||
|
||||
update_pressure_map(event.surface, {
|
||||
x = event.position.x,
|
||||
y = event.position.y,
|
||||
}, range, true)
|
||||
update_pressure_map(event.entity.surface, {
|
||||
x = event.entity.position.x,
|
||||
y = event.entity.position.y,
|
||||
}, strength)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
@ -48,8 +48,8 @@ local function diggy_hole(entity, temporary_inventory)
|
||||
local out_of_map_found = Scanner.scan_around_position(entity.surface, entity.position, 'out-of-map');
|
||||
|
||||
for _, position in pairs(out_of_map_found) do
|
||||
table.insert(tiles, {name = 'dirt-' .. math.random(1, 7), position = {position.x, position.y}})
|
||||
table.insert(rocks, {name = 'sand-rock-big', position = {position.x, position.y}})
|
||||
table.insert(tiles, {name = 'dirt-' .. math.random(1, 7), position = {x = position.x, y = position.y}})
|
||||
table.insert(rocks, {name = 'sand-rock-big', position = {x = position.x, y = position.y}})
|
||||
end
|
||||
|
||||
Template.insert(entity.surface, tiles, rocks)
|
||||
|
||||
@ -25,9 +25,10 @@ function RefreshMap.register(config)
|
||||
if (target_x < 1 and target_y < 1 and target_x > -2 and target_y > -2) then
|
||||
tile = 'lab-dark-1'
|
||||
end
|
||||
|
||||
table.insert(tiles, {
|
||||
name = tile,
|
||||
position = {target_x, target_y}
|
||||
position = {x = target_x, y = target_y}
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
@ -14,10 +14,11 @@ local SetupPlayer = {}
|
||||
]]
|
||||
function SetupPlayer.register(config)
|
||||
Event.add(defines.events.on_player_created, function (event)
|
||||
local player = game.players[event.player_index]
|
||||
Debug.cheat(function()
|
||||
local player =game.players[event.player_index]
|
||||
player.force.manual_mining_speed_modifier = 1000
|
||||
end)
|
||||
player.teleport({x = 0, y = 0})
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
@ -26,10 +26,10 @@ function StartingZone.register(config)
|
||||
local rocks = {}
|
||||
|
||||
Mask.circle(0, 0, config.starting_size, function(x, y, tile_distance_to_center)
|
||||
table.insert(tiles, {name = 'dirt-' .. math.random(1, 7), position = {x, y}})
|
||||
table.insert(tiles, {name = 'dirt-' .. math.random(1, 7), position = {x = x, y = y}})
|
||||
|
||||
if (tile_distance_to_center > config.starting_size - 2) then
|
||||
table.insert(rocks, {name = 'sand-rock-big', position = {x, y}})
|
||||
table.insert(rocks, {name = 'sand-rock-big', position = {x = x, y = y}})
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
334
Diggy/Inspect.lua
Normal file
334
Diggy/Inspect.lua
Normal file
@ -0,0 +1,334 @@
|
||||
local inspect ={
|
||||
_VERSION = 'inspect.lua 3.1.0',
|
||||
_URL = 'http://github.com/kikito/inspect.lua',
|
||||
_DESCRIPTION = 'human-readable representations of tables',
|
||||
_LICENSE = [[
|
||||
MIT LICENSE
|
||||
|
||||
Copyright (c) 2013 Enrique García Cota
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
]]
|
||||
}
|
||||
|
||||
local tostring = tostring
|
||||
|
||||
inspect.KEY = setmetatable({}, {__tostring = function() return 'inspect.KEY' end})
|
||||
inspect.METATABLE = setmetatable({}, {__tostring = function() return 'inspect.METATABLE' end})
|
||||
|
||||
local function rawpairs(t)
|
||||
return next, t, nil
|
||||
end
|
||||
|
||||
-- Apostrophizes the string if it has quotes, but not aphostrophes
|
||||
-- Otherwise, it returns a regular quoted string
|
||||
local function smartQuote(str)
|
||||
if str:match('"') and not str:match("'") then
|
||||
return "'" .. str .. "'"
|
||||
end
|
||||
return '"' .. str:gsub('"', '\\"') .. '"'
|
||||
end
|
||||
|
||||
-- \a => '\\a', \0 => '\\0', 31 => '\31'
|
||||
local shortControlCharEscapes = {
|
||||
["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n",
|
||||
["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v"
|
||||
}
|
||||
local longControlCharEscapes = {} -- \a => nil, \0 => \000, 31 => \031
|
||||
for i=0, 31 do
|
||||
local ch = string.char(i)
|
||||
if not shortControlCharEscapes[ch] then
|
||||
shortControlCharEscapes[ch] = "\\"..i
|
||||
longControlCharEscapes[ch] = string.format("\\%03d", i)
|
||||
end
|
||||
end
|
||||
|
||||
local function escape(str)
|
||||
return (str:gsub("\\", "\\\\")
|
||||
:gsub("(%c)%f[0-9]", longControlCharEscapes)
|
||||
:gsub("%c", shortControlCharEscapes))
|
||||
end
|
||||
|
||||
local function isIdentifier(str)
|
||||
return type(str) == 'string' and str:match( "^[_%a][_%a%d]*$" )
|
||||
end
|
||||
|
||||
local function isSequenceKey(k, sequenceLength)
|
||||
return type(k) == 'number'
|
||||
and 1 <= k
|
||||
and k <= sequenceLength
|
||||
and math.floor(k) == k
|
||||
end
|
||||
|
||||
local defaultTypeOrders = {
|
||||
['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4,
|
||||
['function'] = 5, ['userdata'] = 6, ['thread'] = 7
|
||||
}
|
||||
|
||||
local function sortKeys(a, b)
|
||||
local ta, tb = type(a), type(b)
|
||||
|
||||
-- strings and numbers are sorted numerically/alphabetically
|
||||
if ta == tb and (ta == 'string' or ta == 'number') then return a < b end
|
||||
|
||||
local dta, dtb = defaultTypeOrders[ta], defaultTypeOrders[tb]
|
||||
-- Two default types are compared according to the defaultTypeOrders table
|
||||
if dta and dtb then return defaultTypeOrders[ta] < defaultTypeOrders[tb]
|
||||
elseif dta then return true -- default types before custom ones
|
||||
elseif dtb then return false -- custom types after default ones
|
||||
end
|
||||
|
||||
-- custom types are sorted out alphabetically
|
||||
return ta < tb
|
||||
end
|
||||
|
||||
-- For implementation reasons, the behavior of rawlen & # is "undefined" when
|
||||
-- tables aren't pure sequences. So we implement our own # operator.
|
||||
local function getSequenceLength(t)
|
||||
local len = 1
|
||||
local v = rawget(t,len)
|
||||
while v ~= nil do
|
||||
len = len + 1
|
||||
v = rawget(t,len)
|
||||
end
|
||||
return len - 1
|
||||
end
|
||||
|
||||
local function getNonSequentialKeys(t)
|
||||
local keys, keysLength = {}, 0
|
||||
local sequenceLength = getSequenceLength(t)
|
||||
for k,_ in rawpairs(t) do
|
||||
if not isSequenceKey(k, sequenceLength) then
|
||||
keysLength = keysLength + 1
|
||||
keys[keysLength] = k
|
||||
end
|
||||
end
|
||||
table.sort(keys, sortKeys)
|
||||
return keys, keysLength, sequenceLength
|
||||
end
|
||||
|
||||
local function countTableAppearances(t, tableAppearances)
|
||||
tableAppearances = tableAppearances or {}
|
||||
|
||||
if type(t) == 'table' then
|
||||
if not tableAppearances[t] then
|
||||
tableAppearances[t] = 1
|
||||
for k,v in rawpairs(t) do
|
||||
countTableAppearances(k, tableAppearances)
|
||||
countTableAppearances(v, tableAppearances)
|
||||
end
|
||||
countTableAppearances(getmetatable(t), tableAppearances)
|
||||
else
|
||||
tableAppearances[t] = tableAppearances[t] + 1
|
||||
end
|
||||
end
|
||||
|
||||
return tableAppearances
|
||||
end
|
||||
|
||||
local copySequence = function(s)
|
||||
local copy, len = {}, #s
|
||||
for i=1, len do copy[i] = s[i] end
|
||||
return copy, len
|
||||
end
|
||||
|
||||
local function makePath(path, ...)
|
||||
local keys = {...}
|
||||
local newPath, len = copySequence(path)
|
||||
for i=1, #keys do
|
||||
newPath[len + i] = keys[i]
|
||||
end
|
||||
return newPath
|
||||
end
|
||||
|
||||
local function processRecursive(process, item, path, visited)
|
||||
if item == nil then return nil end
|
||||
if visited[item] then return visited[item] end
|
||||
|
||||
local processed = process(item, path)
|
||||
if type(processed) == 'table' then
|
||||
local processedCopy = {}
|
||||
visited[item] = processedCopy
|
||||
local processedKey
|
||||
|
||||
for k,v in rawpairs(processed) do
|
||||
processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited)
|
||||
if processedKey ~= nil then
|
||||
processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited)
|
||||
end
|
||||
end
|
||||
|
||||
local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
|
||||
if type(mt) ~= 'table' then mt = nil end -- ignore not nil/table __metatable field
|
||||
setmetatable(processedCopy, mt)
|
||||
processed = processedCopy
|
||||
end
|
||||
return processed
|
||||
end
|
||||
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
local Inspector = {}
|
||||
local Inspector_mt = {__index = Inspector}
|
||||
|
||||
function Inspector:puts(...)
|
||||
local args = {...}
|
||||
local buffer = self.buffer
|
||||
local len = #buffer
|
||||
for i=1, #args do
|
||||
len = len + 1
|
||||
buffer[len] = args[i]
|
||||
end
|
||||
end
|
||||
|
||||
function Inspector:down(f)
|
||||
self.level = self.level + 1
|
||||
f()
|
||||
self.level = self.level - 1
|
||||
end
|
||||
|
||||
function Inspector:tabify()
|
||||
self:puts(self.newline, string.rep(self.indent, self.level))
|
||||
end
|
||||
|
||||
function Inspector:alreadyVisited(v)
|
||||
return self.ids[v] ~= nil
|
||||
end
|
||||
|
||||
function Inspector:getId(v)
|
||||
local id = self.ids[v]
|
||||
if not id then
|
||||
local tv = type(v)
|
||||
id = (self.maxIds[tv] or 0) + 1
|
||||
self.maxIds[tv] = id
|
||||
self.ids[v] = id
|
||||
end
|
||||
return tostring(id)
|
||||
end
|
||||
|
||||
function Inspector:putKey(k)
|
||||
if isIdentifier(k) then return self:puts(k) end
|
||||
self:puts("[")
|
||||
self:putValue(k)
|
||||
self:puts("]")
|
||||
end
|
||||
|
||||
function Inspector:putTable(t)
|
||||
if t == inspect.KEY or t == inspect.METATABLE then
|
||||
self:puts(tostring(t))
|
||||
elseif self:alreadyVisited(t) then
|
||||
self:puts('<table ', self:getId(t), '>')
|
||||
elseif self.level >= self.depth then
|
||||
self:puts('{...}')
|
||||
else
|
||||
if self.tableAppearances[t] > 1 then self:puts('<', self:getId(t), '>') end
|
||||
|
||||
local nonSequentialKeys, nonSequentialKeysLength, sequenceLength = getNonSequentialKeys(t)
|
||||
local mt = getmetatable(t)
|
||||
|
||||
self:puts('{')
|
||||
self:down(function()
|
||||
local count = 0
|
||||
for i=1, sequenceLength do
|
||||
if count > 0 then self:puts(',') end
|
||||
self:puts(' ')
|
||||
self:putValue(t[i])
|
||||
count = count + 1
|
||||
end
|
||||
|
||||
for i=1, nonSequentialKeysLength do
|
||||
local k = nonSequentialKeys[i]
|
||||
if count > 0 then self:puts(',') end
|
||||
self:tabify()
|
||||
self:putKey(k)
|
||||
self:puts(' = ')
|
||||
self:putValue(t[k])
|
||||
count = count + 1
|
||||
end
|
||||
|
||||
if type(mt) == 'table' then
|
||||
if count > 0 then self:puts(',') end
|
||||
self:tabify()
|
||||
self:puts('<metatable> = ')
|
||||
self:putValue(mt)
|
||||
end
|
||||
end)
|
||||
|
||||
if nonSequentialKeysLength > 0 or type(mt) == 'table' then -- result is multi-lined. Justify closing }
|
||||
self:tabify()
|
||||
elseif sequenceLength > 0 then -- array tables have one extra space before closing }
|
||||
self:puts(' ')
|
||||
end
|
||||
|
||||
self:puts('}')
|
||||
end
|
||||
end
|
||||
|
||||
function Inspector:putValue(v)
|
||||
local tv = type(v)
|
||||
|
||||
if tv == 'string' then
|
||||
self:puts(smartQuote(escape(v)))
|
||||
elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or
|
||||
tv == 'cdata' or tv == 'ctype' then
|
||||
self:puts(tostring(v))
|
||||
elseif tv == 'table' then
|
||||
self:putTable(v)
|
||||
else
|
||||
self:puts('<', tv, ' ', self:getId(v), '>')
|
||||
end
|
||||
end
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
function inspect.inspect(root, options)
|
||||
options = options or {}
|
||||
|
||||
local depth = options.depth or math.huge
|
||||
local newline = options.newline or '\n'
|
||||
local indent = options.indent or ' '
|
||||
local process = options.process
|
||||
|
||||
if process then
|
||||
root = processRecursive(process, root, {}, {})
|
||||
end
|
||||
|
||||
local inspector = setmetatable({
|
||||
depth = depth,
|
||||
level = 0,
|
||||
buffer = {},
|
||||
ids = {},
|
||||
maxIds = {},
|
||||
newline = newline,
|
||||
indent = indent,
|
||||
tableAppearances = countTableAppearances(root)
|
||||
}, Inspector_mt)
|
||||
|
||||
inspector:putValue(root)
|
||||
|
||||
return table.concat(inspector.buffer)
|
||||
end
|
||||
|
||||
setmetatable(inspect, { __call = function(_, ...) return inspect.inspect(...) end })
|
||||
|
||||
return inspect
|
||||
|
||||
@ -16,11 +16,11 @@ local Mask = {}
|
||||
--[[--
|
||||
Applies a blur filter.
|
||||
|
||||
@param x_start number, center point
|
||||
@param y_start number, center point
|
||||
@param factor relative strengh of the entity to withstand the pressure
|
||||
@param x_start number center point
|
||||
@param y_start number center point
|
||||
@param factor number relative strength of the entity to withstand the pressure
|
||||
factor < 0 if entity is placed
|
||||
factor > 0 if entity is removed number
|
||||
factor > 0 if entity is removed
|
||||
@param callback function to execute on each tile within the mask callback(x, y, value)
|
||||
]]
|
||||
function Mask.blur(x_start, y_start, factor, callback)
|
||||
|
||||
@ -107,9 +107,11 @@ function PressureMap.add(surface, position, fraction)
|
||||
|
||||
local pressure_map = get_pressure_map(surface)
|
||||
|
||||
fraction = add_fraction(pressure_map, position, fraction)
|
||||
local new = add_fraction(pressure_map, position, fraction)
|
||||
require 'Diggy.Debug'.print(position.x .. ',' .. position.y .. ' :: ' .. fraction .. ' --> ' .. new)
|
||||
|
||||
if (fraction >= 1 ) then
|
||||
if (new >= 1 ) then
|
||||
require 'Diggy.Debug'.print(position.x .. ',' .. position.y .. ' :: ADDING TO BUFFER ' .. new)
|
||||
table.insert(pressure_map.maxed_values_buffer, position)
|
||||
end
|
||||
end
|
||||
|
||||
@ -2,7 +2,11 @@
|
||||
local Template = {}
|
||||
|
||||
Template.events = {
|
||||
on_entity_placed = script.generate_event_name()
|
||||
--[[--
|
||||
When an entity is placed via the template function.
|
||||
- event.entity LuaEntity
|
||||
]]
|
||||
on_placed_entity = script.generate_event_name(),
|
||||
}
|
||||
|
||||
--[[--
|
||||
@ -23,9 +27,11 @@ function Template.insert(surface, tiles, entities)
|
||||
surface.set_tiles(tiles)
|
||||
|
||||
for _, entity in pairs(entities) do
|
||||
surface.create_entity(entity)
|
||||
|
||||
script.raise_event(Template.events.on_entity_placed, {entity = entity})
|
||||
entity = surface.create_entity(entity)
|
||||
if (nil == entity) then
|
||||
error('Failed creating entity ' .. entity.name .. ' on surface.')
|
||||
end
|
||||
script.raise_event(Template.events.on_placed_entity, {entity = entity})
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
_DEBUG = false
|
||||
_DEBUG = true
|
||||
MARKET_ITEM = 'coin'
|
||||
|
||||
global.scenario = {}
|
||||
|
||||
@ -32,6 +32,8 @@ require 'paint'
|
||||
require 'score'
|
||||
require 'popup'
|
||||
|
||||
require 'Diggy.Scenario'.register(_DEBUG)
|
||||
|
||||
|
||||
local Event = require 'utils.event'
|
||||
local Donators = require 'resources.donators'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user