diff --git a/build.sh b/build.sh index c537003..013dbe6 100755 --- a/build.sh +++ b/build.sh @@ -2,3 +2,4 @@ # add -mac, -windows, -linux, or -html if you only want one target rm -r build/* amulet export -r -d build/ -a . +amulet export -r -d build/ -a -html . diff --git a/conf.lua b/conf.lua index bcdde05..2b6ab61 100644 --- a/conf.lua +++ b/conf.lua @@ -2,7 +2,7 @@ title = "hexyz" author = "nick hayashi" shortname = "hexyz" -version = "0.1.2" +version = "0.2.0" support_email = "" copyright_message = "Copyright © 2021 Nick Hayashi" diff --git a/res/radar.png b/res/radar.png deleted file mode 100644 index 723affa..0000000 Binary files a/res/radar.png and /dev/null differ diff --git a/res/radar2.png b/res/radar2.png deleted file mode 100644 index 5e6c3bd..0000000 Binary files a/res/radar2.png and /dev/null differ diff --git a/res/radar3.png b/res/radar3.png deleted file mode 100644 index a41277d..0000000 Binary files a/res/radar3.png and /dev/null differ diff --git a/res/tab_icon.png b/res/tab_icon.png deleted file mode 100644 index 6849880..0000000 Binary files a/res/tab_icon.png and /dev/null differ diff --git a/res/thing.png b/res/thing.png deleted file mode 100644 index f16ad08..0000000 Binary files a/res/thing.png and /dev/null differ diff --git a/res/tower_howitzer_icon-export.png b/res/tower_howitzer_icon-export.png deleted file mode 100644 index 9e6417f..0000000 Binary files a/res/tower_howitzer_icon-export.png and /dev/null differ diff --git a/res/tower_radar4.png b/res/tower_radar4.png deleted file mode 100644 index 1b1e481..0000000 Binary files a/res/tower_radar4.png and /dev/null differ diff --git a/res/tower_wall.aseprite b/res/tower_wall.aseprite deleted file mode 100644 index 2bc3bb1..0000000 Binary files a/res/tower_wall.aseprite and /dev/null differ diff --git a/src/game.lua b/src/game.lua index 94935ab..766aa27 100644 --- a/src/game.lua +++ b/src/game.lua @@ -108,8 +108,8 @@ local function game_deserialize(json_string) local new_state = am.parse_json(json_string) if new_state.version ~= version then - log("loading old save data.") - return nil + log("loading incompatible old save data. starting a fresh game instead.") + return get_initial_game_state() end new_state.map = random_map(new_state.seed) diff --git a/src/grid.lua b/src/grid.lua index 2633633..3b8ac26 100644 --- a/src/grid.lua +++ b/src/grid.lua @@ -216,7 +216,8 @@ function make_hex_grid_scene(map) -- add the magenta diamond that represents 'home' world:append( - am.circle(hex_to_pixel(HEX_GRID_CENTER, vec2(HEX_SIZE)), HEX_SIZE/2, COLORS.MAGENTA, 4) + am.translate(hex_to_pixel(HEX_GRID_CENTER, vec2(HEX_SIZE))) + ^ pack_texture_into_sprite(TEXTURES.GEM1, HEX_SIZE, HEX_SIZE*1.1) ) apply_flow_field(map, generate_flow_field(map, HEX_GRID_CENTER), world)