simplistic autowalk

* add simple and stupid autowalk algorithm
* fix issue in classic control
This commit is contained in:
Eduardo Bart
2012-03-23 11:48:00 -03:00
parent 239f58296e
commit 8bc63e25df
11 changed files with 85 additions and 22 deletions

View File

@@ -49,16 +49,6 @@ AlignTopCenter = 20
AlignBottomCenter = 24
AlignCenter = 48
North = 0
East = 1
South = 2
West = 3
NorthEast = 4
SouthEast = 5
SouthWest = 6
NorthWest = 7
KeyUnknown = 0
KeyEscape = 1
KeyTab = 2

View File

@@ -22,3 +22,12 @@ EmblemNone = 0
EmblemGreen = 1
EmblemRed = 2
EmblemBlue = 3
North = 0
East = 1
South = 2
West = 3
NorthEast = 4
SouthEast = 5
SouthWest = 6
NorthWest = 7

View File

@@ -211,7 +211,7 @@ function GameInterface.processMouseAction(menuPosition, mouseButton, autoWalk, l
return true
end
if not Options['classicControl'] then
if not Options.getOption('classicControl') then
if keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
GameInterface.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
return true

View File

@@ -59,6 +59,38 @@ end
function UIGameMap:onMouseRelease(mousePosition, mouseButton)
local tile = self:getTile(mousePosition)
if tile and GameInterface.processMouseAction(mousePosition, mouseButton, nil, tile:getTopLookThing(), tile:getTopUseThing(), tile:getTopCreature(), tile:getTopMultiUseThing()) then return true end
if tile == nil then return false end
if GameInterface.processMouseAction(mousePosition, mouseButton, nil, tile:getTopLookThing(), tile:getTopUseThing(), tile:getTopCreature(), tile:getTopMultiUseThing()) then
return true
elseif mouseButton == MouseLeftButton then
local fromPos = g_game.getLocalPlayer():getPosition()
local toPos = tile:getPosition()
if fromPos.z ~= toPos.z then
TextMessage.displayStatus('There is no way.')
return true
end
-- simple and stupid pathfinding algorithm
local dirs = {}
local pathPos = fromPos
while pathPos.x ~= toPos.x or pathPos.y ~= toPos.y do
if pathPos.x < toPos.x then
pathPos.x = pathPos.x + 1
table.insert(dirs, East)
elseif pathPos.x > toPos.x then
pathPos.x = pathPos.x - 1
table.insert(dirs, West)
elseif pathPos.y < toPos.y then
pathPos.y = pathPos.y + 1
table.insert(dirs, South)
else --if pathPos.y > toPos.y then
pathPos.y = pathPos.y - 1
table.insert(dirs, North)
end
end
g_game.autoWalk(dirs)
return true
end
return false
end

View File

@@ -113,7 +113,7 @@ function TextMessage.clearMessages()
end
function TextMessage.displayStatus(msg, time)
displayMessage(MessageTypes.warning, msg)
displayMessage(MessageTypes.statusSmall, msg)
end
function TextMessage.displayEventAdvance(msg, time)