Merge pull request #156 from Bestride/refactor

Refactor and Fixes #121

Versions/BeStride_Mainline.xml

@@ -4,12 +4,28 @@
   <Script file="..\localization\zh-TW.lua"/>
   <Script file="..\localization\de-DE.lua"/>
   <Script file="..\BeStride.lua"/>
-  <Script file="Mainline\MountTable.lua"/>
   <Script file="Common\BeStride_Variables.lua"/>
   <Script file="Common\BeStride_ActionButton.lua"/>
   <Script file="Common\BeStride_Events.lua"/>
   <Script file="Common\BeStride_GUI.lua"/>
   <Script file="Common\BeStride_Mount.lua"/>
-  <Script file="Common\Mapping.lua"/>
-  <Script file="Mainline\BeStride_Logic.lua"/>
+  <Script file="Common\functions.lua"/>
+  <Script file="Common\mapping.lua"/>
+  <Script file="Common\logic.class.lua"/>
+  <Script file="Common\logic.mounts.lua"/>
+  <Script file="Common\logic.player.lua"/>
+  <Script file="Common\logic.special.lua"/>
+  <Script file="Common\logic.zone.lua"/>
+  <Script file="Common\mount.lua"/>
+  <Script file="Common\mount.table.lua"/>
+  <Script file="Common\mounting.checks.lua"/>
+  <Script file="Common\mounting.class.lua"/>
+  <Script file="Common\mounting.player.lua"/>
+  <Script file="Common\mounting.special.lua"/>
+  <Script file="Common\mounting.zone.lua"/>
+  <Script file="Common\settings.lua"/>
+  <Script file="Mainline\MountTable.lua"/>
+  <Script file="Mainline\logic.lua"/>
+  <Script file="Common\upgrade.lua"/>
+  <Script file="Common\bestride.lua"/>
 </Ui>

Versions/BeStride_Wrath.xml

@@ -3,15 +3,30 @@
   <Script file="..\localization\en-US.lua"/>
   <Script file="..\localization\zh-TW.lua"/>
   <Script file="..\localization\de-DE.lua"/>
-  <Script file="Common\BeStride_Variables.lua"/>
-
   <Script file="..\BeStride.lua"/>
+  <Script file="Common\BeStride_Variables.lua"/>
   <Script file="Common\BeStride_ActionButton.lua"/>
   <Script file="Common\BeStride_Events.lua"/>
   <Script file="Common\BeStride_GUI.lua"/>
   <Script file="Common\BeStride_Mount.lua"/>
-  <Script file="Common\Mapping.lua"/>
-  <Script file="Wrath\BeStride_Logic.lua"/>
+  <Script file="Common\functions.lua"/>
+  <Script file="Common\mapping.lua"/>
+  <Script file="Common\logic.class.lua"/>
+  <Script file="Common\logic.mounts.lua"/>
+  <Script file="Common\logic.player.lua"/>
+  <Script file="Common\logic.special.lua"/>
+  <Script file="Common\logic.zone.lua"/>
+  <Script file="Common\mount.lua"/>
+  <Script file="Common\mount.table.lua"/>
+  <Script file="Common\mounting.checks.lua"/>
+  <Script file="Common\mounting.class.lua"/>
+  <Script file="Common\mounting.player.lua"/>
+  <Script file="Common\mounting.special.lua"/>
+  <Script file="Common\mounting.zone.lua"/>
+  <Script file="Common\settings.lua"/>
+  <Script file="Wrath\logic.lua"/>
   <Script file="Wrath\MountDB.lua"/>
   <Script file="Wrath\MountTable.lua"/>
+  <Script file="Common\upgrade.lua"/>
+  <Script file="Common\bestride.lua"/>
 </Ui>

Versions/Common/BeStride_ActionButton.lua

@@ -37,19 +37,19 @@ end
 
 -- Action Button Wrapper
 function BeStride_ActionButtonRegularMount:PreClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
-	local mount = BeStride_Logic:Regular()
+	local mount = BeStride:Regular()
 	if mount ~= nil then
 		self:SetAttribute("macrotext",mount)
 	end
 end
 
 -- Action Button Cleanup
 function BeStride_ActionButtonRegularMount:PostClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
@@ -63,19 +63,19 @@ end
 
 -- Action Button Wrapper
 function BeStride_ActionButtonGroundMount:PreClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
-	local mount = BeStride_Logic:GroundMountButton()
+	local mount = BeStride:GroundMountButton()
 	if mount ~= nil then
 		self:SetAttribute("macrotext",mount)
 	end
 end
 
 -- Action Button Cleanup
 function BeStride_ActionButtonGroundMount:PostClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
@@ -89,19 +89,19 @@ end
 
 -- Action Button Wrapper
 function BeStride_ActionButtonPassengerMount:PreClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
-	local mount = BeStride_Logic:PassengerMountButton()
+	local mount = BeStride:PassengerMountButton()
 	if mount ~= nil then
 		self:SetAttribute("macrotext",mount)
 	end
 end
 
 -- Action Button Cleanup
 function BeStride_ActionButtonPassengerMount:PostClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
@@ -115,19 +115,19 @@ end
 
 -- Action Button Wrapper
 function BeStride_ActionButtonRepairMount:PreClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 
-	local mount = BeStride_Logic:RepairMountButton()
+	local mount = BeStride:RepairMountButton()
 	if mount ~= nil then
 		self:SetAttribute("macrotext",mount)
 	end
 end
 
 -- Action Button Cleanup
 function BeStride_ActionButtonRepairMount:PostClick()
-	if BeStride_Logic:IsCombat() then
+	if BeStride:IsCombat() then
 		return
 	end
 

Versions/Common/BeStride_Events.lua

@@ -14,7 +14,7 @@ function BeStride:EventUpdateKeyBinding()
 end
 
 function BeStride:EventCombatEnter()
-	local combatButton = BeStride_Logic:Combat()
+	local combatButton = BeStride:Combat()
 	if combatButton ~= nil then
 		BeStride_ABRegularMount:SetAttribute("macrotext",combatButton)
 		BeStride_ABGroundMount:SetAttribute("macrotext",combatButton)

Versions/Common/BeStride_Mount.lua

@@ -33,8 +33,8 @@ end
 
 function BeStride_Mount:IsUsable(mount)
 	--print("" .. mount)
-	local spellID,mountID,isUsable = BeStride_Logic:isMountUsable(mount)
-	if BeStride_Logic:isZoneMount(mountID) then
+	local spellID,mountID,isUsable = BeStride:isMountUsable(mount)
+	if BeStride:isZoneMount(mountID) then
 
 		if zone ~= nil and zone.mapID == BeStride_Constants.Mount.Mounts[spellID].zone then
 			return true
@@ -164,13 +164,13 @@ function BeStride_Mount:Passenger(type)
 end
 
 function BeStride_Mount:Broom()
-	return self:Mount(BeStride:ItemToName(37011))
+	return self:Mount(ItemToName(37011))
 end
 
 function BeStride_Mount:Loaned()
-	local mount = BeStride_Logic:CheckLoanedMount()
+	local mount = BeStride:CheckLoanedMount()
 
-	return self:MountSpell(BeStride:SpellToName(mount))
+	return self:MountSpell(SpellToName(mount))
 end
 
 function BeStride_Mount:VashjirSeahorse()
@@ -183,9 +183,9 @@ end
 
 function BeStride_Mount:Chauffeur()
 	if IsUsableSpell(179245) then
-		return self:MountSpell(BeStride:SpellToName(179245))
+		return self:MountSpell(SpellToName(179245))
 	elseif IsUsableSpell(179244) then
-		return self:MountSpell(BeStride:SpellToName(179244))
+		return self:MountSpell(SpellToName(179244))
 	end
 end
 
@@ -199,32 +199,32 @@ function BeStride_Mount:Robot()
 		table.insert(mounts,223814)
 	end
 
