Imrpoved "pickup all" option speed

The Water Silmaril penality to luck has been drastically reduced


git-svn-id: http://svn.net-core.org/repos/t-engine4@1506 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/dialogs/ShowPickupFloor.lua

@@ -72,6 +72,7 @@ function _M:init(title, x, y, filter, action)
 end
 
 function _M:used()
+	if self.taking_all then return end
 	self:generateList()
 	if #self.list == 0 then
 		game:unregisterDialog(self)
@@ -87,6 +88,7 @@ function _M:select(item)
 end
 
 function _M:takeAll()
+	self.taking_all = true
 	for i = #self.list, 1, -1 do self.action(self.list[i].object, self.list[i].item) end
 	game:unregisterDialog(self)
 end

game/modules/tome/class/Game.lua

@@ -889,7 +889,7 @@ function _M:onQuit()
 	if not self.quit_dialog and not self.player.dead then
 		self.quit_dialog = Dialog:yesnoPopup("Save and exit?", "Save and exit?", function(ok)
 			if ok then
-				local d = engine.Dialog:simplePopup("Quitting...", "Quitting...", nil, true)
+				local d = engine.ui.Dialog:simplePopup("Quitting...", "Quitting...", nil, true)
 				d.__show_popup = false
 				core.display.forceRedraw()
 

game/modules/tome/class/Grid.lua

@@ -19,7 +19,7 @@
 
 require "engine.class"
 require "engine.Grid"
-local Dialog = require "engine.Dialog"
+local Dialog = require "engine.ui.Dialog"
 local DamageType = require "engine.DamageType"
 
 module(..., package.seeall, class.inherit(engine.Grid))

game/modules/tome/class/Player.lua

@@ -27,7 +27,7 @@ require "engine.interface.PlayerMouse"
 require "mod.class.interface.PlayerStats"
 require "mod.class.interface.PlayerLore"
 local Map = require "engine.Map"
-local Dialog = require "engine.Dialog"
+local Dialog = require "engine.ui.Dialog"
 local ActorTalents = require "engine.interface.ActorTalents"
 local LevelupStatsDialog = require "mod.dialogs.LevelupStatsDialog"
 local LevelupTalentsDialog = require "mod.dialogs.LevelupTalentsDialog"

game/modules/tome/class/Store.lua

@@ -19,7 +19,7 @@
 
 require "engine.class"
 local Store = require "engine.Store"
-local Dialog = require "engine.Dialog"
+local Dialog = require "engine.ui.Dialog"
 
 module(..., package.seeall, class.inherit(Store))
 

game/modules/tome/data/zones/caverns-osse/objects.lua

@@ -46,7 +46,7 @@ newEntity{ base = "BASE_LITE",
 			[Stats.STAT_WIL] = 4,
 			[Stats.STAT_CUN] = 4,
 			[Stats.STAT_CON] = 4,
-			[Stats.STAT_LCK] = -25,
+			[Stats.STAT_LCK] = -5,
 		},
 	},