diff --git a/data/markers.json b/data/markers.json index 948e9bb46..9cbfc3164 100644 --- a/data/markers.json +++ b/data/markers.json @@ -3919,48 +3919,6 @@ "y": 32111, "z": 6 }, - { - "description": "", - "icon": "down", - "x": 33742, - "y": 31035, - "z": 6 - }, - { - "description": "", - "icon": "down", - "x": 33756, - "y": 31042, - "z": 6 - }, - { - "description": "", - "icon": "up", - "x": 33774, - "y": 31036, - "z": 6 - }, - { - "description": "", - "icon": "down", - "x": 33783, - "y": 31041, - "z": 6 - }, - { - "description": "", - "icon": "down", - "x": 33800, - "y": 31012, - "z": 6 - }, - { - "description": "", - "icon": "down", - "x": 33817, - "y": 31021, - "z": 6 - }, { "description": "", "icon": "up", @@ -3968,13 +3926,6 @@ "y": 31658, "z": 6 }, - { - "description": "", - "icon": "down", - "x": 33835, - "y": 31011, - "z": 6 - }, { "description": "Furious Crater", "icon": "crossmark", @@ -11304,13 +11255,6 @@ "y": 32376, "z": 7 }, - { - "description": "Boat to Svargrond", - "icon": "flag", - "x": 33719, - "y": 31105, - "z": 7 - }, { "description": "Message in a bottle", "icon": "crossmark", @@ -11325,13 +11269,6 @@ "y": 31639, "z": 7 }, - { - "description": "", - "icon": "checkmark", - "x": 33730, - "y": 31040, - "z": 7 - }, { "description": "To NPC A Goblin Exile", "icon": "down", @@ -11339,41 +11276,6 @@ "y": 31733, "z": 7 }, - { - "description": "", - "icon": "down", - "x": 33745, - "y": 31063, - "z": 7 - }, - { - "description": "", - "icon": "checkmark", - "x": 33756, - "y": 31021, - "z": 7 - }, - { - "description": "", - "icon": "up", - "x": 33756, - "y": 31042, - "z": 7 - }, - { - "description": "", - "icon": "checkmark", - "x": 33776, - "y": 31023, - "z": 7 - }, - { - "description": "", - "icon": "checkmark", - "x": 33776, - "y": 31043, - "z": 7 - }, { "description": "", "icon": "down", @@ -11381,13 +11283,6 @@ "y": 31600, "z": 7 }, - { - "description": "", - "icon": "checkmark", - "x": 33790, - "y": 31061, - "z": 7 - }, { "description": "Xogixath", "icon": "red down", @@ -11430,20 +11325,6 @@ "y": 31551, "z": 7 }, - { - "description": "", - "icon": "checkmark", - "x": 33798, - "y": 31006, - "z": 7 - }, - { - "description": "", - "icon": "up", - "x": 33800, - "y": 31012, - "z": 7 - }, { "description": "", "icon": "up", @@ -11465,20 +11346,6 @@ "y": 31648, "z": 7 }, - { - "description": "", - "icon": "up", - "x": 33817, - "y": 31021, - "z": 7 - }, - { - "description": "", - "icon": "checkmark", - "x": 33818, - "y": 31095, - "z": 7 - }, { "description": "", "icon": "up", @@ -11486,13 +11353,6 @@ "y": 31680, "z": 7 }, - { - "description": "", - "icon": "up", - "x": 33835, - "y": 31011, - "z": 7 - }, { "description": "", "icon": "up", @@ -14461,13 +14321,6 @@ "y": 31733, "z": 8 }, - { - "description": "", - "icon": "up", - "x": 33745, - "y": 31063, - "z": 8 - }, { "description": "", "icon": "checkmark", @@ -14482,20 +14335,6 @@ "y": 31625, "z": 8 }, - { - "description": "", - "icon": "down", - "x": 33773, - "y": 31016, - "z": 8 - }, - { - "description": "", - "icon": "down", - "x": 33789, - "y": 31022, - "z": 8 - }, { "description": "", "icon": "up", @@ -17212,27 +17051,6 @@ "y": 31985, "z": 9 }, - { - "description": "", - "icon": "flag", - "x": 33752, - "y": 31083, - "z": 9 - }, - { - "description": "", - "icon": "up", - "x": 33786, - "y": 31024, - "z": 9 - }, - { - "description": "", - "icon": "up", - "x": 33789, - "y": 31023, - "z": 9 - }, { "description": "", "icon": "down", diff --git a/extra/percht-island/Minimap_Color_33536_30976_1.png b/extra/percht-island/Minimap_Color_33536_30976_1.png new file mode 100644 index 000000000..1a8030580 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_1.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_2.png b/extra/percht-island/Minimap_Color_33536_30976_2.png new file mode 100644 index 000000000..44c66e1cb Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_2.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_3.png b/extra/percht-island/Minimap_Color_33536_30976_3.png new file mode 100644 index 000000000..47fcf3740 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_3.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_4.png b/extra/percht-island/Minimap_Color_33536_30976_4.png new file mode 100644 index 000000000..c82f84f06 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_4.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_5.png b/extra/percht-island/Minimap_Color_33536_30976_5.png new file mode 100644 index 000000000..a9811b6b3 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_5.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_6.png b/extra/percht-island/Minimap_Color_33536_30976_6.png new file mode 100644 index 000000000..bebe06cf5 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_6.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_7.png b/extra/percht-island/Minimap_Color_33536_30976_7.png new file mode 100644 index 000000000..3e2b920cf Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_7.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_8.png b/extra/percht-island/Minimap_Color_33536_30976_8.png new file mode 100644 index 000000000..70df45d2d Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_8.png differ diff --git a/extra/percht-island/Minimap_Color_33536_30976_9.png b/extra/percht-island/Minimap_Color_33536_30976_9.png new file mode 100644 index 000000000..d0ae618bb Binary files /dev/null and b/extra/percht-island/Minimap_Color_33536_30976_9.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_1.png b/extra/percht-island/Minimap_Color_33792_30976_1.png new file mode 100644 index 000000000..287dd3d9b Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_1.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_2.png b/extra/percht-island/Minimap_Color_33792_30976_2.png new file mode 100644 index 000000000..f99d5a376 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_2.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_3.png b/extra/percht-island/Minimap_Color_33792_30976_3.png new file mode 100644 index 000000000..751da2ad7 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_3.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_4.png b/extra/percht-island/Minimap_Color_33792_30976_4.png new file mode 100644 index 000000000..b734f1e54 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_4.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_5.png b/extra/percht-island/Minimap_Color_33792_30976_5.png new file mode 100644 index 000000000..4fe956e75 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_5.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_6.png b/extra/percht-island/Minimap_Color_33792_30976_6.png new file mode 100644 index 000000000..66d06de11 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_6.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_7.png b/extra/percht-island/Minimap_Color_33792_30976_7.png new file mode 100644 index 000000000..9a1ea73e1 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_7.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_8.png b/extra/percht-island/Minimap_Color_33792_30976_8.png new file mode 100644 index 000000000..6d427d325 Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_8.png differ diff --git a/extra/percht-island/Minimap_Color_33792_30976_9.png b/extra/percht-island/Minimap_Color_33792_30976_9.png new file mode 100644 index 000000000..5c7d63b0e Binary files /dev/null and b/extra/percht-island/Minimap_Color_33792_30976_9.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_1.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_1.png new file mode 100644 index 000000000..1cc7344ed Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_1.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_2.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_2.png new file mode 100644 index 000000000..ff48728e4 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_2.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_3.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_3.png new file mode 100644 index 000000000..dbb020311 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_3.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_4.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_4.png new file mode 100644 index 000000000..4737c5550 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_4.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_5.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_5.png new file mode 100644 index 000000000..0e703a9cd Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_5.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_6.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_6.png new file mode 100644 index 000000000..91f3b4502 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_6.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_7.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_7.png new file mode 100644 index 000000000..292ac48bf Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_7.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_8.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_8.png new file mode 100644 index 000000000..cc8ea81ec Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_8.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33536_30976_9.png b/extra/percht-island/Minimap_WaypointCost_33536_30976_9.png new file mode 100644 index 000000000..2de5ac6a9 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33536_30976_9.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_1.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_1.png new file mode 100644 index 000000000..9a3d2757b Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_1.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_2.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_2.png new file mode 100644 index 000000000..d708d25d3 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_2.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_3.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_3.png new file mode 100644 index 000000000..8c5dbd5f5 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_3.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_4.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_4.png new file mode 100644 index 000000000..171dc3b5f Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_4.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_5.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_5.png new file mode 100644 index 000000000..eda134def Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_5.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_6.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_6.png new file mode 100644 index 000000000..4bffb16e0 Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_6.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_7.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_7.png new file mode 100644 index 000000000..5cc53d68a Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_7.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_8.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_8.png new file mode 100644 index 000000000..78d5d6e0e Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_8.png differ diff --git a/extra/percht-island/Minimap_WaypointCost_33792_30976_9.png b/extra/percht-island/Minimap_WaypointCost_33792_30976_9.png new file mode 100644 index 000000000..393f6ea3d Binary files /dev/null and b/extra/percht-island/Minimap_WaypointCost_33792_30976_9.png differ diff --git a/extra/percht-island/markers.json b/extra/percht-island/markers.json new file mode 100644 index 000000000..d57fb290c --- /dev/null +++ b/extra/percht-island/markers.json @@ -0,0 +1,184 @@ +[ + { + "description": "", + "icon": "down", + "x": 33742, + "y": 31035, + "z": 6 + }, + { + "description": "", + "icon": "down", + "x": 33756, + "y": 31042, + "z": 6 + }, + { + "description": "", + "icon": "up", + "x": 33774, + "y": 31036, + "z": 6 + }, + { + "description": "", + "icon": "down", + "x": 33783, + "y": 31041, + "z": 6 + }, + { + "description": "", + "icon": "down", + "x": 33800, + "y": 31012, + "z": 6 + }, + { + "description": "", + "icon": "down", + "x": 33817, + "y": 31021, + "z": 6 + }, + { + "description": "", + "icon": "down", + "x": 33835, + "y": 31011, + "z": 6 + }, + { + "description": "Boat to Svargrond", + "icon": "flag", + "x": 33719, + "y": 31105, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33730, + "y": 31040, + "z": 7 + }, + { + "description": "", + "icon": "down", + "x": 33745, + "y": 31063, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33756, + "y": 31021, + "z": 7 + }, + { + "description": "", + "icon": "up", + "x": 33756, + "y": 31042, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33776, + "y": 31023, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33776, + "y": 31043, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33790, + "y": 31061, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33798, + "y": 31006, + "z": 7 + }, + { + "description": "", + "icon": "up", + "x": 33800, + "y": 31012, + "z": 7 + }, + { + "description": "", + "icon": "up", + "x": 33817, + "y": 31021, + "z": 7 + }, + { + "description": "", + "icon": "checkmark", + "x": 33818, + "y": 31095, + "z": 7 + }, + { + "description": "", + "icon": "up", + "x": 33835, + "y": 31011, + "z": 7 + }, + { + "description": "", + "icon": "up", + "x": 33745, + "y": 31063, + "z": 8 + }, + { + "description": "", + "icon": "down", + "x": 33773, + "y": 31016, + "z": 8 + }, + { + "description": "", + "icon": "down", + "x": 33789, + "y": 31022, + "z": 8 + }, + { + "description": "", + "icon": "flag", + "x": 33752, + "y": 31083, + "z": 9 + }, + { + "description": "", + "icon": "up", + "x": 33786, + "y": 31024, + "z": 9 + }, + { + "description": "", + "icon": "up", + "x": 33789, + "y": 31023, + "z": 9 + } +] diff --git a/scripts/move-to-extra.js b/scripts/move-to-extra.js index 2aeee18a8..9d3a38084 100644 --- a/scripts/move-to-extra.js +++ b/scripts/move-to-extra.js @@ -3,9 +3,29 @@ const path = require('path'); const sortMarkers = require('tibia-maps/src/sort-markers.js'); -// TODO: Make these command-line parameters, in case that’s useful (?). -const DESCRIPTION = 'Ice flower'; -const SPECIAL_ID = 'achievements'; +const SPECIAL_ID = 'percht-island'; + +const isSpecial = (marker) => { + //return marker.description === 'Ice flower'; + // https://tibiamaps.io/map#33686,30971,9:1 + const TOP_LEFT_COORDINATE = { x: 33686, y: 30971 }; + // https://tibiamaps.io/map#33862,31136,9:1 + const BOTTOM_RIGHT_COORDINATE = { x: 33862, y: 31136 }; + const HIGHEST_FLOOR = 1; + const LOWEST_FLOOR = 9; + const isWithinX = ( + marker.x >= TOP_LEFT_COORDINATE.x && + marker.x <= BOTTOM_RIGHT_COORDINATE.x + ); + const isWithinY = ( + marker.y >= TOP_LEFT_COORDINATE.y && + marker.y <= BOTTOM_RIGHT_COORDINATE.y + ); + const isWithinZ = ( + marker.z >= HIGHEST_FLOOR && marker.z <= LOWEST_FLOOR + ); + return isWithinX && isWithinY && isWithinZ; +}; const readJSON = (filePath) => { const absolutePath = path.resolve(__dirname, filePath); @@ -36,7 +56,7 @@ const specials = []; const rest = []; const oldMarkers = readJSON('../data/markers.json'); for (const oldMarker of oldMarkers) { - if (oldMarker.description === DESCRIPTION) { + if (isSpecial(oldMarker)) { specials.push(oldMarker); } else { rest.push(oldMarker);