-	return self:MountSpell(BeStride:SpellToName(mounts[math.random(#mounts)]))
+	return self:MountSpell(SpellToName(mounts[math.random(#mounts)]))
 end
 
 function BeStride_Mount:Nagrand()
-	return self:MountSpell(BeStride:SpellToName(164222))
+	return self:MountSpell(SpellToName(164222))
 end
 
 function BeStride_Mount:DeathKnightWraithWalk()
-	return self:MountSpell(BeStride:SpellToName(212552))
+	return self:MountSpell(SpellToName(212552))
 end
 
 function BeStride_Mount:DemonHunterFelRush()
-	return self:MountSpell(BeStride:SpellToName(195072))
+	return self:MountSpell(SpellToName(195072))
 end
 
 function BeStride_Mount:DemonHunterGlide()
-	return self:MountSpell(BeStride:SpellToName(131347))
+	return self:MountSpell(SpellToName(131347))
 end
 
 function BeStride_Mount:Druid()
 	local travelForm, flightForm = 783, 783 -- 3 in 1 travel form
 
 	if GetUnitSpeed("player") ~= 0 then
-		return self:MountSpell(BeStride:SpellToName(783))
-	elseif BeStride_Logic:DruidFlyingMTFF() or IsFalling() or IsFlying() or GetShapeshiftForm() == 3 then
-		return self:MountSpell(BeStride:SpellToName(783))
+		return self:MountSpell(SpellToName(783))
+	elseif BeStride:DruidFlyingMTFF() or IsFalling() or IsFlying() or GetShapeshiftForm() == 3 then
+		return self:MountSpell(SpellToName(783))
 	elseif IsFlying() then
 		return self:Flying(name)
 	else
@@ -240,64 +240,64 @@ function BeStride_Mount:DruidAquaticForm()
 end
 
 function BeStride_Mount:DruidTravel()
-	return self:MountSpell(BeStride:SpellToName(783))
+	return self:MountSpell(SpellToName(783))
 end
 
 function BeStride_Mount:HunterAspectOfTheCheetah()
-	return self:MountSpell(BeStride:SpellToName(186257))
+	return self:MountSpell(SpellToName(186257))
 end
 
 function BeStride_Mount:PriestLevitate()
-	return self:MountSpell("[@player] "..BeStride:SpellToName(1706).."\n/cancelaura "..BeStride:SpellToName(1706))
+	return self:MountSpell("[@player] "..SpellToName(1706).."\n/cancelaura "..SpellToName(1706))
 end
 
 function BeStride_Mount:MageSlowFall()
 	--Activate SlowFall
-	return self:MountSpell("[@player] "..BeStride:SpellToName(130).."\n/cancelaura "..BeStride:SpellToName(130))
+	return self:MountSpell("[@player] "..SpellToName(130).."\n/cancelaura "..SpellToName(130))
 end
 
 function BeStride_Mount:MageBlink()
 	--Blink
-	return self:MountSpell("[@player] "..BeStride:SpellToName(1953))
+	return self:MountSpell("[@player] "..SpellToName(1953))
 end
 
 function BeStride_Mount:MageBlinkNoSlowFall()
 	--Blink and cancel Slowfall if active, we're running on the ground or swimming.
-	return self:MountSpell("[@player] "..BeStride:SpellToName(1953))
+	return self:MountSpell("[@player] "..SpellToName(1953))
 end
 
 function BeStride_Mount:MonkRoll()
 	if IsUsableSpell(109132) then
-		return self:MountSpell("[@player] " .. BeStride:SpellToName(109132))
+		return self:MountSpell("[@player] " .. SpellToName(109132))
 	else
-		return self:MountSpell("[@player] " .. BeStride:SpellToName(115008))
+		return self:MountSpell("[@player] " .. SpellToName(115008))
 	end
 end
 
 function BeStride_Mount:MonkZenFlight()
-	return self:MountSpell("[@player] " .. BeStride:SpellToName(125883))
+	return self:MountSpell("[@player] " .. SpellToName(125883))
 end
 
 function BeStride_Mount:Paladin()
 	return self:PaladinDivineSteed()
 end
 
 function BeStride_Mount:PaladinDivineSteed()
-	return self:MountSpell("[@player] "..BeStride:SpellToName(190784).."\n/cancelaura "..BeStride:SpellToName(190784))
+	return self:MountSpell("[@player] "..SpellToName(190784).."\n/cancelaura "..SpellToName(190784))
 end
 
 function BeStride_Mount:Shaman()
 	return self:ShamanGhostWolf()
 end
 
 function BeStride_Mount:ShamanGhostWolf()
-	return self:MountSpell("[@player] "..BeStride:SpellToName(2645).."\n/cancelaura "..BeStride:SpellToName(2645))
+	return self:MountSpell("[@player] "..SpellToName(2645).."\n/cancelaura "..SpellToName(2645))
 end
 
 function BeStride_Mount:Rogue()
 	return self:RogueSprint()
 end
 
 function BeStride_Mount:RogueSprint()
-	return self:MountSpell("[@player] "..BeStride:SpellToName(2983))
+	return self:MountSpell("[@player] "..SpellToName(2983))
 end