From 545e54ee7c346b5466bd9ec4bb3d5be325b65b97 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 25 Jan 2011 08:27:14 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@2496 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 8 ++++----
.../tome/data/talents/psionic/absorption.lua | 12 ------------
.../data/talents/psionic/augmented-mobility.lua | 12 ------------
game/modules/tome/data/talents/psionic/focus.lua | 13 -------------
.../tome/data/talents/psionic/projection.lua | 12 ------------
game/modules/tome/data/talents/psionic/psionic.lua | 11 +++++++++++
game/modules/tome/data/talents/psionic/voracity.lua | 12 ------------
game/modules/tome/data/zones/temporal-rift/zone.lua | 6 +++++-
8 files changed, 20 insertions(+), 66 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index d05cb344de..ba36424899 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -278,7 +278,7 @@ function _M:loaded()
end,
}
Map:setViewerActor(self.player)
- Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 32, 32, nil, 22, true)
+ Map:setViewPort(216, 36, self.w - 216, math.floor(self.h * 0.80) - 36, 32, 32, nil, 22, true)
if self.player then self.player.changed = true end
self.key = engine.KeyBind.new()
@@ -310,13 +310,13 @@ function _M:setupDisplayMode(reboot)
local do_bg = true
if gfx.size == "64x64" then
- Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 64, 64, nil, 44, do_bg)
+ Map:setViewPort(216, 36, self.w - 216, math.floor(self.h * 0.80) - 36, 64, 64, nil, 44, do_bg)
Map:resetTiles()
elseif gfx.size == "32x32" then
- Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 32, 32, nil, 22, do_bg)
+ Map:setViewPort(216, 36, self.w - 216, math.floor(self.h * 0.80) - 36, 32, 32, nil, 22, do_bg)
Map:resetTiles()
elseif gfx.size == "16x16" then
- Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 16, 16, "/data/font/FSEX300.ttf", 16, do_bg)
+ Map:setViewPort(216, 36, self.w - 216, math.floor(self.h * 0.80) - 36, 16, 16, "/data/font/FSEX300.ttf", 16, do_bg)
Map:resetTiles()
end
diff --git a/game/modules/tome/data/talents/psionic/absorption.lua b/game/modules/tome/data/talents/psionic/absorption.lua
index 0f9ca1c9ce..f156fd099b 100644
--- a/game/modules/tome/data/talents/psionic/absorption.lua
+++ b/game/modules/tome/data/talents/psionic/absorption.lua
@@ -17,18 +17,6 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-local function getGemLevel(self)
- local gem_level = 0
- if not self:getInven("PSIONIC_FOCUS") or self:getInven("PSIONIC_FOCUS")[1] then return gem_level end
- local tk_item = self:getInven("PSIONIC_FOCUS")[1]
- if tk_item.type == "gem" then
- gem_level = tk_item.material_level
- else
- gem_level = 0
- end
- return gem_level
-end
-
local function getShieldStrength(self, t)
local add = 0
if self:knowTalent(self.T_FOCUSED_CHANNELING) then
diff --git a/game/modules/tome/data/talents/psionic/augmented-mobility.lua b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
index 164c40ffe0..d3f6e72c71 100644
--- a/game/modules/tome/data/talents/psionic/augmented-mobility.lua
+++ b/game/modules/tome/data/talents/psionic/augmented-mobility.lua
@@ -17,18 +17,6 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-local function getGemLevel(self)
- local gem_level = 0
- if not self:getInven("PSIONIC_FOCUS") or self:getInven("PSIONIC_FOCUS")[1] then return gem_level end
- local tk_item = self:getInven("PSIONIC_FOCUS")[1]
- if tk_item.type == "gem" then
- gem_level = tk_item.material_level
- else
- gem_level = 0
- end
- return gem_level
-end
-
newTalent{
name = "Mindhook",
type = {"psionic/augmented-mobility", 1},
diff --git a/game/modules/tome/data/talents/psionic/focus.lua b/game/modules/tome/data/talents/psionic/focus.lua
index 061953d7fc..85f0b4f8f5 100644
--- a/game/modules/tome/data/talents/psionic/focus.lua
+++ b/game/modules/tome/data/talents/psionic/focus.lua
@@ -22,19 +22,6 @@
--Reach: gem-based range improvements
--Channeling: gem-based shield and improvement
-local function getGemLevel(self)
- local gem_level = 0
- if not self:getInven("PSIONIC_FOCUS") or self:getInven("PSIONIC_FOCUS")[1] then return gem_level end
- local tk_item = self:getInven("PSIONIC_FOCUS")[1]
- if tk_item.type == "gem" then
- gem_level = tk_item.material_level
- else
- gem_level = 0
- end
- return gem_level
-end
-
-
newTalent{
name = "Mindlash",
type = {"psionic/focus", 1},
diff --git a/game/modules/tome/data/talents/psionic/projection.lua b/game/modules/tome/data/talents/psionic/projection.lua
index f616daeae8..fb9a964491 100644
--- a/game/modules/tome/data/talents/psionic/projection.lua
+++ b/game/modules/tome/data/talents/psionic/projection.lua
@@ -17,18 +17,6 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-local function getGemLevel(self)
- local gem_level = 0
- if not self:getInven("PSIONIC_FOCUS") or self:getInven("PSIONIC_FOCUS")[1] then return gem_level end
- local tk_item = self:getInven("PSIONIC_FOCUS")[1]
- if tk_item.type == "gem" then
- gem_level = tk_item.material_level
- else
- gem_level = 0
- end
- return gem_level
-end
-
local function combatTalentDamage(self, t, min, max)
return self:combatTalentSpellDamage(t, min, max, self.level + self:getWil())
end
diff --git a/game/modules/tome/data/talents/psionic/psionic.lua b/game/modules/tome/data/talents/psionic/psionic.lua
index 636894c0db..985ad807f3 100644
--- a/game/modules/tome/data/talents/psionic/psionic.lua
+++ b/game/modules/tome/data/talents/psionic/psionic.lua
@@ -115,6 +115,17 @@ psi_cun_high5 = {
level = function(level) return 26 + (level-1) end,
}
+-- Useful definitions for psionic talents
+function getGemLevel(self)
+ local gem_level = 0
+ if self:getInven("PSIONIC_FOCUS") then
+ local tk_item = self:getInven("PSIONIC_FOCUS")[1]
+ if tk_item and (tk_item.type == "gem") then
+ gem_level = tk_item.material_level
+ end
+ end
+ return gem_level
+end
load("/data/talents/psionic/absorption.lua")
load("/data/talents/psionic/finer-energy-manipulations.lua")
diff --git a/game/modules/tome/data/talents/psionic/voracity.lua b/game/modules/tome/data/talents/psionic/voracity.lua
index 7829a1528d..6808189716 100644
--- a/game/modules/tome/data/talents/psionic/voracity.lua
+++ b/game/modules/tome/data/talents/psionic/voracity.lua
@@ -17,18 +17,6 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-local function getGemLevel(self)
- local gem_level = 0
- if not self:getInven("PSIONIC_FOCUS") or self:getInven("PSIONIC_FOCUS")[1] then return gem_level end
- local tk_item = self:getInven("PSIONIC_FOCUS")[1]
- if tk_item.type == "gem" then
- gem_level = tk_item.material_level
- else
- gem_level = 0
- end
- return gem_level
-end
-
newTalent{
name = "Kinetic Leech",
type = {"psionic/voracity", 1},
diff --git a/game/modules/tome/data/zones/temporal-rift/zone.lua b/game/modules/tome/data/zones/temporal-rift/zone.lua
index 01959b45e3..2b94065337 100644
--- a/game/modules/tome/data/zones/temporal-rift/zone.lua
+++ b/game/modules/tome/data/zones/temporal-rift/zone.lua
@@ -22,7 +22,7 @@ return {
display_name = function(x, y)
if game.level.level == 2 then return "Temporal Rift: Lumberjack village"
elseif game.level.level == 3 then return "Temporal Rift: Daikara"
- elseif game.level.level == 2 then return "Temporal Rift: Lake of Nur"
+ elseif game.level.level == 4 then return "Temporal Rift: Lake of Nur"
end
return "Temporal Rift"
end,
@@ -35,9 +35,13 @@ return {
width = 60, height = 25,
-- all_remembered = true,
all_lited = true,
+ no_worldport = true,
persistent = "zone",
generator = {
},
+ color_shown = {0.4, 0.3, 0.5, 1},
+ color_obscure = {0.4*0.6, 0.3*0.6, 0.5*0.6, 1},
+ ambient_music = "Through the Dark Portal.ogg",
levels =
{
[1] = { generator = {
--
GitLab