Skip to content

Commit a863b7f

Browse files
mathiasbynensmathiasbynens
committed
Add ignore marker pack
Also: - Move Dawnport client-inserted markers to the `ignore` pack. - Make sure any automated marker imports apply the `ignore` pack afterwards. Issue: #292
1 parent 2bb80e6 commit a863b7f

File tree

6 files changed

+195
-140
lines changed

6 files changed

+195
-140
lines changed

‎.github/workflows/import-markers-lee.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
mkdir -p minimap
3030
curl --silent --location --output minimap/minimapmarkers.bin "${URL}"
3131
node_modules/.bin/tibia-maps --from-minimap=minimap --output-dir=data --markers-only
32+
node scripts/disable-marker-pack.mjs 'ignore'
3233
git config user.name 'TibiaMaps.io'
3334
git config user.email '[email protected]'
3435
git commit data/markers.json -m 'Import marker changes from Lee’s client'

‎.github/workflows/import-markers-pieter.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
mkdir -p minimap
3030
curl --silent --location --output minimap/minimapmarkers.bin "${URL}"
3131
node_modules/.bin/tibia-maps --from-minimap=minimap --output-dir=data --markers-only
32+
node scripts/disable-marker-pack.mjs 'ignore'
3233
git config user.name 'TibiaMaps.io'
3334
git config user.email '[email protected]'
3435
git commit data/markers.json -m 'Import marker changes from Pieter’s client'

‎.github/workflows/import-markers-ricci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
mkdir -p minimap
3030
curl --silent --location --output minimap/minimapmarkers.bin "${URL}"
3131
node_modules/.bin/tibia-maps --from-minimap=minimap --output-dir=data --markers-only
32+
node scripts/disable-marker-pack.mjs 'ignore'
3233
git config user.name 'TibiaMaps.io'
3334
git config user.email '[email protected]'
3435
git commit data/markers.json -m 'Import marker changes from Ricci’s client'

‎.github/workflows/import-markers-spenceron.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
mkdir -p minimap
3030
curl --silent --location --output minimap/minimapmarkers.bin "${URL}"
3131
node_modules/.bin/tibia-maps --from-minimap=minimap --output-dir=data --markers-only
32+
node scripts/disable-marker-pack.mjs 'ignore'
3233
git config user.name 'TibiaMaps.io'
3334
git config user.email '[email protected]'
3435
git commit data/markers.json -m 'Import marker changes from Spenceron’s client'

‎data/markers.json‎

