Skip to content
Snippets Groups Projects
Commit 60e9d3bc authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@1099 51575b47-30f0-44d4-a5cc-537603b46e54
parent fa34bc46
No related branches found
No related tags found
No related merge requests found
...@@ -351,6 +351,11 @@ function _M:setupCommands() ...@@ -351,6 +351,11 @@ function _M:setupCommands()
self:registerDialog(menu) self:registerDialog(menu)
end, end,
-- Lua console, you probably want to disable it for releases
LUA_CONSOLE = function()
self:registerDialog(DebugConsole.new())
end,
-- Toggle monster list -- Toggle monster list
TOGGLE_NPC_LIST = function() TOGGLE_NPC_LIST = function()
self.show_npc_list = not self.show_npc_list self.show_npc_list = not self.show_npc_list
......
...@@ -258,7 +258,7 @@ function _M:getTextualDesc() ...@@ -258,7 +258,7 @@ function _M:getTextualDesc()
elseif type == "range" then rs[#rs+1] = "increase range by "..i elseif type == "range" then rs[#rs+1] = "increase range by "..i
else else
local _, _, t, st = type:find("^([^/]+)/?(.*)$") local _, _, t, st = type:find("^([^/]+)/?(.*)$")
if st then if st and st ~= "" then
rs[#rs+1] = st rs[#rs+1] = st
else else
rs[#rs+1] = t rs[#rs+1] = t
......
...@@ -76,6 +76,13 @@ function _M:init(t, no_default) ...@@ -76,6 +76,13 @@ function _M:init(t, no_default)
engine.interface.PlayerHotkeys.init(self, t) engine.interface.PlayerHotkeys.init(self, t)
mod.class.interface.PlayerLore.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 = {} self.descriptor = {}
end end
......
...@@ -55,6 +55,7 @@ newBirthDescriptor{ ...@@ -55,6 +55,7 @@ newBirthDescriptor{
life_rating=12, life_rating=12,
}, },
experience = 1.1, 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}, },
} }
--------------------------------------------------------- ---------------------------------------------------------
......
...@@ -53,6 +53,7 @@ newBirthDescriptor{ ...@@ -53,6 +53,7 @@ newBirthDescriptor{
starting_intro = "elf", starting_intro = "elf",
}, },
experience = 1.05, 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}, },
} }
--------------------------------------------------------- ---------------------------------------------------------
......
...@@ -50,6 +50,7 @@ newBirthDescriptor{ ...@@ -50,6 +50,7 @@ newBirthDescriptor{
starting_quest = "start-dunadan", starting_quest = "start-dunadan",
starting_intro = "hobbit", 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}, },
} }
--------------------------------------------------------- ---------------------------------------------------------
......
...@@ -47,7 +47,7 @@ newBirthDescriptor{ ...@@ -47,7 +47,7 @@ newBirthDescriptor{
faction = "reunited-kingdom", faction = "reunited-kingdom",
type = "humanoid", subtype="human", 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}, },
} }
--------------------------------------------------------- ---------------------------------------------------------
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
name = "Important news" name = "Important news"
desc = function(self, who) desc = function(self, who)
local desc = {} 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") return table.concat(desc, "\n")
end end
...@@ -39,5 +40,5 @@ on_grant = function(self, who) ...@@ -39,5 +40,5 @@ on_grant = function(self, who)
} }
g:resolve() g:resolve(nil, true) g:resolve() g:resolve(nil, true)
game.zone:addEntity(game.memory_levels["wilderness-arda-fareast-1"], g, "terrain", 56, 51) 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 end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment