From 284cb96fd21c56e325e6adfc9507f93d20c6bf5f Mon Sep 17 00:00:00 2001
From: Luan Santos <github@luan.sh>
Date: Wed, 8 Nov 2023 17:04:13 -0800
Subject: [PATCH] feat: zones brush/editor (#56)

---
 data/menubar.xml               |   2 +
 source/CMakeLists.txt          |   3 +
 source/brush.cpp               |   2 +
 source/brush.h                 |   7 +
 source/common.cpp              |  30 ++---
 source/common.h                |   2 +-
 source/common_windows.cpp      |  12 +-
 source/common_windows.h        |   3 +-
 source/editor.cpp              |  25 +++-
 source/gui.h                   |   2 +
 source/gui_ids.h               |   7 +
 source/iomap_otbm.cpp          | 119 ++++++++++++++++-
 source/iomap_otbm.h            |   8 +-
 source/main_menubar.cpp        |  36 +++++-
 source/main_menubar.h          |   4 +
 source/map.cpp                 |  85 +++++++++++-
 source/map.h                   |  11 ++
 source/map_display.cpp         |   6 +-
 source/map_drawer.cpp          |  23 +++-
 source/monster_brush.cpp       |  15 ++-
 source/monster_brush.h         |   1 +
 source/npc_brush.cpp           |   1 -
 source/numbertextctrl.cpp      |   2 +-
 source/palette_common.cpp      |   2 +
 source/palette_monster.cpp     |  22 ++++
 source/palette_monster.h       |   3 +
 source/palette_window.cpp      |  20 +++
 source/palette_window.h        |   3 +
 source/palette_zones.cpp       | 227 +++++++++++++++++++++++++++++++++
 source/palette_zones.h         |  70 ++++++++++
 source/preferences.cpp         |  29 ++++-
 source/preferences.h           |   1 +
 source/settings.cpp            |   2 +
 source/settings.h              |   2 +
 source/spawn_monster_brush.cpp |  22 +++-
 source/spawn_monster_brush.h   |   7 +
 source/tile.cpp                |   3 +
 source/tile.h                  |  16 +++
 source/tileset.h               |   1 +
 source/zone_brush.cpp          |  56 ++++++++
 source/zone_brush.h            |  60 +++++++++
 source/zones.cpp               |  67 ++++++++++
 source/zones.h                 |  64 ++++++++++
 vcproj/Project/RME.vcxproj     |  17 ++-
 44 files changed, 1051 insertions(+), 49 deletions(-)
 create mode 100644 source/palette_zones.cpp
 create mode 100644 source/palette_zones.h
 create mode 100644 source/zone_brush.cpp
 create mode 100644 source/zone_brush.h
 create mode 100644 source/zones.cpp
 create mode 100644 source/zones.h

diff --git a/data/menubar.xml b/data/menubar.xml
index 2d1eb472..391960ed 100644
--- a/data/menubar.xml
+++ b/data/menubar.xml
@@ -80,6 +80,7 @@
         <item name="Replace Items on Selection" action="REPLACE_ON_SELECTION_ITEMS" help="Replace items on selected area."/>
         <item name="Find Item on Selection" action="SEARCH_ON_SELECTION_ITEM" help="Find items on selected area."/>
         <item name="Remove Item on Selection" action="REMOVE_ON_SELECTION_ITEM" help="Remove item on selected area."/>
+        <item name="Remove Monsters on Selection" action="REMOVE_ON_SELECTION_MONSTER" help="Remove monsters on selected area."/>
         <separator/>
         <menu name="$Find on Selection">
             <item name="Find $Everything" action="SEARCH_ON_SELECTION_EVERYTHING" help="Find all unique/action/text/container items."/>
@@ -157,6 +158,7 @@
         <item name="$Creature Palette" hotkey="C" action="SELECT_MONSTER" help="Select the Creature palette."/>
         <item name="$Npc Palette" hotkey="N" action="SELECT_NPC" help="Select the Npc palette."/>
         <item name="$Waypoint Palette" hotkey="W" action="SELECT_WAYPOINT" help="Select the Waypoint palette."/>
+        <item name="$Zones Palette" hotkey="Z" action="SELECT_ZONES" help="Select the Zones palette."/>
         <item name="$RAW Palette" hotkey="R" action="SELECT_RAW" help="Select the RAW palette."/>
     </menu>
     <!--
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index d2c37971..752de380 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -171,6 +171,7 @@ target_sources(${PROJECT_NAME}
 	palette_house.cpp
 	palette_npc.cpp
 	palette_waypoints.cpp
+	palette_zones.cpp
 	palette_window.cpp
 	pngfiles.cpp
 	preferences.cpp
@@ -199,6 +200,8 @@ target_sources(${PROJECT_NAME}
 	waypoint_brush.cpp
 	waypoints.cpp
 	welcome_dialog.cpp
+	zone_brush.cpp
+	zones.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/source/brush.cpp b/source/brush.cpp
index 391ddbc5..949a24cf 100644
--- a/source/brush.cpp
+++ b/source/brush.cpp
@@ -31,6 +31,7 @@
 #include "table_brush.h"
 #include "wall_brush.h"
 #include "waypoint_brush.h"
+#include "zone_brush.h"
 
 #include "settings.h"
 
@@ -87,6 +88,7 @@ void Brushes::init() {
 	addBrush(g_gui.rook_brush = newd FlagBrush(TILESTATE_NOPVP));
 	addBrush(g_gui.nolog_brush = newd FlagBrush(TILESTATE_NOLOGOUT));
 	addBrush(g_gui.pvp_brush = newd FlagBrush(TILESTATE_PVPZONE));
+	addBrush(g_gui.zone_brush = newd ZoneBrush());
 
 	GroundBrush::init();
 	WallBrush::init();
diff --git a/source/brush.h b/source/brush.h
index b58454b4..d59fad79 100644
--- a/source/brush.h
+++ b/source/brush.h
@@ -54,6 +54,7 @@ class HouseExitBrush;
 class WaypointBrush;
 class FlagBrush;
 class EraserBrush;
+class ZoneBrush;
 
 //=============================================================================
 // Brushes, holds all brushes
@@ -188,6 +189,9 @@ class Brush {
 	virtual bool isWaypoint() const {
 		return false;
 	}
+	virtual bool isZone() const {
+		return false;
+	}
 	virtual bool isFlag() const {
 		return false;
 	}
@@ -252,6 +256,9 @@ class Brush {
 	virtual EraserBrush* asEraser() {
 		return nullptr;
 	}
+	virtual ZoneBrush* asZone() {
+		return nullptr;
+	}
 
 	bool visibleInPalette() const {
 		return visible;
diff --git a/source/common.cpp b/source/common.cpp
index fe88f6f7..106c3d41 100644
--- a/source/common.cpp
+++ b/source/common.cpp
@@ -187,7 +187,7 @@ bool posFromClipboard(int &x, int &y, int &z) {
 			std::vector<int> values;
 			wxTextDataObject data;
 			wxTheClipboard->GetData(data);
-			wxString text = data.GetText();
+			auto text = data.GetText().ToStdString();
 
 			if (text.size() < 50) {
 				bool r = false;
@@ -254,26 +254,26 @@ bool posToClipboard(int x, int y, int z, int format) {
 	return true;
 }
 
-bool posToClipboard(int fromx, int fromy, int fromz, int tox, int toy, int toz) {
+bool posToClipboard(int fromx, int fromy, int fromz, int tox, int toy, int toz, int format) {
 	if (!wxTheClipboard->Open()) {
 		return false;
 	}
 
-	std::ostringstream clip;
-	clip << "{";
-	clip << "fromx = " << fromx << ", ";
-	clip << "tox = " << tox << ", ";
-	clip << "fromy = " << fromy << ", ";
-	clip << "toy = " << toy << ", ";
-	if (fromz != toz) {
-		clip << "fromz = " << fromz << ", ";
-		clip << "toz = " << toz;
-	} else {
-		clip << "z = " << fromz;
+	wxTextDataObject* data = new wxTextDataObject();
+
+	switch (format) {
+		case 0:
+			data->SetText(wxString::Format("{fromx = %d, tox = %d, fromy = %d, toy = %d, fromz = %d, toz = %d}", fromx, tox, fromy, toy, fromz, toz));
+			break;
+		case 1:
+			data->SetText(wxString::Format("{ x = %d, y = %d, z = %d }, { x = %d, y = %d, z = %d }", fromx, fromy, fromz, tox, toy, toz));
+			break;
+		case 2:
+			data->SetText(wxString::Format("Position(%d, %d, %d), Position(%d, %d, %d)", fromx, fromy, fromz, tox, toy, toz));
+			break;
 	}
-	clip << "}";
 
-	wxTheClipboard->SetData(new wxTextDataObject(clip.str()));
+	wxTheClipboard->SetData(data);
 	wxTheClipboard->Close();
 	return true;
 }
diff --git a/source/common.h b/source/common.h
index b0a1bbf4..1b0474f7 100644
--- a/source/common.h
+++ b/source/common.h
@@ -68,7 +68,7 @@ std::string wstring2string(const std::wstring &widestring);
 // Gets position values from ClipBoard
 bool posFromClipboard(int &x, int &y, int &z);
 bool posToClipboard(int x, int y, int z, int format);
-bool posToClipboard(int fromx, int fromy, int fromz, int tox, int toy, int toz);
+bool posToClipboard(int fromx, int fromy, int fromz, int tox, int toy, int toz, int format);
 
 // Returns 'yes' if the defined value is true or 'no' if it is false.
 wxString b2yn(bool v);
diff --git a/source/common_windows.cpp b/source/common_windows.cpp
index 2f205f5d..f49d4b30 100644
--- a/source/common_windows.cpp
+++ b/source/common_windows.cpp
@@ -122,6 +122,14 @@ MapPropertiesWindow::MapPropertiesWindow(wxWindow* parent, MapTab* view, Editor
 		house_filename_ctrl = newd wxTextCtrl(this, wxID_ANY, wxstr(map.getHouseFilename())), 1, wxEXPAND
 	);
 
+	grid_sizer->Add(
+		newd wxStaticText(this, wxID_ANY, "External zone file")
+	);
+
+	grid_sizer->Add(
+		zone_filename_ctrl = newd wxTextCtrl(this, wxID_ANY, wxstr(map.getZoneFilename())), 1, wxEXPAND
+	);
+
 	grid_sizer->Add(
 		newd wxStaticText(this, wxID_ANY, "External monster file")
 	);
@@ -341,6 +349,7 @@ void MapPropertiesWindow::OnClickOK(wxCommandEvent &WXUNUSED(event)) {
 	map.setHouseFilename(nstr(house_filename_ctrl->GetValue()));
 	map.setSpawnMonsterFilename(nstr(spawn_filename_ctrl->GetValue()));
 	map.setSpawnNpcFilename(nstr(spawn_npc_filename_ctrl->GetValue()));
+	map.setZoneFilename(nstr(zone_filename_ctrl->GetValue()));
 
 	// Only resize if we have to
 	int new_map_width = width_spin->GetValue();
@@ -1028,12 +1037,11 @@ wxCoord FindDialogListBox::OnMeasureItem(size_t n) const {
 // wxListBox that can be sorted
 
 SortableListBox::SortableListBox(wxWindow* parent, wxWindowID id, const wxPoint &pos, const wxSize &size) :
-	wxListBox(parent, id, pos, size, 0, nullptr, wxLB_SINGLE | wxLB_NEEDED_SB) { }
+	wxCheckListBox(parent, id, pos, size, 0, nullptr, wxLB_SINGLE | wxLB_NEEDED_SB) { }
 
 SortableListBox::~SortableListBox() { }
 
 void SortableListBox::Sort() {
-
 	if (GetCount() == 0) {
 		return;
 	}
diff --git a/source/common_windows.h b/source/common_windows.h
index 47ad61cd..8923ab2d 100644
--- a/source/common_windows.h
+++ b/source/common_windows.h
@@ -73,6 +73,7 @@ class MapPropertiesWindow : public wxDialog {
 	wxTextCtrl* house_filename_ctrl;
 	wxTextCtrl* spawn_filename_ctrl;
 	wxTextCtrl* spawn_npc_filename_ctrl;
+	wxTextCtrl* zone_filename_ctrl;
 
 	DECLARE_EVENT_TABLE();
 };
@@ -177,7 +178,7 @@ class FindDialogListBox : public wxVListBox {
  * A wxListBox that can be sorted without using style wxLB_SORT.
  * wxLB_SORT does not work properly on Windows and causes errors on macOS.
  */
-class SortableListBox : public wxListBox {
+class SortableListBox : public wxCheckListBox {
 public:
 	SortableListBox(wxWindow* parent, wxWindowID id, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
 	~SortableListBox();
diff --git a/source/editor.cpp b/source/editor.cpp
index 931a9602..2ce4c9e7 100644
--- a/source/editor.cpp
+++ b/source/editor.cpp
@@ -86,6 +86,7 @@ Editor::Editor(CopyBuffer &copybuffer) :
 	map.spawnmonsterfile = sname + "-monster.xml";
 	map.spawnnpcfile = sname + "-npc.xml";
 	map.housefile = sname + "-house.xml";
+	map.zonefile = sname + "-zones.xml";
 	map.description = "No map description available.";
 	map.unnamed = true;
 
@@ -278,6 +279,8 @@ void Editor::saveMap(FileName filename, bool showdialog) {
 		map.spawnnpcfile = nstr(_name.GetFullName());
 		_name.SetName(filename.GetName() + "-house");
 		map.housefile = nstr(_name.GetFullName());
+		_name.SetName(filename.GetName() + "-zones");
+		map.zonefile = nstr(_name.GetFullName());
 
 		map.unnamed = false;
 	}
@@ -289,7 +292,7 @@ void Editor::saveMap(FileName filename, bool showdialog) {
 
 	// Make temporary backups
 	// converter.Assign(wxstr(savefile));
-	std::string backup_otbm, backup_house, backup_spawn, backup_spawn_npc;
+	std::string backup_otbm, backup_house, backup_spawn, backup_spawn_npc, backup_zones;
 
 	if (converter.GetExt() == "otgz") {
 		save_otgz = true;
@@ -325,6 +328,13 @@ void Editor::saveMap(FileName filename, bool showdialog) {
 			std::remove(backup_spawn_npc.c_str());
 			std::rename((map_path + map.spawnnpcfile).c_str(), backup_spawn_npc.c_str());
 		}
+
+		converter.SetFullName(wxstr(map.zonefile));
+		if (converter.FileExists()) {
+			backup_zones = map_path + nstr(converter.GetName()) + ".xml~";
+			std::remove(backup_zones.c_str());
+			std::rename((map_path + map.zonefile).c_str(), backup_zones.c_str());
+		}
 	}
 
 	// Save the map
@@ -383,6 +393,12 @@ void Editor::saveMap(FileName filename, bool showdialog) {
 				std::rename(backup_spawn_npc.c_str(), std::string(spawnnpc_filename + ".xml").c_str());
 			}
 
+			if (!backup_zones.empty()) {
+				converter.SetFullName(wxstr(map.zonefile));
+				std::string zones_filename = map_path + nstr(converter.GetName());
+				std::rename(backup_zones.c_str(), std::string(zones_filename + ".xml").c_str());
+			}
+
 			// Display the error
 			g_gui.PopupDialog("Error", "Could not save, unable to open target for writing.", wxOK);
 		}
@@ -442,12 +458,19 @@ void Editor::saveMap(FileName filename, bool showdialog) {
 			std::string spawnnpc_filename = map_path + nstr(converter.GetName());
 			std::rename(backup_spawn_npc.c_str(), std::string(spawnnpc_filename + "." + date.str() + ".xml").c_str());
 		}
+
+		if (!backup_zones.empty()) {
+			converter.SetFullName(wxstr(map.zonefile));
+			std::string zones_filename = map_path + nstr(converter.GetName());
+			std::rename(backup_zones.c_str(), std::string(zones_filename + "." + date.str() + ".xml").c_str());
+		}
 	} else {
 		// Delete the temporary files
 		std::remove(backup_otbm.c_str());
 		std::remove(backup_house.c_str());
 		std::remove(backup_spawn.c_str());
 		std::remove(backup_spawn_npc.c_str());
+		std::remove(backup_zones.c_str());
 	}
 
 	clearChanges();
diff --git a/source/gui.h b/source/gui.h
index fdb32570..9ed11227 100644
--- a/source/gui.h
+++ b/source/gui.h
@@ -29,6 +29,7 @@
 #include "map_tab.h"
 #include "palette_window.h"
 #include "client_version.h"
+#include "zone_brush.h"
 
 class BaseMap;
 class Map;
@@ -443,6 +444,7 @@ class GUI {
 	FlagBrush* rook_brush;
 	FlagBrush* nolog_brush;
 	FlagBrush* pvp_brush;
+	ZoneBrush* zone_brush;
 
 protected:
 	//=========================================================================
diff --git a/source/gui_ids.h b/source/gui_ids.h
index 141a27aa..c413540a 100644
--- a/source/gui_ids.h
+++ b/source/gui_ids.h
@@ -111,6 +111,10 @@ enum EditorActionID {
 	PALETTE_WAYPOINT_ADD_WAYPOINT,
 	PALETTE_WAYPOINT_REMOVE_WAYPOINT,
 
+	PALETTE_ZONES_LISTBOX,
+	PALETTE_ZONES_ADD_ZONE,
+	PALETTE_ZONES_REMOVE_ZONE,
+
 	PALETTE_DOODAD_USE_THICKNESS,
 	PALETTE_DOODAD_SLIDER,
 	PALETTE_BRUSHSHAPE_SQUARE,
@@ -122,13 +126,16 @@ enum EditorActionID {
 	PALETTE_TERRAIN_NOPVP_TOOL,
 	PALETTE_TERRAIN_NOLOGOUT_TOOL,
 	PALETTE_TERRAIN_PVPZONE_TOOL,
+	PALETTE_TERRAIN_ZONE_TOOL,
 
 	PALETTE_MONSTER_TILESET_CHOICE,
 	PALETTE_MONSTER_LISTBOX,
+	PALETTE_MONSTER_SEARCH,
 	PALETTE_MONSTER_BRUSH_BUTTON,
 	PALETTE_SPAWN_MONSTER_BRUSH_BUTTON,
 	PALETTE_MONSTER_SPAWN_TIME,
 	PALETTE_MONSTER_SPAWN_SIZE,
+	PALETTE_MONSTER_SPAWN_DENSITY,
 
 	PALETTE_NPC_TILESET_CHOICE,
 	PALETTE_NPC_LISTBOX,
diff --git a/source/iomap_otbm.cpp b/source/iomap_otbm.cpp
index 56806f15..04a23ead 100644
--- a/source/iomap_otbm.cpp
+++ b/source/iomap_otbm.cpp
@@ -632,6 +632,10 @@ bool IOMapOTBM::loadMap(Map &map, const FileName &filename) {
 		warning("Failed to load houses.");
 		map.housefile = nstr(filename.GetName()) + "-house.xml";
 	}
+	if (!loadZones(map, filename)) {
+		warning("Failed to load zones.");
+		map.zonefile = nstr(filename.GetName()) + "-zones.xml";
+	}
 	if (!loadSpawnsMonster(map, filename)) {
 		warning("Failed to load monsters spawns.");
 		map.spawnmonsterfile = nstr(filename.GetName()) + "-monster.xml";
@@ -730,6 +734,12 @@ bool IOMapOTBM::loadMap(Map &map, NodeFileReadHandle &f) {
 				}
 				break;
 			}
+			case OTBM_ATTR_EXT_ZONE_FILE: {
+				if (!mapHeaderNode->getString(map.zonefile)) {
+					warning("Invalid map zonefile tag");
+				}
+				break;
+			}
 			case OTBM_ATTR_EXT_SPAWN_NPC_FILE: {
 				if (!mapHeaderNode->getString(map.spawnnpcfile)) {
 					warning("Invalid map spawnnpcfile tag");
@@ -836,22 +846,36 @@ bool IOMapOTBM::loadMap(Map &map, NodeFileReadHandle &f) {
 
 					// printf("Didn't die in loop\n");
 
-					for (BinaryNode* itemNode = tileNode->getChild(); itemNode != nullptr; itemNode = itemNode->advance()) {
+					for (BinaryNode* childNode = tileNode->getChild(); childNode != nullptr; childNode = childNode->advance()) {
 						Item* item = nullptr;
-						uint8_t item_type;
-						if (!itemNode->getByte(item_type)) {
+						uint8_t node_type;
+						if (!childNode->getByte(node_type)) {
 							warning("Unknown item type %d:%d:%d", pos.x, pos.y, pos.z);
 							continue;
 						}
-						if (item_type == OTBM_ITEM) {
-							item = Item::Create_OTBM(*this, itemNode);
+						if (node_type == OTBM_ITEM) {
+							item = Item::Create_OTBM(*this, childNode);
 							if (item) {
-								if (!item->unserializeItemNode_OTBM(*this, itemNode)) {
+								if (!item->unserializeItemNode_OTBM(*this, childNode)) {
 									warning("Couldn't unserialize item attributes at %d:%d:%d", pos.x, pos.y, pos.z);
 								}
 								// reform(&map, tile, item);
 								tile->addItem(item);
 							}
+						} else if (node_type == OTBM_TILE_ZONE) {
+							uint16_t zone_count;
+							if (!childNode->getU16(zone_count)) {
+								warning("Invalid zone count at %d:%d:%d", pos.x, pos.y, pos.z);
+								continue;
+							}
+							for (uint16_t i = 0; i < zone_count; ++i) {
+								uint16_t zone_id;
+								if (!childNode->getU16(zone_id)) {
+									warning("Invalid zone id at %d:%d:%d", pos.x, pos.y, pos.z);
+									continue;
+								}
+								tile->addZone(zone_id);
+							}
 						} else {
 							warning("Unknown type of tile child node");
 						}
@@ -1183,6 +1207,41 @@ bool IOMapOTBM::loadHouses(Map &map, pugi::xml_document &doc) {
 	}
 	return true;
 }
+bool IOMapOTBM::loadZones(Map &map, const FileName &dir) {
+	std::string fn = (const char*)(dir.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).mb_str(wxConvUTF8));
+	fn += map.zonefile;
+	FileName filename(wxstr(fn));
+	if (!filename.FileExists()) {
+		return false;
+	}
+
+	pugi::xml_document doc;
+	pugi::xml_parse_result result = doc.load_file(fn.c_str());
+	if (!result) {
+		return false;
+	}
+	return loadZones(map, doc);
+}
+
+bool IOMapOTBM::loadZones(Map &map, pugi::xml_document &doc) {
+	pugi::xml_node node = doc.child("zones");
+	if (!node) {
+		warnings.push_back("IOMapOTBM::loadZones: Invalid rootheader.");
+		return false;
+	}
+
+	pugi::xml_attribute attribute;
+	for (pugi::xml_node zoneNode = node.first_child(); zoneNode; zoneNode = zoneNode.next_sibling()) {
+		if (as_lower_str(zoneNode.name()) != "zone") {
+			continue;
+		}
+
+		std::string name = zoneNode.attribute("name").as_string();
+		unsigned int id = zoneNode.attribute("zoneid").as_uint();
+		map.zones.addZone(name, id);
+	}
+	return true;
+}
 
 bool IOMapOTBM::loadSpawnsNpc(Map &map, const FileName &dir) {
 	std::string fn = (const char*)(dir.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).mb_str(wxConvUTF8));
@@ -1466,6 +1525,9 @@ bool IOMapOTBM::saveMap(Map &map, const FileName &identifier) {
 	g_gui.SetLoadDone(99, "Saving houses...");
 	saveHouses(map, identifier);
 
+	g_gui.SetLoadDone(99, "Saving zones...");
+	saveZones(map, identifier);
+
 	g_gui.SetLoadDone(99, "Saving npcs spawns...");
 	saveSpawnsNpc(map, identifier);
 	return true;
@@ -1519,6 +1581,10 @@ bool IOMapOTBM::saveMap(Map &map, NodeFileWriteHandle &f) {
 			f.addU8(OTBM_ATTR_EXT_HOUSE_FILE);
 			f.addString(nstr(tmpName.GetFullName()));
 
+			tmpName.Assign(wxstr(map.zonefile));
+			f.addU8(OTBM_ATTR_EXT_ZONE_FILE);
+			f.addString(nstr(tmpName.GetFullName()));
+
 			// Start writing tiles
 			uint32_t tiles_saved = 0;
 			bool first = true;
@@ -1603,6 +1669,14 @@ bool IOMapOTBM::saveMap(Map &map, NodeFileWriteHandle &f) {
 						item->serializeItemNode_OTBM(self, f);
 					}
 				}
+				if (!save_tile->zones.empty()) {
+					f.addNode(OTBM_TILE_ZONE);
+					f.addU16(save_tile->zones.size());
+					for (const auto &zoneId : save_tile->zones) {
+						f.addU16(zoneId);
+					}
+					f.endNode();
+				}
 
 				f.endNode();
 				++map_iterator;
@@ -1769,6 +1843,39 @@ bool IOMapOTBM::saveHouses(Map &map, pugi::xml_document &doc) {
 	return true;
 }
 
+bool IOMapOTBM::saveZones(Map &map, const FileName &dir) {
+	wxString filepath = dir.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME);
+	filepath += wxString(map.zonefile.c_str(), wxConvUTF8);
+
+	// Create the XML file
+	pugi::xml_document doc;
+	if (saveZones(map, doc)) {
+		return doc.save_file(filepath.wc_str(), "\t", pugi::format_default, pugi::encoding_utf8);
+	}
+	return false;
+}
+
+bool IOMapOTBM::saveZones(Map &map, pugi::xml_document &doc) {
+	pugi::xml_node decl = doc.prepend_child(pugi::node_declaration);
+	if (!decl) {
+		return false;
+	}
+
+	decl.append_attribute("version") = "1.0";
+
+	pugi::xml_node zoneNodes = doc.append_child("zones");
+	for (const auto &[name, id] : map.zones) {
+		if (id <= 0) {
+			continue;
+		}
+		pugi::xml_node zoneNode = zoneNodes.append_child("zone");
+
+		zoneNode.append_attribute("name") = name.c_str();
+		zoneNode.append_attribute("zoneid") = id;
+	}
+	return true;
+}
+
 bool IOMapOTBM::saveSpawnsNpc(Map &map, const FileName &dir) {
 	wxString filepath = dir.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME);
 	filepath += wxString(map.spawnnpcfile.c_str(), wxConvUTF8);
diff --git a/source/iomap_otbm.h b/source/iomap_otbm.h
index 782d7086..c8ea8e39 100644
--- a/source/iomap_otbm.h
+++ b/source/iomap_otbm.h
@@ -47,6 +47,7 @@ enum OTBM_ItemAttribute {
 	OTBM_ATTR_SLEEPSTART = 21,
 	OTBM_ATTR_CHARGES = 22,
 	OTBM_ATTR_EXT_SPAWN_NPC_FILE = 23,
+	OTBM_ATTR_EXT_ZONE_FILE = 24,
 
 	OTBM_ATTR_ATTRIBUTE_MAP = 128
 };
@@ -69,7 +70,8 @@ enum OTBM_NodeTypes_t {
 	OTBM_WAYPOINTS = 15,
 	OTBM_WAYPOINT = 16,
 	OTBM_SPAWN_NPC_AREA = 17,
-	OTBM_SPAWNS_NPC = 18
+	OTBM_SPAWNS_NPC = 18,
+	OTBM_TILE_ZONE = 19
 };
 
 struct OTBM_root_header {
@@ -133,6 +135,8 @@ class IOMapOTBM : public IOMap {
 	bool loadHouses(Map &map, pugi::xml_document &doc);
 	bool loadSpawnsNpc(Map &map, const FileName &dir);
 	bool loadSpawnsNpc(Map &map, pugi::xml_document &doc);
+	bool loadZones(Map &map, const FileName &dir);
+	bool loadZones(Map &map, pugi::xml_document &doc);
 
 	virtual bool saveMap(Map &map, NodeFileWriteHandle &handle);
 	bool saveSpawns(Map &map, const FileName &dir);
@@ -141,6 +145,8 @@ class IOMapOTBM : public IOMap {
 	bool saveHouses(Map &map, pugi::xml_document &doc);
 	bool saveSpawnsNpc(Map &map, const FileName &dir);
 	bool saveSpawnsNpc(Map &map, pugi::xml_document &doc);
+	bool saveZones(Map &map, const FileName &dir);
+	bool saveZones(Map &map, pugi::xml_document &doc);
 };
 
 #endif
diff --git a/source/main_menubar.cpp b/source/main_menubar.cpp
index 4c4bbd87..1e2857b8 100644
--- a/source/main_menubar.cpp
+++ b/source/main_menubar.cpp
@@ -87,6 +87,7 @@ MainMenuBar::MainMenuBar(MainFrame* frame) :
 	MAKE_ACTION(SEARCH_ON_SELECTION_ITEM, wxITEM_NORMAL, OnSearchForItemOnSelection);
 	MAKE_ACTION(REPLACE_ON_SELECTION_ITEMS, wxITEM_NORMAL, OnReplaceItemsOnSelection);
 	MAKE_ACTION(REMOVE_ON_SELECTION_ITEM, wxITEM_NORMAL, OnRemoveItemOnSelection);
+	MAKE_ACTION(REMOVE_ON_SELECTION_MONSTER, wxITEM_NORMAL, OnRemoveMonstersOnSelection);
 	MAKE_ACTION(SELECT_MODE_COMPENSATE, wxITEM_RADIO, OnSelectionTypeChange);
 	MAKE_ACTION(SELECT_MODE_LOWER, wxITEM_RADIO, OnSelectionTypeChange);
 	MAKE_ACTION(SELECT_MODE_CURRENT, wxITEM_RADIO, OnSelectionTypeChange);
@@ -175,6 +176,7 @@ MainMenuBar::MainMenuBar(MainFrame* frame) :
 	MAKE_ACTION(SELECT_NPC, wxITEM_NORMAL, OnSelectNpcPalette);
 	MAKE_ACTION(SELECT_HOUSE, wxITEM_NORMAL, OnSelectHousePalette);
 	MAKE_ACTION(SELECT_WAYPOINT, wxITEM_NORMAL, OnSelectWaypointPalette);
+	MAKE_ACTION(SELECT_ZONES, wxITEM_NORMAL, OnSelectZonesPalette);
 	MAKE_ACTION(SELECT_RAW, wxITEM_NORMAL, OnSelectRawPalette);
 
 	MAKE_ACTION(FLOOR_0, wxITEM_RADIO, OnChangeFloor);
@@ -348,6 +350,7 @@ void MainMenuBar::Update() {
 	EnableItem(SEARCH_ON_SELECTION_ITEM, has_selection && is_host);
 	EnableItem(REPLACE_ON_SELECTION_ITEMS, has_selection && is_host);
 	EnableItem(REMOVE_ON_SELECTION_ITEM, has_selection && is_host);
+	EnableItem(REMOVE_ON_SELECTION_MONSTER, has_selection && is_host);
 
 	EnableItem(CUT, has_map);
 	EnableItem(COPY, has_map);
@@ -397,6 +400,7 @@ void MainMenuBar::Update() {
 	EnableItem(SELECT_MONSTER, loaded);
 	EnableItem(SELECT_NPC, loaded);
 	EnableItem(SELECT_WAYPOINT, loaded);
+	EnableItem(SELECT_ZONES, loaded);
 	EnableItem(SELECT_RAW, loaded);
 
 	EnableItem(LIVE_START, is_local);
@@ -554,7 +558,7 @@ bool MainMenuBar::Load(const FileName &path, wxArrayString &warnings, wxString &
 	}
 
 #ifdef __LINUX__
-	const int count = 42;
+	const int count = 43;
 	wxAcceleratorEntry entries[count];
 	// Edit
 	entries[0].Set(wxACCEL_CTRL, (int)'Z', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::UNDO));
@@ -604,7 +608,8 @@ bool MainMenuBar::Load(const FileName &path, wxArrayString &warnings, wxString &
 	entries[38].Set(wxACCEL_NORMAL, (int)'C', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_MONSTER));
 	entries[39].Set(wxACCEL_NORMAL, (int)'N', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_NPC));
 	entries[40].Set(wxACCEL_NORMAL, (int)'W', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_WAYPOINT));
-	entries[41].Set(wxACCEL_NORMAL, (int)'R', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_RAW));
+	entries[41].Set(wxACCEL_NORMAL, (int)'Z', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_ZONES));
+	entries[42].Set(wxACCEL_NORMAL, (int)'R', static_cast<int>(MAIN_FRAME_MENU) + static_cast<int>(MenuBar::SELECT_RAW));
 
 	wxAcceleratorTable accelerator(count, entries);
 	frame->SetAcceleratorTable(accelerator);
@@ -1119,6 +1124,23 @@ void MainMenuBar::OnRemoveItemOnSelection(wxCommandEvent &WXUNUSED(event)) {
 	dialog.Destroy();
 }
 
+void MainMenuBar::OnRemoveMonstersOnSelection(wxCommandEvent &WXUNUSED(event)) {
+	if (!g_gui.IsEditorOpen()) {
+		return;
+	}
+
+	g_gui.GetCurrentEditor()->clearActions();
+	g_gui.CreateLoadBar("Searching monsters on selection to remove...");
+	int64_t count = RemoveMonstersOnMap(g_gui.GetCurrentMap(), true);
+	g_gui.DestroyLoadBar();
+
+	wxString msg;
+	msg << count << " monsters removed.";
+	g_gui.PopupDialog("Remove Monsters", msg, wxOK);
+	g_gui.GetCurrentMap().doChange();
+	g_gui.RefreshView();
+}
+
 void MainMenuBar::OnSelectionTypeChange(wxCommandEvent &WXUNUSED(event)) {
 	g_settings.setInteger(Config::COMPENSATED_SELECT, IsItemChecked(MenuBar::SELECT_MODE_COMPENSATE));
 
@@ -1931,13 +1953,13 @@ void MainMenuBar::OnToggleFullscreen(wxCommandEvent &WXUNUSED(event)) {
 }
 
 void MainMenuBar::OnTakeScreenshot(wxCommandEvent &WXUNUSED(event)) {
-	wxString path = wxstr(g_settings.getString(Config::SCREENSHOT_DIRECTORY));
-	if (path.size() > 0 && (path.Last() == '/' || path.Last() == '\\')) {
+	auto path = g_settings.getString(Config::SCREENSHOT_DIRECTORY);
+	if (path.size() > 0 && (path.back() == '/' || path.back() == '\\')) {
 		path = path + "/";
 	}
 
 	g_gui.GetCurrentMapTab()->GetView()->GetCanvas()->TakeScreenshot(
-		path, wxstr(g_settings.getString(Config::SCREENSHOT_FORMAT))
+		wxstr(path), wxstr(g_settings.getString(Config::SCREENSHOT_FORMAT))
 	);
 }
 
@@ -2048,6 +2070,10 @@ void MainMenuBar::OnSelectWaypointPalette(wxCommandEvent &WXUNUSED(event)) {
 	g_gui.SelectPalettePage(TILESET_WAYPOINT);
 }
 
+void MainMenuBar::OnSelectZonesPalette(wxCommandEvent &WXUNUSED(event)) {
+	g_gui.SelectPalettePage(TILESET_ZONES);
+}
+
 void MainMenuBar::OnSelectRawPalette(wxCommandEvent &WXUNUSED(event)) {
 	g_gui.SelectPalettePage(TILESET_RAW);
 }
diff --git a/source/main_menubar.h b/source/main_menubar.h
index a7039b6f..6468498f 100644
--- a/source/main_menubar.h
+++ b/source/main_menubar.h
@@ -56,6 +56,7 @@ namespace MenuBar {
 		SEARCH_ON_SELECTION_ITEM,
 		REPLACE_ON_SELECTION_ITEMS,
 		REMOVE_ON_SELECTION_ITEM,
+		REMOVE_ON_SELECTION_MONSTER,
 		SELECT_MODE_COMPENSATE,
 		SELECT_MODE_CURRENT,
 		SELECT_MODE_LOWER,
@@ -134,6 +135,7 @@ namespace MenuBar {
 		SELECT_NPC,
 		SELECT_HOUSE,
 		SELECT_WAYPOINT,
+		SELECT_ZONES,
 		SELECT_RAW,
 		FLOOR_0,
 		FLOOR_1,
@@ -244,6 +246,7 @@ class MainMenuBar : public wxEvtHandler {
 	void OnSearchForItemOnSelection(wxCommandEvent &event);
 	void OnReplaceItemsOnSelection(wxCommandEvent &event);
 	void OnRemoveItemOnSelection(wxCommandEvent &event);
+	void OnRemoveMonstersOnSelection(wxCommandEvent &event);
 
 	// Map menu
 	void OnMapEditTowns(wxCommandEvent &event);
@@ -280,6 +283,7 @@ class MainMenuBar : public wxEvtHandler {
 	void OnSelectMonsterPalette(wxCommandEvent &event);
 	void OnSelectNpcPalette(wxCommandEvent &event);
 	void OnSelectWaypointPalette(wxCommandEvent &event);
+	void OnSelectZonesPalette(wxCommandEvent &event);
 	void OnSelectRawPalette(wxCommandEvent &event);
 
 	// Floor menu
diff --git a/source/map.cpp b/source/map.cpp
index e65e3051..28eb274e 100644
--- a/source/map.cpp
+++ b/source/map.cpp
@@ -28,7 +28,8 @@ Map::Map() :
 	houses(*this),
 	has_changed(false),
 	unnamed(false),
-	waypoints(*this) {
+	waypoints(*this),
+	zones(*this) {
 	// Earliest version possible
 	// Caller is responsible for converting us to proper version
 	mapVersion.otbm = MAP_OTBM_1;
@@ -307,6 +308,58 @@ void Map::cleanInvalidTiles(bool showdialog) {
 	}
 }
 
+void Map::cleanDeletedZones(bool showdialog) {
+	if (showdialog) {
+		g_gui.CreateLoadBar("Removing deleted zones...");
+	}
+
+	uint64_t tiles_done = 0;
+
+	for (MapIterator miter = begin(); miter != end(); ++miter) {
+		Tile* tile = (*miter)->get();
+		ASSERT(tile);
+
+		if (tile->size() == 0) {
+			continue;
+		}
+
+		for (auto iter = tile->zones.begin(); iter != tile->zones.end();) {
+			if (zones.hasZone(*iter)) {
+				++iter;
+			} else {
+				iter = tile->zones.erase(iter);
+			}
+		}
+
+		++tiles_done;
+		if (showdialog && tiles_done % 0x10000 == 0) {
+			g_gui.SetLoadDone(int(tiles_done / double(getTileCount()) * 100.0));
+		}
+	}
+
+	if (showdialog) {
+		g_gui.DestroyLoadBar();
+	}
+}
+
+Position Map::getZonePosition(unsigned int zoneId) {
+	Position pos;
+	for (MapIterator miter = begin(); miter != end(); ++miter) {
+		Tile* tile = (*miter)->get();
+		ASSERT(tile);
+
+		if (tile->size() == 0) {
+			continue;
+		}
+
+		if (tile->zones.find(zoneId) != tile->zones.end()) {
+			pos = tile->getPosition();
+			break;
+		}
+	}
+	return pos;
+}
+
 bool Map::doChange() {
 	bool doupdate = !has_changed;
 	has_changed = true;
@@ -347,6 +400,11 @@ void Map::setHouseFilename(const std::string &new_housefile) {
 	unnamed = false;
 }
 
+void Map::setZoneFilename(const std::string &new_zonefile) {
+	zonefile = new_zonefile;
+	unnamed = false;
+}
+
 void Map::setSpawnMonsterFilename(const std::string &new_spawnmonsterfile) {
 	spawnmonsterfile = new_spawnmonsterfile;
 	unnamed = false;
@@ -820,3 +878,28 @@ bool Map::hasUniqueId(uint16_t uid) const {
 	auto it = std::find(uniqueIds.begin(), uniqueIds.end(), uid);
 	return it != uniqueIds.end();
 }
+
+int64_t RemoveMonstersOnMap(Map &map, bool selectedOnly) {
+	int64_t done = 0;
+	int64_t removed = 0;
+
+	MapIterator it = map.begin();
+	MapIterator end = map.end();
+
+	while (it != end) {
+		++done;
+		Tile* tile = (*it)->get();
+		if (selectedOnly && !tile->isSelected()) {
+			++it;
+			continue;
+		}
+		if (tile->monster) {
+			delete tile->monster;
+			tile->monster = nullptr;
+			++removed;
+		}
+
+		++it;
+	}
+	return removed;
+}
diff --git a/source/map.h b/source/map.h
index 2ee57ba5..c95f7a02 100644
--- a/source/map.h
+++ b/source/map.h
@@ -25,6 +25,7 @@
 #include "spawn_monster.h"
 #include "complexitem.h"
 #include "waypoints.h"
+#include "zones.h"
 #include "templates.h"
 #include "spawn_npc.h"
 
@@ -36,6 +37,8 @@ class Map : public BaseMap {
 
 	// Operations on the entire map
 	void cleanInvalidTiles(bool showdialog = false);
+	void cleanDeletedZones(bool showdialog = false);
+	Position getZonePosition(unsigned int zoneId);
 	// Save a bmp image of the minimap
 	bool exportMinimap(FileName filename, int floor = rme::MapGroundLayer, bool showdialog = false);
 	//
@@ -128,6 +131,9 @@ class Map : public BaseMap {
 	std::string getSpawnNpcFilename() const {
 		return spawnnpcfile;
 	}
+	std::string getZoneFilename() const {
+		return zonefile;
+	}
 
 	// Set some map data
 	void setWidth(int new_width);
@@ -136,6 +142,7 @@ class Map : public BaseMap {
 	void setHouseFilename(const std::string &new_housefile);
 	void setSpawnMonsterFilename(const std::string &new_spawnmonsterfile);
 	void setSpawnNpcFilename(const std::string &new_npcfile);
+	void setZoneFilename(const std::string &new_zonefile);
 
 	void flagAsNamed() noexcept {
 		unnamed = false;
@@ -166,6 +173,7 @@ class Map : public BaseMap {
 	std::string spawnmonsterfile; // The maps spawnmonsterfile
 	std::string spawnnpcfile; // The maps spawnnpcfile
 	std::string housefile; // The housefile
+	std::string zonefile; // The zonefile
 
 public:
 	Towns towns;
@@ -187,6 +195,7 @@ class Map : public BaseMap {
 
 public:
 	Waypoints waypoints;
+	Zones zones;
 
 private:
 	std::vector<uint16_t> uniqueIds;
@@ -312,4 +321,6 @@ inline int64_t RemoveItemOnMap(Map &map, RemoveIfType &condition, bool selectedO
 	return removed;
 }
 
+int64_t RemoveMonstersOnMap(Map &map, bool selectedOnly);
+
 #endif
diff --git a/source/map_display.cpp b/source/map_display.cpp
index e8ff360c..06168797 100644
--- a/source/map_display.cpp
+++ b/source/map_display.cpp
@@ -690,6 +690,8 @@ void MapCanvas::OnMouseActionClick(wxMouseEvent &event) {
 				g_gui.SelectBrush(item->getRAWBrush(), TILESET_RAW);
 			}
 		}
+	} else if (event.AltDown()) {
+		OnMouseCameraClick(event);
 	} else if (g_gui.IsSelectionMode()) {
 		Selection &selection = editor.getSelection();
 		if (isPasting()) {
@@ -1038,6 +1040,7 @@ void MapCanvas::OnMouseActionRelease(wxMouseEvent &event) {
 	int move_x = last_click_map_x - mouse_map_x;
 	int move_y = last_click_map_y - mouse_map_y;
 	int move_z = last_click_map_z - floor;
+	OnMouseCameraRelease(event);
 
 	if (g_gui.IsSelectionMode()) {
 		if (dragging && (move_x != 0 || move_y != 0 || move_z != 0)) {
@@ -1997,7 +2000,8 @@ void MapCanvas::OnCopyPosition(wxCommandEvent &WXUNUSED(event)) {
 	Position minPos = editor.getSelection().minPosition();
 	Position maxPos = editor.getSelection().maxPosition();
 	if (minPos != maxPos) {
-		posToClipboard(minPos.x, minPos.y, minPos.z, maxPos.x, maxPos.y, maxPos.z);
+		int format = g_settings.getInteger(Config::COPY_AREA_FORMAT);
+		posToClipboard(minPos.x, minPos.y, minPos.z, maxPos.x, maxPos.y, maxPos.z, format);
 	} else {
 		int format = g_settings.getInteger(Config::COPY_POSITION_FORMAT);
 		posToClipboard(minPos.x, minPos.y, minPos.z, format);
diff --git a/source/map_drawer.cpp b/source/map_drawer.cpp
index 31709565..ad9f5eaf 100644
--- a/source/map_drawer.cpp
+++ b/source/map_drawer.cpp
@@ -42,6 +42,7 @@
 #include "raw_brush.h"
 #include "table_brush.h"
 #include "waypoint_brush.h"
+#include "zone_brush.h"
 #include "light_drawer.h"
 
 DrawingOptions::DrawingOptions() {
@@ -453,6 +454,10 @@ void MapDrawer::DrawSecondaryMap(int map_z) {
 					r = r / 3 * 2;
 					b = r / 3 * 2;
 				}
+				if (options.show_special_tiles && tile->hasZone(g_gui.zone_brush->getZone())) {
+					r = r / 3 * 2;
+					b = b / 3 * 2;
+				}
 				if (options.show_special_tiles && tile->getMapFlags() & TILESTATE_NOLOGOUT) {
 					b /= 2;
 				}
@@ -1548,6 +1553,18 @@ void MapDrawer::DrawTile(TileLocation* location) {
 				b = b / 3 * 2;
 			}
 
+			bool zone_active = tile->hasZone(g_gui.zone_brush->getZone());
+			if (showspecial && zone_active) {
+				b /= 1.3;
+				r /= 1.5;
+				g /= 2;
+			}
+			if (showspecial && ((!tile->zones.empty() && !zone_active) || tile->zones.size() > 1)) {
+				r /= 1.4;
+				g /= 1.6;
+				b /= 1.3;
+			}
+
 			if (showspecial && tile->getMapFlags() & TILESTATE_NOLOGOUT) {
 				b /= 2;
 			}
@@ -1759,11 +1776,7 @@ void MapDrawer::DrawIndicator(int x, int y, int indicator, uint8_t r, uint8_t g,
 }
 
 void MapDrawer::DrawPositionIndicator(int z) {
-	if (z != pos_indicator.z
-		|| pos_indicator.x < start_x
-		|| pos_indicator.x > end_x
-		|| pos_indicator.y < start_y
-		|| pos_indicator.y > end_y) {
+	if (z != pos_indicator.z || pos_indicator.x < start_x || pos_indicator.x > end_x || pos_indicator.y < start_y || pos_indicator.y > end_y) {
 		return;
 	}
 
diff --git a/source/monster_brush.cpp b/source/monster_brush.cpp
index 88e34d4f..49db3f5e 100644
--- a/source/monster_brush.cpp
+++ b/source/monster_brush.cpp
@@ -68,6 +68,18 @@ void MonsterBrush::undraw(BaseMap* map, Tile* tile) {
 	tile->monster = nullptr;
 }
 
+void MonsterBrush::drawMonster(BaseMap* map, Tile* tile, void* parameter) {
+	ASSERT(tile);
+	ASSERT(parameter);
+	if (canDraw(map, tile->getPosition())) {
+		undraw(map, tile);
+		if (monster_type) {
+			tile->monster = newd Monster(monster_type);
+			tile->monster->setSpawnMonsterTime(*(int*)parameter);
+		}
+	}
+}
+
 void MonsterBrush::draw(BaseMap* map, Tile* tile, void* parameter) {
 	ASSERT(tile);
 	ASSERT(parameter);
@@ -78,8 +90,7 @@ void MonsterBrush::draw(BaseMap* map, Tile* tile, void* parameter) {
 				// manually place spawnMonster on location
 				tile->spawnMonster = newd SpawnMonster(1);
 			}
-			tile->monster = newd Monster(monster_type);
-			tile->monster->setSpawnMonsterTime(*(int*)parameter);
+			drawMonster(map, tile, parameter);
 		}
 	}
 }
diff --git a/source/monster_brush.h b/source/monster_brush.h
index 993b9a6d..9c4184ca 100644
--- a/source/monster_brush.h
+++ b/source/monster_brush.h
@@ -37,6 +37,7 @@ class MonsterBrush : public Brush {
 
 	virtual bool canDraw(BaseMap* map, const Position &position) const;
 	virtual void draw(BaseMap* map, Tile* tile, void* parameter);
+	void drawMonster(BaseMap* map, Tile* tile, void* parameter);
 	void draw_creature(BaseMap* map, Tile* tile);
 	virtual void undraw(BaseMap* map, Tile* tile);
 
diff --git a/source/npc_brush.cpp b/source/npc_brush.cpp
index 36e0de6b..0fe780fb 100644
--- a/source/npc_brush.cpp
+++ b/source/npc_brush.cpp
@@ -31,7 +31,6 @@ NpcBrush::NpcBrush(NpcType* type) :
 	Brush(),
 	npc_type(type) {
 	ASSERT(type->brush == nullptr);
-	type->brush /* = this*/;
 }
 
 NpcBrush::~NpcBrush() {
diff --git a/source/numbertextctrl.cpp b/source/numbertextctrl.cpp
index 7bab21cf..bbd4ca2f 100644
--- a/source/numbertextctrl.cpp
+++ b/source/numbertextctrl.cpp
@@ -80,7 +80,7 @@ void NumberTextCtrl::SetMaxValue(long value) {
 }
 
 void NumberTextCtrl::CheckRange() {
-	wxString text = GetValue();
+	auto text = GetValue().ToStdString();
 	wxString ntext;
 
 	for (size_t s = 0; s < text.size(); ++s) {
diff --git a/source/palette_common.cpp b/source/palette_common.cpp
index 1bba4651..a4cec006 100644
--- a/source/palette_common.cpp
+++ b/source/palette_common.cpp
@@ -106,6 +106,8 @@ wxString PalettePanel::GetName() const {
 			return "RAW Palette";
 		case TILESET_WAYPOINT:
 			return "Waypoint Palette";
+		case TILESET_ZONES:
+			return "Zones Palette";
 		case TILESET_UNKNOWN:
 			return "Unknown";
 	}
diff --git a/source/palette_monster.cpp b/source/palette_monster.cpp
index ddcf49c7..b54558b8 100644
--- a/source/palette_monster.cpp
+++ b/source/palette_monster.cpp
@@ -38,6 +38,8 @@ EVT_TOGGLEBUTTON(PALETTE_SPAWN_MONSTER_BRUSH_BUTTON, MonsterPalettePanel::OnClic
 
 EVT_SPINCTRL(PALETTE_MONSTER_SPAWN_TIME, MonsterPalettePanel::OnChangeSpawnMonsterTime)
 EVT_SPINCTRL(PALETTE_MONSTER_SPAWN_SIZE, MonsterPalettePanel::OnChangeSpawnMonsterSize)
+
+EVT_TEXT_ENTER(PALETTE_MONSTER_SEARCH, MonsterPalettePanel::OnChangeMonsterName)
 END_EVENT_TABLE()
 
 MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
@@ -50,6 +52,9 @@ MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
 	tileset_choice = newd wxChoice(this, PALETTE_MONSTER_TILESET_CHOICE, wxDefaultPosition, wxDefaultSize, (int)0, (const wxString*)nullptr);
 	sidesizer->Add(tileset_choice, 0, wxEXPAND);
 
+	monster_name_text = newd wxTextCtrl(this, PALETTE_MONSTER_SEARCH, "Name");
+	sidesizer->Add(monster_name_text, 0, wxEXPAND);
+
 	monster_list = newd SortableListBox(this, PALETTE_MONSTER_LISTBOX);
 	sidesizer->Add(monster_list, 1, wxEXPAND);
 	topsizer->Add(sidesizer, 1, wxEXPAND);
@@ -73,6 +78,9 @@ MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
 	grid->Add(spawn_monster_size_spin, 0, wxEXPAND);
 	spawn_monster_brush_button = newd wxToggleButton(this, PALETTE_SPAWN_MONSTER_BRUSH_BUTTON, "Place Spawn");
 	grid->Add(spawn_monster_brush_button, 0, wxEXPAND);
+	grid->Add(newd wxStaticText(this, wxID_ANY, "Spawn density %"));
+	monster_spawndensity_spin = newd wxSpinCtrl(this, PALETTE_MONSTER_SPAWN_DENSITY, i2ws(g_settings.getInteger(Config::SPAWN_MONSTER_DENSITY)), wxDefaultPosition, wxSize(50, 20), wxSP_ARROW_KEYS, 0, 3600, g_settings.getInteger(Config::SPAWN_MONSTER_DENSITY));
+	grid->Add(monster_spawndensity_spin, 0, wxEXPAND);
 
 	sidesizer->Add(grid, 0, wxEXPAND);
 	topsizer->Add(sidesizer, 0, wxEXPAND);
@@ -106,6 +114,17 @@ Brush* MonsterPalettePanel::GetSelectedBrush() const {
 	} else if (spawn_monster_brush_button->GetValue()) {
 		g_settings.setInteger(Config::CURRENT_SPAWN_MONSTER_RADIUS, spawn_monster_size_spin->GetValue());
 		g_settings.setInteger(Config::DEFAULT_SPAWN_MONSTER_TIME, monster_spawntime_spin->GetValue());
+		g_settings.setInteger(Config::SPAWN_MONSTER_DENSITY, monster_spawndensity_spin->GetValue());
+		std::vector<MonsterBrush*> monsters;
+		wxArrayInt selectedIndices;
+		monster_list->GetCheckedItems(selectedIndices);
+		for (auto index : selectedIndices) {
+			Brush* brush = reinterpret_cast<Brush*>(monster_list->GetClientData(index));
+			if (brush && brush->isMonster()) {
+				monsters.push_back(brush->asMonster());
+			}
+		}
+		g_gui.spawn_brush->setMonsters(monsters);
 		return g_gui.spawn_brush;
 	}
 	return nullptr;
@@ -277,3 +296,6 @@ void MonsterPalettePanel::OnChangeSpawnMonsterSize(wxSpinEvent &event) {
 		handling_event = false;
 	}
 }
+
+void MonsterPalettePanel::OnChangeMonsterName(wxCommandEvent &event) {
+}
diff --git a/source/palette_monster.h b/source/palette_monster.h
index 54ab0519..51f09a0a 100644
--- a/source/palette_monster.h
+++ b/source/palette_monster.h
@@ -57,17 +57,20 @@ class MonsterPalettePanel : public PalettePanel {
 	void OnListBoxChange(wxCommandEvent &event);
 	void OnClickMonsterBrushButton(wxCommandEvent &event);
 	void OnClickSpawnMonsterBrushButton(wxCommandEvent &event);
+	void OnChangeMonsterName(wxCommandEvent &event);
 
 protected:
 	void SelectMonsterBrush();
 	void SelectSpawnBrush();
 
 	wxChoice* tileset_choice;
+	wxTextCtrl* monster_name_text;
 	SortableListBox* monster_list;
 	wxToggleButton* monster_brush_button;
 	wxToggleButton* spawn_monster_brush_button;
 	wxSpinCtrl* monster_spawntime_spin;
 	wxSpinCtrl* spawn_monster_size_spin;
+	wxSpinCtrl* monster_spawndensity_spin;
 
 	bool handling_event;
 
diff --git a/source/palette_window.cpp b/source/palette_window.cpp
index 2a84cf0b..269970e5 100644
--- a/source/palette_window.cpp
+++ b/source/palette_window.cpp
@@ -28,6 +28,7 @@
 #include "palette_monster.h"
 #include "palette_npc.h"
 #include "palette_waypoints.h"
+#include "palette_zones.h"
 
 #include "house_brush.h"
 #include "map.h"
@@ -53,6 +54,7 @@ PaletteWindow::PaletteWindow(wxWindow* parent, const TilesetContainer &tilesets)
 	npc_palette(nullptr),
 	house_palette(nullptr),
 	waypoint_palette(nullptr),
+	zones_palette(nullptr),
 	raw_palette(nullptr) {
 	SetMinSize(wxSize(225, 250));
 
@@ -74,6 +76,9 @@ PaletteWindow::PaletteWindow(wxWindow* parent, const TilesetContainer &tilesets)
 	waypoint_palette = static_cast<WaypointPalettePanel*>(CreateWaypointPalette(choicebook, tilesets));
 	choicebook->AddPage(waypoint_palette, waypoint_palette->GetName());
 
+	zones_palette = static_cast<ZonesPalettePanel*>(CreateZonesPalette(choicebook, tilesets));
+	choicebook->AddPage(zones_palette, zones_palette->GetName());
+
 	monster_palette = static_cast<MonsterPalettePanel*>(CreateMonsterPalette(choicebook, tilesets));
 	choicebook->AddPage(monster_palette, monster_palette->GetName());
 
@@ -151,6 +156,11 @@ PalettePanel* PaletteWindow::CreateWaypointPalette(wxWindow* parent, const Tiles
 	return panel;
 }
 
+PalettePanel* PaletteWindow::CreateZonesPalette(wxWindow* parent, const TilesetContainer &tilesets) {
+	ZonesPalettePanel* panel = newd ZonesPalettePanel(parent);
+	return panel;
+}
+
 PalettePanel* PaletteWindow::CreateMonsterPalette(wxWindow* parent, const TilesetContainer &tilesets) {
 	MonsterPalettePanel* panel = newd MonsterPalettePanel(parent);
 	return panel;
@@ -188,6 +198,9 @@ void PaletteWindow::ReloadSettings(Map* map) {
 	if (waypoint_palette) {
 		waypoint_palette->SetMap(map);
 	}
+	if (zones_palette) {
+		zones_palette->SetMap(map);
+	}
 	if (item_palette) {
 		item_palette->SetListType(wxstr(g_settings.getString(Config::PALETTE_ITEM_STYLE)));
 		item_palette->SetToolbarIconSize(g_settings.getBoolean(Config::USE_LARGE_ITEM_SIZEBAR));
@@ -231,6 +244,9 @@ void PaletteWindow::InvalidateContents() {
 	if (waypoint_palette) {
 		waypoint_palette->OnUpdate();
 	}
+	if (zones_palette) {
+		zones_palette->OnUpdate();
+	}
 }
 
 void PaletteWindow::SelectPage(PaletteType id) {
@@ -430,6 +446,10 @@ void PaletteWindow::OnUpdate(Map* map) {
 		waypoint_palette->SetMap(map);
 		waypoint_palette->OnUpdate();
 	}
+	if (zones_palette) {
+		zones_palette->SetMap(map);
+		zones_palette->OnUpdate();
+	}
 }
 
 void PaletteWindow::OnKey(wxKeyEvent &event) {
diff --git a/source/palette_window.h b/source/palette_window.h
index 8401b042..7879e5c7 100644
--- a/source/palette_window.h
+++ b/source/palette_window.h
@@ -25,6 +25,7 @@ class MonsterPalettePanel;
 class NpcPalettePanel;
 class HousePalettePanel;
 class WaypointPalettePanel;
+class ZonesPalettePanel;
 
 class PaletteWindow : public wxPanel {
 public:
@@ -71,6 +72,7 @@ class PaletteWindow : public wxPanel {
 	static PalettePanel* CreateNpcPalette(wxWindow* parent, const TilesetContainer &tilesets);
 	static PalettePanel* CreateHousePalette(wxWindow* parent, const TilesetContainer &tilesets);
 	static PalettePanel* CreateWaypointPalette(wxWindow* parent, const TilesetContainer &tilesets);
+	static PalettePanel* CreateZonesPalette(wxWindow* parent, const TilesetContainer &tilesets);
 	static PalettePanel* CreateRAWPalette(wxWindow* parent, const TilesetContainer &tilesets);
 
 	wxChoicebook* choicebook;
@@ -82,6 +84,7 @@ class PaletteWindow : public wxPanel {
 	NpcPalettePanel* npc_palette;
 	HousePalettePanel* house_palette;
 	WaypointPalettePanel* waypoint_palette;
+	ZonesPalettePanel* zones_palette;
 	BrushPalettePanel* raw_palette;
 
 	DECLARE_EVENT_TABLE()
diff --git a/source/palette_zones.cpp b/source/palette_zones.cpp
new file mode 100644
index 00000000..8d585c84
--- /dev/null
+++ b/source/palette_zones.cpp
@@ -0,0 +1,227 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// Zone palette
+
+#include "main.h"
+
+#include "gui.h"
+#include "palette_zones.h"
+#include "zone_brush.h"
+#include "map.h"
+
+BEGIN_EVENT_TABLE(ZonesPalettePanel, PalettePanel)
+EVT_BUTTON(PALETTE_ZONES_ADD_ZONE, ZonesPalettePanel::OnClickAddZone)
+EVT_BUTTON(PALETTE_ZONES_REMOVE_ZONE, ZonesPalettePanel::OnClickRemoveZone)
+
+EVT_LIST_BEGIN_LABEL_EDIT(PALETTE_ZONES_LISTBOX, ZonesPalettePanel::OnBeginEditZoneLabel)
+EVT_LIST_END_LABEL_EDIT(PALETTE_ZONES_LISTBOX, ZonesPalettePanel::OnEditZoneLabel)
+EVT_LIST_ITEM_SELECTED(PALETTE_ZONES_LISTBOX, ZonesPalettePanel::OnClickZone)
+EVT_LIST_ITEM_RIGHT_CLICK(PALETTE_ZONES_LISTBOX, ZonesPalettePanel::OnRightClickZone)
+END_EVENT_TABLE()
+
+ZonesPalettePanel::ZonesPalettePanel(wxWindow* parent, wxWindowID id) :
+	PalettePanel(parent, id),
+	map(nullptr) {
+	wxSizer* sidesizer = newd wxStaticBoxSizer(wxVERTICAL, this, "Zones");
+
+	zone_list = newd wxListCtrl(this, PALETTE_ZONES_LISTBOX, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_EDIT_LABELS | wxLC_NO_HEADER);
+	zone_list->InsertColumn(0, "UNNAMED", wxLIST_FORMAT_LEFT, 200);
+	sidesizer->Add(zone_list, 1, wxEXPAND);
+
+	wxSizer* tmpsizer = newd wxBoxSizer(wxHORIZONTAL);
+	tmpsizer->Add(add_zone_button = newd wxButton(this, PALETTE_ZONES_ADD_ZONE, "Add", wxDefaultPosition, wxSize(50, -1)), 1, wxEXPAND);
+	tmpsizer->Add(remove_zone_button = newd wxButton(this, PALETTE_ZONES_REMOVE_ZONE, "Remove", wxDefaultPosition, wxSize(70, -1)), 1, wxEXPAND);
+	sidesizer->Add(tmpsizer, 0, wxEXPAND);
+
+	SetSizerAndFit(sidesizer);
+}
+
+ZonesPalettePanel::~ZonesPalettePanel() {
+	////
+}
+
+void ZonesPalettePanel::OnSwitchIn() {
+	PalettePanel::OnSwitchIn();
+}
+
+void ZonesPalettePanel::OnSwitchOut() {
+	PalettePanel::OnSwitchOut();
+}
+
+void ZonesPalettePanel::SetMap(Map* m) {
+	map = m;
+	this->Enable(m && m->getVersion().otbm >= MAP_OTBM_3);
+}
+
+void ZonesPalettePanel::SelectFirstBrush() {
+	// SelectZoneBrush();
+}
+
+Brush* ZonesPalettePanel::GetSelectedBrush() const {
+	long item = zone_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	g_gui.zone_brush->setZone(
+		item == -1 || !map->zones.hasZone(nstr(zone_list->GetItemText(item))) ? 0 : map->zones.getZoneID(nstr(zone_list->GetItemText(item)))
+	);
+	return g_gui.zone_brush;
+}
+
+bool ZonesPalettePanel::SelectBrush(const Brush* whatbrush) {
+	ASSERT(whatbrush == g_gui.zone_brush);
+	return false;
+}
+
+int ZonesPalettePanel::GetSelectedBrushSize() const {
+	return 0;
+}
+
+PaletteType ZonesPalettePanel::GetType() const {
+	return TILESET_ZONES;
+}
+
+wxString ZonesPalettePanel::GetName() const {
+	return "Zone Palette";
+}
+
+void ZonesPalettePanel::OnUpdate() {
+	if (wxTextCtrl* tc = zone_list->GetEditControl()) {
+		std::string name = nstr(tc->GetValue());
+		if (map->zones.hasZone(name)) {
+			map->zones.removeZone(name);
+			map->cleanDeletedZones();
+		}
+	}
+	zone_list->DeleteAllItems();
+
+	if (!map) {
+		zone_list->Enable(false);
+		add_zone_button->Enable(false);
+		remove_zone_button->Enable(false);
+	} else {
+		zone_list->Enable(true);
+		add_zone_button->Enable(true);
+		remove_zone_button->Enable(true);
+
+		Zones &zones = map->zones;
+
+		for (ZoneMap::const_iterator iter = zones.begin(); iter != zones.end(); ++iter) {
+			zone_list->InsertItem(0, wxstr(iter->first));
+		}
+	}
+}
+
+void ZonesPalettePanel::OnClickZone(wxListEvent &event) {
+	if (!map) {
+		return;
+	}
+
+	std::string name = nstr(event.GetText());
+	if (map->zones.hasZone(name)) {
+		auto zoneId = map->zones.getZoneID(name);
+		g_gui.zone_brush->setZone(zoneId);
+	}
+}
+
+void ZonesPalettePanel::OnRightClickZone(wxListEvent &event) {
+	if (!map) {
+		return;
+	}
+
+	std::string name = nstr(event.GetText());
+	if (map->zones.hasZone(name)) {
+		auto zoneId = map->zones.getZoneID(name);
+		g_gui.zone_brush->setZone(zoneId);
+		g_gui.SetScreenCenterPosition(map->getZonePosition(zoneId));
+	}
+}
+
+void ZonesPalettePanel::OnBeginEditZoneLabel(wxListEvent &event) {
+	// We need to disable all hotkeys, so we can type properly
+	g_gui.DisableHotkeys();
+}
+
+void ZonesPalettePanel::OnEditZoneLabel(wxListEvent &event) {
+	std::string name = nstr(event.GetLabel());
+	std::string oldName = nstr(zone_list->GetItemText(event.GetIndex()));
+
+	if (event.IsEditCancelled()) {
+		return;
+	}
+
+	if (name == "") {
+		map->zones.removeZone(oldName);
+		g_gui.RefreshPalettes();
+	} else {
+		if (name == oldName) {
+			; // do nothing
+		} else {
+			if (map->zones.hasZone(name)) {
+				// Already exists a zone with this name!
+				g_gui.SetStatusText("There already is a zone with this name.");
+				event.Veto();
+				if (oldName == "") {
+					map->zones.removeZone(oldName);
+					g_gui.RefreshPalettes();
+				}
+			} else {
+				map->zones.removeZone(oldName);
+				map->zones.addZone(name);
+				auto zoneId = map->zones.getZoneID(name);
+				g_gui.zone_brush->setZone(zoneId);
+
+				// Refresh other palettes
+				refresh_timer.Start(300, true);
+			}
+		}
+	}
+
+	if (event.IsAllowed()) {
+		g_gui.EnableHotkeys();
+	}
+}
+
+void ZonesPalettePanel::OnClickAddZone(wxCommandEvent &event) {
+	if (map) {
+		if (map->zones.addZone("")) {
+			long i = zone_list->InsertItem(0, "");
+			zone_list->EditLabel(i);
+		} else {
+			long i = zone_list->FindItem(-1, "");
+			zone_list->EditLabel(i);
+		}
+
+		// g_gui.RefreshPalettes();
+	}
+}
+
+void ZonesPalettePanel::OnClickRemoveZone(wxCommandEvent &event) {
+	if (!map) {
+		return;
+	}
+
+	long item = zone_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (item != -1) {
+		std::string name = nstr(zone_list->GetItemText(item));
+		if (map->zones.hasZone(name)) {
+			map->zones.removeZone(name);
+			map->cleanDeletedZones();
+		}
+		zone_list->DeleteItem(item);
+		refresh_timer.Start(300, true);
+	}
+}
diff --git a/source/palette_zones.h b/source/palette_zones.h
new file mode 100644
index 00000000..9939fafb
--- /dev/null
+++ b/source/palette_zones.h
@@ -0,0 +1,70 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#ifndef RME_PALETTE_ZONES_H_
+#define RME_PALETTE_ZONES_H_
+
+#include <wx/listctrl.h>
+
+#include "zones.h"
+#include "palette_common.h"
+
+class ZonesPalettePanel : public PalettePanel {
+public:
+	ZonesPalettePanel(wxWindow* parent, wxWindowID id = wxID_ANY);
+	~ZonesPalettePanel();
+
+	wxString GetName() const;
+	PaletteType GetType() const;
+
+	// Select the first brush
+	void SelectFirstBrush();
+	// Returns the currently selected brush (first brush if panel is not loaded)
+	Brush* GetSelectedBrush() const;
+	// Returns the currently selected brush size
+	int GetSelectedBrushSize() const;
+	// Select the brush in the parameter, this only changes the look of the panel
+	bool SelectBrush(const Brush* whatbrush);
+
+	// Called sometimes?
+	void OnUpdate();
+	// Called when this page is about to be displayed
+	void OnSwitchIn();
+	// Called when this page is hidden
+	void OnSwitchOut();
+
+public:
+	// wxWidgets event handling
+	void OnClickZone(wxListEvent &event);
+	void OnRightClickZone(wxListEvent &event);
+	void OnBeginEditZoneLabel(wxListEvent &event);
+	void OnEditZoneLabel(wxListEvent &event);
+	void OnClickAddZone(wxCommandEvent &event);
+	void OnClickRemoveZone(wxCommandEvent &event);
+
+	void SetMap(Map* map);
+
+protected:
+	Map* map;
+	wxListCtrl* zone_list;
+	wxButton* add_zone_button;
+	wxButton* remove_zone_button;
+
+	DECLARE_EVENT_TABLE()
+};
+
+#endif
diff --git a/source/preferences.cpp b/source/preferences.cpp
index 358bd722..98463019 100644
--- a/source/preferences.cpp
+++ b/source/preferences.cpp
@@ -125,6 +125,28 @@ wxNotebookPage* PreferencesWindow::CreateGeneralPage() {
 	sizer->Add(position_format, 0, wxALL | wxEXPAND, 5);
 	SetWindowToolTip(tmptext, position_format, "The position format when copying from the map.");
 
+	// clip << "{";
+	// clip << "fromx = " << minPos.x << ", ";
+	// clip << "tox = " << maxPos.x << ", ";
+	// clip << "fromy = " << minPos.y << ", ";
+	// clip << "toy = " << maxPos.y << ", ";
+	// if(minPos.z != maxPos.z) {
+	// 	clip << "fromz = " << minPos.z << ", ";
+	// 	clip << "toz = " << maxPos.z;
+	// }
+	// else
+	// 	clip << "z = " << minPos.z;
+	// clip << "}";
+
+	wxString area_choices[] = { "  {fromx = 0, tox = 0, fromy = 0, toy = 0, fromz = 0, toz = 0}",
+								"  { x = 0, y = 0, z = 0 }, { x = 0, y = 0, z = 0 }",
+								"  Position(x, y, z), Position(x, y, z)" };
+	int area_radio_choices = sizeof(area_choices) / sizeof(wxString);
+	area_format = newd wxRadioBox(general_page, wxID_ANY, "Copy Area Format", wxDefaultPosition, wxDefaultSize, area_radio_choices, area_choices, 1, wxRA_SPECIFY_COLS);
+	area_format->SetSelection(g_settings.getInteger(Config::COPY_POSITION_FORMAT));
+	sizer->Add(area_format, 0, wxALL | wxEXPAND, 5);
+	SetWindowToolTip(tmptext, area_format, "The area format when copying from the map.");
+
 	general_page->SetSizerAndFit(sizer);
 
 	return general_page;
@@ -578,6 +600,7 @@ void PreferencesWindow::Apply() {
 	g_settings.setInteger(Config::WORKER_THREADS, worker_threads_spin->GetValue());
 	g_settings.setInteger(Config::REPLACE_SIZE, replace_size_spin->GetValue());
 	g_settings.setInteger(Config::COPY_POSITION_FORMAT, position_format->GetSelection());
+	g_settings.setInteger(Config::COPY_AREA_FORMAT, area_format->GetSelection());
 
 	// Editor
 	g_settings.setInteger(Config::GROUP_ACTIONS, group_actions_chkbox->GetValue());
@@ -678,9 +701,9 @@ void PreferencesWindow::Apply() {
 	ClientVersionList versions = ClientVersion::getAllVisible();
 	int version_counter = 0;
 	for (auto version : versions) {
-		wxString dir = version_dir_pickers[version_counter]->GetPath();
-		if (dir.Length() > 0 && dir.Last() != '/' && dir.Last() != '\\') {
-			dir.Append("/");
+		auto dir = version_dir_pickers[version_counter]->GetPath().ToStdString();
+		if (dir.size() > 0 && dir.back() != '/' && dir.back() != '\\') {
+			dir.push_back('/');
 		}
 		version->setClientPath(FileName(dir));
 
diff --git a/source/preferences.h b/source/preferences.h
index 3ffb9cc3..ff6b725e 100644
--- a/source/preferences.h
+++ b/source/preferences.h
@@ -51,6 +51,7 @@ class PreferencesWindow : public wxDialog {
 	wxSpinCtrl* worker_threads_spin;
 	wxSpinCtrl* replace_size_spin;
 	wxRadioBox* position_format;
+	wxRadioBox* area_format;
 
 	// Editor
 	wxCheckBox* group_actions_chkbox;
diff --git a/source/settings.cpp b/source/settings.cpp
index 839add4d..b950674f 100644
--- a/source/settings.cpp
+++ b/source/settings.cpp
@@ -256,6 +256,7 @@ void Settings::IO(IOMode mode) {
 	Int(WARN_FOR_DUPLICATE_ID, 1);
 	Int(AUTO_CREATE_SPAWN_MONSTER, 1);
 	Int(DEFAULT_SPAWN_MONSTER_TIME, 60);
+	Int(SPAWN_MONSTER_DENSITY, 10);
 	Int(MAX_SPAWN_MONSTER_RADIUS, 30);
 	Int(CURRENT_SPAWN_MONSTER_RADIUS, 1);
 	Int(AUTO_CREATE_SPAWN_NPC, 1);
@@ -270,6 +271,7 @@ void Settings::IO(IOMode mode) {
 	Int(SAVE_WITH_OTB_MAGIC_NUMBER, 0);
 	Int(REPLACE_SIZE, 500);
 	Int(COPY_POSITION_FORMAT, 0);
+	Int(COPY_AREA_FORMAT, 0);
 
 	section("Graphics");
 	Int(TEXTURE_MANAGEMENT, 1);
diff --git a/source/settings.h b/source/settings.h
index c678920c..26f60540 100644
--- a/source/settings.h
+++ b/source/settings.h
@@ -127,6 +127,7 @@ namespace Config {
 		CURRENT_SPAWN_MONSTER_RADIUS,
 		AUTO_CREATE_SPAWN_MONSTER,
 		DEFAULT_SPAWN_MONSTER_TIME,
+		SPAWN_MONSTER_DENSITY,
 
 		MAX_SPAWN_NPC_RADIUS,
 		CURRENT_SPAWN_NPC_RADIUS,
@@ -139,6 +140,7 @@ namespace Config {
 		RAW_LIKE_SIMONE,
 		WORKER_THREADS,
 		COPY_POSITION_FORMAT,
+		COPY_AREA_FORMAT,
 
 		GOTO_WEBSITE_ON_BOOT,
 		INDIRECTORY_INSTALLATION,
diff --git a/source/spawn_monster_brush.cpp b/source/spawn_monster_brush.cpp
index 018bc4bf..04d8deee 100644
--- a/source/spawn_monster_brush.cpp
+++ b/source/spawn_monster_brush.cpp
@@ -20,6 +20,7 @@
 #include "spawn_monster_brush.h"
 #include "basemap.h"
 #include "spawn_monster.h"
+#include "monster_brush.h"
 
 //=============================================================================
 // SpawnMonster brush
@@ -59,7 +60,26 @@ void SpawnMonsterBrush::undraw(BaseMap* map, Tile* tile) {
 void SpawnMonsterBrush::draw(BaseMap* map, Tile* tile, void* parameter) {
 	ASSERT(tile);
 	ASSERT(parameter); // Should contain an int which is the size of the newd monster spawn
+	auto size = std::max(1, *(int*)parameter);
+	auto side = size * 2 + 1;
+	int time = g_settings.getInteger(Config::DEFAULT_SPAWN_MONSTER_TIME);
+	int density = g_settings.getInteger(Config::SPAWN_MONSTER_DENSITY);
 	if (tile->spawnMonster == nullptr) {
-		tile->spawnMonster = newd SpawnMonster(std::max(1, *(int*)parameter));
+		tile->spawnMonster = newd SpawnMonster(size);
+		auto toSpawn = (int)std::ceil((side * side) * (density / 100.0));
+		std::set<Position> positions;
+		for (int i = 0; i < side; i++) {
+			for (int j = 0; j < side; j++) {
+				positions.insert(Position(tile->getPosition().x - size + i, tile->getPosition().y - size + j, tile->getPosition().z));
+			}
+		}
+
+		for (int i = 0; i < toSpawn; ++i) {
+			auto iter = positions.begin();
+			std::advance(iter, rand() % positions.size());
+			auto monsterBrush = monsters[rand() % monsters.size()];
+			monsterBrush->drawMonster(map, map->getTile(*iter), &time);
+			positions.erase(iter);
+		}
 	}
 }
diff --git a/source/spawn_monster_brush.h b/source/spawn_monster_brush.h
index 894aa6e6..478ef287 100644
--- a/source/spawn_monster_brush.h
+++ b/source/spawn_monster_brush.h
@@ -50,6 +50,13 @@ class SpawnMonsterBrush : public Brush {
 	virtual bool oneSizeFitsAll() const {
 		return true;
 	}
+
+	void setMonsters(std::vector<MonsterBrush*> &monsters) {
+		this->monsters = monsters;
+	}
+
+private:
+	std::vector<MonsterBrush*> monsters;
 };
 
 #endif
diff --git a/source/tile.cpp b/source/tile.cpp
index 52116357..3bcb05b9 100644
--- a/source/tile.cpp
+++ b/source/tile.cpp
@@ -96,6 +96,9 @@ Tile* Tile::deepCopy(BaseMap &map) const {
 	for (const Item* item : items) {
 		copy->items.push_back(item->deepCopy());
 	}
+	for (unsigned int zone : zones) {
+		copy->zones.insert(zone);
+	}
 	return copy;
 }
 
diff --git a/source/tile.h b/source/tile.h
index 92370ffe..89cf301b 100644
--- a/source/tile.h
+++ b/source/tile.h
@@ -57,6 +57,7 @@ class Tile {
 	Npc* npc;
 	SpawnNpc* spawnNpc;
 	uint32_t house_id; // House id for this tile (pointer not safe)
+	std::set<unsigned int> zones;
 
 public:
 	// ALWAYS use this constructor if the Tile is EVER going to be placed on a map
@@ -248,6 +249,21 @@ class Tile {
 	void unsetStatFlags(uint16_t flags);
 	uint16_t getStatFlags() const noexcept;
 
+	bool hasZone(unsigned int zone) const {
+		return zones.find(zone) != zones.end();
+	}
+
+	void addZone(unsigned int zone) {
+		if (zone == 0) {
+			return;
+		}
+		zones.insert(zone);
+	}
+
+	void removeZone(unsigned int zone) {
+		zones.erase(zone);
+	}
+
 protected:
 	union {
 		struct {
diff --git a/source/tileset.h b/source/tileset.h
index 0afee2a1..af4e5bc7 100644
--- a/source/tileset.h
+++ b/source/tileset.h
@@ -30,6 +30,7 @@ enum TilesetCategoryType {
 	TILESET_RAW,
 	TILESET_HOUSE,
 	TILESET_WAYPOINT,
+	TILESET_ZONES,
 };
 
 class TilesetCategory {
diff --git a/source/zone_brush.cpp b/source/zone_brush.cpp
new file mode 100644
index 00000000..31e3d0af
--- /dev/null
+++ b/source/zone_brush.cpp
@@ -0,0 +1,56 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#include "main.h"
+
+#include "zone_brush.h"
+#include "zones.h"
+#include "basemap.h"
+
+//=============================================================================
+// Zone Brush
+
+ZoneBrush::ZoneBrush() :
+	FlagBrush(0) {
+	////
+}
+
+ZoneBrush::~ZoneBrush() {
+	////
+}
+
+void ZoneBrush::setZone(unsigned int id) {
+	zoneId = id;
+}
+
+unsigned int ZoneBrush::getZone() const {
+	return zoneId;
+}
+
+bool ZoneBrush::canDraw(BaseMap* map, const Position &position) const {
+	return map->getTile(position) != nullptr && zoneId != 0;
+}
+
+void ZoneBrush::undraw(BaseMap* map, Tile* tile) {
+	tile->removeZone(zoneId);
+}
+
+void ZoneBrush::draw(BaseMap* map, Tile* tile, void* parameter) {
+	if (tile->hasGround()) {
+		tile->addZone(zoneId);
+	}
+}
diff --git a/source/zone_brush.h b/source/zone_brush.h
new file mode 100644
index 00000000..0022d9d8
--- /dev/null
+++ b/source/zone_brush.h
@@ -0,0 +1,60 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#ifndef RME_ZONE_BRUSH_H
+#define RME_ZONE_BRUSH_H
+
+#include "brush.h"
+
+//=============================================================================
+// ZoneBrush, draws zones simply
+
+class ZoneBrush : public FlagBrush {
+public:
+	ZoneBrush();
+	virtual ~ZoneBrush();
+
+	bool isZone() const {
+		return true;
+	}
+	ZoneBrush* asZone() {
+		return static_cast<ZoneBrush*>(this);
+	}
+
+	// Not used
+	virtual bool load(pugi::xml_node node, wxArrayString &warnings) {
+		return true;
+	}
+
+	virtual bool canDraw(BaseMap* map, const Position &position) const;
+	virtual void draw(BaseMap* map, Tile* tile, void* parameter);
+	virtual void undraw(BaseMap* map, Tile* tile);
+
+	unsigned int getZone() const;
+	void setZone(unsigned int id);
+	virtual int getLookID() const {
+		return 0;
+	} // We don't have a graphic
+	virtual std::string getName() const {
+		return "Zone Brush";
+	}
+
+protected:
+	unsigned int zoneId;
+};
+
+#endif
diff --git a/source/zones.cpp b/source/zones.cpp
new file mode 100644
index 00000000..377e6e33
--- /dev/null
+++ b/source/zones.cpp
@@ -0,0 +1,67 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#include "main.h"
+
+#include "zones.h"
+#include "map.h"
+
+Zones::~Zones() {
+	zones.clear();
+}
+
+bool Zones::addZone(std::string name, unsigned int id) {
+	if (hasZone(name)) {
+		return false;
+	}
+	if (used_ids.find(id) != used_ids.end()) {
+		return false;
+	}
+	zones.emplace(name, id);
+	used_ids.insert(id);
+	return true;
+}
+
+bool Zones::addZone(std::string name) {
+	return addZone(name, generateID());
+}
+
+bool Zones::hasZone(std::string name) {
+	to_lower_str(name);
+	return zones.find(name) != zones.end();
+}
+
+bool Zones::hasZone(unsigned int id) {
+	return used_ids.find(id) != used_ids.end();
+}
+
+void Zones::removeZone(std::string name) {
+	to_lower_str(name);
+	if (!hasZone(name)) {
+		return;
+	}
+	used_ids.erase(zones[name]);
+	zones.erase(name);
+}
+
+unsigned int Zones::generateID() {
+	unsigned int id = 1;
+	while (used_ids.find(id) != used_ids.end()) {
+		id++;
+	}
+	return id;
+}
diff --git a/source/zones.h b/source/zones.h
new file mode 100644
index 00000000..2da5dbdb
--- /dev/null
+++ b/source/zones.h
@@ -0,0 +1,64 @@
+//////////////////////////////////////////////////////////////////////
+// This file is part of Remere's Map Editor
+//////////////////////////////////////////////////////////////////////
+// Remere's Map Editor is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Remere's Map Editor is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////
+
+#ifndef RME_ZONES_H_
+#define RME_ZONES_H_
+
+typedef std::map<std::string, unsigned int> ZoneMap;
+
+class Zones {
+public:
+	Zones(Map &map) :
+		map(map) { }
+	virtual ~Zones();
+
+	unsigned int getZoneID(std::string name) const {
+		auto it = zones.find(name);
+		if (it == zones.end()) {
+			return 0;
+		}
+		return it->second;
+	}
+	bool addZone(std::string name);
+	bool addZone(std::string name, unsigned int id);
+	bool hasZone(std::string name);
+	bool hasZone(unsigned int id);
+	void removeZone(std::string name);
+
+	ZoneMap zones;
+
+	ZoneMap::iterator begin() {
+		return zones.begin();
+	}
+	ZoneMap::const_iterator begin() const {
+		return zones.begin();
+	}
+	ZoneMap::iterator end() {
+		return zones.end();
+	}
+	ZoneMap::const_iterator end() const {
+		return zones.end();
+	}
+
+private:
+	Map &map;
+	std::unordered_set<unsigned int> used_ids;
+
+	unsigned int generateID();
+};
+
+#endif
diff --git a/vcproj/Project/RME.vcxproj b/vcproj/Project/RME.vcxproj
index 9f5b06f8..de70b1c0 100644
--- a/vcproj/Project/RME.vcxproj
+++ b/vcproj/Project/RME.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{7AA6C5AC-C8C4-40EF-A0B3-3569B9819163}</ProjectGuid>
     <RootNamespace>RME</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -95,6 +96,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(ProjectName)_x64</TargetName>
+    <OutDir>$(SolutionDir)\..</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)\..</OutDir>
+    <TargetName>$(ProjectName)_Debug</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
     <VcpkgEnableManifest>true</VcpkgEnableManifest>
@@ -140,16 +146,17 @@
       <PrecompiledHeaderFile>main.h</PrecompiledHeaderFile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;Rpcrt4.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\dependencies\vs\lib\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\dependencies\vs\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
       <MapFileName>$(TargetName).map</MapFileName>
       <MapExports>true</MapExports>
       <SubSystem>Windows</SubSystem>
-      <IgnoreSpecificDefaultLibraries>wxscintillad.lib;freeglutd.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>freeglutd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -221,8 +228,11 @@
     <ClCompile Include="..\..\source\find_item_window.cpp" />
     <ClCompile Include="..\..\source\light_drawer.cpp" />
     <ClCompile Include="..\..\source\iominimap.cpp" />
+    <ClCompile Include="..\..\source\palette_zones.cpp" />
     <ClCompile Include="..\..\source\replace_items_window.cpp" />
     <ClCompile Include="..\..\source\welcome_dialog.cpp" />
+    <ClCompile Include="..\..\source\zones.cpp" />
+    <ClCompile Include="..\..\source\zone_brush.cpp" />
     <ClInclude Include="..\..\source\actions_history_window.h" />
     <ClInclude Include="..\..\source\artprovider.h" />
     <ClInclude Include="..\..\source\const.h" />
@@ -232,6 +242,7 @@
     <ClInclude Include="..\..\source\browse_tile_window.h" />
     <ClCompile Include="..\..\source\browse_tile_window.cpp" />
     <ClInclude Include="..\..\source\iominimap.h" />
+    <ClInclude Include="..\..\source\palette_zones.h" />
     <ClInclude Include="..\..\source\positionctrl.h" />
     <ClCompile Include="..\..\source\main_toolbar.cpp" />
     <ClCompile Include="..\..\source\positionctrl.cpp" />
@@ -423,6 +434,8 @@
     <ClCompile Include="..\..\source\waypoint_brush.cpp" />
     <ClInclude Include="..\..\source\find_item_window.h" />
     <ClInclude Include="..\..\source\welcome_dialog.h" />
+    <ClInclude Include="..\..\source\zones.h" />
+    <ClInclude Include="..\..\source\zone_brush.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\mkpch.cpp">