From f8e8bafbe11ff8d8611d13ca24755dc3d6bdf67c Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 13 Mar 2011 11:24:04 +0000
Subject: [PATCH] oups
git-svn-id: http://svn.net-core.org/repos/t-engine4@3007 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/ui/Dialog.lua | 2 +-
game/modules/tome/class/GameState.lua | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/game/engines/default/engine/ui/Dialog.lua b/game/engines/default/engine/ui/Dialog.lua
index 9056e82445..c7b7c34dc7 100644
--- a/game/engines/default/engine/ui/Dialog.lua
+++ b/game/engines/default/engine/ui/Dialog.lua
@@ -48,7 +48,7 @@ function _M:simplePopup(title, text, fct, no_leave, any_leave)
local d = new(title, 1, 1)
d:loadUI{{left = 3, top = 3, ui=require("engine.ui.Textzone").new{width=w+10, height=h+5, text=text}}}
if not no_leave then
- d.key:addBind("EXIT", function() print("==============exiting", d) game:unregisterDialog(d) if fct then fct() end end)
+ d.key:addBind("EXIT", function() game:unregisterDialog(d) if fct then fct() end end)
if any_leave then d.key:addCommand("__DEFAULT", function() game:unregisterDialog(d) if fct then fct() end end) end
local close = require("engine.ui.Button").new{text="Close", fct=function() d.key:triggerVirtual("EXIT") end}
d:loadUI{no_reset=true, {hcenter = 0, bottom = 3, ui=close}}
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index e6a3904be9..2488bd26dc 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -538,32 +538,32 @@ function _M:checkDonation(back_insert)
local min_interval = 30 * 24 * 60 * 60 -- 1 month
if os.time() < last + min_interval then
print("Donation check: too soon")
--- return
+ return
end
-- Not as soon as they start playing, wait 15 minutes
if os.time() - game.real_starttime < 15 * 60 then
print("Donation check: not started tome long enough")
--- return
+ return
end
-- Total playtime must be over a few hours
local total = profile.generic.modules_played and profile.generic.modules_played.tome or 0
if total + (os.time() - game.real_starttime) < 7 * 60 * 60 then
print("Donation check: total time too low")
--- return
+ return
end
-- Dont ask low level characters, they are probably still pissed to not have progressed further
if game.player.level < 15 then
print("Donation check: too low level")
--- return
+ return
end
-- Dont ask people in immediate danger
if game.player.life / game.player.max_life < 0.7 then
print("Donation check: too low life")
--- return
+ return
end
-- Dont ask people that already have their hands full
@@ -577,7 +577,7 @@ function _M:checkDonation(back_insert)
end
if nb_foes > 2 then
print("Donation check: too many foes")
--- return
+ return
end
-- Request money! Even a god has to eat :)
--
GitLab