WoWInterface SVN Livestock

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /
    from Rev 82 to Rev 83
    Reverse comparison

Rev 82 → Rev 83

trunk/Livestock/Livestock.lua
1150,6 → 1150,7
 
SetMapToCurrentZone() -- make sure that the map accurately reflects the zone you're in
local continent = GetCurrentMapContinent()
local areaID = GetCurrentMapAreaID()
local expertRiding = IsUsableSpell(L.LIVESTOCK_SPELL_EXPERTRIDING) -- Expert Riding
local artisanRiding = IsUsableSpell(L.LIVESTOCK_SPELL_ARTISANRIDING) -- Artisan Riding
local masterRiding = IsUsableSpell(L.LIVESTOCK_SPELL_MASTERRIDING) -- Master Riding
1178,7 → 1179,7
return "LAND"
end
local _, _, isActive = GetWorldPVPAreaInfo(1)
return ((zone == L.LIVESTOCK_ZONE_WINTERGRASP and isActive == true) and "LAND") or "FLYING" -- check to see if a battle is in progress and if so, we're on a land mount. If not, flying mount.
return ((zone == L.LIVESTOCK_ZONE_WINTERGRASP and isActive == true) and "LAND") or "FLYING" -- check to see if a battle is in progress and if so, we're on a land mount. If not, flying mount.
else
return "LAND"
end
1200,12 → 1201,14
else
return "LAND"
end
else
if IsFlyableArea() then
elseif continent == -1 then
if areaID == 1177 then -- The Deaths of Chromie scenario
return "FLYING"
else
return "LAND"
end
else
return "LAND" -- anywhere else we should get a land mount
end
end
 
1766,10 → 1769,10
if GetNumGroupMembers() ~= 0 and LivestockSettings.partyfave == 1 and LivestockSettings.Party and LivestockSettings.Party["mount"] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Party["mount"]].index)
return
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]].index)
return
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]].index)
return
end
1838,10 → 1841,10
if GetNumGroupMembers() ~= 0 and LivestockSettings.partyfave == 1 and LivestockSettings.Party and LivestockSettings.Party["mount"] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Party["mount"]].index)
return
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]].index)
return
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]].index)
return
end
1903,10 → 1906,10
if GetNumGroupMembers() ~= 0 and LivestockSettings.partyfave == 1 and LivestockSettings.Party and LivestockSettings.Party["mount"] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Party["mount"]].index)
return
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetSubZoneText()] and LivestockSettings.Zones[GetSubZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetSubZoneText()]["mount"]].index)
return
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] then
elseif LivestockSettings.Zones[GetZoneText()] and LivestockSettings.Zones[GetZoneText()]["mount"] and LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]] then
C_MountJournal.SummonByID(LivestockSettings.Mounts[LivestockSettings.Zones[GetZoneText()]["mount"]].index)
return
end
1919,7 → 1922,7
if (debug) then
print(format("Timer = '%s' and value = '%s'", timer, scale))
end
if timer == "BREATH" and scale == -1 then
if IsSubmerged() then
breath = true
end
end
trunk/Livestock/Change Log.txt
1,3 → 1,10
Version 2.6.4
 
- Better error handling for zone mounts
- Better water mount handling (flying from water's surface will require macro)
Ex: /click [modifier:alt]LivestockLandMountsButton;[button:2]LivestockFlyingMountsButton;LivestockComboButton
- Fix for flying mounts in class halls
 
Version 2.6.3
 
- Fix for flying in Chromie scenario
trunk/Livestock/Livestock.toc
2,7 → 2,7
## Title: Livestock
## Notes: Enables easy random summoning of vanity pets and mounts, including the option of "smart mounting"
## Author: Kharthus - Deathwing(US)
## Version: 2.6.3
## Version: 2.6.4
## SavedVariablesPerCharacter: LivestockSettings
 
LibRecompense\RecompenseTools.lua