Lines changed: 0 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -636,34 +636,13 @@
636636
"y": 32876,
637637
"z": 3
638638
},
639-
{
640-
"description": "Northern safe trade room",
641-
"icon": "lock",
642-
"x": 32057,
643-
"y": 31883,
644-
"z": 3
645-
},
646-
{
647-
"description": "Southern safe trade room",
648-
"icon": "lock",
649-
"x": 32057,
650-
"y": 31897,
651-
"z": 3
652-
},
653639
{
654640
"description": "Levitate spot",
655641
"icon": "red right",
656642
"x": 32060,
657643
"y": 32596,
658644
"z": 3
659645
},
660-
{
661-
"description": "To the shops, temple, bank, and vocation gates",
662-
"icon": "down",
663-
"x": 32065,
664-
"y": 31890,
665-
"z": 3
666-
},
667646
{
668647
"description": "Key 0010 (silver key)",
669648
"icon": "?",
@@ -1161,13 +1140,6 @@
11611140
"y": 31899,
11621141
"z": 4
11631142
},
1164-
{
1165-
"description": "Druid and sorcerer spells",
1166-
"icon": "star",
1167-
"x": 32057,
1168-
"y": 31882,
1169-
"z": 4
1170-
},
11711143
{
11721144
"description": "",
11731145
"icon": "down",
@@ -1182,13 +1154,6 @@
11821154
"y": 32597,
11831155
"z": 4
11841156
},
1185-
{
1186-
"description": "To the safe trade rooms",
1187-
"icon": "up",
1188-
"x": 32065,
1189-
"y": 31890,
1190-
"z": 4
1191-
},
11921157
{
11931158
"description": "Levitate spot",
11941159
"icon": "red down",
@@ -1203,34 +1168,13 @@
12031168
"y": 31034,
12041169
"z": 4
12051170
},
1206-
{
1207-
"description": "Knight and paladin spells",
1208-
"icon": "star",
1209-
"x": 32072,
1210-
"y": 31882,
1211-
"z": 4
1212-
},
1213-
{
1214-
"description": "Mr Morris’ room",
1215-
"icon": "!",
1216-
"x": 32072,
1217-
"y": 31899,
1218-
"z": 4
1219-
},
12201171
{
12211172
"description": "",
12221173
"icon": "up",
12231174
"x": 32072,
12241175
"y": 32604,
12251176
"z": 4
12261177
},
1227-
{
1228-
"description": "To the shops, temple, and vocation gates",
1229-
"icon": "down",
1230-
"x": 32073,
1231-
"y": 31895,
1232-
"z": 4
1233-
},
12341178
{
12351179
"description": "Levitate spot",
12361180
"icon": "up",
@@ -2022,13 +1966,6 @@
20221966
"y": 31567,
20231967
"z": 5
20241968
},
2025-
{
2026-
"description": "Ship to the Mainland",
2027-
"icon": "flag",
2028-
"x": 32033,
2029-
"y": 31874,
2030-
"z": 5
2031-
},
20321969
{
20331970
"description": "",
20341971
"icon": "down",
@@ -2043,27 +1980,13 @@
20431980
"y": 32609,
20441981
"z": 5
20451982
},
2046-
{
2047-
"description": "Potions and magic store",
2048-
"icon": "bag",
2049-
"x": 32057,
2050-
"y": 31900,
2051-
"z": 5
2052-
},
20531983
{
20541984
"description": "",
20551985
"icon": "up",
20561986
"x": 32058,
20571987
"y": 32602,
20581988
"z": 5
20591989
},
2060-
{
2061-
"description": "To the temple and vocation doors",
2062-
"icon": "cross",
2063-
"x": 32065,
2064-
"y": 31888,
2065-
"z": 5
2066-
},
20671990
{
20681991
"description": "Levitate spot",
20691992
"icon": "red up",
@@ -2078,20 +2001,6 @@
20782001
"y": 31035,
20792002
"z": 5
20802003
},
2081-
{
2082-
"description": "General information and creature products",
2083-
"icon": "!",
2084-
"x": 32071,
2085-
"y": 31900,
2086-
"z": 5
2087-
},
2088-
{
2089-
"description": "To the spell trainers, safe trade rooms, and Mr Morris",
2090-
"icon": "up",
2091-
"x": 32074,
2092-
"y": 31895,
2093-
"z": 5
2094-
},
20952004
{
20962005
"description": "",
20972006
"icon": "down",
@@ -3394,69 +3303,20 @@
33943303
"y": 32610,
33953304
"z": 6
33963305
},
3397-
{
3398-
"description": "To the Mainland",
3399-
"icon": "red left",
3400-
"x": 32048,
3401-
"y": 31878,
3402-
"z": 6
3403-
},
34043306
{
34053307
"description": "",
34063308
"icon": "down",
34073309
"x": 32050,
34083310
"y": 32600,
34093311
"z": 6
34103312
},
3411-
{
3412-
"description": "Sorcerer vocation door",
3413-
"icon": "star",
3414-
"x": 32055,
3415-
"y": 31886,
3416-
"z": 6
3417-
},
3418-
{
3419-
"description": "Paladin vocation door",
3420-
"icon": "star",
3421-
"x": 32059,
3422-
"y": 31886,
3423-
"z": 6
3424-
},
3425-
{
3426-
"description": "Alternate bank",
3427-
"icon": "$",
3428-
"x": 32064,
3429-
"y": 31881,
3430-
"z": 6
3431-
},
3432-
{
3433-
"description": "Dawnport temple",
3434-
"icon": "cross",
3435-
"x": 32064,
3436-
"y": 31892,
3437-
"z": 6
3438-
},
34393313
{
34403314
"description": "Levitate spot",
34413315
"icon": "red down",
34423316
"x": 32067,
34433317
"y": 32632,
34443318
"z": 6
34453319
},
3446-
{
3447-
"description": "Knight vocation door",
3448-
"icon": "star",
3449-
"x": 32069,
3450-
"y": 31886,
3451-
"z": 6
3452-
},
3453-
{
3454-
"description": "Druid vocation door",
3455-
"icon": "star",
3456-
"x": 32073,
3457-
"y": 31886,
3458-
"z": 6
3459-
},
34603320
{
34613321
"description": "",
34623322
"icon": "up",

0 commit comments

Comments
 (0)