Browse Source

fix buggies

master
Nicholas Hayashi 3 years ago
parent
commit
e267286d22
  1. 10
      src/map-editor.lua
  2. 4
      src/tower.lua

10
src/map-editor.lua

@ -49,7 +49,10 @@ local map_editor_scene_menu_options = {
action = function() action = function()
win.scene:remove("menu") win.scene:remove("menu")
win.scene("context").paused = false win.scene("context").paused = false
end
end,
keys = {
"escape"
}
}, },
{ {
texture = TEXTURES.SETTINGS_HEX, texture = TEXTURES.SETTINGS_HEX,
@ -61,7 +64,10 @@ local map_editor_scene_menu_options = {
texture = TEXTURES.QUIT_HEX, texture = TEXTURES.QUIT_HEX,
action = function() action = function()
win:close() win:close()
end
end,
keys = {
"f4"
}
}, },
false false
} }

4
src/tower.lua

@ -435,7 +435,11 @@ end
function tower_deserialize(json_string) function tower_deserialize(json_string)
local tower = entity_basic_json_parse(json_string) local tower = entity_basic_json_parse(json_string)
-- @HACK weapons.last_shot_time field gets overrided with this merge, which we don't want
local weapons = tower.weapons
table.merge(tower, get_tower_spec(tower.type)) table.merge(tower, get_tower_spec(tower.type))
tower.weapons = weapons
for i,h in pairs(tower.hexes) do for i,h in pairs(tower.hexes) do
tower.hexes[i] = vec2(tower.hexes[i][1], tower.hexes[i][2]) tower.hexes[i] = vec2(tower.hexes[i][1], tower.hexes[i][2])

Loading…
Cancel
Save