fix use with, improve move, change icons, improve topbar

modules/game/game.lua

@@ -1,3 +1,6 @@
+-- private variables
+local m_mouseGrabberWidget
+
 -- private functions
 local function onGameKeyPress(self, keyCode, keyboardModifiers, wouldFilter)
   if wouldFilter then return end
@@ -13,7 +16,34 @@ local function onGameKeyPress(self, keyCode, keyboardModifiers, wouldFilter)
   return false
 end
 
+local function onUseWithMouseRelease(self, mousePosition, mouseButton)
+  if Game.selectedThing == nil then return false end
+  if mouseButton == MouseLeftButton then
+    local clickedWidget = Game.gameUi:recursiveGetChildByPos(mousePosition)
+    if clickedWidget then
+      if clickedWidget.getTile then
+        local tile = clickedWidget:getTile(mousePosition)
+        if tile then
+          Game.useWith(Game.selectedThing, tile:getTopMultiUseThing())
+        end
+      elseif clickedWidget.getItem then
+        Game.useWith(Game.selectedThing, clickedWidget:getItem())
+      end
+    end
+  end
+  Game.selectedThing = nil
+  restoreCursor()
+  self:ungrabMouse()
+  return true
+end
+
 -- public functions
+function Game.startUseWith(thing)
+  Game.selectedThing = thing
+  m_mouseGrabberWidget:grabMouse()
+  setTargetCursor()
+end
+
 function Game.createInterface()
   Background.hide()
   CharacterList.destroyLoadBox()
@@ -33,7 +63,9 @@ function Game.createInterface()
   Game.gameMapPanel = Game.gameUi:getChildById('gameMapPanel')
   Game.gameRightPanel = Game.gameUi:getChildById('gameRightPanel')
   Game.gameBottomPanel = Game.gameUi:getChildById('gameBottomPanel')
-  Game.gameUi.onKeyPress = onGameKeyPress
+  m_mouseGrabberWidget = Game.gameUi:getChildById('mouseGrabber')
+  connect(Game.gameUi, { onKeyPress = onGameKeyPress })
+  connect(m_mouseGrabberWidget, { onMouseRelease = onUseWithMouseRelease })
 end
 
 function Game.destroyInterface()

modules/game/game.otui

@@ -26,3 +26,6 @@ UIGame
     anchors.bottom: gameBottomPanel.top
     focusable: false
 
+  UIWidget
+    id: mouseGrabber
+    focusable: false

modules/game/map.lua

@@ -1,7 +1,7 @@
 function UIMap:onDragEnter(mousePos)
   local tile = self:getTile(mousePos)
   if not tile then return false end
-  
+
   local thing = tile:getTopMoveThing()
   if not thing then return false end
 
@@ -18,11 +18,11 @@ end
 
 function UIMap:onDrop(widget, mousePos)
   if not widget or not widget.currentDragThing then return false end
-  
+
   local tile = self:getTile(mousePos)
   if not tile then return false end
-  local count = 1 -- todo make a window for it
-  
+  local count = widget.currentDragThing:getData()
+
   Game.move(widget.currentDragThing, tile:getPos(), count)
   return true
 end

modules/game/thing.lua

@@ -14,24 +14,13 @@ end
 function Game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing, useThing, creatureThing, multiUseThing)
   local keyboardModifiers = g_window.getKeyboardModifiers()
 
-  local selectedThing = Game.getSelectedThing()
-  if mouseButton == MouseRightButton and selectedThing then
-    Game.setSelectedThing(nil)
-    return true
-  end
-
-  if autoWalk and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseLeftButton and not Game.getSelectedThing() then
+  if autoWalk and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseLeftButton then
     -- todo auto walk
     return true
   end
 
   if not Options.classicControl then
-    if mouseButton == MouseLeftButton and selectedThing then
-      Game.useWith(Game.getSelectedThing(), multiUseThing)
-      Game.setSelectedThing(nil)
-      restoreCursor()
-      return true
-    elseif keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
+    if keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
       Game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       return true
     elseif lookThing and keyboardModifiers == KeyboardShiftModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
@@ -41,14 +30,17 @@ function Game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing,
       if useThing:isContainer() then
         if useThing:isInsideContainer() then
           Game.open(useThing, useThing:getContainerId())
+          return true
         else
           Game.open(useThing, Containers.getFreeContainerId())
+        return true
         end
       elseif useThing:isMultiUse() then
-        Game.setSelectedThing(useThing)
-        setTargetCursor()
+        Game.startUseWith(useThing)
+        return true
       else
         Game.use(useThing)
+        return true
       end
       return true
     elseif creatureThing and keyboardModifiers == KeyboardAltModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
@@ -56,23 +48,21 @@ function Game.processMouseAction(menuPosition, mouseButton, autoWalk, lookThing,
       return true
     end
   else
-    if mouseButton == MouseLeftButton and selectedThing then
-      Game.useWith(Game.getSelectedThing(), multiUseThing)
-      Game.setSelectedThing(nil)
-      restoreCursor()
-      return true
-    elseif multiUseThing and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
+    if multiUseThing and keyboardModifiers == KeyboardNoModifier and mouseButton == MouseRightButton then
       if multiUseThing:asCreature() then
         Game.attack(multiUseThing:asCreature())
+        return true
       elseif multiUseThing:isContainer() then
         if multiUseThing:isInsideContainer() then
           Game.open(multiUseThing, multiUseThing:getContainerId())
+          return true
         else
           Game.open(multiUseThing, Containers.getFreeContainerId())
+          return true
         end
       elseif multiUseThing:isMultiUse() then
-        Game.setSelectedThing(multiUseThing)
-        setTargetCursor()
+        Game.startUseWith(multiUseThing)
+        return true
       else
         Game.use(multiUseThing)
       end
@@ -110,7 +100,7 @@ function Game.createThingMenu(menuPosition, lookThing, useThing, creatureThing)
       end
     else
       if useThing:isMultiUse() then
-        menu:addOption('Use with ...', function() Game.setSelectedThing(useThing) setTargetCursor() end)
+        menu:addOption('Use with ...', function() Game.startUseWith(useThing) end)
       else
         menu:addOption('Use', function() Game.use(useThing) end)
       end