Passenger Mounting

Bestride · Oct 19, 2018 · 99b2cf7 · 99b2cf7
1 parent edb8fc0
commit 99b2cf7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/BeStride_ActionButton.lua b/BeStride_ActionButton.lua
@@ -43,10 +43,23 @@ function BeStride_ActionButtonRegularMount:PreClick()
 		return
 	end
 
-	local mount = BeStride_Logic:Regular()
-	if mount ~= nil then
-		self:SetAttribute("macrotext",mount)
-		BeStride_Debug:Verbose(self:GetAttribute("macrotext"))
+	local passenger = nil
+
+	if IsInGroup() == true and BeStride_Logic:IsFlyable() then
+		passenger = BeStride_Mount:Passenger("flying")
+	elseif IsInGroup() == true then
+		passenger = BeStride_Mount:Passenger()
+	end
+
+	if passenger ~= nil then
+		BeStride_Debug:Verbose("Mount:" .. tostring(passenger))
+		self:SetAttribute("macrotext",passenger)
+	else
+		local mount = BeStride_Logic:Regular()
+		if mount ~= nil then
+			self:SetAttribute("macrotext",mount)
+			BeStride_Debug:Verbose(self:GetAttribute("macrotext"))
+		end
 	end
 end
 
@@ -70,9 +83,20 @@ function BeStride_ActionButtonGroundMount:PreClick()
 		return
 	end
 
-	local mount = BeStride_Logic:GroundMountButton()
-	if mount ~= nil then
-		self:SetAttribute("macrotext",mount)
+	local passenger = nil
+
+	if IsInGroup() == true then
+		passenger = BeStride_Mount:Passenger("ground")
+	end
+
+	if passenger ~= nil then
+		BeStride_Debug:Verbose("Mount:" .. tostring(passenger))
+		self:SetAttribute("macrotext",passenger)
+	else
+		local mount = BeStride_Logic:GroundMountButton()
+		if mount ~= nil then
+			self:SetAttribute("macrotext",mount)
+		end
 	end
 end
 

diff --git a/BeStride_Logic.lua b/BeStride_Logic.lua
@@ -112,9 +112,9 @@ function BeStride_Logic:RepairMountButton()
 	end
 end
 
-function BeStride_Logic:PassengerMountButton()
+function BeStride_Logic:PassengerMountButton(type)
 	if IsMounted() or IsOutdoors() then
-		return BeStride_Mount:Passenger()
+		return BeStride_Mount:Passenger(type)
 	else
 		return nil
 	end

diff --git a/BeStride_Mount.lua b/BeStride_Mount.lua
@@ -109,10 +109,10 @@ function BeStride_Mount:Repair()
 	return BeStride_Mount:DoMount(mounts)
 end
 
-function BeStride_Mount:Passenger()
+function BeStride_Mount:Passenger(type)
 	local mounts = {}
 
-	for k,v in pairs(mountTable["passenger"]) do if self:IsUsable(v) then table.insert(mounts,v) end end
+	for k,v in pairs(mountTable["passenger"]) do if self:IsUsable(v) and ( (type ~= nil and mountTable.master[v].type) or type == nil ) then table.insert(mounts,v) end end
 
 	if #mounts == 0 then
 		BeStride_Debug:Debug("No Mounts")