diff --git a/game/engines/default/data/gfx/trophy_gold.png b/game/engines/default/data/gfx/trophy_gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..9870e7bc483c56a54b0675e5f27d5da91da70710
Binary files /dev/null and b/game/engines/default/data/gfx/trophy_gold.png differ
diff --git a/game/engines/default/engine/dialogs/Achievement.lua b/game/engines/default/engine/dialogs/Achievement.lua
new file mode 100644
index 0000000000000000000000000000000000000000..a71bbcf24805e73fb61017767f5d171d581e1377
--- /dev/null
+++ b/game/engines/default/engine/dialogs/Achievement.lua
@@ -0,0 +1,46 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Dialog = require "engine.ui.Dialog"
+local Image = require "engine.ui.Image"
+local Textzone = require "engine.ui.Textzone"
+
+module(..., package.seeall, class.inherit(Dialog))
+
+function _M:init(title, a)
+ local c_image = Image.new{file=a.image or "trophy_gold.png", shadow=true, width=64, height=64}
+ local c_desc = Textzone.new{width=500, auto_height=true, text=a.desc}
+
+ Dialog.init(self, title, 10, 10)
+
+ self:loadUI{
+ {left=0, vcenter=0, ui=c_image},
+ {right=0, vcenter=0, ui=c_desc},
+ }
+ self:setupUI(true, true, nil, nil, math.max(c_image.h, c_desc.h))
+
+ self.key:addBinds{
+ ACCEPT = "EXIT",
+ EXIT = function()
+ game:unregisterDialog(self)
+ if on_exit then on_exit() end
+ end,
+ }
+end
diff --git a/game/engines/default/engine/dialogs/ShowAchievements.lua b/game/engines/default/engine/dialogs/ShowAchievements.lua
index c14fca63349fae88f23be9bd0f50b816e54beae8..aa06a87edd764765aafee078eb0b415022047d58 100644
--- a/game/engines/default/engine/dialogs/ShowAchievements.lua
+++ b/game/engines/default/engine/dialogs/ShowAchievements.lua
@@ -18,10 +18,13 @@
-- darkgod@te4.org
require "engine.class"
+local Tiles = require "engine.Tiles"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
+local Image = require "engine.ui.Image"
+local Checkbox = require "engine.ui.Checkbox"
module(..., package.seeall, class.inherit(Dialog))
@@ -33,20 +36,31 @@ function _M:init(title, player)
Dialog.init(self, (title or "Achievements").." ("..nb.."/"..total..")", game.w * 0.8, game.h * 0.8)
- self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih}
+ self.c_self = Checkbox.new{title="Yours only", default=false, fct=function() end, on_change=function(s) if s then self:switchTo("self") end end}
+ self.c_main = Checkbox.new{title="All achieved", default=true, fct=function() end, on_change=function(s) if s then self:switchTo("main") end end}
+ self.c_all = Checkbox.new{title="Everything", default=false, fct=function() end, on_change=function(s) if s then self:switchTo("all") end end}
- self:generateList()
+ self.c_image = Image.new{file="trophy_gold.png", width=64, height=64, shadow=true}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw * 0.4 - 10), height=self.ih - self.c_self.h}
- self.c_list = ListColumns.new{width=math.floor(self.iw / 2 - 10), height=self.ih - 10, scrollbar=true, sortable=true, columns={
+ self:generateList("main")
+
+ self.c_list = ListColumns.new{width=math.floor(self.iw * 0.6 - 10), height=self.ih - 10 - self.c_self.h, scrollbar=true, sortable=true, columns={
+ {name="", width={24,"fixed"}, display_prop="--", direct_draw=function(item, x, y) if item.tex then item.tex[1]:toScreen(x+4, y, 16, 16) end end},
{name="Achievement", width=60, display_prop="name", sort="name"},
{name="When", width=20, display_prop="when", sort="when"},
{name="Who", width=20, display_prop="who", sort="who"},
}, list=self.list, fct=function(item) end, select=function(item, sel) self:select(item) end}
self:loadUI{
- {left=0, top=0, ui=self.c_list},
- {right=0, top=0, ui=self.c_desc},
- {hcenter=0, top=5, ui=Separator.new{dir="horizontal", size=self.ih - 10}},
+ {left=0, top=0, ui=self.c_self},
+ {left=self.c_self.w, top=0, ui=self.c_main},
+ {left=self.c_self.w+self.c_main.w, top=0, ui=self.c_all},
+
+ {left=0, top=self.c_self.h, ui=self.c_list},
+ {left=self.iw * 0.6 + 10, top=self.c_self.h, ui= self.c_image},
+ {right=0, top=self.c_image.h + self.c_self.h, ui=self.c_desc},
+ {left=self.iw * 0.6 - 5, top=self.c_self.h + 5, ui=Separator.new{dir="horizontal", size=self.ih - 10 - self.c_self.h}},
}
self:setFocus(self.c_list)
self:setupUI()
@@ -56,28 +70,100 @@ function _M:init(title, player)
}
end
+function _M:switchTo(kind)
+ self:generateList(kind)
+ if kind == "self" then self.c_main.checked = false self.c_all.checked = false
+ elseif kind == "main" then self.c_self.checked = false self.c_all.checked = false
+ elseif kind == "all" then self.c_main.checked = false self.c_self.checked = false
+ end
+
+ self.c_list.list = self.list
+ self.c_list:generate()
+ self.c_desc.items = {}
+ self.c_desc:switchItem(nil)
+end
+
function _M:select(item)
if item then
local also = ""
if self.player and self.player.achievements and self.player.achievements[item.id] then
also = "#GOLD#Also achieved by your current character#LAST#\n"
end
- self.c_desc:switchItem(item, ("#GOLD#Achieved on:#LAST# %s\n#GOLD#Achieved by:#LAST# %s\n%s\n#GOLD#Description:#LAST# %s"):format(item.when, item.who, also, item.desc))
+ self.c_image.item = item.tex
+ local track = self:getTrack(item.a)
+ local desc = ("#GOLD#Achieved on:#LAST# %s\n#GOLD#Achieved by:#LAST# %s\n%s\n#GOLD#Description:#LAST# %s"):format(item.when, item.who, also, item.desc):toTString()
+ if track then
+ desc:add(true, true, {"color","GOLD"}, "Progress: ", {"color","LAST"})
+ desc:merge(track)
+ end
+ self.c_desc:switchItem(item, desc)
end
end
-function _M:generateList()
+function _M:getTrack(a)
+ if a.track then
+ local src = self.player
+ local id = a.id
+ local data = nil
+ if a.mode == "world" then
+ world.achievement_data = world.achievement_data or {}
+ world.achievement_data[id] = world.achievement_data[id] or {}
+ data = world.achievement_data[id]
+ elseif a.mode == "game" then
+ game.achievement_data = game.achievement_data or {}
+ game.achievement_data[id] = game.achievement_data[id] or {}
+ data = game.achievement_data[id]
+ elseif a.mode == "player" then
+ src.achievement_data = src.achievement_data or {}
+ src.achievement_data[id] = src.achievement_data[id] or {}
+ data = src.achievement_data[id]
+ end
+ return a.track(data, src)
+ end
+ return nil
+end
+
+function _M:generateList(kind)
+ local tiles = Tiles.new(16, 16, nil, nil, true)
+ local cache = {}
+
-- Makes up the list
local list = {}
local i = 0
- for id, data in pairs(world.achieved) do
+ local function handle(id, data)
local a = world:getAchievementFromId(id)
local color = nil
if self.player and self.player.achievements and self.player.achievements[id] then
color = colors.simple(colors.LIGHT_GREEN)
end
- list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id }
- i = i + 1
+ local img = a.image or "trophy_gold.png"
+ local tex = cache[img]
+ if not tex then
+ local image = tiles:loadImage(img)
+ if image then
+ tex = {image:glTexture()}
+ cache[img] = tex
+ end
+ end
+ if not data.notdone or a.show then
+ if a.show == "full" or not data.notdone then
+ list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ elseif a.show == "none" then
+ list[#list+1] = { name="???", color=color, desc="-- Unknown --", when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ elseif a.show == "name" then
+ list[#list+1] = { name=a.name, color=color, desc="-- Unknown --", when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ else
+ list[#list+1] = { name=a.name, color=color, desc=a.desc, when=data.when, who=data.who, order=a.order, id=id, tex=tex, a=a }
+ end
+ i = i + 1
+ end
+ end
+ if kind == "self" and self.player then
+ for id, data in pairs(self.player.achievements) do handle(id, world.achieved[id]) end
+ elseif kind == "main" then
+ for id, data in pairs(world.achieved) do handle(id, data) end
+ elseif kind == "all" then
+ for _, a in ipairs(world.achiev_defs) do handle(a.id, world.achieved[id] or {notdone=true, when="--", who="--"}) end
end
table.sort(list, function(a, b) return a.name < b.name end)
self.list = list
diff --git a/game/engines/default/engine/interface/WorldAchievements.lua b/game/engines/default/engine/interface/WorldAchievements.lua
index 8344fc9293432362c005adfacd283e30a36f7837..6fd3a68ae73d6e0df18ac361273d028ecc00bc54 100644
--- a/game/engines/default/engine/interface/WorldAchievements.lua
+++ b/game/engines/default/engine/interface/WorldAchievements.lua
@@ -19,6 +19,7 @@
require "engine.class"
local Dialog = require "engine.ui.Dialog"
+local Achievement = require "engine.dialogs.Achievement"
--- Handles achievements in a world
module(..., package.seeall, class.make)
@@ -91,7 +92,7 @@ function _M:gainPersonalAchievement(silent, id, src, ...)
src.achievements[id] = {turn=game.turn, who=self:achievementWho(src), when=os.date("%Y-%m-%d %H:%M:%S")}
if not silent then
game.log("#LIGHT_GREEN#Personal New Achievement: %s!", a.name)
- Dialog:simplePopup("Personal New Achievement: #LIGHT_GREEN#"..a.name, a.desc)
+ self:showAchievement("Personal New Achievement: #LIGHT_GREEN#"..a.name, a)
profile.chat:achievement(a.name)
end
if a.on_gain then a:on_gain(src, true) end
@@ -132,13 +133,18 @@ function _M:gainAchievement(id, src, ...)
self.achieved[id] = {turn=game.turn, who=self:achievementWho(src), when=os.date("%Y-%m-%d %H:%M:%S")}
profile:saveModuleProfile("achievement."..id, self.achieved[id])
game.log("#LIGHT_GREEN#New Achievement: %s!", a.name)
- Dialog:simplePopup("New Achievement: #LIGHT_GREEN#"..a.name, a.desc)
+ self:showAchievement("New Achievement: #LIGHT_GREEN#"..a.name, a)
profile.chat:achievement(a.name)
if a.on_gain then a:on_gain(src) end
return true
end
+--- Show an achievement gain dialog
+function _M:showAchievement(title, a)
+ game:registerDialog(Achievement.new("New Achievement: #LIGHT_GREEN#"..a.name, a))
+end
+
--- Format an achievement source
-- By default just uses the actor's name, you can overload it to do more
-- @param src the actor who did it
diff --git a/game/engines/default/engine/ui/Checkbox.lua b/game/engines/default/engine/ui/Checkbox.lua
index b60fea1eca402d8c923086914b4f6d7c6e3357df..c22203b75d93e894f00dbae1b23e2f9654084494 100644
--- a/game/engines/default/engine/ui/Checkbox.lua
+++ b/game/engines/default/engine/ui/Checkbox.lua
@@ -29,6 +29,7 @@ function _M:init(t)
self.text = t.text or ""
self.checked = t.default
self.fct = assert(t.fct, "no checkbox fct")
+ self.on_change = t.on_change
Base.init(self, t)
end
@@ -64,6 +65,7 @@ end
function _M:select()
self.checked = not self.checked
+ if self.on_change then self.on_change(self.checked) end
end
function _M:display(x, y, nb_keyframes)
diff --git a/game/engines/default/engine/ui/Dialog.lua b/game/engines/default/engine/ui/Dialog.lua
index a9e320d3da42339660ae31e4bfee1ab9c4ea454d..0eedab51db1e03330ecf541f64e648ca4d18f935 100644
--- a/game/engines/default/engine/ui/Dialog.lua
+++ b/game/engines/default/engine/ui/Dialog.lua
@@ -242,7 +242,7 @@ function _M:loadUI(t)
end
end
-function _M:setupUI(resizex, resizey, on_resize)
+function _M:setupUI(resizex, resizey, on_resize, addmw, addmh)
local mw, mh = nil, nil
-- resizex, resizey = true, true
@@ -265,8 +265,8 @@ function _M:setupUI(resizex, resizey, on_resize)
end
end
-- print("===", mw, addw)
- mw = mw + addw + 5 * 2
- mh = mh + addh + 5 + 22 + 3
+ mw = mw + addw + 5 * 2 + (addmw or 0)
+ mh = mh + addh + 5 + 22 + 3 + (addmh or 0)
-- print("===", mw, addw)
local tw, th = self.font_bold:size(self.title)
diff --git a/game/engines/default/engine/ui/Image.lua b/game/engines/default/engine/ui/Image.lua
new file mode 100644
index 0000000000000000000000000000000000000000..d46c9c5c1ad07a097153a114132af49714b4c5cf
--- /dev/null
+++ b/game/engines/default/engine/ui/Image.lua
@@ -0,0 +1,58 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Tiles = require "engine.Tiles"
+local Base = require "engine.ui.Base"
+
+--- A generic UI image
+module(..., package.seeall, class.inherit(Base))
+
+function _M:init(t)
+ if t.tex then
+ self.tex = t.tex
+ else
+ self.file = tostring(assert(t.file, "no image file"))
+ self.image = assert(Tiles:loadImage(self.file), "can not load image "..self.file)
+ local iw, ih = self.image:getSize()
+ if t.auto_width then t.width = iw end
+ if t.auto_height then t.height = ih end
+ end
+ self.w = assert(t.width, "no image width")
+ self.h = assert(t.height, "no image height")
+
+ self.shadow = t.shadow
+
+ Base.init(self, t)
+end
+
+function _M:generate()
+ self.mouse:reset()
+ self.key:reset()
+
+ self.item = self.tex or {self.image:glTexture()}
+end
+
+function _M:display(x, y)
+ if self.shadow then
+ self.item[1]:toScreenFull(x + 5, y + 5, self.w, self.h, self.item[2], self.item[3], 0, 0, 0, 0.5)
+ end
+
+ self.item[1]:toScreenFull(x, y, self.w, self.h, self.item[2], self.item[3])
+end
diff --git a/game/engines/default/engine/ui/TextzoneList.lua b/game/engines/default/engine/ui/TextzoneList.lua
index e2571d2aca41f382c39d14043b1e2752c607906a..0b8a3953898ea07e499bf98a98e7233e76090ba1 100644
--- a/game/engines/default/engine/ui/TextzoneList.lua
+++ b/game/engines/default/engine/ui/TextzoneList.lua
@@ -117,7 +117,7 @@ end
function _M:switchItem(item, create_if_needed)
self.cur_item = item
if create_if_needed then if not self.items[item] then self:createItem(item, create_if_needed) end end
- if not self.items[item] then self.list = nil return false end
+ if not item or not self.items[item] then self.list = nil return false end
local d = self.items[item]
self.scroll = d.scroll
diff --git a/game/modules/tome/data/achievements/arena.lua b/game/modules/tome/data/achievements/arena.lua
index 44a754a9bbbc1f28ef88c17e37535292884c2841..9c6809f00585b3bb965f0375ebf96385054b95dc 100644
--- a/game/modules/tome/data/achievements/arena.lua
+++ b/game/modules/tome/data/achievements/arena.lua
@@ -19,40 +19,48 @@
newAchievement{
name = "The Arena",
+ show = "full",
desc = [[Unlocked Arena mode.]],
}
newAchievement{
name = "Arena Battler 20",
+ show = "full",
desc = [[Got to wave 20 in the arena.]],
}
newAchievement{
name = "Arena Battler 50",
+ show = "full",
desc = [[Got to wave 50 in the arena.]],
}
newAchievement{
name = "Almost Master of Arena",
+ show = "full",
desc = [[Became the new master of the arena in 30-wave mode.]],
}
newAchievement{
name = "Master of Arena",
+ show = "full",
desc = [[Became the new master of the arena in 60-wave mode.]],
}
newAchievement{
name = "XXX the Destroyer",
+ show = "full",
desc = [[Earned the rank of Destroyer in the arena.]],
}
newAchievement{
name = "Grand Master",
+ show = "full",
desc = [[Earned the rank of Grand Master in the arena.]],
}
newAchievement{
name = "Ten at one blow",
+ show = "full",
desc = [[Killed 10 or more enemies in one single attack in the arena.]],
}
diff --git a/game/modules/tome/data/achievements/infinite-dungeon.lua b/game/modules/tome/data/achievements/infinite-dungeon.lua
index 1583bf327958e55293b543715b067f4a708000a1..c22f4e1b4f8724522c363c3074f924af03f6c04c 100644
--- a/game/modules/tome/data/achievements/infinite-dungeon.lua
+++ b/game/modules/tome/data/achievements/infinite-dungeon.lua
@@ -19,61 +19,76 @@
newAchievement{
name = "Infinite x10",
+ show = "full",
desc = [[Got to level 10 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x20",
+ show = "full",
desc = [[Got to level 20 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x30",
+ show = "full",
desc = [[Got to level 30 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x40",
+ show = "full",
desc = [[Got to level 40 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x50",
+ show = "full",
desc = [[Got to level 50 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x60",
+ show = "full",
desc = [[Got to level 60 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x70",
+ show = "full",
desc = [[Got to level 70 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x80",
+ show = "full",
desc = [[Got to level 80 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x90",
+ show = "full",
desc = [[Got to level 90 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x100",
+ show = "full",
desc = [[Got to level 100 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x150",
+ show = "full",
desc = [[Got to level 150 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x200",
+ show = "full",
desc = [[Got to level 200 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x300",
+ show = "full",
desc = [[Got to level 300 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x400",
+ show = "full",
desc = [[Got to level 400 of the infinite dungeon.]],
}
newAchievement{
name = "Infinite x500",
+ show = "full",
desc = [[Got to level 500 of the infinite dungeon.]],
}
diff --git a/game/modules/tome/data/achievements/items.lua b/game/modules/tome/data/achievements/items.lua
index 5c80243ef928bab72ed8e854987f325281eb6262..be695a3c518348bf52f5ab36f5cdbc63ace0bca6 100644
--- a/game/modules/tome/data/achievements/items.lua
+++ b/game/modules/tome/data/achievements/items.lua
@@ -30,6 +30,8 @@ newAchievement{
newAchievement{
name = "Treasure Hunter",
+ image = "object/money_large.png",
+ show = "name",
desc = [[Amass 1000 gold pieces.]],
can_gain = function(self, who)
return who.money >= 1000
@@ -38,6 +40,8 @@ newAchievement{
newAchievement{
name = "Treasure Hoarder",
+ image = "object/money_large.png",
+ show = "name",
desc = [[Amass 3000 gold pieces.]],
can_gain = function(self, who)
return who.money >= 3000
@@ -46,6 +50,8 @@ newAchievement{
newAchievement{ id = "DRAGON_GREED",
name = "Dragon's Greed",
+ image = "object/money_large.png",
+ show = "name",
desc = [[Amass 8000 gold pieces.]],
can_gain = function(self, who)
return who.money >= 8000
diff --git a/game/modules/tome/data/achievements/kills.lua b/game/modules/tome/data/achievements/kills.lua
index f326bcbb82c774eeadc733a964b4fe83a1900cd1..cb934fb9f3b3a05dff373dfa2f6b99824b4d38ba 100644
--- a/game/modules/tome/data/achievements/kills.lua
+++ b/game/modules/tome/data/achievements/kills.lua
@@ -19,23 +19,29 @@
newAchievement{
name = "That was close",
+ show = "full",
desc = [[Kill your target while having only 1 life left.]],
}
newAchievement{
name = "Size matters",
+ show = "full",
desc = [[Do over 600 damage in one attack]],
}
newAchievement{
name = "Exterminator",
+ show = "full",
desc = [[Killed 1000 creatures]],
mode = "player",
can_gain = function(self, who)
self.nb = (self.nb or 0) + 1
if self.nb >= 1000 then return true end
- end
+ end,
+ track = function(self) return tstring{tostring(self.nb or 0)," / 1000"} end,
}
newAchievement{
name = "Pest Control",
+ image = "npc/vermin_worms_green_worm_mass.png",
+ show = "full",
desc = [[Killed 1000 reproducing vermin]],
mode = "player",
can_gain = function(self, who, target)
@@ -43,10 +49,12 @@ newAchievement{
self.nb = (self.nb or 0) + 1
if self.nb >= 1000 then return true end
end
- end
+ end,
+ track = function(self) return tstring{tostring(self.nb or 0)," / 1000"} end,
}
newAchievement{
name = "Reaver",
+ show = "full",
desc = [[Killed 1000 humanoids]],
mode = "world",
can_gain = function(self, who, target)
@@ -55,6 +63,7 @@ newAchievement{
if self.nb >= 1000 then return true end
end
end,
+ track = function(self) return tstring{tostring(self.nb or 0)," / 1000"} end,
on_gain = function(_, src, personal)
game:setAllowedBuild("corrupter")
game:setAllowedBuild("corrupter_reaver", true)
@@ -63,28 +72,36 @@ newAchievement{
newAchievement{
name = "Backstabbing Traitor", id = "ESCORT_KILL",
+ image = "object/knife_stralite.png",
+ show = "full",
desc = [[Killed 6 escorted adventurers while you were supposed to save them]],
mode = "player",
can_gain = function(self, who, target)
self.nb = (self.nb or 0) + 1
if self.nb >= 6 then return true end
end,
+ track = function(self) return tstring{tostring(self.nb or 0)," / 6"} end,
}
newAchievement{
name = "Earth Master", id = "GEOMANCER",
+ show = "name",
desc = [[Killed Harkor'Zun and unlocked Stone magic]],
mode = "player",
}
newAchievement{
name = "Kill Bill!", id = "KILL_BILL",
+ image = "object/artifact/bill_treestump.png",
+ show = "full",
desc = [[Killed Bill in the Trollmire with a level one character]],
mode = "player",
}
newAchievement{
name = "Atamathoned!", id = "ATAMATHON",
+ image = "npc/atamathon.png",
+ show = "name",
desc = [[Killed the giant golem Atamathon after foolishly reactivating it.]],
mode = "player",
}
diff --git a/game/modules/tome/data/achievements/player.lua b/game/modules/tome/data/achievements/player.lua
index 45eaa007bd12fd3c60e216e2c496f727586f8086..cb4aa9b63ff4f1c0f3006a628ca8d9ea52453873 100644
--- a/game/modules/tome/data/achievements/player.lua
+++ b/game/modules/tome/data/achievements/player.lua
@@ -19,37 +19,46 @@
newAchievement{
name = "Level 10",
+ show = "full",
desc = [[Got a character to level 10.]],
}
newAchievement{
name = "Level 20",
+ show = "full",
desc = [[Got a character to level 20.]],
}
newAchievement{
name = "Level 30",
+ show = "full",
desc = [[Got a character to level 30.]],
}
newAchievement{
name = "Level 40",
+ show = "full",
desc = [[Got a character to level 40.]],
}
newAchievement{
name = "Level 50",
+ show = "full",
desc = [[Got a character to level 50.]],
}
newAchievement{
name = "Unstoppable",
+ show = "full",
desc = [[Has returned from the dead.]],
}
newAchievement{
name = "Utterly Destroyed", id = "EIDOLON_DEATH",
+ show = "name",
desc = [[Died on the Eidolon Plane.]],
}
newAchievement{
name = "Emancipation", id = "EMANCIPATION",
+ image = "npc/alchemist_golem.png",
+ show = "name",
desc = [[Have the golem kill a boss while its master is already dead.]],
mode = "player",
can_gain = function(self, who, target)
@@ -66,6 +75,7 @@ newAchievement{
newAchievement{
name = "Take you with me", id = "BOSS_REVENGE",
+ show = "full",
desc = [[Kill a boss while already dead.]],
mode = "player",
can_gain = function(self, who, target)
diff --git a/game/modules/tome/data/achievements/quests.lua b/game/modules/tome/data/achievements/quests.lua
index 887d85eba17887e742b21ee67e7902770d3042f2..f7371b5d484c3c3428b72450f1dc2ac65e8f415d 100644
--- a/game/modules/tome/data/achievements/quests.lua
+++ b/game/modules/tome/data/achievements/quests.lua
@@ -31,150 +31,188 @@ newAchievement{
--------------- Main objectives
newAchievement{
name = "Vampire crusher",
+ image = "npc/the_master.png",
+ show = "name",
desc = [[Destroyed the Master in its lair of the Dreadfell.]],
}
newAchievement{
name = "A dangerous secret",
+ show = "name",
desc = [[Found the mysterious staff and told Last Hope about it.]],
}
newAchievement{
name = "The secret city",
+ show = "none",
desc = [[Discovered the truth about mages.]],
}
newAchievement{
name = "Burnt to the ground", id="APPRENTICE_STAFF",
+ show = "none",
desc = [[Gave the staff of absorption to the apprentice mage and watched the fireworks.]],
}
newAchievement{
name = "Against all odds", id = "KILL_UKRUK",
+ show = "name",
desc = [[Killed Ukruk in the ambush.]],
}
newAchievement{
name = "Sliders",
+ image = "object/artifact/orb_many_ways.png",
+ show = "name",
desc = [[Activated a portal using the Orb of Many Ways.]],
}
newAchievement{
name = "Destroyer's bane", id = "DESTROYER_BANE",
+ show = "name",
desc = [[Killed Golbug the Destroyer.]],
}
newAchievement{
name = "Brave new world", id = "STRANGE_NEW_WORLD",
+ show = "name",
desc = [[Went to the Far East and took part in the war.]],
}
newAchievement{
name = "Race through fire", id = "CHARRED_SCAR_SUCCESS",
+ show = "name",
desc = [[Raced through the fires of the Charred Scar to stop the Sorcerers.]],
}
newAchievement{
name = "Orcrist", id = "ORC_PRIDE",
+ show = "name",
desc = [[Killed the leaders of the Orc Pride.]],
}
--------------- Wins
newAchievement{
name = "Evil denied", id = "WIN_FULL",
+ show = "name",
desc = [[Won ToME by preventing the Void portal to open.]],
}
newAchievement{
name = "The High Lady's destiny", id = "WIN_AERYN",
+ show = "name",
desc = [[Won ToME by closing the Void portal using Aeryn as a sacrifice.]],
}
newAchievement{
name = "Selfless", id = "WIN_SACRIFICE",
+ show = "name",
desc = [[Won ToME by closing the Void portal using yourself as a sacrifice.]],
}
newAchievement{
name = "Triumph of the Way", id = "YEEK_SACRIFICE",
+ show = "name",
desc = [[Won ToME by sacrificing yourself to forcefully spread the Way to every other sentient being on Eyal.]],
}
newAchievement{
name = "Tactical master", id = "SORCERER_NO_PORTAL",
+ show = "name",
desc = [[Fought the two Sorcerers without closing any invocation portals.]],
}
newAchievement{
name = "Portal destroyer", id = "SORCERER_ONE_PORTAL",
+ show = "name",
desc = [[Fought the two Sorcerers and closed one invocation portal.]],
}
newAchievement{
name = "Portal reaver", id = "SORCERER_TWO_PORTAL",
+ show = "name",
desc = [[Fought the two Sorcerers and closed two invocation portals.]],
}
newAchievement{
name = "Portal ender", id = "SORCERER_THREE_PORTAL",
+ show = "name",
desc = [[Fought the two Sorcerers and closed three invocation portals.]],
}
newAchievement{
name = "Portal master", id = "SORCERER_FOUR_PORTAL",
+ show = "name",
desc = [[Fought the two Sorcerers and closed four invocation portals.]],
}
-------------- Other quests
newAchievement{
name = "Rescuer of the lost", id = "LOST_MERCHANT_RESCUE",
+ show = "name",
desc = [[Rescued the merchant from the assassin lord.]],
}
newAchievement{
name = "Destroyer of the creation", id = "SLASUL_DEAD",
+ show = "name",
desc = [[Killed Slasul.]],
}
newAchievement{
name = "Flooder", id = "UKLLMSWWIK_DEAD",
+ show = "name",
desc = [[Defeated Ukllmswwik while doing his own quest.]],
}
newAchievement{
name = "Gem of the Moon", id = "MASTER_JEWELER",
+ show = "name",
desc = [[Completed the Master Jeweler quest with Limmir.]],
}
newAchievement{
name = "Curse Lifter", id = "CURSE_ERASER",
+ show = "name",
desc = [[Killed Ben Cruthdar the Cursed.]],
}
newAchievement{
name = "Eye of the storm", id = "EYE_OF_THE_STORM",
+ show = "name",
desc = [[Freed Derth from the onslaught of the mad Tempest, Urkis.]],
}
newAchievement{
name = "Antimagic!", id = "ANTIMAGIC",
+ show = "name",
desc = [[Completed antimagic training in the Ziguranth camp.]],
}
newAchievement{
name = "Anti-Antimagic!", id = "ANTI_ANTIMAGIC",
+ show = "name",
desc = [[Destroyed the Ziguranth camp with your Rhaloren allies.]],
}
newAchievement{
name = "There and back again", id = "WEST_PORTAL",
+ show = "name",
desc = [[Opened a portal to Maj'Eyal from the Far East.]],
}
newAchievement{
name = "Back and there again", id = "EAST_PORTAL",
+ show = "name",
desc = [[Opened a portal to the Far East from Maj'Eyal.]],
}
newAchievement{
name = "Arachnophobia", id = "SPYDRIC_INFESTATION",
+ show = "name",
desc = [[Destroyed the spydric menace.]],
}
newAchievement{
name = "Clone War", id = "SHADOW_CLONE",
+ show = "name",
desc = [[Destroyed your own Shade.]],
}
newAchievement{
name = "Home sweet home", id = "SHERTUL_FORTRESS",
+ show = "name",
desc = [[Dispatched the Weirdling Beast and taken possession of Yiilkgur, the Sher'Tul Fortress for your own usage.]],
}
newAchievement{
name = "Squadmate", id = "NORGAN_SAVED",
+ show = "name",
desc = [[Escaped from Reknor alive with your squadmate Norgan.]],
}
newAchievement{
name = "Genocide", id = "GREATMOTHER_DEAD",
+ show = "name",
desc = [[Killed the Orc Greatmother in the breeding pits, thus dealing a terrible blow to the orc race.]],
}
newAchievement{
name = "Savior of the damsels in distress", id = "MELINDA_SAVED",
+ show = "name",
desc = [[Saved Melinda from her terrible fate in the Crypt of Kryl-Feijan.]],
}
newAchievement{
name = "Impossible Death", id = "PARADOX_NOW",
+ show = "name",
desc = [[Being killed by your future self.]],
on_gain = function(_, src, personal)
if world:hasAchievement("PARADOX_FUTURE") then world:gainAchievement("PARADOX_FULL", src) end
@@ -182,6 +220,7 @@ newAchievement{
}
newAchievement{
name = "Self-killer", id = "PARADOX_FUTURE",
+ show = "name",
desc = [[Killed your future self.]],
on_gain = function(_, src, personal)
if world:hasAchievement("PARADOX_NOW") then world:gainAchievement("PARADOX_FULL", src) end
@@ -189,9 +228,11 @@ newAchievement{
}
newAchievement{
name = "Paradoxology", id = "PARADOX_FULL",
+ show = "name",
desc = [[Both killed your future self and got killed by your future self.]],
}
newAchievement{
name = "Explorer", id = "EXPLORER",
+ show = "name",
desc = [[Use the Sher'Tul fortress exploratory farportal at least 7 times with the same character.]],
}
diff --git a/game/modules/tome/data/achievements/talents.lua b/game/modules/tome/data/achievements/talents.lua
index 3eee9482ef54e8117f9c6bada8e1660d0e01e876..a90f699ae904b1d56617be6c7111fe04155ef3e5 100644
--- a/game/modules/tome/data/achievements/talents.lua
+++ b/game/modules/tome/data/achievements/talents.lua
@@ -50,11 +50,13 @@ newAchievement{
newAchievement{
name = "Pyromancer",
desc = [[Unlocked Archmage class and did over one million fire damage (with any item/talent/class).]],
+ show = "full",
mode = "world",
can_gain = function(self, who, dam)
self.nb = (self.nb or 0) + dam
return self.nb > 1000000 and profile.mod.allow_build.mage
end,
+ track = function(self) return tstring{tostring(math.floor(self.nb or 0))," / 1000000"} end,
on_gain = function(_, src, personal)
game:setAllowedBuild("mage_pyromancer", true)
local p = game.party:findMember{main=true}
@@ -69,11 +71,13 @@ newAchievement{
newAchievement{
name = "Cryomancer",
desc = [[Unlocked Archmage class and did over one million cold damage (with any item/talent/class).]],
+ show = "full",
mode = "world",
can_gain = function(self, who, dam)
self.nb = (self.nb or 0) + dam
return self.nb > 1000000 and profile.mod.allow_build.mage
end,
+ track = function(self) return tstring{tostring(math.floor(self.nb or 0))," / 1000000"} end,
on_gain = function(_, src, personal)
game:setAllowedBuild("mage_cryomancer", true)
local p = game.party:findMember{main=true}
diff --git a/game/modules/tome/data/zones/lake-nur/grids.lua b/game/modules/tome/data/zones/lake-nur/grids.lua
index efdf57dfe42adb6f4c293933921fc322a9f8ab81..2431a78b41cf379816fe59be873f551fbfc992ab 100644
--- a/game/modules/tome/data/zones/lake-nur/grids.lua
+++ b/game/modules/tome/data/zones/lake-nur/grids.lua
@@ -28,7 +28,7 @@ newEntity{
display = '<', color_r=255, color_g=255, color_b=0,
notice = true,
always_remember = true,
- change_level = 7, change_zone = "old-forest", force_down = true,
+ change_level = 5, change_zone = "old-forest", force_down = true,
}
newEntity{