From e793479dac55e34355140e42e59596d185570c2f Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 8 Jun 2011 12:51:02 +0000
Subject: [PATCH] hihi
git-svn-id: http://svn.net-core.org/repos/t-engine4@3609 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/PlayerProfile.lua | 1 +
game/engines/default/engine/interface/PlayerDumpJSON.lua | 4 ++++
game/modules/tome/class/interface/PlayerDumpJSON.lua | 4 ++++
game/modules/tome/data/talents/gifts/summon-utility.lua | 2 +-
game/modules/tome/dialogs/Birther.lua | 3 ++-
5 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/PlayerProfile.lua b/game/engines/default/engine/PlayerProfile.lua
index 2606d4ae17..8a30b0fb01 100644
--- a/game/engines/default/engine/PlayerProfile.lua
+++ b/game/engines/default/engine/PlayerProfile.lua
@@ -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
diff --git a/game/engines/default/engine/interface/PlayerDumpJSON.lua b/game/engines/default/engine/interface/PlayerDumpJSON.lua
index bc9532eb9a..e32ac9ce9c 100644
--- a/game/engines/default/engine/interface/PlayerDumpJSON.lua
+++ b/game/engines/default/engine/interface/PlayerDumpJSON.lua
@@ -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 {}
diff --git a/game/modules/tome/class/interface/PlayerDumpJSON.lua b/game/modules/tome/class/interface/PlayerDumpJSON.lua
index 32c496e1f4..9184eabe5d 100644
--- a/game/modules/tome/class/interface/PlayerDumpJSON.lua
+++ b/game/modules/tome/class/interface/PlayerDumpJSON.lua
@@ -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
diff --git a/game/modules/tome/data/talents/gifts/summon-utility.lua b/game/modules/tome/data/talents/gifts/summon-utility.lua
index 11d1b5f08a..5d597ea597 100644
--- a/game/modules/tome/data/talents/gifts/summon-utility.lua
+++ b/game/modules/tome/data/talents/gifts/summon-utility.lua
@@ -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",
diff --git a/game/modules/tome/dialogs/Birther.lua b/game/modules/tome/dialogs/Birther.lua
index e622bb6d0a..ef651fe716 100644
--- a/game/modules/tome/dialogs/Birther.lua
+++ b/game/modules/tome/dialogs/Birther.lua
@@ -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
--
GitLab