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

hihi

git-svn-id: http://svn.net-core.org/repos/t-engine4@3609 51575b47-30f0-44d4-a5cc-537603b46e54
parent 656f4064
No related branches found
No related tags found
No related merge requests found
......@@ -518,6 +518,7 @@ function _M:syncOnline(module)
end
function _M:checkModuleHash(module, md5)
do self.hash_valid = true return true end
self.hash_valid = false
-- if not self.auth then return nil, "no online profile active" end
if config.settings.cheat then return nil, "cheat mode active" end
......
......@@ -43,6 +43,10 @@ function _M:saveUUID()
end
local data = {sections={}}
setmetatable(data, {__index={
hiddenData = function(self, key, value)
self.hidden = self.hidden or {}
self.hidden[key] = value
end,
newSection = function(self, display, table, type, column, sectable)
self.sections[#self.sections+1] = {display=display, table=table, type=type, column=column}
self[table] = sectable or {}
......
......@@ -296,6 +296,10 @@ function _M:dumpToJSON(js)
dead = self.dead and "dead" or nil,
winner = self.winner and "winner" or nil,
}
if self.has_custom_tile then
tags.tile = self.has_custom_tile
js:hiddenData("tile", self.has_custom_tile)
end
return title, tags
end
......@@ -196,7 +196,7 @@ newTalent{
local NPC = require "mod.class.NPC"
local m = NPC.new{
type = "animal", subtype = "spider",
display = "S", color=colors.LIGHT_DARK, image = "npc/summoner_spider.png",
display = "S", color=colors.LIGHT_DARK, image = "npc/spiderkin_spider_giant_spider.png",
name = "giant spider", faction = self.faction,
desc = [[]],
autolevel = "none",
......
......@@ -166,6 +166,7 @@ function _M:atEnd(v)
game:unregisterDialog(self)
self:apply()
if self.actor.has_custom_tile then self.actor.make_tile = nil end
game:setPlayerName(self.c_name.text)
self.at_end(false)
end)
......@@ -717,7 +718,7 @@ function _M:setTile(f, w, h)
self.actor.add_mos = nil
self.actor.image = f
end
self.actor.has_custom_tile = true
self.actor.has_custom_tile = f
end
if self.actor._mo then self.actor._mo:invalidate() end
self.actor._mo = nil
......
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