From 60e9d3bcb0fcc4d49d89486ab5f756e3f306aa0f Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 29 Aug 2010 12:01:29 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@1099 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/example/class/Game.lua | 5 +++++
game/modules/tome/class/Object.lua | 2 +-
game/modules/tome/class/Player.lua | 7 +++++++
game/modules/tome/data/birth/races/dwarf.lua | 1 +
game/modules/tome/data/birth/races/elf.lua | 1 +
game/modules/tome/data/birth/races/hobbit.lua | 1 +
game/modules/tome/data/birth/races/human.lua | 2 +-
game/modules/tome/data/quests/pre-mount-doom.lua | 5 +++--
8 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/game/modules/example/class/Game.lua b/game/modules/example/class/Game.lua
index 84797f8715..d6d825eed3 100644
--- a/game/modules/example/class/Game.lua
+++ b/game/modules/example/class/Game.lua
@@ -351,6 +351,11 @@ function _M:setupCommands()
self:registerDialog(menu)
end,
+ -- Lua console, you probably want to disable it for releases
+ LUA_CONSOLE = function()
+ self:registerDialog(DebugConsole.new())
+ end,
+
-- Toggle monster list
TOGGLE_NPC_LIST = function()
self.show_npc_list = not self.show_npc_list
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index dfc92af03d..9011488d26 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -258,7 +258,7 @@ function _M:getTextualDesc()
elseif type == "range" then rs[#rs+1] = "increase range by "..i
else
local _, _, t, st = type:find("^([^/]+)/?(.*)$")
- if st then
+ if st and st ~= "" then
rs[#rs+1] = st
else
rs[#rs+1] = t
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 612b2cfbea..4a310ed198 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -76,6 +76,13 @@ function _M:init(t, no_default)
engine.interface.PlayerHotkeys.init(self, t)
mod.class.interface.PlayerLore.init(self, t)
+ local mt = getmetatable(self)
+ mt.__newindex = function(t, k, v)
+ rawset(t, k, v)
+ print("===set===", k, v)
+ util.show_backtrace()
+ end
+
self.descriptor = {}
end
diff --git a/game/modules/tome/data/birth/races/dwarf.lua b/game/modules/tome/data/birth/races/dwarf.lua
index 71767694ef..6ed77023eb 100644
--- a/game/modules/tome/data/birth/races/dwarf.lua
+++ b/game/modules/tome/data/birth/races/dwarf.lua
@@ -55,6 +55,7 @@ newBirthDescriptor{
life_rating=12,
},
experience = 1.1,
+ random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
}
---------------------------------------------------------
diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua
index 9f193659ff..8ce6d30c1f 100644
--- a/game/modules/tome/data/birth/races/elf.lua
+++ b/game/modules/tome/data/birth/races/elf.lua
@@ -53,6 +53,7 @@ newBirthDescriptor{
starting_intro = "elf",
},
experience = 1.05,
+ random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
}
---------------------------------------------------------
diff --git a/game/modules/tome/data/birth/races/hobbit.lua b/game/modules/tome/data/birth/races/hobbit.lua
index 3f0657ff88..42e4913948 100644
--- a/game/modules/tome/data/birth/races/hobbit.lua
+++ b/game/modules/tome/data/birth/races/hobbit.lua
@@ -50,6 +50,7 @@ newBirthDescriptor{
starting_quest = "start-dunadan",
starting_intro = "hobbit",
},
+ random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
}
---------------------------------------------------------
diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua
index 9f1622f085..549b2c59ee 100644
--- a/game/modules/tome/data/birth/races/human.lua
+++ b/game/modules/tome/data/birth/races/human.lua
@@ -47,7 +47,7 @@ newBirthDescriptor{
faction = "reunited-kingdom",
type = "humanoid", subtype="human",
},
- random_escort_possibilities = { {"trollshaws", 1, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+ random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
}
---------------------------------------------------------
diff --git a/game/modules/tome/data/quests/pre-mount-doom.lua b/game/modules/tome/data/quests/pre-mount-doom.lua
index 6966ad4d6d..00eb330f47 100644
--- a/game/modules/tome/data/quests/pre-mount-doom.lua
+++ b/game/modules/tome/data/quests/pre-mount-doom.lua
@@ -20,7 +20,8 @@
name = "Important news"
desc = function(self, who)
local desc = {}
- desc[#desc+1] = ""
+ desc[#desc+1] = "Orcs were spotted with the staff you seek in an arid waste in the southern desert."
+ desc[#desc+1] = "You should go investigate what is happenning there."
return table.concat(desc, "\n")
end
@@ -39,5 +40,5 @@ on_grant = function(self, who)
}
g:resolve() g:resolve(nil, true)
game.zone:addEntity(game.memory_levels["wilderness-arda-fareast-1"], g, "terrain", 56, 51)
- game.logPlayer(game.player, "Aeryn explained where the cave is located.")
+ game.logPlayer(game.player, "Aeryn explained where the orcs were spotted.")
end
--
GitLab