Merge pull request #35 from xrandox/dev_null

Dev null
xrandox · Aug 18, 2023 · 04bc62e · 04bc62e
2 parents 78df1ab + 588b5e1
commit 04bc62e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/TehsTrails/Data/TehsTrails/Scripts/follower.lua b/TehsTrails/Data/TehsTrails/Scripts/follower.lua
@@ -9,7 +9,7 @@ Teh.heartfollower = {
 
 Debug:Watch("Teh_HeartFollower", Teh.heartfollower)
 
-local category = World:CategoryByType("tt.s.tgsp")
+local category = World:CategoryByType("tt.mc")
 
 --Creates a follower targeting the specified target GUID
 local function createFollower(heartMarker, targetGuid)

diff --git a/TehsTrails/Data/TehsTrails/Scripts/highlight.lua b/TehsTrails/Data/TehsTrails/Scripts/highlight.lua
@@ -14,6 +14,11 @@ Debug:Watch("Teh_Highlight", Teh.highlight)
 local MAX_SIZE = 150
 local MIN_SIZE = 75
 
+local cat = World:CategoryByType("tt.mc.cm.nwm")
+if (cat:IsVisible() == false) then
+    cat:Show()
+end
+
 -- Resets the highlight
 function Teh_HighlightReset()
     local waypoint = Teh.highlight.currentWaypoint

diff --git a/TehsTrails/Data/TehsTrails/Scripts/trailcolors.lua b/TehsTrails/Data/TehsTrails/Scripts/trailcolors.lua
@@ -21,9 +21,7 @@ Teh.trailcolors = {
 }
 
 Debug:Watch("Teh_TrailColors", Teh.trailcolors)
-
 local mainTrail = World:TrailByGuid("cb6VPxgSL0yytSwws/y+Vg==")
-local texture = I:Texture(Pack, "Data/TehsTrails/Markers/trailwhite.png")
 
 -- Change the color of the main trail to the requested color name
 function Teh_ChangeColor(name)
@@ -35,7 +33,7 @@ function Teh_ChangeColor(name)
     for _, value in ipairs(Teh.trailcolors.colors) do
         if (value[1] == name) then
             mainTrail.Tint = value[2]
-            mainTrail.Texture = texture
+            mainTrail.Texture = I:Texture(Pack, "Data/TehsTrails/Markers/trailwhite.png")
             mainTrail.TrailSampleColor = value[2]
             mainTrail.InGameVisibility = true
             Teh_SaveValue("trailColor", name)

diff --git a/TehsTrails/Data/TehsTrails/Scripts/tutorial.lua b/TehsTrails/Data/TehsTrails/Scripts/tutorial.lua
@@ -232,12 +232,10 @@ function Teh_ToggleTutorial()
     end
 end
 
-local function tutorialTickHandler(gametime)
+function Teh_TutorialTickHandler(gametime)
     if (Teh.tutorial.shown) then
         if ((Mumble.PlayerCharacter.Position - Teh.tutorial.origin):Length() > 50) then
             hideTutorial()
         end
     end
-end
-
-Event:OnTick(tutorialTickHandler)
+end
diff --git a/TehsTrails/Pack.lua b/TehsTrails/Pack.lua
@@ -1,5 +1,5 @@
 Teh = {}
-TehsTrailsVersion = "Release v4.0.0"
+TehsTrailsVersion = "Release v4.0.1"
 
 Debug:Print("Pathing Version: v" .. PathingVersion)
 Debug:Print("TehsTrails Version: " .. TehsTrailsVersion)
@@ -14,12 +14,18 @@ Pack:Require("Data/TehsTrails/Scripts/versioncheck.lua")
 -- If the version check is good, then we load everything else
 if (Teh_VersionCheck()) then
     -- Load storage first
+    Pack:Require("Data/TehsTrails/Scripts/staticcategories.lua")
+
+    if (Teh_MapIsIn(Teh.static.maps.all, Mumble.CurrentMap.Id) == false) then
+        Debug:Print('Not in a map the pack is in. Stopped loading TehsTrails scripts.')
+        return
+    end
+
     Pack:Require("Data/TehsTrails/Scripts/storage.lua")
     Pack:Require("Data/TehsTrails/Scripts/trailcolors.lua")
     Pack:Require("Data/TehsTrails/Scripts/alternatemounts.lua")
     Pack:Require("Data/TehsTrails/Scripts/mmtoggle.lua")
     Pack:Require("Data/TehsTrails/Scripts/lookups.lua")
-    Pack:Require("Data/TehsTrails/Scripts/staticcategories.lua")
     Pack:Require("Data/TehsTrails/Scripts/bounce.lua")
     Pack:Require("Data/TehsTrails/Scripts/highlight.lua")
     Pack:Require("Data/TehsTrails/Scripts/globalmarker.lua")
@@ -50,6 +56,7 @@ if (Teh_VersionCheck()) then
 
         Teh_CopyTickHandler()
 
+        Teh_TutorialTickHandler(gameTime)
     end
 
     --Teh_Convert_Markers() used only when generating lookups

diff --git a/TehsTrails/TehsTrails.taco b/TehsTrails/TehsTrails.taco