Skip to content
Snippets Groups Projects
Commit baa20a26 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'master' of git.net-core.org:darkgod/t-engine4

parents 53b77694 7b7c611a
No related branches found
No related tags found
No related merge requests found
......@@ -352,7 +352,7 @@ function _M:dumpToJSON(js, bypass, nosub)
for id, data in pairs(self.achievements or {}) do
local a = world:getAchievementFromId(id)
if a then
achs[#achs+1] = { name=a.name, when=game.calendar:getTimeDate(data.turn, "%s %s %s year of Ascendancy at %02d:%02d"), desc=a.desc.."\nBy "..(data.who or "???")}
achs[#achs+1] = { id=a.id, name=a.name, when=game.calendar:getTimeDate(data.turn, "%s %s %s year of Ascendancy at %02d:%02d"), desc=a.desc.."\nBy "..(data.who or "???")}
end
end
table.sort(achs, function(a, b) return a.name < b.name end)
......
......@@ -17,6 +17,8 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
local Particles = require "engine.Particles"
newBirthDescriptor{
type = "class",
name = "Afflicted",
......
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