Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Data-Storage/urls.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
},
{
"id": "dataStaticMaps",
"md5": "8d96152542e03ccad186a993ca1cf9c8",
"md5": "96913e54566a0f088ec799c5c5795bac",
"path": "Reference/maps.json",
"url": "https://cdn.wynntils.com/static/Reference/maps.json"
},
Expand Down
7 changes: 5 additions & 2 deletions Generators/update_maps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

base_dir="$(cd $(dirname "$0")/.. 2>/dev/null && pwd)"
WYNNDATA_DIR=${WYNNDATA_DIR:-$base_dir}
BASE_URL="https://cdn.wynntils.com/static/Reference/maps"
BASE_URL="https://cdn.wynntils.com/static"
MAP_BASE_PATH="Reference/maps"
JSON_METADATA_FILE="$WYNNDATA_DIR/Reference/maps.json"

# ImageMagick respects SOURCE_DATE_EPOCH, and will make consistent timestamps if it is set
Expand Down Expand Up @@ -133,10 +134,12 @@ function do_map() {
z_min=$(expr $Z1 '*' 512)
z_max=$(expr $Z2 '*' 512 + 511)
MD5=$(md5sum $OUTPUT_FILE_NAME | cut -d' ' -f1)
map_name="map-$FILE.png"
cat <<EOT >> $JSON_METADATA_FILE
{
"name": "$NAME",
"url": "$BASE_URL/map-$FILE.png",
"url": "$BASE_URL/$MAP_BASE_PATH/$map_name",
"path": "$MAP_BASE_PATH/$map_name",
"x1": $x_min,
"z1": $z_min,
"x2": $x_max,
Expand Down
45 changes: 45 additions & 0 deletions Reference/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
"name": "Main 1-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-1-1.png",
"path": "Reference/maps/map-main-1-1.png",
"x1": -2560,
"z1": -6144,
"x2": -1025,
Expand All @@ -11,6 +12,7 @@
{
"name": "Main 1-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-1-2.png",
"path": "Reference/maps/map-main-1-2.png",
"x1": -1024,
"z1": -6144,
"x2": 1023,
Expand All @@ -20,6 +22,7 @@
{
"name": "Main 1-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-1-3.png",
"path": "Reference/maps/map-main-1-3.png",
"x1": 1024,
"z1": -6144,
"x2": 2047,
Expand All @@ -29,6 +32,7 @@
{
"name": "Main 2-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-2-1.png",
"path": "Reference/maps/map-main-2-1.png",
"x1": -2560,
"z1": -5120,
"x2": -1025,
Expand All @@ -38,6 +42,7 @@
{
"name": "Main 2-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-2-2.png",
"path": "Reference/maps/map-main-2-2.png",
"x1": -1024,
"z1": -5120,
"x2": 1023,
Expand All @@ -47,6 +52,7 @@
{
"name": "Main 2-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-2-3.png",
"path": "Reference/maps/map-main-2-3.png",
"x1": 1024,
"z1": -5120,
"x2": 2047,
Expand All @@ -56,6 +62,7 @@
{
"name": "Main 3-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-3-1.png",
"path": "Reference/maps/map-main-3-1.png",
"x1": -2560,
"z1": -4096,
"x2": -1025,
Expand All @@ -65,6 +72,7 @@
{
"name": "Main 3-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-3-2.png",
"path": "Reference/maps/map-main-3-2.png",
"x1": -1024,
"z1": -4096,
"x2": 1023,
Expand All @@ -74,6 +82,7 @@
{
"name": "Main 3-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-3-3.png",
"path": "Reference/maps/map-main-3-3.png",
"x1": 1024,
"z1": -4096,
"x2": 2047,
Expand All @@ -83,6 +92,7 @@
{
"name": "Main 4-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-4-1.png",
"path": "Reference/maps/map-main-4-1.png",
"x1": -2560,
"z1": -3072,
"x2": -1025,
Expand All @@ -92,6 +102,7 @@
{
"name": "Main 4-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-4-2.png",
"path": "Reference/maps/map-main-4-2.png",
"x1": -1024,
"z1": -3072,
"x2": 1023,
Expand All @@ -101,6 +112,7 @@
{
"name": "Main 4-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-4-3.png",
"path": "Reference/maps/map-main-4-3.png",
"x1": 1024,
"z1": -3072,
"x2": 2047,
Expand All @@ -110,6 +122,7 @@
{
"name": "Main 5-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-5-1.png",
"path": "Reference/maps/map-main-5-1.png",
"x1": -2560,
"z1": -2048,
"x2": -1025,
Expand All @@ -119,6 +132,7 @@
{
"name": "Main 5-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-5-2.png",
"path": "Reference/maps/map-main-5-2.png",
"x1": -1024,
"z1": -2048,
"x2": 1023,
Expand All @@ -128,6 +142,7 @@
{
"name": "Main 5-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-5-3.png",
"path": "Reference/maps/map-main-5-3.png",
"x1": 1024,
"z1": -2048,
"x2": 2047,
Expand All @@ -137,6 +152,7 @@
{
"name": "Main 6-1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-6-1.png",
"path": "Reference/maps/map-main-6-1.png",
"x1": -2560,
"z1": -1024,
"x2": -1025,
Expand All @@ -146,6 +162,7 @@
{
"name": "Main 6-2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-6-2.png",
"path": "Reference/maps/map-main-6-2.png",
"x1": -1024,
"z1": -1024,
"x2": 1023,
Expand All @@ -155,6 +172,7 @@
{
"name": "Main 6-3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-main-6-3.png",
"path": "Reference/maps/map-main-6-3.png",
"x1": 1024,
"z1": -1024,
"x2": 2047,
Expand All @@ -164,6 +182,7 @@
{
"name": "Ceralus Farm 1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-ceralus-1.png",
"path": "Reference/maps/map-ceralus-1.png",
"x1": -5120,
"z1": -1536,
"x2": -3073,
Expand All @@ -173,6 +192,7 @@
{
"name": "Ceralus Farm 2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-ceralus-2.png",
"path": "Reference/maps/map-ceralus-2.png",
"x1": -8704,
"z1": -1536,
"x2": -7681,
Expand All @@ -182,6 +202,7 @@
{
"name": "Deja Vu",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-deja-vu.png",
"path": "Reference/maps/map-deja-vu.png",
"x1": -4608,
"z1": 1024,
"x2": -3585,
Expand All @@ -191,6 +212,7 @@
{
"name": "King's Recruit",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kings-recruit.png",
"path": "Reference/maps/map-kings-recruit.png",
"x1": -10752,
"z1": -2560,
"x2": -10241,
Expand All @@ -200,6 +222,7 @@
{
"name": "Misadventure on the Sea",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-misadventure-on-the-sea.png",
"path": "Reference/maps/map-misadventure-on-the-sea.png",
"x1": -3584,
"z1": 15360,
"x2": -2049,
Expand All @@ -209,6 +232,7 @@
{
"name": "Realm of Light",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-realm-of-light.png",
"path": "Reference/maps/map-realm-of-light.png",
"x1": -1536,
"z1": -6656,
"x2": -513,
Expand All @@ -218,6 +242,7 @@
{
"name": "Seaskipper",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-seaskipper.png",
"path": "Reference/maps/map-seaskipper.png",
"x1": 15872,
"z1": 15360,
"x2": 16895,
Expand All @@ -227,6 +252,7 @@
{
"name": "Sunset Valley",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-sunset-valley.png",
"path": "Reference/maps/map-sunset-valley.png",
"x1": -2048,
"z1": 9728,
"x2": -1025,
Expand All @@ -236,6 +262,7 @@
{
"name": "The Void",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-void.png",
"path": "Reference/maps/map-void.png",
"x1": 13312,
"z1": -5120,
"x2": 14335,
Expand All @@ -245,6 +272,7 @@
{
"name": "Wynnter Fair",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-wynnter-fair.png",
"path": "Reference/maps/map-wynnter-fair.png",
"x1": -1536,
"z1": 15872,
"x2": -513,
Expand All @@ -254,6 +282,7 @@
{
"name": "Wynnter Fair Parkour",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-wynnter-fair-parkour.png",
"path": "Reference/maps/map-wynnter-fair-parkour.png",
"x1": -2048,
"z1": 17920,
"x2": -1537,
Expand All @@ -263,6 +292,7 @@
{
"name": "A Sandy Scandal 1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-sandy-scandal-1.png",
"path": "Reference/maps/map-sandy-scandal-1.png",
"x1": -14336,
"z1": 20480,
"x2": -13313,
Expand All @@ -272,6 +302,7 @@
{
"name": "A Sandy Scandal 2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-sandy-scandal-2.png",
"path": "Reference/maps/map-sandy-scandal-2.png",
"x1": -15360,
"z1": 20480,
"x2": -14337,
Expand All @@ -281,6 +312,7 @@
{
"name": "A Sandy Scandal 3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-sandy-scandal-3.png",
"path": "Reference/maps/map-sandy-scandal-3.png",
"x1": -17408,
"z1": 20992,
"x2": -16385,
Expand All @@ -290,6 +322,7 @@
{
"name": "Kingdom of Sand 1",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kingdom-of-sand-1.png",
"path": "Reference/maps/map-kingdom-of-sand-1.png",
"x1": 1536,
"z1": -2048,
"x2": 2559,
Expand All @@ -299,6 +332,7 @@
{
"name": "Kingdom of Sand 2",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kingdom-of-sand-2.png",
"path": "Reference/maps/map-kingdom-of-sand-2.png",
"x1": 2048,
"z1": 512,
"x2": 3071,
Expand All @@ -308,6 +342,7 @@
{
"name": "Kingdom of Sand 3",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kingdom-of-sand-3.png",
"path": "Reference/maps/map-kingdom-of-sand-3.png",
"x1": 3072,
"z1": -1536,
"x2": 3583,
Expand All @@ -317,6 +352,7 @@
{
"name": "Kingdom of Sand 4",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kingdom-of-sand-4.png",
"path": "Reference/maps/map-kingdom-of-sand-4.png",
"x1": 5632,
"z1": -2560,
"x2": 6143,
Expand All @@ -326,6 +362,7 @@
{
"name": "Kingdom of Sand 5",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-kingdom-of-sand-5.png",
"path": "Reference/maps/map-kingdom-of-sand-5.png",
"x1": 7680,
"z1": -2048,
"x2": 8703,
Expand All @@ -335,6 +372,7 @@
{
"name": "Talespun Citadel",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-talespun-citadel.png",
"path": "Reference/maps/map-talespun-citadel.png",
"x1": -1536,
"z1": 9728,
"x2": -1025,
Expand All @@ -344,6 +382,7 @@
{
"name": "Ozoth's Nest",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-ozoths-nest.png",
"path": "Reference/maps/map-ozoths-nest.png",
"x1": -16384,
"z1": 1024,
"x2": -15873,
Expand All @@ -353,6 +392,7 @@
{
"name": "Death's Realm",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-deaths-realm.png",
"path": "Reference/maps/map-deaths-realm.png",
"x1": 0,
"z1": -8192,
"x2": 1023,
Expand All @@ -362,6 +402,7 @@
{
"name": "Little Wing Navigation",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-little-wing-navigation.png",
"path": "Reference/maps/map-little-wing-navigation.png",
"x1": 3072,
"z1": -5120,
"x2": 3583,
Expand All @@ -371,6 +412,7 @@
{
"name": "On Board Little Wing",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-on-board-little-wing.png",
"path": "Reference/maps/map-on-board-little-wing.png",
"x1": 2048,
"z1": -4608,
"x2": 3071,
Expand All @@ -380,6 +422,7 @@
{
"name": "Gateway Island",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-gateway-island.png",
"path": "Reference/maps/map-gateway-island.png",
"x1": 19456,
"z1": -5120,
"x2": 20479,
Expand All @@ -389,6 +432,7 @@
{
"name": "Gateway Island Crash",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-gateway-island-crash.png",
"path": "Reference/maps/map-gateway-island-crash.png",
"x1": 20992,
"z1": -4608,
"x2": 21503,
Expand All @@ -398,6 +442,7 @@
{
"name": "The Feathers Fly Part II, Corkus City Plant",
"url": "https://cdn.wynntils.com/static/Reference/maps/map-feathers-fly-corkus-city-plant.png",
"path": "Reference/maps/map-feathers-fly-corkus-city-plant.png",
"x1": -512,
"z1": 20480,
"x2": 511,
Expand Down