Added Jail and some other stuff

This commit is contained in:
Cooldude2606
2019-04-16 20:46:42 +01:00
parent 0123451267
commit eb4c389673
14 changed files with 194 additions and 66 deletions

View File

@@ -7,20 +7,18 @@ local config = require 'config.compilatron'
local messages = config.messages
local locations = config.locations
local compilatrons = {}
local current_messages = {}
Global.register(
{
compilatrons = compilatrons,
current_messages = current_messages
},
function(tbl)
compilatrons = tbl.compilatrons
current_messages = tbl.current_messages
end
)
local Public = {
compilatrons={},
current_messages={}
}
local Public = {}
Global.register({
Public.compilatrons,
Public.current_messages
},function(tbl)
Public.compilatrons=tbl[1]
Public.current_messages=tbl[2]
end)
--- This will re-create the speech bubble after it de-spawns called with set_timeout
local callback =
@@ -33,17 +31,17 @@ local callback =
ent.surface.create_entity(
{name = 'compi-speech-bubble', text = messages[name][msg_number], position = {0, 0}, source = ent}
)
current_messages[name] = {message = message, msg_number = msg_number}
Public.global.current_messages[name] = {message = message, msg_number = msg_number}
end
)
--- This will move the messages onto the next message in the loop
local function circle_messages()
for name, ent in pairs(compilatrons) do
for name, ent in pairs(Public.global.compilatrons) do
if not ent.valid then
Public.spawn_compilatron(game.players[1].surface,name)
end
local current_message = current_messages[name]
local current_message = Public.global.current_messages[name]
local msg_number
local message
if current_message ~= nil then
@@ -73,12 +71,12 @@ function Public.add_compilatron(entity, name)
if name == nil then
return
end
compilatrons[name] = entity
Public.global.compilatrons[name] = entity
local message =
entity.surface.create_entity(
{name = 'compi-speech-bubble', text = messages[name][1], position = {0, 0}, source = entity}
)
current_messages[name] = {message = message, msg_number = 1}
Public.global.current_messages[name] = {message = message, msg_number = 1}
end
--- This spawns a new compilatron on a surface with the given location tag (not a position)