Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #223 - Sea Turtle Swimming Mount #225

Merged
merged 4 commits into from
Nov 27, 2022
Merged

Fixes #223 - Sea Turtle Swimming Mount #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dda13b
Merge pull request #224 from Bestride/master
DanSheps Nov 27, 2022
02c8a4d
Fixes: #223 - Adjust logic to add mounts to table
Nov 27, 2022
a5dc292
Merge branch 'develop' of https://github.com/bestride/bestride into d…
Nov 27, 2022
1bf7d2a
Fix TAQ mounts showing as swimming
Nov 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 24 additions & 15 deletions Versions/Common/mount.table.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions Versions/Wrath/MountDB.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,7 @@ BeStride_MountDB={
flying=false,
passenger=false,
vendor=false,
swimming=true
swimming=false
}
},
[26054]= {
Expand All @@ -1887,7 +1887,7 @@ BeStride_MountDB={
flying=false,
passenger=false,
vendor=false,
swimming=true
swimming=false
}
},
[26055]= {
Expand All @@ -1905,7 +1905,7 @@ BeStride_MountDB={
flying=false,
passenger=false,
vendor=false,
swimming=true
swimming=false
}
},
[26056]= {
Expand All @@ -1923,7 +1923,7 @@ BeStride_MountDB={
flying=false,
passenger=false,
vendor=false,
swimming=true
swimming=false
}
},
[26656]= {
Expand All @@ -1941,7 +1941,7 @@ BeStride_MountDB={
flying=true,
passenger=false,
vendor=false,
swimming=true
swimming=false
}
},
[28025]= {
Expand Down