WoWInterface SVN MountRandomMount

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 15 to Rev 16
    ↔ Reverse comparison
  •

Rev 15 → Rev 16

trunk/MountRandomMount.lua
360,7 → 360,7
--SetBindingClick("MRMSecureButton")
end
 
function MountRandomMount:add(amount, listtype)
function MountRandomMount:add(amount)
local foundmount = false
local mountcount = GetNumCompanions("MOUNT")
local id, mntspid
376,185 → 376,57
end
if (foundmount == true) then
local mounttoadd = mntspid
if listtype == 'CL' then
local sources, mounts
for sources, mounts in pairs(MountRandomMount_MountDataList["flying"]) do
table.foreach(mounts, function(k,v)
if mntspid == v then
listtype = 'flying'
end
end)
end
for sources, mounts in pairs(MountRandomMount_MountDataList["ground"]) do
table.foreach(mounts, function(k,v)
if mntspid == v then
if listtype == 'flying' then
listtype = 'both'
else
listtype = 'ground'
local sources, mounts
for sources, mounts in pairs(MountRandomMount_MountDataList["flying"]) do
table.foreach(mounts, function(k,v)
if mntspid == v then
local insert = true
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['flying']) do
if vSaved == v then
insert = false
end
end
end)
end
end
if (listtype == 'flying') then
 
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['flying'] == nil) or (#MountRandomMount_SavedTable['flying'] == 0) then
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['flying'] do
if (MountRandomMount_SavedTable['flying'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
if insert then
print(amount.." "..L['MRMFlyingAdded'])
table.insert(MountRandomMount_SavedTable['flying'], v)
end
end
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][#MountRandomMount_SavedTable['flying']+1] = mounttoadd
end
elseif(headlesshorse == true) then
if(listtype == "both") then
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['flying'] == nil) or (#MountRandomMount_SavedTable['flying'] == 0) then
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['flying'] do
if (MountRandomMount_SavedTable['flying'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
end)
end
for sources, mounts in pairs(MountRandomMount_MountDataList["ground"]) do
table.foreach(mounts, function(k,v)
if mntspid == v then
local insert = true
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['flying']) do
if vSaved == v then
insert = false
end
end
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][#MountRandomMount_SavedTable['flying']+1] = mounttoadd
end
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['ground'] == nil) or (#MountRandomMount_SavedTable['ground'] == 0) then
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['ground'] do
if (MountRandomMount_SavedTable['ground'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
end
if insert then
print(amount.." "..L['MRMLandAdded'])
table.insert(MountRandomMount_SavedTable['flying'], v)
end
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][((#MountRandomMount_SavedTable['ground'])+1)] = mounttoadd
end
elseif(listtype == "Flying") then
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['flying'] == nil) or (#MountRandomMount_SavedTable['flying'] == 0) then
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['flying'] do
if (MountRandomMount_SavedTable['flying'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
end
end
print(amount.." "..L['MRMFlyingAdded'])
MountRandomMount_SavedTable['flying'][#MountRandomMount_SavedTable['flying']+1] = mounttoadd
end
else
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['ground'] == nil) or (#MountRandomMount_SavedTable['ground'] == 0) then
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['ground'] do
if (MountRandomMount_SavedTable['ground'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
end
end
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][((#MountRandomMount_SavedTable['ground'])+1)] = mounttoadd
end
end
elseif(listtype == "Land") then
if (MountRandomMount_SavedTable.randommountlist == nil) or (MountRandomMount_SavedTable['ground'] == nil) or (#MountRandomMount_SavedTable['ground'] == 0) then
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][1] = mounttoadd
else
for j = 1, #MountRandomMount_SavedTable['ground'] do
if (MountRandomMount_SavedTable['ground'][j][1] == amount) then
print(amount.." "..L['MRMAlreadyInList'])
return
end
end
print(amount.." "..L['MRMLandAdded'])
MountRandomMount_SavedTable['ground'][((#MountRandomMount_SavedTable['ground'])+1)] = mounttoadd
end
end)
end
else
print(amount.." " ..L['MRMNoExist'])
end
end
 
function MountRandomMount:remove(amount, listtype)
if (MountRandomMount_SavedTable.randommountlist == nil) or ((MountRandomMount_SavedTable['flying'] == nil) and (MountRandomMount_SavedTable['ground'] == nil)) or ((#MountRandomMount_SavedTable['flying'] == 0) and (#MountRandomMount_SavedTable['ground'] == 0)) then
print(L['MRMNoMounts'])
return
end
local foundmount = false
local mountcount = GetNumCompanions("MOUNT")
local id, mntspid
 
if listtype == "CL" then
 
for i = 1, mountcount do
local _, creatureName, creatureSpellID = GetCompanionInfo("MOUNT", i)
local lowerCN = string.lower(creatureName)
--print("]"..amount..'[ - ]'..creatureName.."[")
if (amount == lowerCN) then
foundmount = true
id = i
mntspid = creatureSpellID
break
end
function MountRandomMount:remove(amount)
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['ground']) do
if amount == GetSpellInfo(vSaved) then
print(amount.." "..L['MRMLandRemoved'])
table.remove(MountRandomMount_SavedTable['ground'], iSaved)
break
end
 
local _, name, spellID = GetCompanionInfo("MOUNT",id)
MountRandomMount:MountDataListFill()
if (MountRandomMount_MountDataList[spellID][3]) then
 
if listtype == "CL" then
listtype = "both"
end
elseif (MountRandomMount_MountDataList[spellID][2]) then
 
if listtype == "CL" then
listtype = "Flying"
end
elseif (MountRandomMount_MountDataList[spellID][1]) then
 
if listtype == "CL" then
listtype = "Land"
end
end
end
local exists = 0
if (listtype == "Flying" or listtype == "both") then
for i = 1, #MountRandomMount_SavedTable['flying'] do
if (amount == MountRandomMount_SavedTable['flying'][i][1]) then
table.remove(MountRandomMount_SavedTable['flying'], i)
print(amount.." "..L['MRMFlyingRemoved'])
exists = 1
break
end
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['flying']) do
if amount == GetSpellInfo(vSaved) then
print(amount.." "..L['MRMFlyingRemoved'])
table.remove(MountRandomMount_SavedTable['flying'], iSaved)
break
end
end
if (listtype == "Land" or listtype == "both") then
for i = 1, #MountRandomMount_SavedTable['ground'] do
if (amount == MountRandomMount_SavedTable['ground'][i][1]) then
table.remove(MountRandomMount_SavedTable['ground'], i)
print(amount.." "..L['MRMLandRemoved'])
exists = 1
break
end
end
end
if (exists == 0) then
print(amount.." "..L['MRMNoExist'])
end
end
 
function MountRandomMount:list()
600,13 → 472,13
MountRandomMount:LandOnly()
elseif (command == L['MRMAdd']) then
if(rest ~= nil) then
MountRandomMount:add(rest, "CL")
MountRandomMount:add(rest)
else
print(L['MRMBracketERROR'])
end
elseif (command == L['MRMRemove']) then
if(rest ~= nil) then
MountRandomMount:remove(rest, "CL")
MountRandomMount:remove(rest)
else
print(L['MRMBracketERROR'])
end
trunk/MountRandomMount_GUI.lua
34,9 → 34,10
local optionTableMount = {}
table.foreach(mounts, function(k,v)
if GetSpellInfo(v) ~= nil then
optionTableMount[GetSpellInfo(v)] = {
local spellName = GetSpellInfo(v)
optionTableMount[spellName] = {
order = k,
name = GetSpellInfo(v),
name = spellName,
type = "toggle",
disabled = function()
if playerMountArray[v] == nil or not(IsUsableSpell(v)) then
49,12 → 50,14
local insert = true
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['ground']) do
if vSaved == v then
print(spellName.." "..L['MRMLandRemoved'])
table.remove(MountRandomMount_SavedTable['ground'], iSaved)
insert = false
break
end
end
if insert then
print(spellName.." "..L['MRMLandAdded'])
table.insert(MountRandomMount_SavedTable['ground'], v)
end
end,
118,9 → 121,10
local optionTableMount = {}
table.foreach(mounts, function(k,v)
if GetSpellInfo(v) ~= nil then
optionTableMount[GetSpellInfo(v)] = {
local spellName = GetSpellInfo(v)
optionTableMount[spellName] = {
order = k,
name = GetSpellInfo(v),
name = spellName,
type = "toggle",
disabled = function()
if playerMountArray[v] == nil or not(IsUsableSpell(v)) then
133,12 → 137,14
local insert = true
for iSaved, vSaved in pairs(MountRandomMount_SavedTable['flying']) do
if vSaved == v then
print(spellName.." "..L['MRMFlyingRemoved'])
table.remove(MountRandomMount_SavedTable['flying'], iSaved)
insert = false
break
end
end
if insert then
print(spellName.." "..L['MRMFlyingAdded'])
table.insert(MountRandomMount_SavedTable['flying'], v)
end
end,