Skip to content

Commit

Permalink
Import marker changes from Lee’s client
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasbynens committed Jun 14, 2021
1 parent b66a75f commit 51c3de1
Showing 1 changed file with 62 additions and 20 deletions.
82 changes: 62 additions & 20 deletions data/markers.json
Expand Up @@ -1252,6 +1252,13 @@
"y": 32493,
"z": 4
},
{
"description": "NPC John (night)",
"icon": "mouth",
"x": 32443,
"y": 32487,
"z": 4
},
{
"description": "NPC Fral the Butcher (day)",
"icon": "mouth",
Expand Down Expand Up @@ -6026,6 +6033,13 @@
"y": 32758,
"z": 7
},
{
"description": "Shortcut to Forest of Life",
"icon": "flag",
"x": 32419,
"y": 32458,
"z": 7
},
{
"description": "",
"icon": "down",
Expand Down Expand Up @@ -12928,6 +12942,13 @@
"y": 31063,
"z": 8
},
{
"description": "NPC John the Carpenter (day)",
"icon": "mouth",
"x": 32437,
"y": 32473,
"z": 8
},
{
"description": "Druid spells",
"icon": "star",
Expand Down Expand Up @@ -12970,6 +12991,13 @@
"y": 32508,
"z": 8
},
{
"description": "Bounacean Lion",
"icon": "down",
"x": 32470,
"y": 32492,
"z": 8
},
{
"description": "",
"icon": "up",
Expand Down Expand Up @@ -17114,13 +17142,6 @@
"y": 32777,
"z": 9
},
{
"description": "",
"icon": "up",
"x": 32948,
"y": 31618,
"z": 9
},
{
"description": "",
"icon": "red down",
Expand Down Expand Up @@ -19215,7 +19236,7 @@
"z": 10
},
{
"description": "",
"description": "Forest of Life",
"icon": "red left",
"x": 32423,
"y": 32501,
Expand Down Expand Up @@ -19635,7 +19656,7 @@
"z": 10
},
{
"description": "Diremaws",
"description": "Crypts ",
"icon": "flag",
"x": 32630,
"y": 31839,
Expand Down Expand Up @@ -22070,6 +22091,13 @@
"y": 31656,
"z": 11
},
{
"description": "Shortcut to surface",
"icon": "flag",
"x": 32528,
"y": 32488,
"z": 11
},
{
"description": "Dwarven pickaxe (daily spawn)",
"icon": "bag",
Expand Down Expand Up @@ -22163,7 +22191,7 @@
},
{
"description": "Killing Task",
"icon": "checkmark",
"icon": "sword",
"x": 32658,
"y": 31722,
"z": 11
Expand Down Expand Up @@ -23457,8 +23485,8 @@
"z": 12
},
{
"description": "Fishing rod task",
"icon": "checkmark",
"description": "Fishing in Lava task",
"icon": "crossmark",
"x": 32083,
"y": 31465,
"z": 12
Expand Down Expand Up @@ -25109,8 +25137,8 @@
"z": 13
},
{
"description": "Basalt task",
"icon": "checkmark",
"description": "The Mega Magmaoid task",
"icon": "crossmark",
"x": 32067,
"y": 31479,
"z": 13
Expand Down Expand Up @@ -26460,8 +26488,8 @@
"z": 14
},
{
"description": "War hammer task",
"icon": "checkmark",
"description": "The Lost Structure task",
"icon": "crossmark",
"x": 32069,
"y": 31488,
"z": 14
Expand Down Expand Up @@ -26614,8 +26642,8 @@
"z": 14
},
{
"description": "Gnome miner task",
"icon": "checkmark",
"description": "Gnomish Explorer task ",
"icon": "crossmark",
"x": 32181,
"y": 31408,
"z": 14
Expand All @@ -26628,8 +26656,8 @@
"z": 14
},
{
"description": "Wax task",
"icon": "checkmark",
"description": "Wax Research task",
"icon": "crossmark",
"x": 32188,
"y": 31421,
"z": 14
Expand Down Expand Up @@ -27488,6 +27516,13 @@
"y": 31243,
"z": 14
},
{
"description": "Levitate Spot (face west)",
"icon": "red down",

This comment has been minimized.

Copy link
@mathiasbynens

mathiasbynens Jun 14, 2021

Author Member

FYI, the convention we use is to use red up/left/down/right to indicate the position your character has to face (rather than whether you need to levitate up or down). That way you can immediately tell which way to face when mapclicking a dangerous area, without having to read the label (which takes a second to appear when you put your mouse in the right position). I've changed this (and the other marker below) in a follow-up commit.

Thanks for these additions!

"x": 33539,
"y": 31808,
"z": 14
},
{
"description": "",
"icon": "crossmark",
Expand Down Expand Up @@ -29000,6 +29035,13 @@
"y": 32182,
"z": 15
},
{
"description": "Levitate Spot (face east)",
"icon": "red up",
"x": 33538,
"y": 31808,
"z": 15
},
{
"description": "Blue crystal",
"icon": "!",
Expand Down

0 comments on commit 51c3de1

Please sign in to comment.