From 5568eab3666aad4268b0c8c85168d7ab2a5f658f Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Sun, 5 Sep 2010 17:44:36 +0000 Subject: [PATCH] licence git-svn-id: http://svn.net-core.org/repos/t-engine4@1149 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/engines/default/engine/Dialog.lua | 20 +++++++++++++++---- .../class/generator/actor/HighPeakFinal.lua | 2 +- .../tome/class/generator/actor/MountDoom.lua | 2 +- .../tome/class/generator/actor/ValleyMoon.lua | 2 +- .../tome/class/generator/map/MountDoom.lua | 2 +- .../tome/class/generator/map/SlimeTunnels.lua | 2 +- .../tome/class/interface/PlayerStats.lua | 2 +- .../class/interface/WorldAchievements.lua | 2 +- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/game/engines/default/engine/Dialog.lua b/game/engines/default/engine/Dialog.lua index f508fb9578..d8ee00f7cb 100644 --- a/game/engines/default/engine/Dialog.lua +++ b/game/engines/default/engine/Dialog.lua @@ -212,10 +212,22 @@ end function _M:toScreen(x, y) -- Draw with only the texture if self.__showup then - local zoom = self.__showup / 7 - self.texture:toScreenFull(x + (self.w - self.w * zoom) / 2, y + (self.h - self.h * zoom) / 2, self.w * zoom, self.h * zoom, self.texture_w * zoom, self.texture_h * zoom) - self.__showup = self.__showup + 1 - if self.__showup >= 7 then self.__showup = nil end + local eff = self.__showup_effect or "pop" + if eff == "overpop" then + local zoom = self.__showup / 7 + if self.__showup >= 9 then + zoom = (9 - (self.__showup - 9)) / 7 - 1 + zoom = 1 + zoom * 0.5 + end + self.texture:toScreenFull(x + (self.w - self.w * zoom) / 2, y + (self.h - self.h * zoom) / 2, self.w * zoom, self.h * zoom, self.texture_w * zoom, self.texture_h * zoom) + self.__showup = self.__showup + 1 + if self.__showup >= 11 then self.__showup = nil end + else + local zoom = self.__showup / 7 + self.texture:toScreenFull(x + (self.w - self.w * zoom) / 2, y + (self.h - self.h * zoom) / 2, self.w * zoom, self.h * zoom, self.texture_w * zoom, self.texture_h * zoom) + self.__showup = self.__showup + 1 + if self.__showup >= 7 then self.__showup = nil end + end else self.texture:toScreenFull(x, y, self.w, self.h, self.texture_w, self.texture_h) end diff --git a/game/modules/tome/class/generator/actor/HighPeakFinal.lua b/game/modules/tome/class/generator/actor/HighPeakFinal.lua index e6b6955d6f..7aa0b5f52e 100644 --- a/game/modules/tome/class/generator/actor/HighPeakFinal.lua +++ b/game/modules/tome/class/generator/actor/HighPeakFinal.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/generator/actor/MountDoom.lua b/game/modules/tome/class/generator/actor/MountDoom.lua index 10685133fb..405465ba7a 100644 --- a/game/modules/tome/class/generator/actor/MountDoom.lua +++ b/game/modules/tome/class/generator/actor/MountDoom.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/generator/actor/ValleyMoon.lua b/game/modules/tome/class/generator/actor/ValleyMoon.lua index 7a7f64941b..d920fbfce2 100644 --- a/game/modules/tome/class/generator/actor/ValleyMoon.lua +++ b/game/modules/tome/class/generator/actor/ValleyMoon.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/generator/map/MountDoom.lua b/game/modules/tome/class/generator/map/MountDoom.lua index c8f9439e1f..b7eab54239 100644 --- a/game/modules/tome/class/generator/map/MountDoom.lua +++ b/game/modules/tome/class/generator/map/MountDoom.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/generator/map/SlimeTunnels.lua b/game/modules/tome/class/generator/map/SlimeTunnels.lua index 1b41ec43af..e1a57ddc76 100644 --- a/game/modules/tome/class/generator/map/SlimeTunnels.lua +++ b/game/modules/tome/class/generator/map/SlimeTunnels.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/interface/PlayerStats.lua b/game/modules/tome/class/interface/PlayerStats.lua index 0ca9dca32b..8880d835ab 100644 --- a/game/modules/tome/class/interface/PlayerStats.lua +++ b/game/modules/tome/class/interface/PlayerStats.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify diff --git a/game/modules/tome/class/interface/WorldAchievements.lua b/game/modules/tome/class/interface/WorldAchievements.lua index 8eeac2b0fa..d8daf0b83e 100644 --- a/game/modules/tome/class/interface/WorldAchievements.lua +++ b/game/modules/tome/class/interface/WorldAchievements.lua @@ -1,4 +1,4 @@ --- TE4 - T-Engine 4 +-- ToME - Tales of Middle-Earth -- Copyright (C) 2009, 2010 Nicolas Casalini -- -- This program is free software: you can redistribute it and/or modify -- GitLab