From 28754ab0065e94363a81736cfe614c1227ae948a Mon Sep 17 00:00:00 2001 From: Metallis Date: Thu, 5 Sep 2024 17:46:59 -0700 Subject: [PATCH] Further category refactors and ensuring POIs have valid types to try and eliminate distance issue. --- Data/Scripts/baitmenu.lua | 2 +- Data/Trails/queens_confidence.trl | Bin 3092 -> 3092 bytes achievements_eod.xml | 5 +- achievements_general.xml | 66 +++--- achievements_hidden.xml | 5 +- achievements_jw.xml | 6 +- achievements_story.xml | 18 +- adventures.xml | 41 ++-- category_structure.xml | 53 +++-- contributors.xml | 16 +- farming_chests.xml | 53 +++-- farming_currency.xml | 375 +++++++++++++++--------------- festivals.xml | 25 +- fishing_bait.xml | 7 +- fishing_holes.xml | 6 +- gathering.xml | 318 +++++++++++++------------ jumping_puzzles.xml | 13 +- legendaries.xml | 15 +- mapcomp_hearts.xml | 5 +- mapcomp_lanterns.xml | 7 +- mastery_insights.xml | 3 +- pewcannon_bashy_pinatas.xml | 88 +++---- pewcannon_specops.xml | 265 +++++++++++---------- psna_scheduled.xml | 5 +- xml_blank.xml | 8 +- 25 files changed, 703 insertions(+), 702 deletions(-) diff --git a/Data/Scripts/baitmenu.lua b/Data/Scripts/baitmenu.lua index ddf579e..358b179 100644 --- a/Data/Scripts/baitmenu.lua +++ b/Data/Scripts/baitmenu.lua @@ -1,5 +1,5 @@ -- Construct Menu -local MMM_MainMenu = Menu:Add("MMM - Fishing Bait Locations", copyBait, false, false, "Copies bait waypoint codes") + -- Submenu Options MMM_MainMenu:Add("Fish Egg", function (Copy) User.SetClipboard("[&BC8EAAA=][&BOcBAAA=][&BEMLAAA=]", "Fish Egg WPs copied to clipboard.") end, false, false, "Copies the relevant WPs to your clipboard.") MMM_MainMenu:Add("Freshwater Minnow", function (Copy) User.SetClipboard("[&BMcMAAA=][&BGMNAAA=][&BC8EAAA=][&BOcBAAA=]", "Freshwater Minnow WPs copied to clipboard.") end, false, false, "Copies the relevant WPs to your clipboard.") diff --git a/Data/Trails/queens_confidence.trl b/Data/Trails/queens_confidence.trl index 28691786a51bfdde5955e0f88c3ec5c6919888e4..9300337fa7464e1e08449022961b16243686527a 100644 GIT binary patch delta 36 ucmV+<0NekR7?c>WvWv - - - + + diff --git a/achievements_general.xml b/achievements_general.xml index 69dddb1..17bf5e5 100644 --- a/achievements_general.xml +++ b/achievements_general.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - + + + + + @@ -31,33 +31,33 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/achievements_hidden.xml b/achievements_hidden.xml index 92a074f..42c6f5f 100644 --- a/achievements_hidden.xml +++ b/achievements_hidden.xml @@ -3,9 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + diff --git a/achievements_jw.xml b/achievements_jw.xml index 7c5067e..ead78dc 100644 --- a/achievements_jw.xml +++ b/achievements_jw.xml @@ -3,10 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - + + diff --git a/achievements_story.xml b/achievements_story.xml index 1fa6e2c..d7c7c72 100644 --- a/achievements_story.xml +++ b/achievements_story.xml @@ -3,16 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/adventures.xml b/adventures.xml index 10aacfb..42c2968 100644 --- a/adventures.xml +++ b/adventures.xml @@ -3,35 +3,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/category_structure.xml b/category_structure.xml index d4bd944..90e6bc2 100644 --- a/category_structure.xml +++ b/category_structure.xml @@ -3,17 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - + + + + - - - - - + + + + + @@ -329,7 +328,7 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + @@ -346,7 +345,7 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + @@ -354,25 +353,25 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -724,5 +723,5 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + \ No newline at end of file diff --git a/contributors.xml b/contributors.xml index 9ee7f4d..4708bd1 100644 --- a/contributors.xml +++ b/contributors.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - + + @@ -15,10 +15,6 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - @@ -34,13 +30,17 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + - + + + + + diff --git a/farming_chests.xml b/farming_chests.xml index 5bfef21..74563b0 100644 --- a/farming_chests.xml +++ b/farming_chests.xml @@ -3,16 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + - - - + + + - + @@ -27,23 +26,23 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -66,7 +65,6 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - @@ -81,5 +79,10 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> + + + + + \ No newline at end of file diff --git a/farming_currency.xml b/farming_currency.xml index d9482d1..b827e5a 100644 --- a/farming_currency.xml +++ b/farming_currency.xml @@ -3,195 +3,194 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/festivals.xml b/festivals.xml index 851042b..94e96d6 100644 --- a/festivals.xml +++ b/festivals.xml @@ -3,22 +3,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + - + - - - - - - + + + + + + - - - + + + \ No newline at end of file diff --git a/fishing_bait.xml b/fishing_bait.xml index 002a9cc..774412d 100644 --- a/fishing_bait.xml +++ b/fishing_bait.xml @@ -3,11 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - + + diff --git a/fishing_holes.xml b/fishing_holes.xml index 1d0e798..5e9e648 100644 --- a/fishing_holes.xml +++ b/fishing_holes.xml @@ -3,10 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> + - - - @@ -3250,5 +3248,5 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + \ No newline at end of file diff --git a/gathering.xml b/gathering.xml index a1dee0b..185c306 100644 --- a/gathering.xml +++ b/gathering.xml @@ -3,9 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + @@ -133,27 +132,27 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -195,84 +194,84 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -309,12 +308,12 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - + + + + + + @@ -365,10 +364,10 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - + + + + @@ -394,30 +393,30 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -432,7 +431,6 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - @@ -452,18 +450,18 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - - - + + + + + + + + + + + + @@ -506,23 +504,23 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - - - - - - + + + + + + + + + + - - + + - - - + + + diff --git a/jumping_puzzles.xml b/jumping_puzzles.xml index 7aec82a..1b63b77 100644 --- a/jumping_puzzles.xml +++ b/jumping_puzzles.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + - + @@ -24,12 +23,12 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + - - + + diff --git a/legendaries.xml b/legendaries.xml index 5d48db6..8e548af 100644 --- a/legendaries.xml +++ b/legendaries.xml @@ -3,21 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + - + - + - + - + @@ -25,7 +24,7 @@ xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + diff --git a/mapcomp_hearts.xml b/mapcomp_hearts.xml index 8552acc..8148a2b 100644 --- a/mapcomp_hearts.xml +++ b/mapcomp_hearts.xml @@ -3,9 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - + + diff --git a/mapcomp_lanterns.xml b/mapcomp_lanterns.xml index eae1d28..41dd067 100644 --- a/mapcomp_lanterns.xml +++ b/mapcomp_lanterns.xml @@ -3,12 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + - - + - + diff --git a/mastery_insights.xml b/mastery_insights.xml index edf8631..9903c62 100644 --- a/mastery_insights.xml +++ b/mastery_insights.xml @@ -3,8 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - + diff --git a/pewcannon_bashy_pinatas.xml b/pewcannon_bashy_pinatas.xml index 37f32db..970ebbf 100644 --- a/pewcannon_bashy_pinatas.xml +++ b/pewcannon_bashy_pinatas.xml @@ -3,45 +3,55 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - + + + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pewcannon_specops.xml b/pewcannon_specops.xml index f301e5c..cd79104 100644 --- a/pewcannon_specops.xml +++ b/pewcannon_specops.xml @@ -1,125 +1,142 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/psna_scheduled.xml b/psna_scheduled.xml index 4323c59..c7d7c97 100644 --- a/psna_scheduled.xml +++ b/psna_scheduled.xml @@ -3,10 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - + - - + diff --git a/xml_blank.xml b/xml_blank.xml index 84acabc..49472f6 100644 --- a/xml_blank.xml +++ b/xml_blank.xml @@ -3,11 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD https://raw.githubusercontent.com/xrandox/Gw2_Marker_Pack_DTD_XSD/main/GW2MarkerPack.xsd" xmlns="https://github.com/xrandox/Gw2_Marker_Pack_DTD_XSD"> - - - - - + + + \ No newline at end of file