Adding Luaren-inspired Calcified Gasp farm, fixed issue with PSNA Scr…

…ipt function only ever copying Monday's WPs, fixed issue with Toxic Krait Historian being permanently visible while on relevant maps
Metallis · Jan 12, 2024 · adbbabc · adbbabc
1 parent 5198d28
commit adbbabc
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 169 deletions.
diff --git a/Data/Trails/luaren_amny_stardust.trl b/Data/Trails/luaren_amny_stardust.trl
diff --git a/Data/Trails/luaren_nayos_gasps.trl b/Data/Trails/luaren_nayos_gasps.trl
diff --git a/Scripts/psna.lua b/Scripts/psna.lua
@@ -1,53 +1,33 @@
-MMM.psna = {}
+MMM.psna = {
+    currentUTCTime = nil,
+    utcMinusEight = nil,
+    psnaDay = nil,
+    copy = nil
+}
 
 Debug:Watch("MMM_PSNA", MMM.psna)
 
--- #region Constants
-
-local MARKER_ATTRIBUTES = {
-    ["schedule-duration"] = 1440,
-    iconSize = 0,
-    ["copy-message"] = "PSNA Waypoints copied to clipboard!",
-    triggerRange="1",
-    autoTrigger="1"
-}
-local MARKER_COPIES = {
-    { "0 8 * * 1", "[&BIgHAAA=][&BEwDAAA=][&BNIEAAA=][&BKYBAAA=][&BIMCAAA=][&BB4CAAA=]" },
-    { "0 8 * * 2", "[&BH8HAAA=][&BEgAAAA=][&BBEAAAA=][&BKgCAAA=][&BGQCAAA=][&BIMBAAA=]" },
-    { "0 8 * * 3", "[&BHoHAAA=][&BCEDAAA=][&BLQDAAA=][&BKYAAAA=][&BLQAAAA=][&BFEDAAA=]" },
-    { "0 8 * * 4", "[&BH8HAAA=][&BF0AAAA=][&BEUDAAA=][&BO4CAAA=][&BJcBAAA=][&BOQBAAA=]" },
-    { "0 8 * * 5", "[&BJcHAAA=][&BNUGAAA=][&BKYCAAA=][&BMwCAAA=][&BHsBAAA=][&BNMAAAA=]" },
-    { "0 8 * * 6", "[&BH8HAAA=][&BB8DAAA=][&BNMCAAA=][&BFMCAAA=][&BJIBAAA=][&BF8BAAA=]" },
-    { "0 8 * * 0", "[&BIYHAAA=][&BDoBAAA=][&BO4CAAA=][&BKcBAAA=][&BIUCAAA=][&BCECAAA=]" }
+local COPY_INFO = {
+    { "Monday", "[&BIgHAAA=][&BEwDAAA=][&BNIEAAA=][&BKYBAAA=][&BIMCAAA=][&BB4CAAA=]" },
+    { "Tuesday", "[&BH8HAAA=][&BEgAAAA=][&BBEAAAA=][&BKgCAAA=][&BGQCAAA=][&BIMBAAA=]" },
+    { "Wednesday", "[&BHoHAAA=][&BCEDAAA=][&BLQDAAA=][&BKYAAAA=][&BLQAAAA=][&BFEDAAA=]" },
+    { "Thursday", "[&BH8HAAA=][&BF0AAAA=][&BEUDAAA=][&BO4CAAA=][&BJcBAAA=][&BOQBAAA=]" },
+    { "Friday", "[&BJcHAAA=][&BNUGAAA=][&BKYCAAA=][&BMwCAAA=][&BHsBAAA=][&BNMAAAA=]" },
+    { "Saturday", "[&BH8HAAA=][&BB8DAAA=][&BNMCAAA=][&BFMCAAA=][&BJIBAAA=][&BF8BAAA=]" },
+    { "Sunday", "[&BIYHAAA=][&BDoBAAA=][&BO4CAAA=][&BKcBAAA=][&BIUCAAA=][&BCECAAA=]" }
 }
 
--- #endregion
-
--- Generates PSNA markers at the players current location until finding the current one, then copies it to their clipboard
+-- Copies the current day's PSNA to the user's clipboard
 function MMM_CopyPSNA()
-    -- Get current position
-    local origin = Mumble.PlayerCharacter.Position
-
-    --Create generic marker attributes and add in coordinates
-    local newMarkerAttributes = MARKER_ATTRIBUTES
-    newMarkerAttributes.xpos = origin.X
-    newMarkerAttributes.ypos = origin.Z
-    newMarkerAttributes.zpos = origin.Y
-
-    -- Loop through all markers until we find the one that isn't filtered by schedule
-    for _, copyAttr in ipairs(MARKER_COPIES) do
-        newMarkerAttributes.schedule = copyAttr[1]
-        newMarkerAttributes.copy = copyAttr[2]
-        local newMarker = Pack:CreateMarker(newMarkerAttributes)
-
-        if (newMarker.BehaviorFiltered == false) then
-            -- Once we find the non-filtered one, it'll copy itself to clipboard, then we remove it and break from the loop
-            newMarker.Interact(true)
-            newMarker:Remove()
+    MMM.psna.currentUTCTime = os.time(os.date("!*t"))
+    MMM.psna.utcMinusEight = MMM.psna.currentUTCTime - (8 * 60 * 60)
+    MMM.psna.psnaDay = os.date("%A", MMM.psna.utcMinusEight)
+
+    for _, day in ipairs(COPY_INFO) do
+        if day[1] == MMM.psna.psnaDay then
+            MMM.psna.copy = day[2]
+            User.SetClipboard(MMM.psna.copy, "PSNA Waypoints copied to clipboard!")
             break
-        -- Otherwise delete the marker we just created
-        else
-            newMarker:Remove()
         end
     end
 end
diff --git a/luaren_gasp_farm.xml b/luaren_gasp_farm.xml
@@ -0,0 +1,51 @@
+<OverlayData>
+	<!-- Discord Invite:https://discord.gg/FP8dQj6KBj -->
+    <!-- Credit to Luaren on YT! https://www.youtube.com/watch?v=Rd6gCSsgMUo -->
+	<MarkerCategory Name="exploration" DisplayName="Exploration">
+		<MarkerCategory Name="resources" DisplayName="Resources">
+			<MarkerCategory Name="currency" DisplayName="Map Currencies and Other">
+				<MarkerCategory Name="gasp" DisplayName="Calcified Gasp">
+					<MarkerCategory Name="orbs" DisplayName="Orb Visibility Rings" iconFile="Data/Icons/ring.png" fadeNear="9000" fadeFar="10000" miniMapVisibility="0" mapVisibility="0"/>
+				</MarkerCategory>
+			</MarkerCategory>
+		</MarkerCategory>
+	</MarkerCategory>
+	<POIs>
+		<!-- Inner Nayos -->
+		<Trail type="exploration.resources.currency.gasp" trailData="Data/Trails/luaren_nayos_gasps.trl" texture="Data/Icons/luaren_uwu_arrow.png" fadeNear="3000" fadeFar="5000" color="ff6ede"/>
+		<POI MapID="1526" xpos="654.728" ypos="201.499" zpos="-133.086" type="exploration.resources.currency.gasp.orbs" GUID="BmfBpKDBPUm/mbBsC+gTPw=="/>
+		<POI MapID="1526" xpos="676.355" ypos="224.592" zpos="-126.06" type="exploration.resources.currency.gasp.orbs" GUID="ivRG9NB6Bkq4EKw1ULkuow=="/>
+		<POI MapID="1526" xpos="647.598" ypos="232.961" zpos="-93.4242" type="exploration.resources.currency.gasp.orbs" GUID="ibjr5zuzqkm6r2vEiEhEUw=="/>
+		<POI MapID="1526" xpos="605.576" ypos="225.903" zpos="-91.9099" type="exploration.resources.currency.gasp.orbs" GUID="KwiDb3UOOUi1oSaT7k38Ig=="/>
+		<POI MapID="1526" xpos="630.961" ypos="256.337" zpos="-53.6443" type="exploration.resources.currency.gasp.orbs" GUID="7xLG3g6PmUOuObMcaQzUOQ=="/>
+		<POI MapID="1526" xpos="634.476" ypos="256.205" zpos="-27.3933" type="exploration.resources.currency.gasp.orbs" GUID="qLYcL4UMc0KXUKh5om8ZSQ=="/>
+		<POI MapID="1526" xpos="660.771" ypos="254.366" zpos="-22.0756" type="exploration.resources.currency.gasp.orbs" GUID="xTFvfqcwi0Saf36k5ycWSg=="/>
+		<POI MapID="1526" xpos="516.236" ypos="245.098" zpos="330.838" type="exploration.resources.currency.gasp.orbs" GUID="Pe4vg+uvjkKQ9kt01QaCIQ=="/>
+		<POI MapID="1526" xpos="500.071" ypos="252.569" zpos="321.775" type="exploration.resources.currency.gasp.orbs" GUID="JkSsNHH3jkm5xHybfR8bvg=="/>
+		<POI MapID="1526" xpos="490.457" ypos="257.929" zpos="306.714" type="exploration.resources.currency.gasp.orbs" GUID="HaaS5U6x7EC5u7MTtWRvrA=="/>
+		<POI MapID="1526" xpos="458.638" ypos="269.795" zpos="302.221" type="exploration.resources.currency.gasp.orbs" GUID="+TAQ9J7cSk6I4UL5NOsS/g=="/>
+		<POI MapID="1526" xpos="416.809" ypos="263.476" zpos="342.951" type="exploration.resources.currency.gasp.orbs" GUID="UoYtKpCIJEGfZxopjSVeXA=="/>
+		<POI MapID="1526" xpos="418.891" ypos="269.742" zpos="362.16" type="exploration.resources.currency.gasp.orbs" GUID="aUYiuf585Ue1Tgwk4eQ74g=="/>
+		<POI MapID="1526" xpos="433.472" ypos="259.975" zpos="361.142" type="exploration.resources.currency.gasp.orbs" GUID="fjwsmsaPh0K1FygTl3y0BQ=="/>
+		<POI MapID="1526" xpos="449.751" ypos="269.535" zpos="367.709" type="exploration.resources.currency.gasp.orbs" GUID="u9qrCUwY60yOs5i4f3E1pQ=="/>
+		<POI MapID="1526" xpos="773.475" ypos="260.043" zpos="457.418" type="exploration.resources.currency.gasp.orbs" GUID="fPhYF1VIAkC1zDr1HgiPLw=="/>
+		<POI MapID="1526" xpos="777.301" ypos="273.132" zpos="473.345" type="exploration.resources.currency.gasp.orbs" GUID="zqOVRAwwmEe4kvQU9ZAd3w=="/>
+		<POI MapID="1526" xpos="779.824" ypos="281.804" zpos="483.225" type="exploration.resources.currency.gasp.orbs" GUID="Nnuli23Sf0q5lgSOtDGtMw=="/>
+		<POI MapID="1526" xpos="781.42" ypos="288.463" zpos="491.479" type="exploration.resources.currency.gasp.orbs" GUID="AJlca8H1tEehNTWvpLbHnQ=="/>
+		<POI MapID="1526" xpos="783.291" ypos="296.574" zpos="499.895" type="exploration.resources.currency.gasp.orbs" GUID="VenwzFTcrkiKEg8qB+iWIg=="/>
+		<POI MapID="1526" xpos="786.94" ypos="307.7" zpos="515.307" type="exploration.resources.currency.gasp.orbs" GUID="FzcVtQXyIkC5PEVIwU94ag=="/>
+		<POI MapID="1526" xpos="790.075" ypos="316.586" zpos="528.112" type="exploration.resources.currency.gasp.orbs" GUID="3nH8ZYSlOU29KPsYtjNKXA=="/>
+		<POI MapID="1526" xpos="963.502" ypos="316.357" zpos="188.757" type="exploration.resources.currency.gasp.orbs" GUID="2Gc6KrV3qEGHKS5U/5jXMA=="/>
+		<POI MapID="1526" xpos="968.796" ypos="335.792" zpos="130.093" type="exploration.resources.currency.gasp.orbs" GUID="ctde6b5asUWF9T5hL/LNXQ=="/>
+		<POI MapID="1526" xpos="926.402" ypos="320.585" zpos="195.003" type="exploration.resources.currency.gasp.orbs" GUID="gkxGPFLrGkaH1C16Y3IFow=="/>
+		<POI MapID="1526" xpos="901.516" ypos="322.863" zpos="132.336" type="exploration.resources.currency.gasp.orbs" GUID="624RKcar3kugpZjxY8VG/Q=="/>
+		<POI MapID="1526" xpos="935.955" ypos="302.999" zpos="109.124" type="exploration.resources.currency.gasp.orbs" GUID="uQzdCMsuG0eYjHYv3qT09g=="/>
+		<POI MapID="1526" xpos="887.443" ypos="283.652" zpos="144.133" type="exploration.resources.currency.gasp.orbs" GUID="gHvD5KeJdUim+dtDxakfsQ=="/>
+		<POI MapID="1526" xpos="940.497" ypos="281.632" zpos="181.578" type="exploration.resources.currency.gasp.orbs" GUID="YkQXGRCiAUOV25b6DdKSyg=="/>
+		<POI MapID="1526" xpos="953.829" ypos="270.798" zpos="110.281" type="exploration.resources.currency.gasp.orbs" GUID="053LJDkHZESsyy/6xoqMPA=="/>
+		<POI MapID="1526" xpos="973.327" ypos="258.277" zpos="137.476" type="exploration.resources.currency.gasp.orbs" GUID="p3t5yG0eE0Cy8avMI3BE0w=="/>
+		<POI MapID="1526" xpos="900.788" ypos="259.708" zpos="191.877" type="exploration.resources.currency.gasp.orbs" GUID="NfLDnvuKPEGXHKXPCUvl6Q=="/>
+		<POI MapID="1526" xpos="978.425" ypos="239.511" zpos="118.012" type="exploration.resources.currency.gasp.orbs" GUID="UBgmbfW3P0mUy6joNaqzLA=="/>
+		<POI MapID="1526" xpos="907.637" ypos="235.002" zpos="211.206" type="exploration.resources.currency.gasp" GUID="tcMV2vMzaEyZzS98Gr6ypg==" iconFile="Data/Icons/finish_flag.png" fadeNear="1500" fadeFar="2500" triggerRange="10" autoTrigger="1" copy-message="If you got gasps on this last orb, hop and repeat or check the Tree of Mourning's branches."/>
+	</POIs>
+</OverlayData>
diff --git a/toxic_krait_historian.xml b/toxic_krait_historian.xml
@@ -1,10 +1,8 @@
 <OverlayData>
-    <MarkerCategory name="completion" DisplayName="Completionism">
-        <MarkerCategory name="achievements" DisplayName="Achievements">
-            <MarkerCategory name="story" DisplayName="Story Journal">
-                <MarkerCategory name="towerofnightmares" DisplayName="Tower of Nightmares">
-                    <MarkerCategory name="toxickraithistorian" DisplayName="Toxic Krait Historian"/>
-                </MarkerCategory>
+    <MarkerCategory name="achievements" DisplayName="Achievements">
+        <MarkerCategory name="story" DisplayName="Story Journal">
+            <MarkerCategory name="towerofnightmares" DisplayName="Tower of Nightmares">
+                <MarkerCategory name="toxickraithistorian" DisplayName="Toxic Krait Historian"/>
             </MarkerCategory>
         </MarkerCategory>
     </MarkerCategory>