lustlion/Mothback
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prompt box style, entity prompts improvement, killing entities and particles improvement

Browse Source
This commit is contained in:
lustlion
2022-03-11 13:04:36 +01:00
parent 8c8e4808ad
commit 96b1e750e4
6 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
code/spawn.lua
View File

@@ -76,25 +76,35 @@ function promptSpawnArchetype()
local f = loadstring("return "..prompt.input)
if f ~= nil then
local succ, arch = pcall(f)
print(succ, arch)
print("archetype changed --",succ)
print("from: ", spawn.archetype.type)
if not succ
or type(arch) ~= "table"
or type(arch.type) ~= "string"
then
arch = spawn.archetype
end
print(succ, arch)
print("to: ", arch.type)
spawn.archetype = arch
else
print("invalid input for prompt "..prompt.name)
end
end,
})
prompt.pos.x = spawn.args[1] - Camera.pos.x - offset_x
prompt.pos.y = spawn.args[2] - Camera.pos.y - offset_y
prompt.pos.x = (spawn.args[1]-4)*game.scale - Camera.pos.x - offset_x
prompt.pos.y = (spawn.args[2]-20)*game.scale - Camera.pos.y - offset_y
prompt:activate()
end
end
end
function checkArgsAreInvalid(args)
for _, arg in pairs(args) do
if arg == nil then return true end
end
end
function promptSpawnArgs()
if Prompt.active_prompt then
Prompt.active_prompt.canceled = true
@@ -111,18 +121,25 @@ function promptSpawnArgs()
name = "args",
input = text,
func = function(prompt)
local f = loadstring("return {"..prompt.input.."}")
if f == nil then
spawn.args = arch
if f ~= nil then
local succ, args = pcall(f)
print("args changed --",succ)
print("from: ", unpack(args))
if not succ
or checkArgsAreInvalid(args)
then
args = spawn.args
end
print("to: ", unpack(args))
spawn.args = args
else
spawn.args = f()
print("invalid input for prompt "..prompt.name)
end
end,
})
prompt.pos.x = spawn.args[1] - Camera.pos.x - offset_x
prompt.pos.y = spawn.args[2] - Camera.pos.y - offset_y
prompt.pos.x = (spawn.args[1]-4)*game.scale - Camera.pos.x - offset_x
prompt.pos.y = (spawn.args[2]-4)*game.scale - Camera.pos.y - offset_y
prompt:activate()
end
end