Merge pull request #225 from Bestride/develop

Fixes #223 - Sea Turtle Swimming Mount
Bestride · Nov 27, 2022 · 0115026 · 0115026
2 parents f313309 + 1bf7d2a
commit 0115026
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/Versions/Common/mount.table.lua b/Versions/Common/mount.table.lua
@@ -24,23 +24,32 @@ end
 
 function BeStride:AddCommonMount(mountId)
 	local mount = mountTable["master"][mountId]
-	if BeStride_MountDB and BeStride_MountDB[mount.spellID] and BeStride_MountDB[mount.spellID].attributes.flying and BeStride_MountDB[mount.spellID].attributes.ground then
-		table.insert(mountTable["flying"],mountId)
-		table.insert(mountTable["ground"],mountId)
-	elseif mount["type"] == "ground" then
-		--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
-		table.insert(mountTable["ground"],mountId)
-	elseif mount["type"] == "flying" then
-		--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
-		table.insert(mountTable["flying"],mountId)
-	elseif mount["type"] == "swimming" then
-		--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
-		table.insert(mountTable["swimming"],mountId)
-	elseif mount["type"] == "zone" then
-		if mountId == 373 then
+	if BeStride_MountDB and BeStride_MountDB[mount.spellID] then
+		if BeStride_MountDB[mount.spellID].attributes.flying then
+			table.insert(mountTable["flying"],mountId)
+		end
+		if BeStride_MountDB[mount.spellID].attributes.ground then
+			table.insert(mountTable["ground"],mountId)
+		end
+		if BeStride_MountDB[mount.spellID].attributes.swimming then
+			table.insert(mountTable["swimming"],mountId)
+		end
+	else
+		if mount["type"] == "ground" then
+			--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
+			table.insert(mountTable["ground"],mountId)
+		elseif mount["type"] == "flying" then
+			--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
+			table.insert(mountTable["flying"],mountId)
+		elseif mount["type"] == "swimming" then
+			--print("Adding Mount: " .. mount["name"] .. " Id: " .. mountId .. " Type: " .. mount["type"])
 			table.insert(mountTable["swimming"],mountId)
+		elseif mount["type"] == "zone" then
+			if mountId == 373 then
+				table.insert(mountTable["swimming"],mountId)
+			end
+			table.insert(mountTable["zone"],mountId)
 		end
-		table.insert(mountTable["zone"],mountId)
 	end
 end
 

diff --git a/Versions/Wrath/MountDB.lua b/Versions/Wrath/MountDB.lua
@@ -1869,7 +1869,7 @@ BeStride_MountDB={
 			flying=false,
 			passenger=false,
 			vendor=false,
-			swimming=true
+			swimming=false
 		}
 	},
     [26054]= {
@@ -1887,7 +1887,7 @@ BeStride_MountDB={
 			flying=false,
 			passenger=false,
 			vendor=false,
-			swimming=true
+			swimming=false
 		}
 	},
     [26055]= {
@@ -1905,7 +1905,7 @@ BeStride_MountDB={
 			flying=false,
 			passenger=false,
 			vendor=false,
-			swimming=true
+			swimming=false
 		}
 	},
     [26056]= {
@@ -1923,7 +1923,7 @@ BeStride_MountDB={
 			flying=false,
 			passenger=false,
 			vendor=false,
-			swimming=true
+			swimming=false
 		}
 	},
     [26656]= {
@@ -1941,7 +1941,7 @@ BeStride_MountDB={
 			flying=true,
 			passenger=false,
 			vendor=false,
-			swimming=true
+			swimming=false
 		}
 	},
     [28025]= {